From fa3a96e7905fd531fb9d62a9ee6c221a3c3a0a66 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 7 Mar 2017 19:40:46 +0100 Subject: [PATCH] Move to lettuce.io #493 Rename artifactId to lettuce-core with groupId io.lettuce and switch snapshot versioning scheme from -SNAPSHOT to .BUILD-SNAPSHOT. Relocate packages from com.lambdaworks.redis to io.lettuce.core. --- README.md | 19 ++- pom.xml | 91 ++------------ src/assembly/bin.xml | 4 +- .../com/lambdaworks/codec/package-info.java | 4 - .../redis/cluster/api/package-info.java | 4 - .../redis/cluster/event/package-info.java | 5 - .../redis/cluster/package-info.java | 4 - .../redis/dynamic/intercept/package-info.java | 4 - .../redis/dynamic/output/package-info.java | 4 - .../redis/dynamic/package-info.java | 4 - .../redis/dynamic/parameter/package-info.java | 4 - .../redis/dynamic/segment/package-info.java | 4 - .../redis/event/connection/package-info.java | 5 - .../redis/event/metrics/package-info.java | 5 - .../redis/masterslave/package-info.java | 5 - .../com/lambdaworks/redis/package-info.java | 4 - .../redis/sentinel/api/package-info.java | 4 - .../redis/support/package-info.java | 5 - .../core}/AbstractRedisAsyncCommands.java | 20 ++-- .../lettuce/core}/AbstractRedisClient.java | 12 +- .../core}/AbstractRedisReactiveCommands.java | 20 ++-- .../lettuce/core}/BitFieldArgs.java | 14 +-- .../lettuce/core}/ChannelGroupListener.java | 4 +- .../lettuce/core}/ClientOptions.java | 32 ++--- .../lettuce/core}/CloseEvents.java | 4 +- .../lettuce/core}/CompositeArgument.java | 6 +- .../lettuce/core}/ConnectionBuilder.java | 10 +- .../lettuce/core}/ConnectionEventTrigger.java | 6 +- .../lettuce/core}/ConnectionEvents.java | 4 +- .../lettuce/core}/ConnectionFuture.java | 4 +- .../lettuce/core}/ConnectionId.java | 8 +- .../lettuce/core}/ConnectionPoint.java | 2 +- .../core}/DefaultConnectionFuture.java | 2 +- .../lettuce/core}/EpollProvider.java | 12 +- .../core}/FutureSyncInvocationHandler.java | 8 +- .../redis => io/lettuce/core}/GeoArgs.java | 30 ++--- .../lettuce/core}/GeoCoordinates.java | 10 +- .../lettuce/core}/GeoRadiusStoreArgs.java | 10 +- .../redis => io/lettuce/core}/GeoWithin.java | 4 +- .../lettuce/core}/JavaRuntime.java | 6 +- .../lettuce/core}/KeyScanCursor.java | 4 +- .../redis => io/lettuce/core}/KeyValue.java | 4 +- .../redis => io/lettuce/core}/KillArgs.java | 8 +- .../lettuce/core}/LettuceFutures.java | 2 +- .../lettuce/core}/LettuceStrings.java | 22 ++-- .../redis => io/lettuce/core}/Limit.java | 2 +- .../lettuce/core}/MapScanCursor.java | 6 +- .../lettuce/core}/MigrateArgs.java | 10 +- .../core}/PlainChannelInitializer.java | 16 +-- .../redis => io/lettuce/core}/Range.java | 18 +-- .../redis => io/lettuce/core}/ReadFrom.java | 4 +- .../lettuce/core}/ReadFromImpl.java | 8 +- .../lettuce/core}/RedisAsyncCommandsImpl.java | 10 +- .../lettuce/core}/RedisChannelHandler.java | 10 +- .../core}/RedisChannelInitializer.java | 4 +- .../core}/RedisChannelInitializerImpl.java | 4 +- .../lettuce/core}/RedisChannelWriter.java | 6 +- .../lettuce/core}/RedisClient.java | 42 +++---- .../lettuce/core}/RedisCommandBuilder.java | 24 ++-- .../core}/RedisCommandExecutionException.java | 2 +- .../RedisCommandInterruptedException.java | 4 +- .../core}/RedisCommandTimeoutException.java | 4 +- .../core}/RedisConnectionException.java | 4 +- .../core}/RedisConnectionStateAdapter.java | 4 +- .../core}/RedisConnectionStateListener.java | 14 +-- .../lettuce/core}/RedisException.java | 4 +- .../lettuce/core}/RedisFuture.java | 2 +- .../lettuce/core}/RedisPublisher.java | 20 ++-- .../core}/RedisReactiveCommandsImpl.java | 10 +- .../redis => io/lettuce/core}/RedisURI.java | 70 +++++------ .../redis => io/lettuce/core}/ScanArgs.java | 20 ++-- .../redis => io/lettuce/core}/ScanCursor.java | 16 +-- .../lettuce/core}/ScanIterator.java | 18 +-- .../lettuce/core}/ScoredValue.java | 6 +- .../lettuce/core}/ScoredValueScanCursor.java | 6 +- .../lettuce/core}/ScriptOutputType.java | 10 +- .../redis => io/lettuce/core}/SetArgs.java | 6 +- .../lettuce/core}/SocketOptions.java | 12 +- .../redis => io/lettuce/core}/SortArgs.java | 14 +-- .../lettuce/core}/SslConnectionBuilder.java | 20 ++-- .../redis => io/lettuce/core}/SslOptions.java | 4 +- .../core}/StatefulRedisConnectionImpl.java | 24 ++-- .../lettuce/core}/StreamScanCursor.java | 4 +- .../lettuce/core}/TransactionResult.java | 2 +- .../redis => io/lettuce/core}/Transports.java | 4 +- .../redis => io/lettuce/core}/Value.java | 10 +- .../lettuce/core}/ValueScanCursor.java | 4 +- .../redis => io/lettuce/core}/ZAddArgs.java | 6 +- .../redis => io/lettuce/core}/ZStoreArgs.java | 8 +- .../lettuce/core}/api/StatefulConnection.java | 6 +- .../core}/api/StatefulRedisConnection.java | 20 ++-- .../api/async/BaseRedisAsyncCommands.java | 34 +++--- .../core}/api/async/RedisAsyncCommands.java | 16 +-- .../api/async/RedisGeoAsyncCommands.java | 6 +- .../api/async/RedisHLLAsyncCommands.java | 8 +- .../api/async/RedisHashAsyncCommands.java | 64 +++++----- .../api/async/RedisKeyAsyncCommands.java | 98 +++++++-------- .../api/async/RedisListAsyncCommands.java | 48 ++++---- .../async/RedisScriptingAsyncCommands.java | 28 ++--- .../api/async/RedisServerAsyncCommands.java | 78 ++++++------ .../api/async/RedisSetAsyncCommands.java | 72 +++++------ .../async/RedisSortedSetAsyncCommands.java | 50 ++++---- .../api/async/RedisStringAsyncCommands.java | 14 +-- .../RedisTransactionalAsyncCommands.java | 12 +- .../lettuce/core}/api/async/package-info.java | 2 +- .../lettuce/core}/api/package-info.java | 2 +- .../reactive/BaseRedisReactiveCommands.java | 32 ++--- .../reactive/RedisGeoReactiveCommands.java | 6 +- .../reactive/RedisHLLReactiveCommands.java | 6 +- .../reactive/RedisHashReactiveCommands.java | 64 +++++----- .../reactive/RedisKeyReactiveCommands.java | 98 +++++++-------- .../reactive/RedisListReactiveCommands.java | 46 +++---- .../api/reactive/RedisReactiveCommands.java | 14 +-- .../RedisScriptingReactiveCommands.java | 26 ++-- .../reactive/RedisServerReactiveCommands.java | 76 ++++++------ .../reactive/RedisSetReactiveCommands.java | 78 ++++++------ .../RedisSortedSetReactiveCommands.java | 50 ++++---- .../reactive/RedisStringReactiveCommands.java | 14 +-- .../RedisTransactionalReactiveCommands.java | 10 +- .../core}/api/reactive/package-info.java | 2 +- .../core}/api/sync/BaseRedisCommands.java | 32 ++--- .../lettuce/core}/api/sync/RedisCommands.java | 16 +-- .../core}/api/sync/RedisGeoCommands.java | 6 +- .../core}/api/sync/RedisHLLCommands.java | 6 +- .../core}/api/sync/RedisHashCommands.java | 64 +++++----- .../core}/api/sync/RedisKeyCommands.java | 98 +++++++-------- .../core}/api/sync/RedisListCommands.java | 46 +++---- .../api/sync/RedisScriptingCommands.java | 26 ++-- .../core}/api/sync/RedisServerCommands.java | 76 ++++++------ .../core/api/sync}/RedisSetCommands.java | 79 ++++++------ .../api/sync/RedisSortedSetCommands.java | 50 ++++---- .../core}/api/sync/RedisStringCommands.java | 12 +- .../api/sync/RedisTransactionalCommands.java | 10 +- .../lettuce/core}/api/sync/package-info.java | 2 +- .../AbstractClusterNodeConnectionFactory.java | 14 +-- .../core}/cluster/AbstractNodeSelection.java | 10 +- .../core}/cluster/AsyncExecutionsImpl.java | 6 +- .../core}/cluster/ClusterClientOptions.java | 24 ++-- .../lettuce/core}/cluster/ClusterCommand.java | 16 +-- .../cluster/ClusterConnectionProvider.java | 30 ++--- .../ClusterDistributionChannelWriter.java | 18 +-- .../core}/cluster/ClusterEventListener.java | 2 +- .../ClusterFutureSyncInvocationHandler.java | 22 ++-- .../cluster/ClusterNodeConnectionFactory.java | 10 +- .../core}/cluster/ClusterNodeEndpoint.java | 16 +-- .../ClusterPubSubConnectionProvider.java | 24 ++-- .../core}/cluster/ClusterScanSupport.java | 18 +-- .../ClusterTopologyRefreshOptions.java | 16 +-- .../ClusterTopologyRefreshScheduler.java | 4 +- .../core}/cluster/DynamicNodeSelection.java | 10 +- .../core}/cluster/MultiNodeExecution.java | 24 ++-- .../NodeSelectionInvocationHandler.java | 18 +-- .../core}/cluster/PartitionAccessor.java | 6 +- .../core}/cluster/PartitionsConsensus.java | 14 +-- .../cluster/PartitionsConsensusImpl.java | 10 +- .../core}/cluster/PipelinedRedisFuture.java | 6 +- .../PooledClusterConnectionProvider.java | 24 ++-- .../core}/cluster/PubSubClusterEndpoint.java | 14 +-- .../core}/cluster/ReactiveExecutionsImpl.java | 6 +- .../core}/cluster/ReadOnlyCommands.java | 6 +- .../core}/cluster/ReconnectEventListener.java | 6 +- ...RedisAdvancedClusterAsyncCommandsImpl.java | 54 ++++----- ...isAdvancedClusterReactiveCommandsImpl.java | 32 ++--- .../core}/cluster/RedisClusterClient.java | 56 ++++----- .../RedisClusterPubSubAsyncCommandsImpl.java | 26 ++-- ...edisClusterPubSubReactiveCommandsImpl.java | 26 ++-- .../core}/cluster/RedisClusterURIUtil.java | 10 +- .../lettuce/core}/cluster/RoundRobin.java | 6 +- .../RoundRobinSocketAddressSupplier.java | 10 +- .../lettuce/core}/cluster/SlotHash.java | 10 +- .../StatefulRedisClusterConnectionImpl.java | 40 +++---- ...tefulRedisClusterPubSubConnectionImpl.java | 42 +++---- .../core}/cluster/StaticNodeSelection.java | 10 +- .../core}/cluster/SyncExecutionsImpl.java | 6 +- ...ynchronizingClusterConnectionProvider.java | 16 +-- .../cluster/api/NodeSelectionSupport.java | 8 +- .../api/StatefulRedisClusterConnection.java | 30 ++--- .../cluster/api/async/AsyncExecutions.java | 4 +- .../cluster/api/async/AsyncNodeSelection.java | 8 +- .../async/BaseNodeSelectionAsyncCommands.java | 30 ++--- .../api/async/NodeSelectionAsyncCommands.java | 6 +- .../async/NodeSelectionGeoAsyncCommands.java | 6 +- .../async/NodeSelectionHLLAsyncCommands.java | 6 +- .../async/NodeSelectionHashAsyncCommands.java | 64 +++++----- .../async/NodeSelectionKeyAsyncCommands.java | 98 +++++++-------- .../async/NodeSelectionListAsyncCommands.java | 46 +++---- .../NodeSelectionScriptingAsyncCommands.java | 24 ++-- .../NodeSelectionServerAsyncCommands.java | 74 ++++++------ .../async/NodeSelectionSetAsyncCommands.java | 78 ++++++------ .../NodeSelectionSortedSetAsyncCommands.java | 50 ++++---- .../NodeSelectionStringAsyncCommands.java | 12 +- .../RedisAdvancedClusterAsyncCommands.java | 22 ++-- .../api/async/RedisClusterAsyncCommands.java | 22 ++-- .../core}/cluster/api/async/package-info.java | 2 +- .../core/cluster/api/package-info.java | 4 + .../api/reactive/ReactiveExecutions.java | 6 +- .../RedisAdvancedClusterReactiveCommands.java | 18 +-- .../RedisClusterReactiveCommands.java | 18 +-- .../cluster/api/reactive/package-info.java | 2 +- .../api/sync/BaseNodeSelectionCommands.java | 24 ++-- .../core}/cluster/api/sync/Executions.java | 6 +- .../core}/cluster/api/sync/NodeSelection.java | 8 +- .../api/sync/NodeSelectionCommands.java | 6 +- .../api/sync/NodeSelectionGeoCommands.java | 6 +- .../api/sync/NodeSelectionHLLCommands.java | 6 +- .../api/sync/NodeSelectionHashCommands.java | 64 +++++----- .../api/sync/NodeSelectionKeyCommands.java | 98 +++++++-------- .../api/sync/NodeSelectionListCommands.java | 46 +++---- .../sync/NodeSelectionScriptingCommands.java | 24 ++-- .../api/sync/NodeSelectionServerCommands.java | 74 ++++++------ .../api/sync/NodeSelectionSetCommands.java | 78 ++++++------ .../sync/NodeSelectionSortedSetCommands.java | 50 ++++---- .../api/sync/NodeSelectionStringCommands.java | 12 +- .../sync/RedisAdvancedClusterCommands.java | 38 +++--- .../api/sync/RedisClusterCommands.java | 48 ++++---- .../core}/cluster/api/sync/package-info.java | 2 +- .../event/ClusterTopologyChangedEvent.java | 14 +-- .../core/cluster/event/package-info.java | 5 + .../partitions/ClusterPartitionParser.java | 16 +-- .../cluster/models/partitions/Partitions.java | 10 +- .../models/partitions/RedisClusterNode.java | 48 ++++---- .../models/partitions/package-info.java | 2 +- .../models/slots/ClusterSlotRange.java | 10 +- .../models/slots/ClusterSlotsParser.java | 12 +- .../cluster/models/slots/package-info.java | 2 +- .../io/lettuce/core/cluster/package-info.java | 4 + .../pubsub/RedisClusterPubSubAdapter.java | 4 +- .../pubsub/RedisClusterPubSubListener.java | 10 +- .../StatefulRedisClusterPubSubConnection.java | 24 ++-- .../NodeSelectionPubSubAsyncCommands.java | 6 +- .../api/async/PubSubAsyncNodeSelection.java | 8 +- .../RedisClusterPubSubAsyncCommands.java | 8 +- .../NodeSelectionPubSubReactiveCommands.java | 4 +- .../reactive/PubSubReactiveNodeSelection.java | 8 +- .../RedisClusterPubSubReactiveCommands.java | 8 +- .../api/sync/NodeSelectionPubSubCommands.java | 4 +- .../pubsub/api/sync/PubSubNodeSelection.java | 6 +- .../api/sync/RedisClusterPubSubCommands.java | 8 +- .../cluster/topology/AsyncConnections.java | 8 +- .../topology/ClusterTopologyRefresh.java | 16 +-- .../core}/cluster/topology/Connections.java | 18 +-- .../topology/NodeConnectionFactory.java | 8 +- .../cluster/topology/NodeTopologyView.java | 12 +- .../cluster/topology/NodeTopologyViews.java | 8 +- .../topology/RedisClusterNodeSnapshot.java | 4 +- .../cluster/topology/RefreshFutures.java | 2 +- .../core}/cluster/topology/Requests.java | 6 +- .../cluster/topology/TimedAsyncCommand.java | 6 +- .../cluster/topology/TopologyComparators.java | 14 +-- .../core}/cluster/topology/package-info.java | 2 +- .../lettuce/core}/codec/Base16.java | 10 +- .../lettuce/core}/codec/ByteArrayCodec.java | 4 +- .../core}/codec/ByteBufferInputStream.java | 2 +- .../lettuce/core}/codec/CRC16.java | 6 +- .../lettuce/core}/codec/CompressionCodec.java | 10 +- .../lettuce/core}/codec/RedisCodec.java | 2 +- .../lettuce/core}/codec/StringCodec.java | 10 +- .../lettuce/core}/codec/ToByteBufEncoder.java | 4 +- .../lettuce/core}/codec/Utf8StringCodec.java | 6 +- .../lettuce/core}/codec/package-info.java | 2 +- .../core}/dynamic/AsyncExecutableCommand.java | 16 +-- .../AsyncExecutableCommandLookupStrategy.java | 10 +- .../core}/dynamic/BatchExecutableCommand.java | 20 ++-- .../BatchExecutableCommandLookupStrategy.java | 14 +-- .../lettuce/core}/dynamic/BatchTasks.java | 6 +- .../lettuce/core}/dynamic/Batcher.java | 10 +- .../CodecAwareMethodParametersAccessor.java | 14 +-- .../dynamic/CommandCreationException.java | 8 +- .../lettuce/core}/dynamic/CommandFactory.java | 6 +- .../core}/dynamic/CommandFactoryResolver.java | 6 +- .../lettuce/core}/dynamic/CommandMethod.java | 20 ++-- .../dynamic/CommandMethodSyntaxException.java | 6 +- .../core}/dynamic/CommandMethodVerifier.java | 8 +- .../dynamic/CommandSegmentCommandFactory.java | 30 ++--- .../lettuce/core}/dynamic/Commands.java | 4 +- .../core}/dynamic/ConversionService.java | 12 +- .../core}/dynamic/ConvertingCommand.java | 4 +- .../core}/dynamic/DeclaredCommandMethod.java | 30 ++--- .../dynamic/DefaultCommandMethodVerifier.java | 18 +-- .../DefaultMethodParametersAccessor.java | 18 +-- .../dynamic/DefaultRedisCommandsMetadata.java | 8 +- .../core}/dynamic/ExecutableCommand.java | 8 +- .../ExecutableCommandLookupStrategy.java | 6 +- ...xecutableCommandLookupStrategySupport.java | 14 +-- .../core}/dynamic/ParameterBinder.java | 22 ++-- .../ReactiveCommandSegmentCommandFactory.java | 18 +-- .../dynamic/ReactiveExecutableCommand.java | 6 +- ...activeExecutableCommandLookupStrategy.java | 18 +-- .../core}/dynamic/ReactiveTypeAdapters.java | 8 +- .../lettuce/core}/dynamic/ReactiveTypes.java | 8 +- .../core}/dynamic/RedisCommandFactory.java | 52 ++++---- .../core}/dynamic/RedisCommandsMetadata.java | 6 +- .../lettuce/core}/dynamic/SimpleBatcher.java | 12 +- .../core}/dynamic/annotation/Command.java | 12 +- .../dynamic/annotation/CommandNaming.java | 2 +- .../lettuce/core}/dynamic/annotation/Key.java | 4 +- .../core}/dynamic/annotation/Param.java | 4 +- .../core}/dynamic/annotation/Value.java | 2 +- .../dynamic/annotation/package-info.java | 2 +- .../core}/dynamic/batch/BatchException.java | 10 +- .../core}/dynamic/batch/BatchExecutor.java | 6 +- .../core}/dynamic/batch/BatchSize.java | 14 +-- .../core}/dynamic/batch/CommandBatching.java | 22 ++-- .../codec/AnnotationRedisCodecResolver.java | 36 +++--- .../dynamic/codec/RedisCodecResolver.java | 8 +- .../lettuce/core}/dynamic/domain/Timeout.java | 10 +- .../core}/dynamic/domain/package-info.java | 2 +- .../intercept/DefaultMethodInvocation.java | 4 +- .../intercept/InvocationProxyFactory.java | 6 +- .../dynamic/intercept/MethodInterceptor.java | 4 +- .../intercept/MethodInterceptorChain.java | 2 +- .../dynamic/intercept/MethodInvocation.java | 4 +- .../core/dynamic/intercept/package-info.java | 4 + .../CodecAwareOutputFactoryResolver.java | 10 +- .../dynamic/output/CommandOutputFactory.java | 8 +- .../output/CommandOutputFactoryResolver.java | 16 +-- .../output/CommandOutputResolverSupport.java | 8 +- .../core}/dynamic/output/OutputRegistry.java | 24 ++-- ...tRegistryCommandOutputFactoryResolver.java | 12 +- .../core}/dynamic/output/OutputSelector.java | 14 +-- .../core}/dynamic/output/OutputType.java | 24 ++-- .../core}/dynamic/output/VoidOutput.java | 8 +- .../core/dynamic/output/package-info.java | 4 + .../io/lettuce/core/dynamic/package-info.java | 4 + .../ExecutionSpecificParameters.java | 10 +- .../parameter/MethodParametersAccessor.java | 10 +- .../core}/dynamic/parameter/Parameter.java | 16 +-- .../core}/dynamic/parameter/Parameters.java | 10 +- .../core/dynamic/parameter/package-info.java | 4 + .../AnnotationCommandSegmentFactory.java | 18 +-- .../core}/dynamic/segment/CommandSegment.java | 10 +- .../segment/CommandSegmentFactory.java | 8 +- .../dynamic/segment/CommandSegments.java | 10 +- .../core/dynamic/segment/package-info.java | 4 + .../AnnotationParameterNameDiscoverer.java | 6 +- .../dynamic/support/ClassTypeInformation.java | 16 +-- .../CompositeParameterNameDiscoverer.java | 4 +- .../support/GenericArrayTypeInformation.java | 4 +- .../dynamic/support/GenericTypeResolver.java | 4 +- .../dynamic/support/MethodParameter.java | 54 ++++----- .../support/ParameterNameDiscoverer.java | 6 +- .../support/ParametrizedTypeInformation.java | 6 +- .../ParentTypeAwareTypeInformation.java | 6 +- .../dynamic/support/ReflectionUtils.java | 38 +++--- .../core}/dynamic/support/ResolvableType.java | 98 +++++++-------- ...dardReflectionParameterNameDiscoverer.java | 2 +- .../core}/dynamic/support/TypeDiscoverer.java | 12 +- .../dynamic/support/TypeInformation.java | 28 ++--- .../support/TypeVariableTypeInformation.java | 8 +- .../core}/dynamic/support/TypeWrapper.java | 6 +- .../support/WildcardTypeInformation.java | 2 +- .../core}/dynamic/support/package-info.java | 2 +- .../lettuce/core}/event/DefaultEventBus.java | 4 +- .../event/DefaultEventPublisherOptions.java | 10 +- .../lettuce/core}/event/Event.java | 4 +- .../lettuce/core}/event/EventBus.java | 4 +- .../core}/event/EventPublisherOptions.java | 6 +- .../event/connection/ConnectedEvent.java | 4 +- .../connection/ConnectionActivatedEvent.java | 6 +- .../ConnectionDeactivatedEvent.java | 4 +- .../event/connection/ConnectionEvent.java | 8 +- .../connection/ConnectionEventSupport.java | 8 +- .../event/connection/DisconnectedEvent.java | 4 +- .../core/event/connection/package-info.java | 5 + .../event/metrics/CommandLatencyEvent.java | 12 +- .../DefaultCommandLatencyEventPublisher.java | 10 +- .../event/metrics/MetricEventPublisher.java | 8 +- .../core/event/metrics/package-info.java | 5 + .../lettuce/core}/event/package-info.java | 2 +- .../internal/AbstractInvocationHandler.java | 12 +- .../lettuce/core}/internal/HostAndPort.java | 10 +- .../lettuce/core}/internal/LettuceAssert.java | 6 +- .../core}/internal/LettuceClassUtils.java | 10 +- .../core}/internal/LettuceFactories.java | 2 +- .../lettuce/core}/internal/LettuceLists.java | 10 +- .../lettuce/core}/internal/LettuceSets.java | 10 +- .../lettuce/core}/internal/package-info.java | 4 +- .../core}/masterslave/AsyncConnections.java | 8 +- .../core}/masterslave/Connections.java | 18 +-- .../core}/masterslave/MasterSlave.java | 22 ++-- .../masterslave/MasterSlaveChannelWriter.java | 20 ++-- .../MasterSlaveConnectionProvider.java | 30 ++--- .../MasterSlaveTopologyProvider.java | 14 +-- .../MasterSlaveTopologyRefresh.java | 24 ++-- .../core}/masterslave/MasterSlaveUtils.java | 16 +-- .../masterslave/NodeConnectionFactory.java | 8 +- .../core}/masterslave/ReadOnlyCommands.java | 6 +- .../masterslave/RedisMasterSlaveNode.java | 8 +- .../ReflectiveNodeConnectionFactory.java | 12 +- .../core}/masterslave/RefreshFutures.java | 4 +- .../lettuce/core}/masterslave/Requests.java | 6 +- .../masterslave/SentinelTopologyProvider.java | 20 ++-- .../masterslave/SentinelTopologyRefresh.java | 20 ++-- .../StatefulRedisMasterSlaveConnection.java | 12 +- ...tatefulRedisMasterSlaveConnectionImpl.java | 8 +- .../StaticMasterSlaveTopologyProvider.java | 16 +-- .../core}/masterslave/TimedAsyncCommand.java | 6 +- .../lettuce/core}/masterslave/Timeout.java | 4 +- .../masterslave/TopologyComparators.java | 6 +- .../core}/masterslave/TopologyProvider.java | 10 +- .../core/masterslave/package-info.java | 5 + .../metrics/CommandLatencyCollector.java | 8 +- .../CommandLatencyCollectorOptions.java | 10 +- .../core}/metrics/CommandLatencyId.java | 18 +-- .../lettuce/core}/metrics/CommandMetrics.java | 18 +-- .../DefaultCommandLatencyCollector.java | 10 +- ...DefaultCommandLatencyCollectorOptions.java | 12 +- .../core}/metrics/MetricCollector.java | 8 +- .../lettuce/core}/metrics/package-info.java | 2 +- .../core}/models/command/CommandDetail.java | 4 +- .../models/command/CommandDetailParser.java | 8 +- .../core}/models/command/package-info.java | 2 +- .../core}/models/role/RedisInstance.java | 8 +- .../models/role/RedisMasterInstance.java | 10 +- .../models/role/RedisNodeDescription.java | 8 +- .../models/role/RedisSentinelInstance.java | 10 +- .../core}/models/role/RedisSlaveInstance.java | 10 +- .../core}/models/role/ReplicationPartner.java | 10 +- .../lettuce/core}/models/role/RoleParser.java | 10 +- .../core}/models/role/package-info.java | 2 +- .../lettuce/core}/output/ArrayOutput.java | 8 +- .../core}/output/BooleanListOutput.java | 6 +- .../lettuce/core}/output/BooleanOutput.java | 6 +- .../lettuce/core}/output/ByteArrayOutput.java | 6 +- .../lettuce/core}/output/CommandOutput.java | 30 ++--- .../lettuce/core}/output/DateOutput.java | 6 +- .../output/DefaultTransactionResult.java | 10 +- .../lettuce/core}/output/DoubleOutput.java | 6 +- .../output/GeoCoordinatesListOutput.java | 10 +- .../output/GeoCoordinatesValueListOutput.java | 10 +- .../core}/output/GeoWithinListOutput.java | 10 +- .../lettuce/core}/output/IntegerOutput.java | 6 +- .../lettuce/core}/output/KeyListOutput.java | 6 +- .../lettuce/core}/output/KeyOutput.java | 8 +- .../lettuce/core}/output/KeyScanOutput.java | 10 +- .../core}/output/KeyScanStreamingOutput.java | 8 +- .../core}/output/KeyStreamingChannel.java | 6 +- .../core}/output/KeyStreamingOutput.java | 8 +- .../core}/output/KeyValueListOutput.java | 8 +- .../lettuce/core}/output/KeyValueOutput.java | 6 +- .../output/KeyValueScanStreamingOutput.java | 10 +- .../output/KeyValueStreamingChannel.java | 6 +- .../core}/output/KeyValueStreamingOutput.java | 8 +- .../core}/output/ListOfMapsOutput.java | 8 +- .../lettuce/core}/output/ListSubscriber.java | 6 +- .../lettuce/core}/output/MapOutput.java | 4 +- .../lettuce/core}/output/MapScanOutput.java | 10 +- .../lettuce/core}/output/MultiOutput.java | 12 +- .../core}/output/NestedMultiOutput.java | 8 +- .../lettuce/core}/output/ScanOutput.java | 10 +- .../core}/output/ScoredValueListOutput.java | 8 +- .../core}/output/ScoredValueScanOutput.java | 12 +- .../ScoredValueScanStreamingOutput.java | 10 +- .../output/ScoredValueStreamingChannel.java | 8 +- .../output/ScoredValueStreamingOutput.java | 8 +- .../lettuce/core}/output/StatusOutput.java | 8 +- .../core}/output/StreamingChannel.java | 4 +- .../lettuce/core}/output/StreamingOutput.java | 2 +- .../core}/output/StringListOutput.java | 6 +- .../core}/output/StringValueListOutput.java | 10 +- .../lettuce/core}/output/ValueListOutput.java | 6 +- .../lettuce/core}/output/ValueOutput.java | 8 +- .../lettuce/core}/output/ValueScanOutput.java | 10 +- .../output/ValueScanStreamingOutput.java | 8 +- .../lettuce/core}/output/ValueSetOutput.java | 8 +- .../core}/output/ValueStreamingChannel.java | 6 +- .../core}/output/ValueStreamingOutput.java | 6 +- .../core}/output/ValueValueListOutput.java | 8 +- .../lettuce/core}/output/package-info.java | 2 +- .../java/io/lettuce/core/package-info.java | 4 + .../lettuce/core}/protocol/AsyncCommand.java | 24 ++-- .../protocol/BaseRedisCommandBuilder.java | 10 +- .../core}/protocol/ChannelLogDescriptor.java | 2 +- .../lettuce/core}/protocol/Command.java | 6 +- .../lettuce/core}/protocol/CommandArgs.java | 56 ++++----- .../core}/protocol/CommandEncoder.java | 4 +- .../core}/protocol/CommandHandler.java | 14 +-- .../core}/protocol/CommandKeyword.java | 4 +- .../lettuce/core}/protocol/CommandType.java | 2 +- .../core}/protocol/CommandWrapper.java | 8 +- .../core}/protocol/CompleteableCommand.java | 2 +- .../core}/protocol/ConnectionFacade.java | 4 +- .../core}/protocol/ConnectionWatchdog.java | 18 +-- .../core}/protocol/DecoratedCommand.java | 6 +- .../core}/protocol/DefaultEndpoint.java | 16 +-- .../lettuce/core}/protocol/DemandAware.java | 6 +- .../lettuce/core}/protocol/Endpoint.java | 14 +-- .../core}/protocol/HasQueuedCommands.java | 4 +- .../core}/protocol/LettuceCharsets.java | 6 +- .../core}/protocol/ProtocolKeyword.java | 8 +- .../core}/protocol/QueuedCommands.java | 12 +- .../core}/protocol/ReconnectionHandler.java | 8 +- .../core}/protocol/ReconnectionListener.java | 8 +- .../lettuce/core}/protocol/RedisCommand.java | 12 +- .../core}/protocol/RedisStateMachine.java | 13 +- .../lettuce/core}/protocol/SharedLock.java | 10 +- .../core}/protocol/TransactionalCommand.java | 8 +- .../lettuce/core}/protocol/WithLatency.java | 8 +- .../lettuce/core}/protocol/package-info.java | 2 +- .../core}/pubsub/PubSubCommandArgs.java | 8 +- .../core}/pubsub/PubSubCommandBuilder.java | 30 ++--- .../core}/pubsub/PubSubCommandHandler.java | 16 +-- .../lettuce/core}/pubsub/PubSubEndpoint.java | 6 +- .../lettuce/core}/pubsub/PubSubOutput.java | 8 +- .../core}/pubsub/RedisPubSubAdapter.java | 6 +- .../pubsub/RedisPubSubAsyncCommandsImpl.java | 10 +- .../core}/pubsub/RedisPubSubListener.java | 16 +-- .../RedisPubSubReactiveCommandsImpl.java | 12 +- .../pubsub/StatefulRedisPubSubConnection.java | 24 ++-- .../StatefulRedisPubSubConnectionImpl.java | 20 ++-- .../api/async/RedisPubSubAsyncCommands.java | 18 +-- .../core}/pubsub/api/async/package-info.java | 2 +- .../pubsub/api/reactive/ChannelMessage.java | 4 +- .../pubsub/api/reactive/PatternMessage.java | 4 +- .../reactive/RedisPubSubReactiveCommands.java | 16 +-- .../pubsub/api/reactive/package-info.java | 2 +- .../pubsub/api/sync/RedisPubSubCommands.java | 16 +-- .../core}/pubsub/api/sync/package-info.java | 2 +- .../lettuce/core}/pubsub/package-info.java | 2 +- .../core}/resource/ClientResources.java | 10 +- .../lettuce/core}/resource/ConstantDelay.java | 4 +- .../resource/DecorrelatedJitterDelay.java | 6 +- .../resource/DefaultClientResources.java | 40 +++---- .../DefaultEventLoopGroupProvider.java | 12 +- .../lettuce/core}/resource/Delay.java | 14 +-- .../core}/resource/DirContextDnsResolver.java | 18 +-- .../lettuce/core}/resource/DnsResolver.java | 6 +- .../lettuce/core}/resource/DnsResolvers.java | 4 +- .../core}/resource/EqualJitterDelay.java | 2 +- .../resource/EventLoopGroupProvider.java | 8 +- .../core}/resource/ExponentialDelay.java | 4 +- .../core}/resource/FullJitterDelay.java | 2 +- .../lettuce/core}/resource/Futures.java | 20 ++-- .../core}/resource/SocketAddressResolver.java | 12 +- .../lettuce/core}/resource/package-info.java | 2 +- .../RedisSentinelAsyncCommandsImpl.java | 22 ++-- .../RedisSentinelReactiveCommandsImpl.java | 16 +-- .../sentinel/SentinelCommandBuilder.java | 22 ++-- .../StatefulRedisSentinelConnectionImpl.java | 22 ++-- .../api/StatefulRedisSentinelConnection.java | 20 ++-- .../api/async/RedisSentinelAsyncCommands.java | 34 +++--- .../sentinel/api/async/package-info.java | 2 +- .../core/sentinel/api/package-info.java | 4 + .../RedisSentinelReactiveCommands.java | 32 ++--- .../sentinel/api/reactive/package-info.java | 2 +- .../api/sync/RedisSentinelCommands.java | 32 ++--- .../core}/sentinel/api/sync/package-info.java | 2 +- .../lettuce/core}/sentinel/package-info.java | 2 +- .../core}/support/AbstractCdiBean.java | 6 +- .../support/ClientResourcesFactoryBean.java | 8 +- .../core}/support/ConnectionPoolSupport.java | 18 +-- .../core}/support/LettuceCdiExtension.java | 20 ++-- .../support/LettuceFactoryBeanSupport.java | 18 +-- .../core}/support/RedisClientCdiBean.java | 10 +- .../core}/support/RedisClientFactoryBean.java | 10 +- .../support/RedisClusterClientCdiBean.java | 10 +- .../RedisClusterClientFactoryBean.java | 16 +-- .../io/lettuce/core/support/package-info.java | 5 + src/main/javadoc/overview.html | 20 ++-- .../javax.enterprise.inject.spi.Extension | 2 +- .../lettuce/core}/api/BaseRedisCommands.java | 32 ++--- .../lettuce/core}/api/RedisGeoCommands.java | 6 +- .../lettuce/core}/api/RedisHLLCommands.java | 6 +- .../lettuce/core}/api/RedisHashCommands.java | 64 +++++----- .../lettuce/core}/api/RedisKeyCommands.java | 98 +++++++-------- .../lettuce/core}/api/RedisListCommands.java | 46 +++---- .../core}/api/RedisScriptingCommands.java | 26 ++-- .../core}/api/RedisSentinelCommands.java | 32 ++--- .../core}/api/RedisServerCommands.java | 76 ++++++------ .../lettuce/core/api}/RedisSetCommands.java | 81 +++++++------ .../core}/api/RedisSortedSetCommands.java | 50 ++++---- .../core}/api/RedisStringCommands.java | 16 +-- .../core}/api/RedisTransactionalCommands.java | 10 +- src/site/markdown/download.md.vm | 74 ------------ src/site/markdown/index.md.vm | 113 ------------------ src/site/site.xml | 53 -------- .../redis/extensibility/LettuceGeoDemo.java | 4 +- .../extensibility/MyExtendedRedisClient.java | 16 +-- .../MyExtendedRedisClientTest.java | 14 +-- .../extensibility/MyPubSubConnection.java | 12 +- .../lettuce}/CanConnect.java | 4 +- .../lettuce}/ConnectionTestUtil.java | 29 +++-- .../lambdaworks => io/lettuce}/Delay.java | 4 +- .../lambdaworks => io/lettuce}/Futures.java | 8 +- .../lettuce}/KeysAndValues.java | 6 +- .../lettuce}/LoggingTestRule.java | 4 +- .../lambdaworks => io/lettuce}/Sockets.java | 4 +- .../lambdaworks => io/lettuce}/SslTest.java | 19 ++- .../lettuce}/TestClientResources.java | 18 +-- .../{com/lambdaworks => io/lettuce}/Wait.java | 24 ++-- .../apigenerator/CompilationUnitFactory.java | 2 +- .../lettuce}/apigenerator/Constants.java | 2 +- .../lettuce}/apigenerator/CreateAsyncApi.java | 11 +- .../CreateAsyncNodeSelectionClusterApi.java | 9 +- .../apigenerator/CreateReactiveApi.java | 18 +-- .../lettuce}/apigenerator/CreateSyncApi.java | 19 +-- .../CreateSyncNodeSelectionClusterApi.java | 7 +- .../GenerateCommandInterfaces.java | 4 +- .../lettuce}/category/SlowTests.java | 2 +- .../lettuce}/codec/CRC16Test.java | 4 +- .../core}/AbstractRedisClientTest.java | 7 +- .../lettuce/core}/AbstractTest.java | 6 +- .../lettuce/core}/AllTheAPIsTest.java | 10 +- .../lettuce/core}/AsyncConnectionTest.java | 4 +- .../lettuce/core}/ClientMetricsTest.java | 20 ++-- .../lettuce/core}/ClientOptionsTest.java | 20 ++-- .../redis => io/lettuce/core}/ClientTest.java | 16 +-- .../lettuce/core}/ConnectionCommandTest.java | 8 +- .../lettuce/core}/CustomCodecTest.java | 12 +- .../lettuce/core}/DefaultRedisClient.java | 4 +- .../lettuce/core}/FastShutdown.java | 6 +- .../lettuce/core}/GeoModelTest.java | 2 +- .../lettuce/core}/JavaRuntimeTest.java | 6 +- .../core}/KeyValueStreamingAdapter.java | 8 +- .../lettuce/core}/KeyValueTest.java | 2 +- .../lettuce/core}/LettuceFuturesTest.java | 2 +- .../redis => io/lettuce/core}/LimitTest.java | 2 +- .../lettuce/core}/ListStreamingAdapter.java | 10 +- .../lettuce/core}/PipeliningTest.java | 6 +- .../lettuce/core}/PrivateAccessorTest.java | 20 ++-- .../redis => io/lettuce/core}/RangeTest.java | 6 +- .../ReactiveBackpressurePropagationTest.java | 14 +-- .../lettuce/core}/ReactiveConnectionTest.java | 12 +- .../core}/ReactiveStreamingOutputTest.java | 10 +- .../core}/RedisClientConnectionTest.java | 14 +-- .../core}/RedisClientFactoryBeanTest.java | 4 +- .../lettuce/core}/RedisClientFactoryTest.java | 9 +- .../core}/RedisClientListenerTest.java | 12 +- .../lettuce/core}/RedisClientTest.java | 8 +- .../lettuce/core}/RedisURIBuilderTest.java | 2 +- .../lettuce/core}/RedisURITest.java | 4 +- .../lettuce/core}/ScanCursorTest.java | 2 +- .../lettuce/core}/ScanIteratorTest.java | 6 +- .../core}/ScoredValueStreamingAdapter.java | 4 +- .../lettuce/core}/ScoredValueTest.java | 4 +- .../lettuce/core}/SocketOptionsTest.java | 2 +- .../core}/SyncAsyncApiConvergenceTest.java | 6 +- .../core}/TestEventLoopGroupProvider.java | 8 +- .../lettuce/core}/TestRedisPublisher.java | 6 +- .../lettuce/core}/TestSettings.java | 6 +- .../lettuce/core}/UnixDomainSocketTest.java | 12 +- .../lettuce/core}/Utf8StringCodecTest.java | 2 +- .../redis => io/lettuce/core}/ValueTest.java | 2 +- .../core}/cluster/AbstractClusterTest.java | 14 +-- .../cluster/AdvancedClusterClientTest.java | 30 ++--- .../cluster/AdvancedClusterReactiveTest.java | 22 ++-- .../core}/cluster/ByteCodecClusterTest.java | 6 +- .../cluster/ClusterClientOptionsTest.java | 2 +- .../cluster/ClusterCommandInternalsTest.java | 14 +-- .../core}/cluster/ClusterCommandTest.java | 31 +++-- .../ClusterDistributionChannelWriterTest.java | 12 +- .../cluster/ClusterNodeEndpointTest.java | 22 ++-- .../cluster/ClusterPartiallyDownTest.java | 16 +-- .../cluster/ClusterPartitionParserTest.java | 12 +- .../cluster/ClusterReactiveCommandTest.java | 22 ++-- .../lettuce/core}/cluster/ClusterRule.java | 16 +-- .../lettuce/core}/cluster/ClusterSetup.java | 18 +-- .../core}/cluster/ClusterTestUtil.java | 24 ++-- .../ClusterTopologyRefreshOptionsTest.java | 4 +- .../ClusterTopologyRefreshSchedulerTest.java | 4 +- ...ealthyMajorityPartitionsConsensusTest.java | 14 +-- .../KnownMajorityPartitionsConsensusTest.java | 14 +-- .../core}/cluster/NodeSelectionAsyncTest.java | 26 ++-- .../core}/cluster/NodeSelectionSyncTest.java | 26 ++-- .../PartitionsConsensusTestSupport.java | 8 +- .../cluster/PipelinedRedisFutureTest.java | 2 +- .../PooledClusterConnectionProviderTest.java | 34 +++--- .../lettuce/core}/cluster/ReadFromTest.java | 10 +- .../core}/cluster/ReadOnlyCommandsTest.java | 6 +- .../RedisClusterClientFactoryTest.java | 12 +- .../core}/cluster/RedisClusterClientTest.java | 34 +++--- .../RedisClusterPasswordSecuredSslTest.java | 26 ++-- .../cluster/RedisClusterReadFromTest.java | 14 +-- .../core}/cluster/RedisClusterSetupTest.java | 40 +++---- .../RedisClusterStressScenariosTest.java | 26 ++-- .../cluster/RedisClusterURIUtilTest.java | 6 +- .../RedisReactiveClusterClientTest.java | 20 ++-- .../RoundRobinSocketAddressSupplierTest.java | 12 +- .../core}/cluster/ScanIteratorTest.java | 18 +-- .../lettuce/core}/cluster/SlotHashTest.java | 2 +- ...ronizingClusterConnectionProviderTest.java | 12 +- .../commands/CustomClusterCommandTest.java | 30 ++--- .../commands/GeoClusterCommandTest.java | 22 ++-- .../commands/HashClusterCommandTest.java | 20 ++-- .../commands/KeyClusterCommandTest.java | 18 +-- .../commands/ListClusterCommandTest.java | 21 ++-- .../commands/StringClusterCommandTest.java | 17 ++- .../HashClusterReactiveCommandTest.java | 20 ++-- .../KeyClusterReativeCommandTest.java | 22 ++-- .../ListClusterReactiveCommandTest.java | 20 ++-- .../StringClusterReactiveCommandTest.java | 24 ++-- .../models/partitions/PartitionsTest.java | 4 +- .../partitions/RedisClusterNodeTest.java | 4 +- .../models/slots/ClusterSlotsParserTest.java | 6 +- .../cluster/pubsub/PubSubClusterTest.java | 24 ++-- .../cluster/pubsub/PubSubConnectionTest.java | 14 +-- .../topology/ClusterTopologyRefreshTest.java | 32 ++--- .../topology/NodeTopologyViewsTest.java | 4 +- .../core}/cluster/topology/RequestsTest.java | 12 +- .../topology/TopologyComparatorsTest.java | 14 +-- .../cluster/topology/TopologyRefreshTest.java | 32 ++--- .../core}/codec/CompressionCodecTest.java | 2 +- .../lettuce/core}/codec/StringCodecTest.java | 4 +- .../core}/commands/BitCommandTest.java | 20 ++-- .../core}/commands/CustomCommandTest.java | 16 +-- .../core}/commands/GeoCommandTest.java | 4 +- .../core}/commands/HLLCommandTest.java | 8 +- .../core}/commands/HashCommandTest.java | 4 +- .../core}/commands/KeyCommandTest.java | 4 +- .../core}/commands/ListCommandTest.java | 6 +- .../core}/commands/NumericCommandTest.java | 4 +- .../RunOnlyOnceServerCommandTest.java | 18 +-- .../core}/commands/ScriptingCommandTest.java | 12 +- .../core}/commands/ServerCommandTest.java | 20 ++-- .../core}/commands/SetCommandTest.java | 4 +- .../core}/commands/SortCommandTest.java | 18 +-- .../core}/commands/SortedSetCommandTest.java | 14 +-- .../core}/commands/StringCommandTest.java | 14 +-- .../commands/TransactionCommandTest.java | 12 +- .../reactive/BitReactiveCommandTest.java | 24 ++-- .../reactive/CustomReactiveCommandTest.java | 18 +-- .../reactive/GeoReactiveCommandTest.java | 10 +- .../reactive/HLLReactiveCommandTest.java | 8 +- .../reactive/HashReactiveCommandTest.java | 8 +- .../reactive/KeyReactiveCommandTest.java | 8 +- .../reactive/ListReactiveCommandTest.java | 8 +- .../reactive/NumericReactiveCommandTest.java | 8 +- .../ScriptingReactiveCommandTest.java | 8 +- .../reactive/ServerReactiveCommandTest.java | 10 +- .../reactive/SetReactiveCommandTest.java | 8 +- .../reactive/SortReactiveCommandTest.java | 8 +- .../SortedSetReactiveCommandTest.java | 8 +- .../reactive/StringReactiveCommandTest.java | 12 +- .../TransactionReactiveCommandTest.java | 18 +-- .../transactional/BitTxCommandTest.java | 6 +- .../transactional/GeoTxCommandTest.java | 6 +- .../transactional/HLLTxCommandTest.java | 6 +- .../transactional/HashTxCommandTest.java | 6 +- .../transactional/KeyTxCommandTest.java | 6 +- .../transactional/ListTxCommandTest.java | 6 +- .../transactional/SetTxCommandTest.java | 6 +- .../transactional/SortTxCommandTest.java | 6 +- .../transactional/SortedSetTxCommandTest.java | 6 +- .../transactional/StringTxCommandTest.java | 6 +- .../TxSyncInvocationHandler.java | 14 +-- ...chExecutableCommandLookupStrategyTest.java | 14 +-- .../CommandSegmentCommandFactoryTest.java | 34 +++--- .../core}/dynamic/ConversionServiceTest.java | 2 +- .../dynamic/DeclaredCommandMethodTest.java | 2 +- .../DefaultCommandMethodVerifierTest.java | 16 +-- .../core}/dynamic/ParameterBinderTest.java | 16 +-- ...ctiveCommandSegmentCommandFactoryTest.java | 18 +-- .../dynamic/ReactiveTypeAdaptersTest.java | 4 +- .../dynamic/ReactiveTypeAdaptionTest.java | 6 +- .../core}/dynamic/RedisCommandsAsyncTest.java | 4 +- .../dynamic/RedisCommandsBatchingTest.java | 20 ++-- .../dynamic/RedisCommandsClusterSyncTest.java | 24 ++-- .../dynamic/RedisCommandsReactiveTest.java | 6 +- .../core}/dynamic/RedisCommandsSyncTest.java | 14 +-- .../core}/dynamic/RedisCommandsTest.java | 4 +- .../core}/dynamic/SimpleBatcherTest.java | 16 +-- .../AnnotationRedisCodecResolverTest.java | 24 ++-- .../dynamic/codec/ParameterWrappersTest.java | 22 ++-- .../intercept/InvocationProxyFactoryTest.java | 2 +- .../output/CodecAwareOutputResolverTest.java | 12 +- ...istryCommandOutputFactoryResolverTest.java | 16 +-- .../dynamic/output/OutputRegistryTest.java | 16 +-- .../AnnotationCommandSegmentFactoryTest.java | 16 +-- .../ParametrizedTypeInformationTest.java | 4 +- .../support/WildcardTypeInformationTest.java | 6 +- .../event/ConnectionEventsTriggeredTest.java | 12 +- .../core}/event/DefaultEventBusTest.java | 2 +- .../DefaultEventPublisherOptionsTest.java | 2 +- .../AbstractInvocationHandlerTest.java | 2 +- .../core}/internal/HostAndPortTest.java | 2 +- .../core}/masterslave/CustomCommandTest.java | 16 +-- .../MasterSlaveChannelWriterTest.java | 10 +- .../MasterSlaveConnectionProviderTest.java | 14 +-- .../masterslave/MasterSlaveSentinelTest.java | 16 +-- .../core}/masterslave/MasterSlaveTest.java | 16 +-- .../MasterSlaveTopologyProviderTest.java | 12 +- .../masterslave/MasterSlaveUtilsTest.java | 6 +- .../SentinelTopologyRefreshTest.java | 18 +-- .../masterslave/StaticMasterSlaveTest.java | 14 +-- .../core}/metrics/CommandLatencyIdTest.java | 4 +- .../DefaultCommandLatencyCollectorTest.java | 4 +- ...ultCommandLatencyCollectorOptionsTest.java | 2 +- .../command/CommandDetailParserTest.java | 4 +- .../core}/models/role/RoleParserTest.java | 6 +- .../core}/output/BooleanListOutputTest.java | 4 +- .../output/GeoCoordinatesListOutputTest.java | 6 +- .../GeoCoordinatesValueListOutputTest.java | 8 +- .../core}/output/GeoWithinListOutputTest.java | 10 +- .../lettuce/core}/output/ListOutputTest.java | 4 +- .../core}/output/NestedMultiOutputTest.java | 8 +- .../output/ScoredValueListOutputTest.java | 6 +- .../protocol/AsyncCommandInternalsTest.java | 14 +-- .../core}/protocol/CommandArgsTest.java | 6 +- .../core}/protocol/CommandHandlerTest.java | 14 +-- .../core}/protocol/CommandInternalsTest.java | 16 +-- .../core}/protocol/ConnectionFailureTest.java | 16 +-- .../core}/protocol/DefaultEndpointTest.java | 14 +-- .../core}/protocol/StateMachineTest.java | 12 +- .../core}/pubsub/PubSubCommandTest.java | 14 +-- .../core}/pubsub/PubSubReactiveTest.java | 26 ++-- .../reactive/RedisPublisherVerification.java | 20 ++-- .../core}/reliability/AtLeastOnceTest.java | 20 ++-- .../core}/reliability/AtMostOnceTest.java | 26 ++-- .../core}/resource/ConstantDelayTest.java | 2 +- .../resource/DecorrelatedJitterDelayTest.java | 2 +- .../resource/DefaultClientResourcesTest.java | 12 +- .../DefaultEventLoopGroupProviderTest.java | 2 +- .../resource/DirContextDnsResolverTest.java | 2 +- .../core}/resource/EqualJitterDelayTest.java | 2 +- .../core}/resource/ExponentialDelayTest.java | 2 +- .../core}/resource/FullJitterDelayTest.java | 2 +- .../lettuce/core}/resource/FuturesTest.java | 2 +- .../core}/sentinel/AbstractSentinelTest.java | 10 +- .../core}/sentinel/SentinelCommandTest.java | 16 +-- .../sentinel/SentinelConnectionTest.java | 18 +-- .../lettuce/core}/sentinel/SentinelRule.java | 38 +++--- .../sentinel/SentinelServerCommandTest.java | 14 +-- .../reactive/SentinelReactiveCommandTest.java | 14 +-- .../SentinelServerReactiveCommandTest.java | 14 +-- .../core}/server/RandomResponseServer.java | 4 +- .../core}/server/RandomServerHandler.java | 2 +- .../lettuce/core}/support/CdiTest.java | 14 +-- .../support/ConnectionPoolSupportTest.java | 36 +++--- .../lettuce/core}/support/InjectedClient.java | 8 +- .../lettuce/core}/support/PersonDB.java | 2 +- .../core}/support/PubSubTestListener.java | 6 +- .../RedisClusterClientFactoryBeanTest.java | 4 +- .../lettuce/core}/support/SpringTest.java | 6 +- .../examples/ConnectToElastiCacheMaster.java | 10 +- ...tToMasterSlaveUsingElastiCacheCluster.java | 15 ++- ...onnectToMasterSlaveUsingRedisSentinel.java | 14 +-- .../lettuce}/examples/ConnectToRedis.java | 6 +- .../examples/ConnectToRedisCluster.java | 6 +- .../examples/ConnectToRedisClusterSSL.java | 8 +- ...tToRedisClusterWithTopologyRefreshing.java | 10 +- .../lettuce}/examples/ConnectToRedisSSL.java | 6 +- .../ConnectToRedisUsingRedisSentinel.java | 6 +- .../lettuce}/examples/MySpringBean.java | 9 +- .../lettuce}/examples/ReadWriteExample.java | 10 +- .../lettuce}/examples/SpringExample.java | 8 +- ...ConnectionDecoratingInvocationHandler.java | 14 +-- .../util/ReactiveSyncInvocationHandler.java | 19 ++- .../util/RoutingInvocationHandler.java | 4 +- .../core}/EmptyRedisChannelWriter.java | 6 +- .../core}/EmptyStatefulRedisConnection.java | 14 +-- .../lettuce/core}/RedisClientBenchmark.java | 6 +- ...terDistributionChannelWriterBenchmark.java | 22 ++-- .../cluster/EmptyRedisClusterClient.java | 12 +- .../cluster/RedisClusterClientBenchmark.java | 14 +-- .../lettuce/core}/codec/JmhMain.java | 4 +- .../core}/codec/StringCodecBenchmark.java | 6 +- .../core}/codec/Utf8StringCodecBenchmark.java | 4 +- .../dynamic/RedisCommandFactoryBenchmark.java | 12 +- .../core}/dynamic/RedisCommandsBenchmark.java | 16 +-- .../InvocationProxyFactoryBenchmark.java | 2 +- .../core}/protocol/CommandBenchmark.java | 12 +- .../protocol/CommandHandlerBenchmark.java | 10 +- .../lettuce/core}/protocol/EmptyByteBuf.java | 2 +- .../core}/protocol/EmptyClientResources.java | 22 ++-- .../lettuce/core}/protocol/EmptyContext.java | 2 +- .../lettuce/core}/protocol/EmptyFuture.java | 4 +- .../lettuce/core}/protocol/EmptyPromise.java | 2 +- .../lettuce/core}/protocol/JmhMain.java | 2 +- .../protocol/RedisEndpointBenchmark.java | 10 +- .../protocol/RedisStateMachineBenchmark.java | 6 +- .../core}/support/SpringTest-context.xml | 16 +-- .../lettuce}/examples/SpringTest-context.xml | 4 +- src/test/resources/log4j2-test.xml | 6 +- src/test/resources/spring-test.xml | 4 +- 874 files changed, 5919 insertions(+), 6254 deletions(-) delete mode 100644 src/main/java/com/lambdaworks/codec/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/cluster/api/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/cluster/event/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/cluster/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/dynamic/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/event/connection/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/event/metrics/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/masterslave/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/sentinel/api/package-info.java delete mode 100644 src/main/java/com/lambdaworks/redis/support/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/AbstractRedisAsyncCommands.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/AbstractRedisClient.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/AbstractRedisReactiveCommands.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/BitFieldArgs.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ChannelGroupListener.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ClientOptions.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/CloseEvents.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/CompositeArgument.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionBuilder.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionEventTrigger.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionEvents.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionFuture.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionId.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionPoint.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/DefaultConnectionFuture.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/EpollProvider.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/FutureSyncInvocationHandler.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/GeoArgs.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/GeoCoordinates.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/GeoRadiusStoreArgs.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/GeoWithin.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/JavaRuntime.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/KeyScanCursor.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/KeyValue.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/KillArgs.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/LettuceFutures.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/LettuceStrings.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/Limit.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/MapScanCursor.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/MigrateArgs.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/PlainChannelInitializer.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/Range.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ReadFrom.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ReadFromImpl.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisAsyncCommandsImpl.java (84%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisChannelHandler.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisChannelInitializer.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisChannelInitializerImpl.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisChannelWriter.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisClient.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisCommandBuilder.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisCommandExecutionException.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisCommandInterruptedException.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisCommandTimeoutException.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisConnectionException.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisConnectionStateAdapter.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisConnectionStateListener.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisException.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisFuture.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisPublisher.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisReactiveCommandsImpl.java (83%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisURI.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ScanArgs.java (88%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ScanCursor.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ScanIterator.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ScoredValue.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ScoredValueScanCursor.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ScriptOutputType.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/SetArgs.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/SocketOptions.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/SortArgs.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/SslConnectionBuilder.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/SslOptions.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/StatefulRedisConnectionImpl.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/StreamScanCursor.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/TransactionResult.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/Transports.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/Value.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ValueScanCursor.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ZAddArgs.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ZStoreArgs.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/StatefulConnection.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/StatefulRedisConnection.java (86%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/BaseRedisAsyncCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisAsyncCommands.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisGeoAsyncCommands.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisHLLAsyncCommands.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisHashAsyncCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisKeyAsyncCommands.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisListAsyncCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisScriptingAsyncCommands.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisServerAsyncCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisSetAsyncCommands.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisSortedSetAsyncCommands.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisStringAsyncCommands.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisTransactionalAsyncCommands.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/package-info.java (62%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/package-info.java (55%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/BaseRedisReactiveCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisGeoReactiveCommands.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisHLLReactiveCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisHashReactiveCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisKeyReactiveCommands.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisListReactiveCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisReactiveCommands.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisScriptingReactiveCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisServerReactiveCommands.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisSetReactiveCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisSortedSetReactiveCommands.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisStringReactiveCommands.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisTransactionalReactiveCommands.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/package-info.java (63%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/BaseRedisCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisCommands.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisGeoCommands.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisHLLCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisHashCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisKeyCommands.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisListCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisScriptingCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisServerCommands.java (94%) rename src/main/{templates/com/lambdaworks/redis/api => java/io/lettuce/core/api/sync}/RedisSetCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisSortedSetCommands.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisStringCommands.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisTransactionalCommands.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/package-info.java (62%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/AbstractClusterNodeConnectionFactory.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/AbstractNodeSelection.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/AsyncExecutionsImpl.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterClientOptions.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterCommand.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterConnectionProvider.java (85%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterDistributionChannelWriter.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterEventListener.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterFutureSyncInvocationHandler.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterNodeConnectionFactory.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterNodeEndpoint.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterPubSubConnectionProvider.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterScanSupport.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterTopologyRefreshOptions.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterTopologyRefreshScheduler.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/DynamicNodeSelection.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/MultiNodeExecution.java (85%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/NodeSelectionInvocationHandler.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PartitionAccessor.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PartitionsConsensus.java (84%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PartitionsConsensusImpl.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PipelinedRedisFuture.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PooledClusterConnectionProvider.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PubSubClusterEndpoint.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ReactiveExecutionsImpl.java (88%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ReadOnlyCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ReconnectEventListener.java (87%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisAdvancedClusterAsyncCommandsImpl.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisAdvancedClusterReactiveCommandsImpl.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterClient.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterPubSubAsyncCommandsImpl.java (80%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterPubSubReactiveCommandsImpl.java (80%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterURIUtil.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RoundRobin.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RoundRobinSocketAddressSupplier.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/SlotHash.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/StatefulRedisClusterConnectionImpl.java (86%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/StatefulRedisClusterPubSubConnectionImpl.java (79%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/StaticNodeSelection.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/SyncExecutionsImpl.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/SynchronizingClusterConnectionProvider.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/NodeSelectionSupport.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/StatefulRedisClusterConnection.java (85%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/AsyncExecutions.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/AsyncNodeSelection.java (83%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/BaseNodeSelectionAsyncCommands.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionAsyncCommands.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionGeoAsyncCommands.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionHLLAsyncCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionHashAsyncCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionKeyAsyncCommands.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionListAsyncCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionScriptingAsyncCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionServerAsyncCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionSetAsyncCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionStringAsyncCommands.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/RedisAdvancedClusterAsyncCommands.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/RedisClusterAsyncCommands.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/package-info.java (57%) create mode 100644 src/main/java/io/lettuce/core/cluster/api/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/reactive/ReactiveExecutions.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/reactive/RedisClusterReactiveCommands.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/reactive/package-info.java (58%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/BaseNodeSelectionCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/Executions.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelection.java (85%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionCommands.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionGeoCommands.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionHLLCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionHashCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionKeyCommands.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionListCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionScriptingCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionServerCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionSetCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionSortedSetCommands.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionStringCommands.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/RedisAdvancedClusterCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/RedisClusterCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/package-info.java (57%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/event/ClusterTopologyChangedEvent.java (92%) create mode 100644 src/main/java/io/lettuce/core/cluster/event/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/partitions/ClusterPartitionParser.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/partitions/Partitions.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/partitions/RedisClusterNode.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/partitions/package-info.java (62%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/slots/ClusterSlotRange.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/slots/ClusterSlotsParser.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/slots/package-info.java (55%) create mode 100644 src/main/java/io/lettuce/core/cluster/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/RedisClusterPubSubAdapter.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/RedisClusterPubSubListener.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/StatefulRedisClusterPubSubConnection.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java (82%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java (77%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/sync/PubSubNodeSelection.java (82%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/AsyncConnections.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/ClusterTopologyRefresh.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/Connections.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/NodeConnectionFactory.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/NodeTopologyView.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/NodeTopologyViews.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/RedisClusterNodeSnapshot.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/RefreshFutures.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/Requests.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/TimedAsyncCommand.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/TopologyComparators.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/package-info.java (51%) rename src/main/java/{com/lambdaworks => io/lettuce/core}/codec/Base16.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/ByteArrayCodec.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/ByteBufferInputStream.java (96%) rename src/main/java/{com/lambdaworks => io/lettuce/core}/codec/CRC16.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/CompressionCodec.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/RedisCodec.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/StringCodec.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/ToByteBufEncoder.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/Utf8StringCodec.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/package-info.java (56%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/AsyncExecutableCommand.java (88%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/AsyncExecutableCommandLookupStrategy.java (86%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/BatchExecutableCommand.java (87%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/BatchExecutableCommandLookupStrategy.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/BatchTasks.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/Batcher.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CodecAwareMethodParametersAccessor.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandCreationException.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandFactory.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandFactoryResolver.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandMethod.java (77%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandMethodSyntaxException.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandMethodVerifier.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandSegmentCommandFactory.java (79%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/Commands.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ConversionService.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ConvertingCommand.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/DeclaredCommandMethod.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/DefaultCommandMethodVerifier.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/DefaultMethodParametersAccessor.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/DefaultRedisCommandsMetadata.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ExecutableCommand.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ExecutableCommandLookupStrategy.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ExecutableCommandLookupStrategySupport.java (86%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ParameterBinder.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveCommandSegmentCommandFactory.java (79%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveExecutableCommand.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveExecutableCommandLookupStrategy.java (87%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveTypeAdapters.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveTypes.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandFactory.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsMetadata.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/SimpleBatcher.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/annotation/Command.java (86%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/annotation/CommandNaming.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/annotation/Key.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/annotation/Param.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/annotation/Value.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/annotation/package-info.java (65%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/batch/BatchException.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/batch/BatchExecutor.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/batch/BatchSize.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/batch/CommandBatching.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/codec/AnnotationRedisCodecResolver.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/codec/RedisCodecResolver.java (87%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/domain/Timeout.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/domain/package-info.java (60%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/DefaultMethodInvocation.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/InvocationProxyFactory.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/MethodInterceptor.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/MethodInterceptorChain.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/MethodInvocation.java (96%) create mode 100644 src/main/java/io/lettuce/core/dynamic/intercept/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/CodecAwareOutputFactoryResolver.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/CommandOutputFactory.java (88%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/CommandOutputFactoryResolver.java (79%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/CommandOutputResolverSupport.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/OutputRegistry.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/OutputSelector.java (81%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/OutputType.java (80%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/VoidOutput.java (89%) create mode 100644 src/main/java/io/lettuce/core/dynamic/output/package-info.java create mode 100644 src/main/java/io/lettuce/core/dynamic/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/parameter/ExecutionSpecificParameters.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/parameter/MethodParametersAccessor.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/parameter/Parameter.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/parameter/Parameters.java (96%) create mode 100644 src/main/java/io/lettuce/core/dynamic/parameter/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/segment/AnnotationCommandSegmentFactory.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/segment/CommandSegment.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/segment/CommandSegmentFactory.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/segment/CommandSegments.java (93%) create mode 100644 src/main/java/io/lettuce/core/dynamic/segment/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/AnnotationParameterNameDiscoverer.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ClassTypeInformation.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/CompositeParameterNameDiscoverer.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/GenericArrayTypeInformation.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/GenericTypeResolver.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/MethodParameter.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ParameterNameDiscoverer.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ParametrizedTypeInformation.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ParentTypeAwareTypeInformation.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ReflectionUtils.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ResolvableType.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/StandardReflectionParameterNameDiscoverer.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/TypeDiscoverer.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/TypeInformation.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/TypeVariableTypeInformation.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/TypeWrapper.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/WildcardTypeInformation.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/package-info.java (57%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/DefaultEventBus.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/DefaultEventPublisherOptions.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/Event.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/EventBus.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/EventPublisherOptions.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/connection/ConnectedEvent.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/connection/ConnectionActivatedEvent.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/connection/ConnectionDeactivatedEvent.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/connection/ConnectionEvent.java (85%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/connection/ConnectionEventSupport.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/connection/DisconnectedEvent.java (94%) create mode 100644 src/main/java/io/lettuce/core/event/connection/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/metrics/CommandLatencyEvent.java (87%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/metrics/DefaultCommandLatencyEventPublisher.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/metrics/MetricEventPublisher.java (91%) create mode 100644 src/main/java/io/lettuce/core/event/metrics/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/package-info.java (55%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/AbstractInvocationHandler.java (99%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/HostAndPort.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/LettuceAssert.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/LettuceClassUtils.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/LettuceFactories.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/LettuceLists.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/LettuceSets.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/package-info.java (76%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/AsyncConnections.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/Connections.java (85%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlave.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveChannelWriter.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveConnectionProvider.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveTopologyProvider.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveTopologyRefresh.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveUtils.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/NodeConnectionFactory.java (87%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/ReadOnlyCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/RedisMasterSlaveNode.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/ReflectiveNodeConnectionFactory.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/RefreshFutures.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/Requests.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/SentinelTopologyProvider.java (88%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/SentinelTopologyRefresh.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/StatefulRedisMasterSlaveConnection.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/StatefulRedisMasterSlaveConnectionImpl.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/StaticMasterSlaveTopologyProvider.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/TimedAsyncCommand.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/Timeout.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/TopologyComparators.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/TopologyProvider.java (87%) create mode 100644 src/main/java/io/lettuce/core/masterslave/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/CommandLatencyCollector.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/CommandLatencyCollectorOptions.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/CommandLatencyId.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/CommandMetrics.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/DefaultCommandLatencyCollector.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/DefaultCommandLatencyCollectorOptions.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/MetricCollector.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/package-info.java (52%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/command/CommandDetail.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/command/CommandDetailParser.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/command/package-info.java (65%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RedisInstance.java (85%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RedisMasterInstance.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RedisNodeDescription.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RedisSentinelInstance.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RedisSlaveInstance.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/ReplicationPartner.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RoleParser.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/package-info.java (57%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ArrayOutput.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/BooleanListOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/BooleanOutput.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ByteArrayOutput.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/CommandOutput.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/DateOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/DefaultTransactionResult.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/DoubleOutput.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/GeoCoordinatesListOutput.java (87%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/GeoCoordinatesValueListOutput.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/GeoWithinListOutput.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/IntegerOutput.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyListOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyScanOutput.java (83%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyScanStreamingOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyStreamingChannel.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyStreamingOutput.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyValueListOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyValueOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyValueScanStreamingOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyValueStreamingChannel.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyValueStreamingOutput.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ListOfMapsOutput.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ListSubscriber.java (87%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/MapOutput.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/MapScanOutput.java (85%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/MultiOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/NestedMultiOutput.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScanOutput.java (88%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScoredValueListOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScoredValueScanOutput.java (83%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScoredValueScanStreamingOutput.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScoredValueStreamingChannel.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScoredValueStreamingOutput.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/StatusOutput.java (87%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/StreamingChannel.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/StreamingOutput.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/StringListOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/StringValueListOutput.java (87%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueListOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueScanOutput.java (83%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueScanStreamingOutput.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueSetOutput.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueStreamingChannel.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueStreamingOutput.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueValueListOutput.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/package-info.java (69%) create mode 100644 src/main/java/io/lettuce/core/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/AsyncCommand.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/BaseRedisCommandBuilder.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ChannelLogDescriptor.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/Command.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandArgs.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandEncoder.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandHandler.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandKeyword.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandType.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandWrapper.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CompleteableCommand.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ConnectionFacade.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ConnectionWatchdog.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/DecoratedCommand.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/DefaultEndpoint.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/DemandAware.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/Endpoint.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/HasQueuedCommands.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/LettuceCharsets.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ProtocolKeyword.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/QueuedCommands.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ReconnectionHandler.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ReconnectionListener.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/RedisCommand.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/RedisStateMachine.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/SharedLock.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/TransactionalCommand.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/WithLatency.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/package-info.java (52%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubCommandArgs.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubCommandBuilder.java (78%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubCommandHandler.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubEndpoint.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubOutput.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/RedisPubSubAdapter.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/RedisPubSubAsyncCommandsImpl.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/RedisPubSubListener.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/RedisPubSubReactiveCommandsImpl.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/StatefulRedisPubSubConnection.java (83%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/StatefulRedisPubSubConnectionImpl.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/async/RedisPubSubAsyncCommands.java (87%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/async/package-info.java (57%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/reactive/ChannelMessage.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/reactive/PatternMessage.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/reactive/RedisPubSubReactiveCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/reactive/package-info.java (58%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/sync/RedisPubSubCommands.java (88%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/sync/package-info.java (57%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/package-info.java (50%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/ClientResources.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/ConstantDelay.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DecorrelatedJitterDelay.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DefaultClientResources.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DefaultEventLoopGroupProvider.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/Delay.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DirContextDnsResolver.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DnsResolver.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DnsResolvers.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/EqualJitterDelay.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/EventLoopGroupProvider.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/ExponentialDelay.java (98%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/FullJitterDelay.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/Futures.java (96%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/SocketAddressResolver.java (84%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/package-info.java (56%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/RedisSentinelAsyncCommandsImpl.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/RedisSentinelReactiveCommandsImpl.java (91%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/SentinelCommandBuilder.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/StatefulRedisSentinelConnectionImpl.java (81%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/StatefulRedisSentinelConnection.java (82%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/async/RedisSentinelAsyncCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/async/package-info.java (56%) create mode 100644 src/main/java/io/lettuce/core/sentinel/api/package-info.java rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/reactive/RedisSentinelReactiveCommands.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/reactive/package-info.java (58%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/sync/RedisSentinelCommands.java (93%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/sync/package-info.java (57%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/package-info.java (53%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/AbstractCdiBean.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/ClientResourcesFactoryBean.java (94%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/ConnectionPoolSupport.java (97%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/LettuceCdiExtension.java (95%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/LettuceFactoryBeanSupport.java (92%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/RedisClientCdiBean.java (90%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/RedisClientFactoryBean.java (88%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/RedisClusterClientCdiBean.java (89%) rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/RedisClusterClientFactoryBean.java (89%) create mode 100644 src/main/java/io/lettuce/core/support/package-info.java rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/BaseRedisCommands.java (94%) rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisGeoCommands.java (98%) rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisHLLCommands.java (94%) rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisHashCommands.java (94%) rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisKeyCommands.java (95%) rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisListCommands.java (95%) rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisScriptingCommands.java (93%) rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisSentinelCommands.java (94%) rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisServerCommands.java (95%) rename src/main/{java/com/lambdaworks/redis/api/sync => templates/io/lettuce/core/api}/RedisSetCommands.java (93%) rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisSortedSetCommands.java (99%) rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisStringCommands.java (96%) rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisTransactionalCommands.java (92%) delete mode 100644 src/site/markdown/download.md.vm delete mode 100644 src/site/markdown/index.md.vm delete mode 100644 src/site/site.xml rename src/test/java/{com/lambdaworks => io/lettuce}/CanConnect.java (95%) rename src/test/java/{com/lambdaworks => io/lettuce}/ConnectionTestUtil.java (88%) rename src/test/java/{com/lambdaworks => io/lettuce}/Delay.java (91%) rename src/test/java/{com/lambdaworks => io/lettuce}/Futures.java (92%) rename src/test/java/{com/lambdaworks => io/lettuce}/KeysAndValues.java (95%) rename src/test/java/{com/lambdaworks => io/lettuce}/LoggingTestRule.java (98%) rename src/test/java/{com/lambdaworks => io/lettuce}/Sockets.java (93%) rename src/test/java/{com/lambdaworks => io/lettuce}/SslTest.java (94%) rename src/test/java/{com/lambdaworks => io/lettuce}/TestClientResources.java (79%) rename src/test/java/{com/lambdaworks => io/lettuce}/Wait.java (91%) rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/CompilationUnitFactory.java (99%) rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/Constants.java (96%) rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/CreateAsyncApi.java (92%) rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/CreateAsyncNodeSelectionClusterApi.java (94%) rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/CreateReactiveApi.java (95%) rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/CreateSyncApi.java (93%) rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/CreateSyncNodeSelectionClusterApi.java (96%) rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/GenerateCommandInterfaces.java (96%) rename src/test/java/{com/lambdaworks => io/lettuce}/category/SlowTests.java (95%) rename src/test/java/{com/lambdaworks => io/lettuce}/codec/CRC16Test.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/AbstractRedisClientTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/AbstractTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/AllTheAPIsTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/AsyncConnectionTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ClientMetricsTest.java (88%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ClientOptionsTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ClientTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionCommandTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/CustomCodecTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/DefaultRedisClient.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/FastShutdown.java (92%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/GeoModelTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/JavaRuntimeTest.java (90%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/KeyValueStreamingAdapter.java (88%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/KeyValueTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/LettuceFuturesTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/LimitTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ListStreamingAdapter.java (86%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/PipeliningTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/PrivateAccessorTest.java (81%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RangeTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ReactiveBackpressurePropagationTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ReactiveConnectionTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ReactiveStreamingOutputTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisClientConnectionTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisClientFactoryBeanTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisClientFactoryTest.java (92%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisClientListenerTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisClientTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisURIBuilderTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisURITest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ScanCursorTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ScanIteratorTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ScoredValueStreamingAdapter.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ScoredValueTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/SocketOptionsTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/SyncAsyncApiConvergenceTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/TestEventLoopGroupProvider.java (88%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/TestRedisPublisher.java (89%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/TestSettings.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/UnixDomainSocketTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/Utf8StringCodecTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ValueTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/AbstractClusterTest.java (88%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/AdvancedClusterClientTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/AdvancedClusterReactiveTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ByteCodecClusterTest.java (87%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterClientOptionsTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterCommandInternalsTest.java (90%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterCommandTest.java (90%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterDistributionChannelWriterTest.java (92%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterNodeEndpointTest.java (89%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterPartiallyDownTest.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterPartitionParserTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterReactiveCommandTest.java (87%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterRule.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterSetup.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterTestUtil.java (84%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterTopologyRefreshOptionsTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterTopologyRefreshSchedulerTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/HealthyMajorityPartitionsConsensusTest.java (89%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/KnownMajorityPartitionsConsensusTest.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/NodeSelectionAsyncTest.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/NodeSelectionSyncTest.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PartitionsConsensusTestSupport.java (87%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PipelinedRedisFutureTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PooledClusterConnectionProviderTest.java (88%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ReadFromTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ReadOnlyCommandsTest.java (89%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterClientFactoryTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterClientTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterPasswordSecuredSslTest.java (89%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterReadFromTest.java (89%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterSetupTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterStressScenariosTest.java (87%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterURIUtilTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisReactiveClusterClientTest.java (88%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RoundRobinSocketAddressSupplierTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ScanIteratorTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/SlotHashTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/SynchronizingClusterConnectionProviderTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/CustomClusterCommandTest.java (87%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/GeoClusterCommandTest.java (82%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/HashClusterCommandTest.java (77%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/KeyClusterCommandTest.java (86%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/ListClusterCommandTest.java (85%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/StringClusterCommandTest.java (85%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/reactive/HashClusterReactiveCommandTest.java (75%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/reactive/KeyClusterReativeCommandTest.java (73%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/reactive/ListClusterReactiveCommandTest.java (85%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/reactive/StringClusterReactiveCommandTest.java (80%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/partitions/PartitionsTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/partitions/RedisClusterNodeTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/slots/ClusterSlotsParserTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/PubSubClusterTest.java (89%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/PubSubConnectionTest.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/ClusterTopologyRefreshTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/NodeTopologyViewsTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/RequestsTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/TopologyComparatorsTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/TopologyRefreshTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/codec/CompressionCodecTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/codec/StringCodecTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/BitCommandTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/CustomCommandTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/GeoCommandTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/HLLCommandTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/HashCommandTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/KeyCommandTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/ListCommandTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/NumericCommandTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/RunOnlyOnceServerCommandTest.java (90%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/ScriptingCommandTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/ServerCommandTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/SetCommandTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/SortCommandTest.java (86%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/SortedSetCommandTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/StringCommandTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/TransactionCommandTest.java (92%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/BitReactiveCommandTest.java (84%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/CustomReactiveCommandTest.java (79%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/GeoReactiveCommandTest.java (86%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/HLLReactiveCommandTest.java (80%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/HashReactiveCommandTest.java (80%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/KeyReactiveCommandTest.java (80%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/ListReactiveCommandTest.java (80%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/NumericReactiveCommandTest.java (79%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/ScriptingReactiveCommandTest.java (79%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/ServerReactiveCommandTest.java (88%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/SetReactiveCommandTest.java (80%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/SortReactiveCommandTest.java (80%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/SortedSetReactiveCommandTest.java (79%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/StringReactiveCommandTest.java (85%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/TransactionReactiveCommandTest.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/BitTxCommandTest.java (85%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/GeoTxCommandTest.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/HLLTxCommandTest.java (84%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/HashTxCommandTest.java (84%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/KeyTxCommandTest.java (85%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/ListTxCommandTest.java (84%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/SetTxCommandTest.java (84%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/SortTxCommandTest.java (84%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/SortedSetTxCommandTest.java (83%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/StringTxCommandTest.java (83%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/TxSyncInvocationHandler.java (92%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/BatchExecutableCommandLookupStrategyTest.java (90%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandSegmentCommandFactoryTest.java (85%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ConversionServiceTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/DeclaredCommandMethodTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/DefaultCommandMethodVerifierTest.java (90%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ParameterBinderTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveCommandSegmentCommandFactoryTest.java (83%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveTypeAdaptersTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveTypeAdaptionTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsAsyncTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsBatchingTest.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsClusterSyncTest.java (83%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsReactiveTest.java (89%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsSyncTest.java (86%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/SimpleBatcherTest.java (92%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/codec/AnnotationRedisCodecResolverTest.java (85%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/codec/ParameterWrappersTest.java (89%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/InvocationProxyFactoryTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/CodecAwareOutputResolverTest.java (92%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/OutputRegistryTest.java (90%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/segment/AnnotationCommandSegmentFactoryTest.java (89%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ParametrizedTypeInformationTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/WildcardTypeInformationTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/event/ConnectionEventsTriggeredTest.java (86%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/event/DefaultEventBusTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/event/DefaultEventPublisherOptionsTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/internal/AbstractInvocationHandlerTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/internal/HostAndPortTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/CustomCommandTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveChannelWriterTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveConnectionProviderTest.java (86%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveSentinelTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveTopologyProviderTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveUtilsTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/SentinelTopologyRefreshTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/StaticMasterSlaveTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/CommandLatencyIdTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/DefaultCommandLatencyCollectorTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/models/command/CommandDetailParserTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RoleParserTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/BooleanListOutputTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/GeoCoordinatesListOutputTest.java (90%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/GeoCoordinatesValueListOutputTest.java (89%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/GeoWithinListOutputTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/ListOutputTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/NestedMultiOutputTest.java (84%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScoredValueListOutputTest.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/AsyncCommandInternalsTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandArgsTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandHandlerTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandInternalsTest.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ConnectionFailureTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/DefaultEndpointTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/StateMachineTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubCommandTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubReactiveTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/reactive/RedisPublisherVerification.java (84%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/reliability/AtLeastOnceTest.java (96%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/reliability/AtMostOnceTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/ConstantDelayTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DecorrelatedJitterDelayTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DefaultClientResourcesTest.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DefaultEventLoopGroupProviderTest.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DirContextDnsResolverTest.java (99%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/EqualJitterDelayTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/ExponentialDelayTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/FullJitterDelayTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/FuturesTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/AbstractSentinelTest.java (85%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/SentinelCommandTest.java (94%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/SentinelConnectionTest.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/SentinelRule.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/SentinelServerCommandTest.java (91%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/reactive/SentinelReactiveCommandTest.java (77%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/reactive/SentinelServerReactiveCommandTest.java (77%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/server/RandomResponseServer.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/server/RandomServerHandler.java (97%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/CdiTest.java (89%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/ConnectionPoolSupportTest.java (92%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/InjectedClient.java (88%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/PersonDB.java (95%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/PubSubTestListener.java (93%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/RedisClusterClientFactoryBeanTest.java (98%) rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/SpringTest.java (93%) rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToElastiCacheMaster.java (83%) rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java (78%) rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToMasterSlaveUsingRedisSentinel.java (79%) rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToRedis.java (89%) rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToRedisCluster.java (87%) rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToRedisClusterSSL.java (86%) rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToRedisClusterWithTopologyRefreshing.java (85%) rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToRedisSSL.java (89%) rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToRedisUsingRedisSentinel.java (89%) rename src/test/java/{com/lambdaworks => io/lettuce}/examples/MySpringBean.java (86%) rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ReadWriteExample.java (85%) rename src/test/java/{com/lambdaworks => io/lettuce}/examples/SpringExample.java (88%) rename src/test/java/{com/lambdaworks => io/lettuce}/util/ConnectionDecoratingInvocationHandler.java (84%) rename src/test/java/{com/lambdaworks => io/lettuce}/util/ReactiveSyncInvocationHandler.java (89%) rename src/test/java/{com/lambdaworks => io/lettuce}/util/RoutingInvocationHandler.java (93%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/EmptyRedisChannelWriter.java (91%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/EmptyStatefulRedisConnection.java (86%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/RedisClientBenchmark.java (96%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterDistributionChannelWriterBenchmark.java (88%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/cluster/EmptyRedisClusterClient.java (80%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterClientBenchmark.java (92%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/codec/JmhMain.java (97%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/codec/StringCodecBenchmark.java (96%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/codec/Utf8StringCodecBenchmark.java (94%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandFactoryBenchmark.java (90%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsBenchmark.java (87%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/InvocationProxyFactoryBenchmark.java (97%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandBenchmark.java (89%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandHandlerBenchmark.java (91%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/EmptyByteBuf.java (99%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/EmptyClientResources.java (84%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/EmptyContext.java (99%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/EmptyFuture.java (98%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/EmptyPromise.java (99%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/JmhMain.java (98%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/RedisEndpointBenchmark.java (91%) rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/RedisStateMachineBenchmark.java (94%) rename src/test/resources/{com/lambdaworks/redis => io/lettuce/core}/support/SpringTest-context.xml (61%) rename src/test/resources/{com/lambdaworks => io/lettuce}/examples/SpringTest-context.xml (69%) diff --git a/README.md b/README.md index d4ceedb753..d325f2f755 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,6 @@ Supports advanced Redis features such as Sentinel, Cluster, Pipelining, Auto-Rec This version of lettuce has been tested against the latest Redis source-build. -* lettuce 3.x works with Java 6, 7 and 8, lettuce 4.x requires Java 8 * [synchronous](https://github.com/mp911de/lettuce/wiki/Basic-usage), [asynchronous](https://github.com/mp911de/lettuce/wiki/Asynchronous-API-%284.0%29) and [reactive](https://github.com/mp911de/lettuce/wiki/Reactive-API-%284.0%29) usage * [Redis Sentinel](https://github.com/mp911de/lettuce/wiki/Redis-Sentinel) * [Redis Cluster](https://github.com/mp911de/lettuce/wiki/Redis-Cluster) @@ -50,24 +49,24 @@ Example for Maven: ```xml - biz.paluch.redis - lettuce + io.lettuce + lettuce-core x.y.z ``` -Shaded JAR-File (packaged dependencies and relocated to the `com.lambdaworks` package to prevent version conflicts) +Shaded JAR-File (packaged dependencies and relocated to the `io.lettuce.core` package to prevent version conflicts) ```xml - biz.paluch.redis - lettuce + io.lettuce + lettuce-core x.y.z shaded - io.reactivex - rxjava + io.projectreactor + reactor-core org.latencyutils @@ -89,10 +88,6 @@ Shaded JAR-File (packaged dependencies and relocated to the `com.lambdaworks` p io.netty netty-codec - - com.google.guava - guava - io.netty netty-transport-native-epoll diff --git a/pom.xml b/pom.xml index dd2778b916..4a0a2adcb3 100644 --- a/pom.xml +++ b/pom.xml @@ -8,13 +8,13 @@ 9 - biz.paluch.redis - lettuce - 5.0.0-SNAPSHOT + io.lettuce + lettuce-core + 5.0.0.BUILD-SNAPSHOT jar lettuce - http://github.com/mp911de/lettuce/wiki + http://github.com/lettuce-io/lettuce-core Advanced and thread-safe Java Redis client for synchronous, asynchronous, and reactive usage. Supports Cluster, Sentinel, Pipelining, Auto-Reconnect, Codecs and much more. @@ -30,12 +30,12 @@ Travis CI - https://travis-ci.org/mp911de/lettuce + https://travis-ci.org/lettuce-io/lettuce-core Github - https://github.com/mp911de/lettuce/issues + https://github.com/lettuce-io/lettuce-core/issues @@ -63,9 +63,9 @@ - scm:git:https://github.com/mp911de/lettuce.git - scm:git:https://github.com/mp911de/lettuce.git - http://github.com/mp911de/lettuce + scm:git:https://github.com/lettuce-io/lettuce-core.git + scm:git:https://github.com/lettuce-io/lettuce-core.git + http://github.com/lettuce-io/lettuce-core HEAD @@ -670,79 +670,6 @@ - - - org.apache.maven.plugins - maven-site-plugin - 3.4 - - false - - - - org.apache.maven.doxia - doxia-module-markdown - 1.6 - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.9 - - - - - - org.apache.maven.plugins - maven-scm-publish-plugin - 1.1 - - gh-pages - ${project.build.directory}/site - ${github.site.upload.skip} - true - scm:git:ssh://git@github.com/mp911de/redis.paluch.biz.git - apidocs/** - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - - index - plugin-management - distribution-management - dependency-info - dependencies - scm - issue-tracking - cim - dependency-management - project-team - summary - - - - - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot - - true - - - diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml index 0dfa47f183..b7b0f88720 100644 --- a/src/assembly/bin.xml +++ b/src/assembly/bin.xml @@ -12,7 +12,7 @@ - biz.paluch.redis:lettuce:jar:${project.version} + io.lettuce:lettuce-core:jar:${project.version} false @@ -41,7 +41,7 @@ - biz.paluch.redis:lettuce:*:javadoc + io.lettuce:lettuce-core:*:javadoc apidocs true diff --git a/src/main/java/com/lambdaworks/codec/package-info.java b/src/main/java/com/lambdaworks/codec/package-info.java deleted file mode 100644 index c48584f769..0000000000 --- a/src/main/java/com/lambdaworks/codec/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Base16 and CRC16 codecs. - */ -package com.lambdaworks.codec; diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/api/package-info.java deleted file mode 100644 index cf228a573c..0000000000 --- a/src/main/java/com/lambdaworks/redis/cluster/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Redis Cluster connection API. - */ -package com.lambdaworks.redis.cluster.api; diff --git a/src/main/java/com/lambdaworks/redis/cluster/event/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/event/package-info.java deleted file mode 100644 index 75bb219e15..0000000000 --- a/src/main/java/com/lambdaworks/redis/cluster/event/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Cluster event types. - */ -package com.lambdaworks.redis.cluster.event; - diff --git a/src/main/java/com/lambdaworks/redis/cluster/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/package-info.java deleted file mode 100644 index 18a2d1dc02..0000000000 --- a/src/main/java/com/lambdaworks/redis/cluster/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Client for Redis Cluster, see {@link com.lambdaworks.redis.cluster.RedisClusterClient}. - */ -package com.lambdaworks.redis.cluster; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java deleted file mode 100644 index dfeb3d6fa9..0000000000 --- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Invocation proxy support. - */ -package com.lambdaworks.redis.dynamic.intercept; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java deleted file mode 100644 index e558ad6cbf..0000000000 --- a/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * {@link com.lambdaworks.redis.output.CommandOutput} resolution support. - */ -package com.lambdaworks.redis.dynamic.output; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/package-info.java deleted file mode 100644 index d3d087a524..0000000000 --- a/src/main/java/com/lambdaworks/redis/dynamic/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Core package for Redis Command Interface support through {@link com.lambdaworks.redis.dynamic.RedisCommandFactory}. - */ -package com.lambdaworks.redis.dynamic; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java deleted file mode 100644 index 4ddb28ac0f..0000000000 --- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Parameter access and descriptors. - */ -package com.lambdaworks.redis.dynamic.parameter; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java deleted file mode 100644 index 2826cdedf7..0000000000 --- a/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Support for {@link com.lambdaworks.redis.dynamic.segment.CommandSegments} and segment parsing. - */ -package com.lambdaworks.redis.dynamic.segment; diff --git a/src/main/java/com/lambdaworks/redis/event/connection/package-info.java b/src/main/java/com/lambdaworks/redis/event/connection/package-info.java deleted file mode 100644 index 61d07650fc..0000000000 --- a/src/main/java/com/lambdaworks/redis/event/connection/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Connection-related events. - */ -package com.lambdaworks.redis.event.connection; - diff --git a/src/main/java/com/lambdaworks/redis/event/metrics/package-info.java b/src/main/java/com/lambdaworks/redis/event/metrics/package-info.java deleted file mode 100644 index 9665bcda23..0000000000 --- a/src/main/java/com/lambdaworks/redis/event/metrics/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Metric events and publishing. - */ -package com.lambdaworks.redis.event.metrics; - diff --git a/src/main/java/com/lambdaworks/redis/masterslave/package-info.java b/src/main/java/com/lambdaworks/redis/masterslave/package-info.java deleted file mode 100644 index e55b21491f..0000000000 --- a/src/main/java/com/lambdaworks/redis/masterslave/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Client support for Redis Master/Slave setups. {@link com.lambdaworks.redis.masterslave.MasterSlave} supports self-managed, - * Redis Sentinel-managed, AWS ElastiCache and Azure Redis managed Master/Slave setups. - */ -package com.lambdaworks.redis.masterslave; diff --git a/src/main/java/com/lambdaworks/redis/package-info.java b/src/main/java/com/lambdaworks/redis/package-info.java deleted file mode 100644 index a55a3a7f0f..0000000000 --- a/src/main/java/com/lambdaworks/redis/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * The redis client package containing {@link com.lambdaworks.redis.RedisClient} for regular and sentinel operations. - */ -package com.lambdaworks.redis; diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/package-info.java b/src/main/java/com/lambdaworks/redis/sentinel/api/package-info.java deleted file mode 100644 index 088f267527..0000000000 --- a/src/main/java/com/lambdaworks/redis/sentinel/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Redis Sentinel connection API. - */ -package com.lambdaworks.redis.sentinel.api; diff --git a/src/main/java/com/lambdaworks/redis/support/package-info.java b/src/main/java/com/lambdaworks/redis/support/package-info.java deleted file mode 100644 index 274f0f7446..0000000000 --- a/src/main/java/com/lambdaworks/redis/support/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Supportive classes such as {@link com.lambdaworks.redis.support.RedisClientCdiBean} for CDI support, {@link com.lambdaworks.redis.support.RedisClientFactoryBean} for Spring. - */ -package com.lambdaworks.redis.support; - diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java rename to src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java index e306fb2d9e..3229dbfb02 100644 --- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java +++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.protocol.CommandType.EXEC; +import static io.lettuce.core.protocol.CommandType.EXEC; import java.util.Date; import java.util.List; @@ -23,14 +23,14 @@ import java.util.Set; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.GeoArgs.Unit; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.async.*; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.*; -import com.lambdaworks.redis.protocol.*; +import io.lettuce.core.GeoArgs.Unit; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.async.*; +import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.*; +import io.lettuce.core.protocol.*; /** * An asynchronous and thread-safe API for a Redis connection. diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/AbstractRedisClient.java rename to src/main/java/io/lettuce/core/AbstractRedisClient.java index 431099ec41..77b294efcd 100644 --- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java +++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.io.Closeable; import java.net.SocketAddress; @@ -25,11 +25,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; -import com.lambdaworks.redis.Transports.NativeTransports; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.ConnectionWatchdog; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.DefaultClientResources; +import io.lettuce.core.Transports.NativeTransports; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.ConnectionWatchdog; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.DefaultClientResources; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.PooledByteBufAllocator; diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java rename to src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java index f111005f0f..75965c4834 100644 --- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java +++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.protocol.CommandType.EXEC; +import static io.lettuce.core.protocol.CommandType.EXEC; import java.util.Date; import java.util.Map; @@ -25,14 +25,14 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import com.lambdaworks.redis.GeoArgs.Unit; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.reactive.*; -import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.*; -import com.lambdaworks.redis.protocol.*; +import io.lettuce.core.GeoArgs.Unit; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.reactive.*; +import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.*; +import io.lettuce.core.protocol.*; /** * A reactive and thread-safe API for a Redis connection. diff --git a/src/main/java/com/lambdaworks/redis/BitFieldArgs.java b/src/main/java/io/lettuce/core/BitFieldArgs.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/BitFieldArgs.java rename to src/main/java/io/lettuce/core/BitFieldArgs.java index 3c1b22d2b2..e0ee570560 100644 --- a/src/main/java/com/lambdaworks/redis/BitFieldArgs.java +++ b/src/main/java/io/lettuce/core/BitFieldArgs.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandType; -import com.lambdaworks.redis.protocol.LettuceCharsets; -import com.lambdaworks.redis.protocol.ProtocolKeyword; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandType; +import io.lettuce.core.protocol.LettuceCharsets; +import io.lettuce.core.protocol.ProtocolKeyword; /** * Arguments and types for the {@code BITFIELD} command. @@ -620,7 +620,7 @@ public String toString() { /** * Represents a bit field offset. See also Bits and * positional offsets - * + * * @since 4.3 */ public static class Offset { diff --git a/src/main/java/com/lambdaworks/redis/ChannelGroupListener.java b/src/main/java/io/lettuce/core/ChannelGroupListener.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/ChannelGroupListener.java rename to src/main/java/io/lettuce/core/ChannelGroupListener.java index c2e67e9837..49671d9bd0 100644 --- a/src/main/java/com/lambdaworks/redis/ChannelGroupListener.java +++ b/src/main/java/io/lettuce/core/ChannelGroupListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -23,7 +23,7 @@ /** * A netty {@link ChannelHandler} responsible for monitoring the channel and adding/removing the channel from/to the * ChannelGroup. - * + * * @author Will Glozer */ class ChannelGroupListener extends ChannelInboundHandlerAdapter { diff --git a/src/main/java/com/lambdaworks/redis/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/ClientOptions.java rename to src/main/java/io/lettuce/core/ClientOptions.java index 9a685c065c..888f53af80 100644 --- a/src/main/java/com/lambdaworks/redis/ClientOptions.java +++ b/src/main/java/io/lettuce/core/ClientOptions.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.io.Serializable; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Client Options to control the behavior of {@link RedisClient}. - * + * * @author Mark Paluch */ public class ClientOptions implements Serializable { @@ -87,7 +87,7 @@ public static ClientOptions.Builder builder() { /** * Create a new instance of {@link ClientOptions} with default settings. - * + * * @return a new instance of {@link ClientOptions} with default settings */ public static ClientOptions create() { @@ -114,7 +114,7 @@ protected Builder() { /** * Sets the {@literal PING} before activate connection flag. Defaults to {@literal false}. See * {@link #DEFAULT_PING_BEFORE_ACTIVATE_CONNECTION}. - * + * * @param pingBeforeActivateConnection true/false * @return {@code this} */ @@ -126,7 +126,7 @@ public Builder pingBeforeActivateConnection(boolean pingBeforeActivateConnection /** * Enables or disables auto reconnection on connection loss. Defaults to {@literal true}. See * {@link #DEFAULT_AUTO_RECONNECT}. - * + * * @param autoReconnect true/false * @return {@code this} */ @@ -138,7 +138,7 @@ public Builder autoReconnect(boolean autoReconnect) { /** * Suspends reconnect when reconnects run into protocol failures (SSL verification, PING before connect fails). Defaults * to {@literal false}. See {@link #DEFAULT_SUSPEND_RECONNECT_PROTO_FAIL}. - * + * * @param suspendReconnectOnProtocolFailure true/false * @return {@code this} */ @@ -150,7 +150,7 @@ public Builder suspendReconnectOnProtocolFailure(boolean suspendReconnectOnProto /** * Allows cancelling queued commands in case a reconnect fails.Defaults to {@literal false}. See * {@link #DEFAULT_CANCEL_CMD_RECONNECT_FAIL}. - * + * * @param cancelCommandsOnReconnectFailure true/false * @return {@code this} */ @@ -177,7 +177,7 @@ public Builder requestQueueSize(int requestQueueSize) { /** * Sets the behavior for command invocation when connections are in a disconnected state. Defaults to {@literal true}. * See {@link #DEFAULT_DISCONNECTED_BEHAVIOR}. - * + * * @param disconnectedBehavior must not be {@literal null}. * @return {@code this} */ @@ -217,7 +217,7 @@ public Builder sslOptions(SslOptions sslOptions) { /** * Create a new instance of {@link ClientOptions}. - * + * * @return new instance of {@link ClientOptions} */ public ClientOptions build() { @@ -242,7 +242,7 @@ public boolean isPingBeforeActivateConnection() { * queued commands. * * This flag has also the effect that disconnected connections will refuse commands and cancel these with an exception. - * + * * @return {@literal true} if auto-reconnect is enabled. */ public boolean isAutoReconnect() { @@ -252,7 +252,7 @@ public boolean isAutoReconnect() { /** * If this flag is {@literal true} any queued commands will be canceled when a reconnect fails within the activation * sequence. Default is {@literal false}. - * + * * @return {@literal true} if commands should be cancelled on reconnect failures. */ public boolean isCancelCommandsOnReconnectFailure() { @@ -262,7 +262,7 @@ public boolean isCancelCommandsOnReconnectFailure() { /** * If this flag is {@literal true} the reconnect will be suspended on protocol errors. Protocol errors are errors while SSL * negotiation or when PING before connect fails. - * + * * @return {@literal true} if reconnect will be suspended on protocol errors. */ public boolean isSuspendReconnectOnProtocolFailure() { @@ -273,7 +273,7 @@ public boolean isSuspendReconnectOnProtocolFailure() { * Request queue size for a connection. This value applies per connection. The command invocation will throw a * {@link RedisException} if the queue size is exceeded and a new command is requested. Defaults to * {@link Integer#MAX_VALUE}. - * + * * @return the request queue size. */ public int getRequestQueueSize() { @@ -283,7 +283,7 @@ public int getRequestQueueSize() { /** * Behavior for command invocation when connections are in a disconnected state. Defaults to * {@link DisconnectedBehavior#DEFAULT true}. See {@link #DEFAULT_DISCONNECTED_BEHAVIOR}. - * + * * @return the behavior for command invocation when connections are in a disconnected state */ public DisconnectedBehavior getDisconnectedBehavior() { @@ -292,7 +292,7 @@ public DisconnectedBehavior getDisconnectedBehavior() { /** * Returns the {@link SocketOptions}. - * + * * @return the {@link SocketOptions}. */ public SocketOptions getSocketOptions() { diff --git a/src/main/java/com/lambdaworks/redis/CloseEvents.java b/src/main/java/io/lettuce/core/CloseEvents.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/CloseEvents.java rename to src/main/java/io/lettuce/core/CloseEvents.java index 2cd4b28498..4da7672b4c 100644 --- a/src/main/java/com/lambdaworks/redis/CloseEvents.java +++ b/src/main/java/io/lettuce/core/CloseEvents.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.Set; @@ -21,7 +21,7 @@ /** * Close Events Facility. Can register/unregister CloseListener and fire a closed event to all registered listeners. - * + * * @author Mark Paluch * @since 3.0 */ diff --git a/src/main/java/com/lambdaworks/redis/CompositeArgument.java b/src/main/java/io/lettuce/core/CompositeArgument.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/CompositeArgument.java rename to src/main/java/io/lettuce/core/CompositeArgument.java index d7f2811e59..7e44693eb3 100644 --- a/src/main/java/com/lambdaworks/redis/CompositeArgument.java +++ b/src/main/java/io/lettuce/core/CompositeArgument.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.redis.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandArgs; /** * Interface for composite command argument objects. Implementing classes of {@link CompositeArgument} consolidate multiple @@ -24,7 +24,7 @@ *

* Command builder call {@link #build(CommandArgs)} during command construction to contribute command arguments for command * invocation. A composite argument is usually stateless as it can be reused multiple times by different commands. - * + * * @author Mark Paluch * @since 5.0 * @see CommandArgs diff --git a/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/ConnectionBuilder.java rename to src/main/java/io/lettuce/core/ConnectionBuilder.java index dd420e09f5..1e223c7291 100644 --- a/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java +++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.net.SocketAddress; import java.util.ArrayList; @@ -22,10 +22,10 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.*; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.*; +import io.lettuce.core.resource.ClientResources; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelHandler; diff --git a/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java b/src/main/java/io/lettuce/core/ConnectionEventTrigger.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java rename to src/main/java/io/lettuce/core/ConnectionEventTrigger.java index dc90d6846b..dd2b8bf25e 100644 --- a/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java +++ b/src/main/java/io/lettuce/core/ConnectionEventTrigger.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.net.SocketAddress; -import com.lambdaworks.redis.event.EventBus; -import com.lambdaworks.redis.event.connection.ConnectionDeactivatedEvent; +import io.lettuce.core.event.EventBus; +import io.lettuce.core.event.connection.ConnectionDeactivatedEvent; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; diff --git a/src/main/java/com/lambdaworks/redis/ConnectionEvents.java b/src/main/java/io/lettuce/core/ConnectionEvents.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/ConnectionEvents.java rename to src/main/java/io/lettuce/core/ConnectionEvents.java index efe5636819..4803067477 100644 --- a/src/main/java/com/lambdaworks/redis/ConnectionEvents.java +++ b/src/main/java/io/lettuce/core/ConnectionEvents.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.net.SocketAddress; import java.util.Set; @@ -23,7 +23,7 @@ /** * Close Events Facility. Can register/unregister CloseListener and fire a closed event to all registered listeners. - * + * * @author Mark Paluch * @since 3.0 */ diff --git a/src/main/java/com/lambdaworks/redis/ConnectionFuture.java b/src/main/java/io/lettuce/core/ConnectionFuture.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/ConnectionFuture.java rename to src/main/java/io/lettuce/core/ConnectionFuture.java index f62781c8bd..fc9ddf7f83 100644 --- a/src/main/java/com/lambdaworks/redis/ConnectionFuture.java +++ b/src/main/java/io/lettuce/core/ConnectionFuture.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.net.SocketAddress; import java.util.concurrent.*; @@ -22,7 +22,7 @@ import java.util.function.Consumer; import java.util.function.Function; -import com.lambdaworks.redis.api.StatefulConnection; +import io.lettuce.core.api.StatefulConnection; /** * A {@code ConnectionFuture} represents the result of an asynchronous connection initialization. The future provides a diff --git a/src/main/java/com/lambdaworks/redis/ConnectionId.java b/src/main/java/io/lettuce/core/ConnectionId.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/ConnectionId.java rename to src/main/java/io/lettuce/core/ConnectionId.java index bb14cd6383..acda361018 100644 --- a/src/main/java/com/lambdaworks/redis/ConnectionId.java +++ b/src/main/java/io/lettuce/core/ConnectionId.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.net.SocketAddress; /** * Connection identifier. A connection identifier consists of the {@link #localAddress()} and the {@link #remoteAddress()}. - * + * * @author Mark Paluch * @since 3.4 */ @@ -27,14 +27,14 @@ public interface ConnectionId { /** * Returns the local address. - * + * * @return the local address */ SocketAddress localAddress(); /** * Returns the remote address. - * + * * @return the remote address */ SocketAddress remoteAddress(); diff --git a/src/main/java/com/lambdaworks/redis/ConnectionPoint.java b/src/main/java/io/lettuce/core/ConnectionPoint.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/ConnectionPoint.java rename to src/main/java/io/lettuce/core/ConnectionPoint.java index 832fb4e8fe..ec437dd1db 100644 --- a/src/main/java/com/lambdaworks/redis/ConnectionPoint.java +++ b/src/main/java/io/lettuce/core/ConnectionPoint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; /** * Interface for a connection point described with a host and port or socket. diff --git a/src/main/java/com/lambdaworks/redis/DefaultConnectionFuture.java b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/DefaultConnectionFuture.java rename to src/main/java/io/lettuce/core/DefaultConnectionFuture.java index 53b1749959..943a14c23d 100644 --- a/src/main/java/com/lambdaworks/redis/DefaultConnectionFuture.java +++ b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.net.SocketAddress; import java.util.concurrent.*; diff --git a/src/main/java/com/lambdaworks/redis/EpollProvider.java b/src/main/java/io/lettuce/core/EpollProvider.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/EpollProvider.java rename to src/main/java/io/lettuce/core/EpollProvider.java index 297bae9e76..30522de3f2 100644 --- a/src/main/java/com/lambdaworks/redis/EpollProvider.java +++ b/src/main/java/io/lettuce/core/EpollProvider.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.lang.reflect.Constructor; import java.net.SocketAddress; import java.util.Locale; import java.util.concurrent.ThreadFactory; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceClassUtils; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceClassUtils; import io.netty.channel.Channel; import io.netty.channel.EventLoopGroup; @@ -33,14 +33,14 @@ /** * Wraps and provides Epoll classes. This is to protect the user from {@link ClassNotFoundException}'s caused by the absence of * the {@literal netty-transport-native-epoll} library during runtime. Internal API. - * + * * @author Mark Paluch */ public class EpollProvider { private static final InternalLogger logger = InternalLoggerFactory.getInstance(EpollProvider.class); - private static final String EPOLL_ENABLED_KEY = "biz.paluch.lettuce.redis.epoll"; + private static final String EPOLL_ENABLED_KEY = "io.lettuce.core.epoll"; private static final boolean EPOLL_ENABLED = Boolean.parseBoolean(SystemPropertyUtil.get(EPOLL_ENABLED_KEY, "true")); private static final boolean EPOLL_COMPATIBLE = SystemPropertyUtil.get("os.name").toLowerCase(Locale.UK).trim() .startsWith("linux"); @@ -81,7 +81,7 @@ public static boolean isEventLoopGroup(Class type) /** * Create a new {@link io.netty.channel.epoll.EpollEventLoopGroup}. - * + * * @param nThreads * @param threadFactory * @return the {@link EventLoopGroup}. diff --git a/src/main/java/com/lambdaworks/redis/FutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/FutureSyncInvocationHandler.java rename to src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java index 10d8600aea..074c577938 100644 --- a/src/main/java/com/lambdaworks/redis/FutureSyncInvocationHandler.java +++ b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.internal.AbstractInvocationHandler; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.internal.AbstractInvocationHandler; /** * Invocation-handler to synchronize API calls which use Futures as backend. This class leverages the need to implement a full diff --git a/src/main/java/com/lambdaworks/redis/GeoArgs.java b/src/main/java/io/lettuce/core/GeoArgs.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/GeoArgs.java rename to src/main/java/io/lettuce/core/GeoArgs.java index 1363207ac3..63e65d563f 100644 --- a/src/main/java/com/lambdaworks/redis/GeoArgs.java +++ b/src/main/java/io/lettuce/core/GeoArgs.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandKeyword; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandKeyword; /** * Args for {@literal GEORADIUS} and {@literal GEORADIUSBYMEMBER} commands. - * + * * @author Mark Paluch */ public class GeoArgs implements CompositeArgument { @@ -34,7 +34,7 @@ public class GeoArgs implements CompositeArgument { /** * Request distance for results. - * + * * @return {@code this} */ public GeoArgs withDistance() { @@ -44,7 +44,7 @@ public GeoArgs withDistance() { /** * Request coordinates for results. - * + * * @return {@code this} */ public GeoArgs withCoordinates() { @@ -54,7 +54,7 @@ public GeoArgs withCoordinates() { /** * Request geohash for results. - * + * * @return {@code this} */ public GeoArgs withHash() { @@ -64,7 +64,7 @@ public GeoArgs withHash() { /** * Limit results to {@code count} entries. - * + * * @param count number greater 0 * @return {@code this} */ @@ -75,7 +75,7 @@ public GeoArgs withCount(long count) { } /** - * + * * @return {@literal true} if distance is requested. */ public boolean isWithDistance() { @@ -83,7 +83,7 @@ public boolean isWithDistance() { } /** - * + * * @return {@literal true} if coordinates are requested. */ public boolean isWithCoordinates() { @@ -91,7 +91,7 @@ public boolean isWithCoordinates() { } /** - * + * * @return {@literal true} if geohash is requested. */ public boolean isWithHash() { @@ -100,7 +100,7 @@ public boolean isWithHash() { /** * Sort results ascending. - * + * * @return {@code this} */ public GeoArgs asc() { @@ -109,7 +109,7 @@ public GeoArgs asc() { /** * Sort results descending. - * + * * @return {@code this} */ public GeoArgs desc() { @@ -118,7 +118,7 @@ public GeoArgs desc() { /** * Sort results. - * + * * @param sort sort order, must not be {@literal null} * @return {@code this} */ diff --git a/src/main/java/com/lambdaworks/redis/GeoCoordinates.java b/src/main/java/io/lettuce/core/GeoCoordinates.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/GeoCoordinates.java rename to src/main/java/io/lettuce/core/GeoCoordinates.java index 8fcb4a5061..afd9dec360 100644 --- a/src/main/java/com/lambdaworks/redis/GeoCoordinates.java +++ b/src/main/java/io/lettuce/core/GeoCoordinates.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * A tuple consisting of numerical geo data points to describe geo coordinates. - * + * * @author Mark Paluch */ public class GeoCoordinates { @@ -29,7 +29,7 @@ public class GeoCoordinates { /** * Creates new {@link GeoCoordinates}. - * + * * @param x the longitude, must not be {@literal null}. * @param y the latitude, must not be {@literal null}. */ @@ -44,7 +44,7 @@ public GeoCoordinates(Number x, Number y) { /** * Creates new {@link GeoCoordinates}. - * + * * @param x the longitude, must not be {@literal null}. * @param y the latitude, must not be {@literal null}. * @return {@literal {@link GeoCoordinates}. diff --git a/src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java rename to src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java index 9f959a4099..bc35e55acb 100644 --- a/src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java +++ b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.redis.GeoArgs.Sort; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandKeyword; +import io.lettuce.core.GeoArgs.Sort; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandKeyword; /** * Store Args for {@literal GEORADIUS} to store {@literal GEORADIUS} results or {@literal GEORADIUS} distances in a sorted set. diff --git a/src/main/java/com/lambdaworks/redis/GeoWithin.java b/src/main/java/io/lettuce/core/GeoWithin.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/GeoWithin.java rename to src/main/java/io/lettuce/core/GeoWithin.java index 5029c91c94..8983e0f4b7 100644 --- a/src/main/java/com/lambdaworks/redis/GeoWithin.java +++ b/src/main/java/io/lettuce/core/GeoWithin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; /** * Geo element within a certain radius. Contains: @@ -23,7 +23,7 @@ *

  • the geohash (if requested)
    • *
  • the coordinates (if requested)
    • * - * + * * @param Value type. * @author Mark Paluch */ diff --git a/src/main/java/com/lambdaworks/redis/JavaRuntime.java b/src/main/java/io/lettuce/core/JavaRuntime.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/JavaRuntime.java rename to src/main/java/io/lettuce/core/JavaRuntime.java index a8e19d2aa1..dbd8455de2 100644 --- a/src/main/java/com/lambdaworks/redis/JavaRuntime.java +++ b/src/main/java/io/lettuce/core/JavaRuntime.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.internal.LettuceClassUtils.isPresent; +import static io.lettuce.core.internal.LettuceClassUtils.isPresent; /** * Utility to determine which Java runtime is used. - * + * * @author Mark Paluch */ public class JavaRuntime { diff --git a/src/main/java/com/lambdaworks/redis/KeyScanCursor.java b/src/main/java/io/lettuce/core/KeyScanCursor.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/KeyScanCursor.java rename to src/main/java/io/lettuce/core/KeyScanCursor.java index b668145aaf..7c8e69ac29 100644 --- a/src/main/java/com/lambdaworks/redis/KeyScanCursor.java +++ b/src/main/java/io/lettuce/core/KeyScanCursor.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.ArrayList; import java.util.List; /** * Cursor providing a list of keys. - * + * * @param Key type. * @author Mark Paluch * @since 3.0 diff --git a/src/main/java/com/lambdaworks/redis/KeyValue.java b/src/main/java/io/lettuce/core/KeyValue.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/KeyValue.java rename to src/main/java/io/lettuce/core/KeyValue.java index f3cc4e4470..5783de4d76 100644 --- a/src/main/java/com/lambdaworks/redis/KeyValue.java +++ b/src/main/java/io/lettuce/core/KeyValue.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.Optional; import java.util.function.Function; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * A key-value container extension to {@link Value}. A {@link KeyValue} requires always a non-null key on construction. diff --git a/src/main/java/com/lambdaworks/redis/KillArgs.java b/src/main/java/io/lettuce/core/KillArgs.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/KillArgs.java rename to src/main/java/io/lettuce/core/KillArgs.java index 8de347a246..d4c29d9329 100644 --- a/src/main/java/com/lambdaworks/redis/KillArgs.java +++ b/src/main/java/io/lettuce/core/KillArgs.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.protocol.CommandKeyword.*; -import static com.lambdaworks.redis.protocol.CommandType.*; +import static io.lettuce.core.protocol.CommandKeyword.*; +import static io.lettuce.core.protocol.CommandType.*; -import com.lambdaworks.redis.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandArgs; /** * diff --git a/src/main/java/com/lambdaworks/redis/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/LettuceFutures.java rename to src/main/java/io/lettuce/core/LettuceFutures.java index e1d787009c..045883ee59 100644 --- a/src/main/java/com/lambdaworks/redis/LettuceFutures.java +++ b/src/main/java/io/lettuce/core/LettuceFutures.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.concurrent.*; import java.util.function.Supplier; diff --git a/src/main/java/com/lambdaworks/redis/LettuceStrings.java b/src/main/java/io/lettuce/core/LettuceStrings.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/LettuceStrings.java rename to src/main/java/io/lettuce/core/LettuceStrings.java index dcf786d760..f0d7ce6902 100644 --- a/src/main/java/com/lambdaworks/redis/LettuceStrings.java +++ b/src/main/java/io/lettuce/core/LettuceStrings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.nio.ByteBuffer; import java.security.MessageDigest; @@ -21,11 +21,11 @@ import java.util.Collection; import java.util.Iterator; -import com.lambdaworks.codec.Base16; +import io.lettuce.core.codec.Base16; /** * Helper for {@link String} checks. This class is part of the internal API and may change without further notice. - * + * * @author Mark Paluch * @since 3.0 */ @@ -40,7 +40,7 @@ private LettuceStrings() { /** * Checks if a CharSequence is empty ("") or null. - * + * * @param cs the char sequence * @return true if empty */ @@ -50,10 +50,10 @@ public static boolean isEmpty(final CharSequence cs) { /** * Checks if a CharSequence is not empty ("") and not null. - * + * * @param cs the char sequence * @return true if not empty - * + * */ public static boolean isNotEmpty(final CharSequence cs) { return !isEmpty(cs); @@ -61,7 +61,7 @@ public static boolean isNotEmpty(final CharSequence cs) { /** * Convert double to string. If double is infinite, returns positive/negative infinity {@code +inf} and {@code -inf}. - * + * * @param n the double. * @return string representation of {@code n} */ @@ -74,7 +74,7 @@ public static String string(double n) { /** * Create SHA1 digest from Lua script. - * + * * @param script the script * @return the Base16 encoded SHA1 value */ @@ -84,7 +84,7 @@ public static String digest(byte[] script) { /** * Create SHA1 digest from Lua script. - * + * * @param script the script * @return the Base16 encoded SHA1 value */ @@ -102,7 +102,7 @@ public static String digest(ByteBuffer script) { * Convert a {@code String} array into a delimited {@code String} (e.g. CSV). *

    * Useful for {@code toString()} implementations. - * + * * @param arr the array to display * @param delim the delimiter to use (typically a ",") * @return the delimited {@code String} @@ -131,7 +131,7 @@ public static String arrayToDelimitedString(Object[] arr, String delim) { * Convert a {@link Collection} to a delimited {@code String} (e.g. CSV). *

    * Useful for {@code toString()} implementations. - * + * * @param coll the {@code Collection} to convert * @param delim the delimiter to use (typically a ",") * @param prefix the {@code String} to start each element with diff --git a/src/main/java/com/lambdaworks/redis/Limit.java b/src/main/java/io/lettuce/core/Limit.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/Limit.java rename to src/main/java/io/lettuce/core/Limit.java index d6c6193a47..6ea3cfaceb 100644 --- a/src/main/java/com/lambdaworks/redis/Limit.java +++ b/src/main/java/io/lettuce/core/Limit.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; /** * Value object for a slice of data (offset/count). diff --git a/src/main/java/com/lambdaworks/redis/MapScanCursor.java b/src/main/java/io/lettuce/core/MapScanCursor.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/MapScanCursor.java rename to src/main/java/io/lettuce/core/MapScanCursor.java index a2b96b02fe..ddaa8d096b 100644 --- a/src/main/java/com/lambdaworks/redis/MapScanCursor.java +++ b/src/main/java/io/lettuce/core/MapScanCursor.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.LinkedHashMap; import java.util.Map; /** * Scan cursor for maps. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -31,7 +31,7 @@ public class MapScanCursor extends ScanCursor { private final Map map = new LinkedHashMap<>(); /** - * + * * @return the map result. */ public Map getMap() { diff --git a/src/main/java/com/lambdaworks/redis/MigrateArgs.java b/src/main/java/io/lettuce/core/MigrateArgs.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/MigrateArgs.java rename to src/main/java/io/lettuce/core/MigrateArgs.java index c8b5f6b660..93d85e2755 100644 --- a/src/main/java/com/lambdaworks/redis/MigrateArgs.java +++ b/src/main/java/io/lettuce/core/MigrateArgs.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandKeyword; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandKeyword; +import io.lettuce.core.protocol.CommandType; /** * Argument list builder for the new redis MIGRATE command. Static import diff --git a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java rename to src/main/java/io/lettuce/core/PlainChannelInitializer.java index c7ce995a65..32d638d876 100644 --- a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java +++ b/src/main/java/io/lettuce/core/PlainChannelInitializer.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.ConnectionEventTrigger.local; -import static com.lambdaworks.redis.ConnectionEventTrigger.remote; +import static io.lettuce.core.ConnectionEventTrigger.local; +import static io.lettuce.core.ConnectionEventTrigger.remote; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import com.lambdaworks.redis.event.connection.ConnectedEvent; -import com.lambdaworks.redis.event.connection.ConnectionActivatedEvent; -import com.lambdaworks.redis.event.connection.DisconnectedEvent; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.event.connection.ConnectedEvent; +import io.lettuce.core.event.connection.ConnectionActivatedEvent; +import io.lettuce.core.event.connection.DisconnectedEvent; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.resource.ClientResources; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; diff --git a/src/main/java/com/lambdaworks/redis/Range.java b/src/main/java/io/lettuce/core/Range.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/Range.java rename to src/main/java/io/lettuce/core/Range.java index 1e8c1bdeb5..a6f21aac5e 100644 --- a/src/main/java/com/lambdaworks/redis/Range.java +++ b/src/main/java/io/lettuce/core/Range.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * {@link Range} defines {@literal lower} and {@literal upper} boundaries to retrieve items from a sorted set. - * + * * @author Mark Paluch * @since 4.3 */ @@ -58,7 +58,7 @@ public static Range create(T lower, T upper) { /** * Create a new range from {@code lower} and {@code upper} boundaries. - * + * * @param lower lower boundary, must not be {@literal null}. * @param upper upper boundary, must not be {@literal null}. * @param value type. @@ -78,7 +78,7 @@ public static Range unbounded() { /** * Greater than or equals {@code lower}. - * + * * @param lower the lower boundary value. * @return {@code this} {@link Range} with {@code lower} applied. */ @@ -102,7 +102,7 @@ public Range gt(T lower) { /** * Less than or equals {@code lower}. - * + * * @param upper the upper boundary value. * @return {@code this} {@link Range} with {@code upper} applied. */ @@ -114,7 +114,7 @@ public Range lte(T upper) { /** * Less than {@code lower}. - * + * * @param upper the upper boundary value. * @return {@code this} {@link Range} with {@code upper} applied. */ @@ -163,7 +163,7 @@ private Boundary(T value, boolean including) { /** * Creates an unbounded (infinite) boundary that marks the beginning/end of the range. - * + * * @return the unbounded boundary. * @param inferred type. */ @@ -175,7 +175,7 @@ public static Boundary unbounded() { /** * Create a {@link Boundary} based on the {@code value} that includes the value when comparing ranges. Greater or * equals, less or equals. but not Greater or equal, less or equal to {@code value}. - * + * * @param value must not be {@literal null}. * @param value type. * @return the {@link Boundary}. diff --git a/src/main/java/com/lambdaworks/redis/ReadFrom.java b/src/main/java/io/lettuce/core/ReadFrom.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/ReadFrom.java rename to src/main/java/io/lettuce/core/ReadFrom.java index efbd6844de..5438c47126 100644 --- a/src/main/java/com/lambdaworks/redis/ReadFrom.java +++ b/src/main/java/io/lettuce/core/ReadFrom.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.List; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.models.role.RedisNodeDescription; /** * Defines from which Redis nodes data is read. diff --git a/src/main/java/com/lambdaworks/redis/ReadFromImpl.java b/src/main/java/io/lettuce/core/ReadFromImpl.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/ReadFromImpl.java rename to src/main/java/io/lettuce/core/ReadFromImpl.java index 1cf86c5ad8..80fb5448b6 100644 --- a/src/main/java/com/lambdaworks/redis/ReadFromImpl.java +++ b/src/main/java/io/lettuce/core/ReadFromImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.lambdaworks.redis.internal.LettuceLists; -import com.lambdaworks.redis.models.role.RedisInstance; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.internal.LettuceLists; +import io.lettuce.core.models.role.RedisInstance; +import io.lettuce.core.models.role.RedisNodeDescription; /** * Collection of common read setting implementations. diff --git a/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java similarity index 84% rename from src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java rename to src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java index 762c29d9ed..840f1c603d 100644 --- a/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java +++ b/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; +import io.lettuce.core.codec.RedisCodec; /** * An asynchronous and thread-safe API for a Redis connection. diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/RedisChannelHandler.java rename to src/main/java/io/lettuce/core/RedisChannelHandler.java index 5ee51fd4a5..554d843074 100644 --- a/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java +++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.io.Closeable; import java.io.IOException; @@ -22,10 +22,10 @@ import java.util.Collection; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.ConnectionFacade; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.ConnectionFacade; +import io.lettuce.core.protocol.RedisCommand; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelInitializer.java b/src/main/java/io/lettuce/core/RedisChannelInitializer.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/RedisChannelInitializer.java rename to src/main/java/io/lettuce/core/RedisChannelInitializer.java index 4614df5550..be78ff7a6a 100644 --- a/src/main/java/com/lambdaworks/redis/RedisChannelInitializer.java +++ b/src/main/java/io/lettuce/core/RedisChannelInitializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.concurrent.Future; @@ -22,7 +22,7 @@ /** * Channel initializer to set up the transport before a Redis connection can be used. This is part of the internal API. This * class is part of the internal API. - * + * * @author Mark Paluch */ public interface RedisChannelInitializer extends ChannelHandler { diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java b/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java rename to src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java index 54143abbf1..231989bf4a 100644 --- a/src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java +++ b/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import io.netty.channel.ChannelDuplexHandler; /** * Channel initializer to set up the transport before a Redis connection can be used. This class is part of the internal API. - * + * * @author Mark Paluch */ abstract class RedisChannelInitializerImpl extends ChannelDuplexHandler implements RedisChannelInitializer { diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java b/src/main/java/io/lettuce/core/RedisChannelWriter.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/RedisChannelWriter.java rename to src/main/java/io/lettuce/core/RedisChannelWriter.java index 4c02879822..5c04387011 100644 --- a/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java +++ b/src/main/java/io/lettuce/core/RedisChannelWriter.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.io.Closeable; import java.util.Collection; -import com.lambdaworks.redis.protocol.ConnectionFacade; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.protocol.ConnectionFacade; +import io.lettuce.core.protocol.RedisCommand; /** * Writer for a channel. Writers push commands on to the communication channel and maintain a state for the commands. diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/RedisClient.java rename to src/main/java/io/lettuce/core/RedisClient.java index 5c119711b9..52cc30b40e 100644 --- a/src/main/java/com/lambdaworks/redis/RedisClient.java +++ b/src/main/java/io/lettuce/core/RedisClient.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.LettuceStrings.isEmpty; -import static com.lambdaworks.redis.LettuceStrings.isNotEmpty; +import static io.lettuce.core.LettuceStrings.isEmpty; +import static io.lettuce.core.LettuceStrings.isNotEmpty; import java.net.SocketAddress; import java.util.List; @@ -25,20 +25,20 @@ import java.util.concurrent.TimeoutException; import java.util.function.Supplier; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.CommandHandler; -import com.lambdaworks.redis.protocol.DefaultEndpoint; -import com.lambdaworks.redis.pubsub.PubSubCommandHandler; -import com.lambdaworks.redis.pubsub.PubSubEndpoint; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.SocketAddressResolver; -import com.lambdaworks.redis.sentinel.StatefulRedisSentinelConnectionImpl; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.CommandHandler; +import io.lettuce.core.protocol.DefaultEndpoint; +import io.lettuce.core.pubsub.PubSubCommandHandler; +import io.lettuce.core.pubsub.PubSubEndpoint; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.SocketAddressResolver; +import io.lettuce.core.sentinel.StatefulRedisSentinelConnectionImpl; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; /** * A scalable and thread-safe Redis client supporting synchronous, asynchronous and reactive @@ -53,8 +53,8 @@ *

  • Redis Sentinel, Master connections
    • * * - * Redis Cluster is used through {@link com.lambdaworks.redis.cluster.RedisClusterClient}. Master/Slave connections through - * {@link com.lambdaworks.redis.masterslave.MasterSlave} provide connections to Redis Master/Slave setups which run either in a + * Redis Cluster is used through {@link io.lettuce.core.cluster.RedisClusterClient}. Master/Slave connections through + * {@link io.lettuce.core.masterslave.MasterSlave} provide connections to Redis Master/Slave setups which run either in a * static Master/Slave setup or are managed by Redis Sentinel. *

    * {@link RedisClient} is an expensive resource. It holds a set of netty's {@link io.netty.channel.EventLoopGroup}'s that use @@ -71,8 +71,8 @@ * @see RedisCodec * @see ClientOptions * @see ClientResources - * @see com.lambdaworks.redis.masterslave.MasterSlave - * @see com.lambdaworks.redis.cluster.RedisClusterClient + * @see io.lettuce.core.masterslave.MasterSlave + * @see io.lettuce.core.cluster.RedisClusterClient */ public class RedisClient extends AbstractRedisClient { diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java rename to src/main/java/io/lettuce/core/RedisCommandBuilder.java index 2150664708..8930b11dd3 100644 --- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java +++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.LettuceStrings.string; -import static com.lambdaworks.redis.protocol.CommandKeyword.*; -import static com.lambdaworks.redis.protocol.CommandType.*; +import static io.lettuce.core.LettuceStrings.string; +import static io.lettuce.core.protocol.CommandKeyword.*; +import static io.lettuce.core.protocol.CommandType.*; import java.nio.ByteBuffer; import java.util.*; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.*; -import com.lambdaworks.redis.protocol.BaseRedisCommandBuilder; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.*; +import io.lettuce.core.protocol.BaseRedisCommandBuilder; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.RedisCommand; /** * @param diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandExecutionException.java b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/RedisCommandExecutionException.java rename to src/main/java/io/lettuce/core/RedisCommandExecutionException.java index 854f5defd0..168b3f9176 100644 --- a/src/main/java/com/lambdaworks/redis/RedisCommandExecutionException.java +++ b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; /** * Exception for errors states reported by Redis. diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandInterruptedException.java b/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/RedisCommandInterruptedException.java rename to src/main/java/io/lettuce/core/RedisCommandInterruptedException.java index 3c6d9cfe35..6e9c3a84c6 100644 --- a/src/main/java/com/lambdaworks/redis/RedisCommandInterruptedException.java +++ b/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; /** * Exception thrown when the thread executing a redis command is interrupted. - * + * * @author Will Glozer */ @SuppressWarnings("serial") diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandTimeoutException.java b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/RedisCommandTimeoutException.java rename to src/main/java/io/lettuce/core/RedisCommandTimeoutException.java index 57c8d4ea1e..334860135b 100644 --- a/src/main/java/com/lambdaworks/redis/RedisCommandTimeoutException.java +++ b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; /** * Exception thrown when the command waiting timeout is exceeded. - * + * * @author Mark Paluch */ @SuppressWarnings("serial") diff --git a/src/main/java/com/lambdaworks/redis/RedisConnectionException.java b/src/main/java/io/lettuce/core/RedisConnectionException.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/RedisConnectionException.java rename to src/main/java/io/lettuce/core/RedisConnectionException.java index ba94c81453..d8857f3efa 100644 --- a/src/main/java/com/lambdaworks/redis/RedisConnectionException.java +++ b/src/main/java/io/lettuce/core/RedisConnectionException.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; /** * Exception for connection failures. - * + * * @author Mark Paluch */ @SuppressWarnings("serial") diff --git a/src/main/java/com/lambdaworks/redis/RedisConnectionStateAdapter.java b/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/RedisConnectionStateAdapter.java rename to src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java index cda5404118..3e86275fb2 100644 --- a/src/main/java/com/lambdaworks/redis/RedisConnectionStateAdapter.java +++ b/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.net.SocketAddress; /** * Convenience adapter with an empty implementation of all {@link RedisConnectionStateListener} callback methods. - * + * * @author Mark Paluch * @since 4.4 */ diff --git a/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java b/src/main/java/io/lettuce/core/RedisConnectionStateListener.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java rename to src/main/java/io/lettuce/core/RedisConnectionStateListener.java index 5d461a1513..a43499e93d 100644 --- a/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java +++ b/src/main/java/io/lettuce/core/RedisConnectionStateListener.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.net.SocketAddress; /** * Simple interface for Redis connection state monitoring. - * + * * @author ze * @author Mark Paluch */ @@ -27,7 +27,7 @@ public interface RedisConnectionStateListener { /** * Event handler for successful connection event. - * + * * @param connection Source connection. * @deprecated since 4.4, use {@link RedisConnectionStateListener#onRedisConnected(RedisChannelHandler, SocketAddress)}. */ @@ -48,17 +48,17 @@ default void onRedisConnected(RedisChannelHandler connection, SocketAddres /** * Event handler for disconnection event. - * + * * @param connection Source connection. */ void onRedisDisconnected(RedisChannelHandler connection); /** - * + * * Event handler for exceptions. - * + * * @param connection Source connection. - * + * * @param cause Caught exception. */ void onRedisExceptionCaught(RedisChannelHandler connection, Throwable cause); diff --git a/src/main/java/com/lambdaworks/redis/RedisException.java b/src/main/java/io/lettuce/core/RedisException.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/RedisException.java rename to src/main/java/io/lettuce/core/RedisException.java index 8eeedf3337..2258211e09 100644 --- a/src/main/java/com/lambdaworks/redis/RedisException.java +++ b/src/main/java/io/lettuce/core/RedisException.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; /** * Exception thrown when Redis returns an error message, or when the client fails for any reason. - * + * * @author Will Glozer */ @SuppressWarnings("serial") diff --git a/src/main/java/com/lambdaworks/redis/RedisFuture.java b/src/main/java/io/lettuce/core/RedisFuture.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/RedisFuture.java rename to src/main/java/io/lettuce/core/RedisFuture.java index 6c2c3e3021..36a91c32ed 100644 --- a/src/main/java/com/lambdaworks/redis/RedisFuture.java +++ b/src/main/java/io/lettuce/core/RedisFuture.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.concurrent.CompletionStage; import java.util.concurrent.Future; diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/RedisPublisher.java rename to src/main/java/io/lettuce/core/RedisPublisher.java index 62a7b0e9cf..75ed457f6c 100644 --- a/src/main/java/com/lambdaworks/redis/RedisPublisher.java +++ b/src/main/java/io/lettuce/core/RedisPublisher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.io.IOException; import java.util.Arrays; @@ -32,13 +32,13 @@ import reactor.core.publisher.Operators; import reactor.util.concurrent.QueueSupplier; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.StreamingOutput; -import com.lambdaworks.redis.protocol.CommandWrapper; -import com.lambdaworks.redis.protocol.DemandAware; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.StreamingOutput; +import io.lettuce.core.protocol.CommandWrapper; +import io.lettuce.core.protocol.DemandAware; +import io.lettuce.core.protocol.RedisCommand; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; @@ -50,7 +50,7 @@ * individual elements instead of emitting collections. This publisher allows multiple subscriptions if it's backed by a * {@link Supplier command supplier}. *

    - * When using streaming outputs ({@link com.lambdaworks.redis.output.CommandOutput} that implement {@link StreamingOutput}) + * When using streaming outputs ({@link io.lettuce.core.output.CommandOutput} that implement {@link StreamingOutput}) * elements are emitted as they are decoded. Otherwise, results are processed at command completion. * * @author Mark Paluch @@ -693,7 +693,7 @@ private void onError(Throwable throwable) { } /** - * Composite {@link com.lambdaworks.redis.output.StreamingOutput.Subscriber} that can notify multiple nested subscribers. + * Composite {@link io.lettuce.core.output.StreamingOutput.Subscriber} that can notify multiple nested subscribers. * * @param element type */ diff --git a/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java similarity index 83% rename from src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java rename to src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java index 5ff894fdd7..e0e90384b8 100644 --- a/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java +++ b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; -import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.reactive.RedisReactiveCommands; +import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands; +import io.lettuce.core.codec.RedisCodec; /** * A reactive and thread-safe API for a Redis Sentinel connection. diff --git a/src/main/java/com/lambdaworks/redis/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/RedisURI.java rename to src/main/java/io/lettuce/core/RedisURI.java index 9e14520874..895d9758f6 100644 --- a/src/main/java/com/lambdaworks/redis/RedisURI.java +++ b/src/main/java/io/lettuce/core/RedisURI.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.LettuceStrings.isEmpty; -import static com.lambdaworks.redis.LettuceStrings.isNotEmpty; +import static io.lettuce.core.LettuceStrings.isEmpty; +import static io.lettuce.core.LettuceStrings.isNotEmpty; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -28,10 +28,10 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import com.lambdaworks.redis.internal.HostAndPort; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceSets; -import com.lambdaworks.redis.protocol.LettuceCharsets; +import io.lettuce.core.internal.HostAndPort; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceSets; +import io.lettuce.core.protocol.LettuceCharsets; /** * Redis URI. Contains connection details for the Redis/Sentinel connections. You can provide the database, client name, @@ -49,8 +49,8 @@ *

    * {@code RedisURI.Builder.redis("localhost", 6379).withPassword("password").withDatabase(1).build(); } *

    - * See {@link com.lambdaworks.redis.RedisURI.Builder#redis(String)} and - * {@link com.lambdaworks.redis.RedisURI.Builder#sentinel(String)} for more options. + * See {@link io.lettuce.core.RedisURI.Builder#redis(String)} and + * {@link io.lettuce.core.RedisURI.Builder#sentinel(String)} for more options. *
  • Construct your own instance: *

    * {@code new RedisURI("localhost", 6379, 60, TimeUnit.SECONDS);} @@ -111,7 +111,7 @@ *

    * * RedisURI supports Redis Standalone, Redis Sentinel and Redis Cluster with plain, SSL, TLS and unix domain socket connections. - * + * * @author Mark Paluch * @since 3.0 */ @@ -243,7 +243,7 @@ public static RedisURI create(URI uri) { /** * Returns the host. - * + * * @return the host. */ public String getHost() { @@ -252,7 +252,7 @@ public String getHost() { /** * Sets the Redis host. - * + * * @param host the host */ public void setHost(String host) { @@ -261,7 +261,7 @@ public void setHost(String host) { /** * Returns the Sentinel Master Id. - * + * * @return the Sentinel Master Id. */ public String getSentinelMasterId() { @@ -270,7 +270,7 @@ public String getSentinelMasterId() { /** * Sets the Sentinel Master Id. - * + * * @param sentinelMasterId the Sentinel Master Id. */ public void setSentinelMasterId(String sentinelMasterId) { @@ -279,7 +279,7 @@ public void setSentinelMasterId(String sentinelMasterId) { /** * Returns the Redis port. - * + * * @return the Redis port */ public int getPort() { @@ -288,7 +288,7 @@ public int getPort() { /** * Sets the Redis port. Defaults to {@link #DEFAULT_REDIS_PORT}. - * + * * @param port the Redis port */ public void setPort(int port) { @@ -297,7 +297,7 @@ public void setPort(int port) { /** * Returns the Unix Domain Socket path. - * + * * @return the Unix Domain Socket path. */ public String getSocket() { @@ -306,7 +306,7 @@ public String getSocket() { /** * Sets the Unix Domain Socket path. - * + * * @param socket the Unix Domain Socket path. */ public void setSocket(String socket) { @@ -315,7 +315,7 @@ public void setSocket(String socket) { /** * Returns the password. - * + * * @return the password */ public char[] getPassword() { @@ -324,7 +324,7 @@ public char[] getPassword() { /** * Sets the password. Use empty string to skip authentication. - * + * * @param password the password, must not be {@literal null}. */ public void setPassword(String password) { @@ -335,7 +335,7 @@ public void setPassword(String password) { /** * Returns the command timeout for synchronous command execution. - * + * * @return the Timeout */ public long getTimeout() { @@ -344,7 +344,7 @@ public long getTimeout() { /** * Sets the command timeout for synchronous command execution. - * + * * @param timeout the command timeout for synchronous command execution. */ public void setTimeout(long timeout) { @@ -353,7 +353,7 @@ public void setTimeout(long timeout) { /** * Returns the {@link TimeUnit} for the command timeout. - * + * * @return the {@link TimeUnit} for the command timeout. */ public TimeUnit getUnit() { @@ -362,7 +362,7 @@ public TimeUnit getUnit() { /** * Sets the {@link TimeUnit} for the command timeout. - * + * * @param unit the {@link TimeUnit} for the command timeout, must not be {@literal null} */ public void setUnit(TimeUnit unit) { @@ -373,7 +373,7 @@ public void setUnit(TimeUnit unit) { /** * Returns the Redis database number. Databases are only available for Redis Standalone and Redis Master/Slave. - * + * * @return */ public int getDatabase() { @@ -382,7 +382,7 @@ public int getDatabase() { /** * Sets the Redis database number. Databases are only available for Redis Standalone and Redis Master/Slave. - * + * * @param database the Redis database number. */ public void setDatabase(int database) { @@ -414,7 +414,7 @@ public void setClientName(String clientName) { /** * Returns {@literal true} if SSL mode is enabled. - * + * * @return {@literal true} if SSL mode is enabled. */ public boolean isSsl() { @@ -423,7 +423,7 @@ public boolean isSsl() { /** * Sets whether to use SSL model. - * + * * @param ssl */ public void setSsl(boolean ssl) { @@ -432,7 +432,7 @@ public void setSsl(boolean ssl) { /** * Sets whether to verify peers when using {@link #isSsl() SSL}. - * + * * @return {@literal true} to verify peers when using {@link #isSsl() SSL}. */ public boolean isVerifyPeer() { @@ -441,7 +441,7 @@ public boolean isVerifyPeer() { /** * Sets whether to verify peers when using {@link #isSsl() SSL}. - * + * * @param verifyPeer {@literal true} to verify peers when using {@link #isSsl() SSL}. */ public void setVerifyPeer(boolean verifyPeer) { @@ -450,7 +450,7 @@ public void setVerifyPeer(boolean verifyPeer) { /** * Returns {@literal true} if StartTLS is enabled. - * + * * @return {@literal true} if StartTLS is enabled. */ public boolean isStartTls() { @@ -459,7 +459,7 @@ public boolean isStartTls() { /** * Returns whether StartTLS is enabled. - * + * * @param startTls {@literal true} if StartTLS is enabled. */ public void setStartTls(boolean startTls) { @@ -476,7 +476,7 @@ public List getSentinels() { /** * Creates an URI based on the RedisURI. - * + * * @return URI based on the RedisURI */ public URI toURI() { @@ -658,7 +658,7 @@ private String toQueryParamUnit(TimeUnit unit) { /** * URL encode the {@code str} without slash escaping {@code %2F} - * + * * @param str * @return the URL-encoded string */ @@ -1193,7 +1193,7 @@ public Builder withTimeout(long timeout, TimeUnit unit) { /** * Configures a sentinel master Id. - * + * * @param sentinelMasterId sentinel master id, must not be empty or {@literal null} * @return the builder */ diff --git a/src/main/java/com/lambdaworks/redis/ScanArgs.java b/src/main/java/io/lettuce/core/ScanArgs.java similarity index 88% rename from src/main/java/com/lambdaworks/redis/ScanArgs.java rename to src/main/java/io/lettuce/core/ScanArgs.java index 625886517d..bfa5b1405b 100644 --- a/src/main/java/com/lambdaworks/redis/ScanArgs.java +++ b/src/main/java/io/lettuce/core/ScanArgs.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.protocol.CommandKeyword.COUNT; -import static com.lambdaworks.redis.protocol.CommandKeyword.MATCH; +import static io.lettuce.core.protocol.CommandKeyword.COUNT; +import static io.lettuce.core.protocol.CommandKeyword.MATCH; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.CommandArgs; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.CommandArgs; /** * Argument list builder for the redis scan commans (scan, hscan, sscan, zscan) . Static import the methods from {@link Builder} * and chain the method calls: {@code matches("weight_*").limit(0, 2)}. - * + * * @author Mark Paluch * @since 3.0 */ @@ -47,7 +47,7 @@ private Builder() { /** * Create a new instance of {@link ScanArgs} with limit. - * + * * @param count number of elements to scan * @return a new instance of {@link ScanArgs} */ @@ -57,7 +57,7 @@ public static ScanArgs limit(long count) { /** * Create a new instance of {@link ScanArgs} with match filter. - * + * * @param matches the filter * @return a new instance of {@link ScanArgs} */ @@ -68,7 +68,7 @@ public static ScanArgs matches(String matches) { /** * Match filter - * + * * @param match the filter * @return the current instance of {@link ScanArgs} */ @@ -80,7 +80,7 @@ public ScanArgs match(String match) { /** * Limit the scan by count - * + * * @param count number of elements to scan * @return the current instance of {@link ScanArgs} */ diff --git a/src/main/java/com/lambdaworks/redis/ScanCursor.java b/src/main/java/io/lettuce/core/ScanCursor.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/ScanCursor.java rename to src/main/java/io/lettuce/core/ScanCursor.java index 7ce6f744d5..031fc92b1f 100644 --- a/src/main/java/com/lambdaworks/redis/ScanCursor.java +++ b/src/main/java/io/lettuce/core/ScanCursor.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Generic Cursor data structure. - * + * * @author Mark Paluch * @since 3.0 */ @@ -46,7 +46,7 @@ public ScanCursor() { /** * Creates a new {@link ScanCursor}. - * + * * @param cursor * @param finished */ @@ -56,7 +56,7 @@ public ScanCursor(String cursor, boolean finished) { } /** - * + * * @return cursor id */ public String getCursor() { @@ -65,7 +65,7 @@ public String getCursor() { /** * Set the cursor - * + * * @param cursor the cursor id */ public void setCursor(String cursor) { @@ -75,7 +75,7 @@ public void setCursor(String cursor) { } /** - * + * * @return true if the scan operation of this cursor is finished. */ public boolean isFinished() { @@ -88,7 +88,7 @@ public void setFinished(boolean finished) { /** * Creates a Scan-Cursor reference. - * + * * @param cursor the cursor id * @return ScanCursor */ diff --git a/src/main/java/com/lambdaworks/redis/ScanIterator.java b/src/main/java/io/lettuce/core/ScanIterator.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/ScanIterator.java rename to src/main/java/io/lettuce/core/ScanIterator.java index cf306af142..3dfd362f23 100644 --- a/src/main/java/com/lambdaworks/redis/ScanIterator.java +++ b/src/main/java/io/lettuce/core/ScanIterator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.Iterator; import java.util.NoSuchElementException; @@ -22,11 +22,11 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import com.lambdaworks.redis.api.sync.RedisHashCommands; -import com.lambdaworks.redis.api.sync.RedisKeyCommands; -import com.lambdaworks.redis.api.sync.RedisSetCommands; -import com.lambdaworks.redis.api.sync.RedisSortedSetCommands; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.api.sync.RedisHashCommands; +import io.lettuce.core.api.sync.RedisKeyCommands; +import io.lettuce.core.api.sync.RedisSetCommands; +import io.lettuce.core.api.sync.RedisSortedSetCommands; +import io.lettuce.core.internal.LettuceAssert; /** * Scan command support exposed through {@link Iterator}. @@ -43,7 +43,7 @@ public abstract class ScanIterator implements Iterator { /** * Sequentially iterate over keys in the keyspace. This method uses {@code SCAN} to perform an iterative scan. - * + * * @param commands the commands interface, must not be {@literal null}. * @param Key type. * @param Value type. @@ -270,7 +270,7 @@ private ScoredValueScanCursor getNextScanCursor(ScanCursor scanCursor) { /** * Returns a sequential {@code Stream} with this {@link ScanIterator} as its source. - * + * * @return a {@link Stream} for this {@link ScanIterator}. */ public Stream stream() { @@ -279,7 +279,7 @@ public Stream stream() { /** * Synchronous {@link ScanIterator} implementation. - * + * * @param */ private static abstract class SyncScanIterator extends ScanIterator { diff --git a/src/main/java/com/lambdaworks/redis/ScoredValue.java b/src/main/java/io/lettuce/core/ScoredValue.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/ScoredValue.java rename to src/main/java/io/lettuce/core/ScoredValue.java index b18dfd0248..9977258381 100644 --- a/src/main/java/com/lambdaworks/redis/ScoredValue.java +++ b/src/main/java/io/lettuce/core/ScoredValue.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.Optional; import java.util.function.Function; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * A scored-value extension to {@link Value}. - * + * * @param Value type. * @author Will Glozer * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/ScoredValueScanCursor.java b/src/main/java/io/lettuce/core/ScoredValueScanCursor.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/ScoredValueScanCursor.java rename to src/main/java/io/lettuce/core/ScoredValueScanCursor.java index d34e139f6d..ee543c1c6d 100644 --- a/src/main/java/com/lambdaworks/redis/ScoredValueScanCursor.java +++ b/src/main/java/io/lettuce/core/ScoredValueScanCursor.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.ArrayList; import java.util.List; /** - * Cursor providing a list of {@link com.lambdaworks.redis.ScoredValue} - * + * Cursor providing a list of {@link io.lettuce.core.ScoredValue} + * * @param Value type. * @author Mark Paluch * @since 3.0 diff --git a/src/main/java/com/lambdaworks/redis/ScriptOutputType.java b/src/main/java/io/lettuce/core/ScriptOutputType.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/ScriptOutputType.java rename to src/main/java/io/lettuce/core/ScriptOutputType.java index 0de83d291d..07089a5b08 100644 --- a/src/main/java/com/lambdaworks/redis/ScriptOutputType.java +++ b/src/main/java/io/lettuce/core/ScriptOutputType.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; /** * A Lua script returns one of the following types: - * + * *
      *
    • {@link #BOOLEAN} boolean
      • *
    • {@link #INTEGER} 64-bit integer
      • @@ -25,7 +25,7 @@ *
    • {@link #VALUE} value
      • *
    • {@link #MULTI} of these types
      • *
    - * + * * Redis to Lua conversion table. *
      *
    • Redis integer reply -> Lua number
      • @@ -35,7 +35,7 @@ *
    • Redis error reply -> Lua table with a single {@code err} field containing the error
      • *
    • Redis Nil bulk reply and Nil multi bulk reply -> Lua false boolean type
      • *
    - * + * * Lua to Redis conversion table. *
      *
    • Lua number -> Redis integer reply (the number is converted into an integer)
      • @@ -45,7 +45,7 @@ *
    • Lua table with a single {@code err} field -> Redis error reply
      • *
    • Lua boolean false -> Redis Nil bulk reply.
      • *
    - * + * * @author Will Glozer */ public enum ScriptOutputType { diff --git a/src/main/java/com/lambdaworks/redis/SetArgs.java b/src/main/java/io/lettuce/core/SetArgs.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/SetArgs.java rename to src/main/java/io/lettuce/core/SetArgs.java index 46792705d7..4343d3fbe4 100644 --- a/src/main/java/com/lambdaworks/redis/SetArgs.java +++ b/src/main/java/io/lettuce/core/SetArgs.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.redis.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandArgs; /** * Argument list builder for the new redis SET command starting from Redis 2.6.12. * Static import the methods from {@link Builder} and chain the method calls: {@code ex(10).nx()}. - * + * * @author Will Glozer * @author Vincent Rischmann */ diff --git a/src/main/java/com/lambdaworks/redis/SocketOptions.java b/src/main/java/io/lettuce/core/SocketOptions.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/SocketOptions.java rename to src/main/java/io/lettuce/core/SocketOptions.java index dc60be33b0..578bdeb407 100644 --- a/src/main/java/com/lambdaworks/redis/SocketOptions.java +++ b/src/main/java/io/lettuce/core/SocketOptions.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Options to configure low-level socket options for the connections kept to Redis servers. @@ -151,7 +151,7 @@ public SocketOptions build() { /** * Returns the connection timeout. - * + * * @return the connection timeout. */ public long getConnectTimeout() { @@ -160,7 +160,7 @@ public long getConnectTimeout() { /** * Returns the the connection timeout unit. - * + * * @return the connection timeout unit. */ public TimeUnit getConnectTimeoutUnit() { @@ -169,7 +169,7 @@ public TimeUnit getConnectTimeoutUnit() { /** * Returns whether to enable TCP keepalive. - * + * * @return whether to enable TCP keepalive * @see java.net.SocketOptions#SO_KEEPALIVE */ @@ -179,7 +179,7 @@ public boolean isKeepAlive() { /** * Returns whether to use TCP NoDelay. - * + * * @return {@literal true} to disable Nagle's algorithm, {@link false} to enable Nagle's algorithm. * @see java.net.SocketOptions#TCP_NODELAY */ diff --git a/src/main/java/com/lambdaworks/redis/SortArgs.java b/src/main/java/io/lettuce/core/SortArgs.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/SortArgs.java rename to src/main/java/io/lettuce/core/SortArgs.java index fc009c5814..e66da934be 100644 --- a/src/main/java/com/lambdaworks/redis/SortArgs.java +++ b/src/main/java/io/lettuce/core/SortArgs.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.protocol.CommandKeyword.*; -import static com.lambdaworks.redis.protocol.CommandType.GET; +import static io.lettuce.core.protocol.CommandKeyword.*; +import static io.lettuce.core.protocol.CommandType.GET; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandKeyword; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandKeyword; /** * Argument list builder for the redis SORT command. Static import the methods from * {@link Builder} and chain the method calls: {@code by("weight_*").desc().limit(0, 2)}. - * + * * @author Will Glozer */ public class SortArgs implements CompositeArgument { diff --git a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java rename to src/main/java/io/lettuce/core/SslConnectionBuilder.java index 1515e91bf6..a5c1af25b6 100644 --- a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java +++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.ConnectionEventTrigger.local; -import static com.lambdaworks.redis.ConnectionEventTrigger.remote; -import static com.lambdaworks.redis.PlainChannelInitializer.pingBeforeActivate; +import static io.lettuce.core.ConnectionEventTrigger.local; +import static io.lettuce.core.ConnectionEventTrigger.remote; +import static io.lettuce.core.PlainChannelInitializer.pingBeforeActivate; import java.io.IOException; import java.io.InputStream; @@ -30,12 +30,12 @@ import javax.net.ssl.*; -import com.lambdaworks.redis.event.connection.ConnectedEvent; -import com.lambdaworks.redis.event.connection.ConnectionActivatedEvent; -import com.lambdaworks.redis.event.connection.DisconnectedEvent; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.event.connection.ConnectedEvent; +import io.lettuce.core.event.connection.ConnectionActivatedEvent; +import io.lettuce.core.event.connection.DisconnectedEvent; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.resource.ClientResources; import io.netty.channel.Channel; import io.netty.channel.ChannelDuplexHandler; diff --git a/src/main/java/com/lambdaworks/redis/SslOptions.java b/src/main/java/io/lettuce/core/SslOptions.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/SslOptions.java rename to src/main/java/io/lettuce/core/SslOptions.java index e09ae13e33..af0c866979 100644 --- a/src/main/java/com/lambdaworks/redis/SslOptions.java +++ b/src/main/java/io/lettuce/core/SslOptions.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; import io.netty.handler.ssl.OpenSsl; import io.netty.handler.ssl.SslProvider; diff --git a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java rename to src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java index 905cd9b41e..de7ffec91d 100644 --- a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java +++ b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.protocol.CommandType.*; +import static io.lettuce.core.protocol.CommandType.*; import java.util.ArrayList; import java.util.Collection; @@ -23,16 +23,16 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.output.MultiOutput; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.reactive.RedisReactiveCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.api.sync.RedisClusterCommands; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.output.MultiOutput; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.*; /** * A thread-safe connection to a Redis server. Multiple threads may share one {@link StatefulRedisConnectionImpl} diff --git a/src/main/java/com/lambdaworks/redis/StreamScanCursor.java b/src/main/java/io/lettuce/core/StreamScanCursor.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/StreamScanCursor.java rename to src/main/java/io/lettuce/core/StreamScanCursor.java index 06e9258391..9685b0770e 100644 --- a/src/main/java/com/lambdaworks/redis/StreamScanCursor.java +++ b/src/main/java/io/lettuce/core/StreamScanCursor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; /** * Cursor result using the Streaming API. Provides the count of retrieved elements. - * + * * @author Mark Paluch * @since 3.0 */ diff --git a/src/main/java/com/lambdaworks/redis/TransactionResult.java b/src/main/java/io/lettuce/core/TransactionResult.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/TransactionResult.java rename to src/main/java/io/lettuce/core/TransactionResult.java index ebc27b6d84..dc402cf10a 100644 --- a/src/main/java/com/lambdaworks/redis/TransactionResult.java +++ b/src/main/java/io/lettuce/core/TransactionResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.List; import java.util.stream.Stream; diff --git a/src/main/java/com/lambdaworks/redis/Transports.java b/src/main/java/io/lettuce/core/Transports.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/Transports.java rename to src/main/java/io/lettuce/core/Transports.java index 330cb8d14b..758a879d12 100644 --- a/src/main/java/com/lambdaworks/redis/Transports.java +++ b/src/main/java/io/lettuce/core/Transports.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import io.netty.channel.Channel; import io.netty.channel.EventLoopGroup; @@ -23,7 +23,7 @@ /** * Transport infrastructure utility class. This class provides {@link EventLoopGroup} and {@link Channel} classes for socket and * native socket transports. - * + * * @author Mark Paluch * @since 4.4 */ diff --git a/src/main/java/com/lambdaworks/redis/Value.java b/src/main/java/io/lettuce/core/Value.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/Value.java rename to src/main/java/io/lettuce/core/Value.java index 0c249e2680..6b3828eab7 100644 --- a/src/main/java/com/lambdaworks/redis/Value.java +++ b/src/main/java/io/lettuce/core/Value.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.io.Serializable; import java.util.NoSuchElementException; @@ -23,7 +23,7 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * A value container object which may or may not contain a non-null value. If a value is present, {@code isPresent()} will @@ -32,7 +32,7 @@ *

    * Additional methods that depend on the presence or absence of a contained value are provided, such as * {@link #getValueOrElse(java.lang.Object) getValueOrElse()} (return a default value if value not present). - * + * * @param Value type. * @author Mark Paluch */ @@ -60,7 +60,7 @@ protected Value(V value) { /** * Creates a {@link Value} from an {@link Optional}. The resulting value contains the value from the {@link Optional} if a * value is present. Value is empty if the {@link Optional} is empty. - * + * * @param optional the optional. May be empty but never {@literal null}. * @param * @param @@ -269,7 +269,7 @@ public void ifEmpty(Runnable runnable) { /** * Returns an {@link Optional} wrapper for the value. - * + * * @return {@link Optional} wrapper for the value. */ public Optional optional() { diff --git a/src/main/java/com/lambdaworks/redis/ValueScanCursor.java b/src/main/java/io/lettuce/core/ValueScanCursor.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/ValueScanCursor.java rename to src/main/java/io/lettuce/core/ValueScanCursor.java index 4ce4fc16ba..571603c107 100644 --- a/src/main/java/com/lambdaworks/redis/ValueScanCursor.java +++ b/src/main/java/io/lettuce/core/ValueScanCursor.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.ArrayList; import java.util.List; /** * Cursor providing a list of values. - * + * * @param Value type. * @author Mark Paluch * @since 3.0 diff --git a/src/main/java/com/lambdaworks/redis/ZAddArgs.java b/src/main/java/io/lettuce/core/ZAddArgs.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/ZAddArgs.java rename to src/main/java/io/lettuce/core/ZAddArgs.java index 2137fcd3f1..ea620809a0 100644 --- a/src/main/java/com/lambdaworks/redis/ZAddArgs.java +++ b/src/main/java/io/lettuce/core/ZAddArgs.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.redis.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandArgs; /** * Argument list builder for the improved redis ZADD command starting from Redis * 3.0.2. Static import the methods from {@link Builder} and call the methods: {@code xx()} or {@code nx()} . - * + * * @author Mark Paluch */ public class ZAddArgs implements CompositeArgument { diff --git a/src/main/java/com/lambdaworks/redis/ZStoreArgs.java b/src/main/java/io/lettuce/core/ZStoreArgs.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/ZStoreArgs.java rename to src/main/java/io/lettuce/core/ZStoreArgs.java index b0819c5d11..474cc3ccb9 100644 --- a/src/main/java/com/lambdaworks/redis/ZStoreArgs.java +++ b/src/main/java/io/lettuce/core/ZStoreArgs.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.protocol.CommandKeyword.*; +import static io.lettuce.core.protocol.CommandKeyword.*; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandArgs; /** * Argument list builder for the redis ZUNIONSTORE and * ZINTERSTORE commands. Static import the methods from {@link Builder} and * chain the method calls: {@code weights(1, 2).max()}. - * + * * @author Will Glozer */ public class ZStoreArgs implements CompositeArgument { diff --git a/src/main/java/com/lambdaworks/redis/api/StatefulConnection.java b/src/main/java/io/lettuce/core/api/StatefulConnection.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/api/StatefulConnection.java rename to src/main/java/io/lettuce/core/api/StatefulConnection.java index 771632ad54..89c9303009 100644 --- a/src/main/java/com/lambdaworks/redis/api/StatefulConnection.java +++ b/src/main/java/io/lettuce/core/api/StatefulConnection.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api; import java.util.Collection; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.protocol.RedisCommand; /** * A stateful connection providing command dispatching, timeouts and open/close methods. diff --git a/src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java b/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java similarity index 86% rename from src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java rename to src/main/java/io/lettuce/core/api/StatefulRedisConnection.java index d0761e46c8..a4ad508501 100644 --- a/src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java +++ b/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.protocol.ConnectionWatchdog; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.reactive.RedisReactiveCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.protocol.ConnectionWatchdog; /** * A thread-safe connection to a redis server. Multiple threads may share one {@link StatefulRedisConnection}. - * + * * A {@link ConnectionWatchdog} monitors each connection and reconnects automatically until {@link #close} is called. All * pending commands will be (re)sent after successful reconnection. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -41,21 +41,21 @@ public interface StatefulRedisConnection extends StatefulConnection /** * Returns the {@link RedisCommands} API for the current connection. Does not create a new connection. - * + * * @return the synchronous API for the underlying connection. */ RedisCommands sync(); /** * Returns the {@link RedisAsyncCommands} API for the current connection. Does not create a new connection. - * + * * @return the asynchronous API for the underlying connection. */ RedisAsyncCommands async(); /** * Returns the {@link RedisReactiveCommands} API for the current connection. Does not create a new connection. - * + * * @return the reactive API for the underlying connection. */ RedisReactiveCommands reactive(); diff --git a/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java index aea62fdae5..10fc53a113 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.output.CommandOutput; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.ProtocolKeyword; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.output.CommandOutput; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.ProtocolKeyword; /** - * + * * Asynchronous executed commands for basic commands. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface BaseRedisAsyncCommands { /** * Post a message to a channel. - * + * * @param channel the channel type: key * @param message the message type: value * @return Long integer-reply the number of clients that received the message. @@ -46,14 +46,14 @@ public interface BaseRedisAsyncCommands { /** * Lists the currently *active channels*. - * + * * @return List<K> array-reply a list of active channels, optionally matching the specified pattern. */ RedisFuture> pubsubChannels(); /** * Lists the currently *active channels*. - * + * * @param channel the key * @return List<K> array-reply a list of active channels, optionally matching the specified pattern. */ @@ -69,14 +69,14 @@ public interface BaseRedisAsyncCommands { /** * Returns the number of subscriptions to patterns. - * + * * @return Long integer-reply the number of patterns all the clients are subscribed to. */ RedisFuture pubsubNumpat(); /** * Echo the given string. - * + * * @param msg the message type: value * @return V bulk-string-reply */ @@ -92,7 +92,7 @@ public interface BaseRedisAsyncCommands { /** * Ping the server. - * + * * @return String simple-string-reply */ RedisFuture ping(); @@ -113,14 +113,14 @@ public interface BaseRedisAsyncCommands { /** * Close the connection. - * + * * @return String simple-string-reply always OK. */ RedisFuture quit(); /** * Wait for replication. - * + * * @param replicas minimum number of replicas * @param timeout timeout in milliseconds * @return number of replicas @@ -149,7 +149,7 @@ public interface BaseRedisAsyncCommands { RedisFuture dispatch(ProtocolKeyword type, CommandOutput output, CommandArgs args); /** - * + * * @return true if the connection is open (connected and not closed). */ boolean isOpen(); diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java index 1f22ccf184..ba0ea0aee2 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; /** * A complete asynchronous and thread-safe Redis API with 400+ Methods. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -37,7 +37,7 @@ public interface RedisAsyncCommands extends RedisHashAsyncCommands, /** * Set the default timeout for operations. - * + * * @param timeout the timeout value * @param unit the unit of the timeout value */ @@ -45,7 +45,7 @@ public interface RedisAsyncCommands extends RedisHashAsyncCommands, /** * Authenticate to the server. - * + * * @param password the password * @return String simple-string-reply */ @@ -53,7 +53,7 @@ public interface RedisAsyncCommands extends RedisHashAsyncCommands, /** * Change the selected database for the current connection. - * + * * @param db the database number * @return String simple-string-reply */ diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java index 962e8c4742..28f806657f 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; import java.util.List; import java.util.Set; -import com.lambdaworks.redis.*; +import io.lettuce.core.*; /** * Asynchronous executed commands for the Geo-API. * * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface RedisGeoAsyncCommands { diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisHLLAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/api/async/RedisHLLAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java index ce8b5c8d24..e1dbfa0b83 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/RedisHLLAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; -import com.lambdaworks.redis.RedisFuture; +import io.lettuce.core.RedisFuture; /** * Asynchronous executed commands for HyperLogLog (PF* commands). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 3.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface RedisHLLAsyncCommands { diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java index 90806cc534..c972bb6249 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.KeyValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Asynchronous executed commands for Hashes (Key-Value pairs). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface RedisHashAsyncCommands { /** * Delete one or more hash fields. - * + * * @param key the key * @param fields the field type: key * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing @@ -46,11 +46,11 @@ public interface RedisHashAsyncCommands { /** * Determine if a hash field exists. - * + * * @param key the key * @param field the field type: key * @return Boolean integer-reply specifically: - * + * * {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field}, * or {@code key} does not exist. */ @@ -58,7 +58,7 @@ public interface RedisHashAsyncCommands { /** * Get the value of a hash field. - * + * * @param key the key * @param field the field type: key * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present @@ -68,7 +68,7 @@ public interface RedisHashAsyncCommands { /** * Increment the integer value of a hash field by the given number. - * + * * @param key the key * @param field the field type: key * @param amount the increment type: long @@ -78,7 +78,7 @@ public interface RedisHashAsyncCommands { /** * Increment the float value of a hash field by the given amount. - * + * * @param key the key * @param field the field type: key * @param amount the increment type: double @@ -88,7 +88,7 @@ public interface RedisHashAsyncCommands { /** * Get all the fields and values in a hash. - * + * * @param key the key * @return Map<K,V> array-reply list of fields and their values stored in the hash, or an empty list when {@code key} * does not exist. @@ -97,17 +97,17 @@ public interface RedisHashAsyncCommands { /** * Stream over all the fields and values in a hash. - * + * * @param channel the channel * @param key the key - * + * * @return Long count of the keys. */ RedisFuture hgetall(KeyValueStreamingChannel channel, K key); /** * Get all the fields in a hash. - * + * * @param key the key * @return List<K> array-reply list of fields in the hash, or an empty list when {@code key} does not exist. */ @@ -115,17 +115,17 @@ public interface RedisHashAsyncCommands { /** * Stream over all the fields in a hash. - * + * * @param channel the channel * @param key the key - * + * * @return Long count of the keys. */ RedisFuture hkeys(KeyStreamingChannel channel, K key); /** * Get the number of fields in a hash. - * + * * @param key the key * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist. */ @@ -133,7 +133,7 @@ public interface RedisHashAsyncCommands { /** * Get the values of all the given hash fields. - * + * * @param key the key * @param fields the field type: key * @return List<V> array-reply list of values associated with the given fields, in the same @@ -142,18 +142,18 @@ public interface RedisHashAsyncCommands { /** * Stream over the values of all the given hash fields. - * + * * @param channel the channel * @param key the key * @param fields the fields - * + * * @return Long count of the keys */ RedisFuture hmget(KeyValueStreamingChannel channel, K key, K... fields); /** * Set multiple hash fields to multiple values. - * + * * @param key the key * @param map the null * @return String simple-string-reply @@ -162,7 +162,7 @@ public interface RedisHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @return MapScanCursor<K, V> map scan cursor. */ @@ -170,7 +170,7 @@ public interface RedisHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanArgs scan arguments * @return MapScanCursor<K, V> map scan cursor. @@ -179,7 +179,7 @@ public interface RedisHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -189,7 +189,7 @@ public interface RedisHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return MapScanCursor<K, V> map scan cursor. @@ -198,7 +198,7 @@ public interface RedisHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @return StreamScanCursor scan cursor. @@ -207,7 +207,7 @@ public interface RedisHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanArgs scan arguments @@ -217,7 +217,7 @@ public interface RedisHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} @@ -228,7 +228,7 @@ public interface RedisHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java index 2d3ca33f3f..d3ce167eb0 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; import java.util.Date; import java.util.List; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Asynchronous executed commands for Keys (Key manipulation/querying). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface RedisKeyAsyncCommands { @@ -51,7 +51,7 @@ public interface RedisKeyAsyncCommands { /** * Return a serialized version of the value stored at the specified key. - * + * * @param key the key * @return byte[] bulk-string-reply the serialized value. */ @@ -67,11 +67,11 @@ public interface RedisKeyAsyncCommands { /** * Set a key's time to live in seconds. - * + * * @param key the key * @param seconds the seconds type: long * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set. */ @@ -79,11 +79,11 @@ public interface RedisKeyAsyncCommands { /** * Set the expiration for a key as a UNIX timestamp. - * + * * @param key the key * @param timestamp the timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -91,11 +91,11 @@ public interface RedisKeyAsyncCommands { /** * Set the expiration for a key as a UNIX timestamp. - * + * * @param key the key * @param timestamp the timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -103,7 +103,7 @@ public interface RedisKeyAsyncCommands { /** * Find all keys matching the given pattern. - * + * * @param pattern the pattern type: patternkey (pattern) * @return List<K> array-reply list of keys matching {@code pattern}. */ @@ -111,7 +111,7 @@ public interface RedisKeyAsyncCommands { /** * Find all keys matching the given pattern. - * + * * @param channel the channel * @param pattern the pattern * @return Long array-reply list of keys matching {@code pattern}. @@ -120,7 +120,7 @@ public interface RedisKeyAsyncCommands { /** * Atomically transfer a key from a Redis instance to another one. - * + * * @param host the host * @param port the port * @param key the key @@ -144,7 +144,7 @@ public interface RedisKeyAsyncCommands { /** * Move a key to another database. - * + * * @param key the key * @param db the db type: long * @return Boolean integer-reply specifically: @@ -153,7 +153,7 @@ public interface RedisKeyAsyncCommands { /** * returns the kind of internal representation used in order to store the value associated with a key. - * + * * @param key the key * @return String */ @@ -162,7 +162,7 @@ public interface RedisKeyAsyncCommands { /** * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write * operations). - * + * * @param key the key * @return number of seconds since the object stored at the specified key is idle. */ @@ -170,7 +170,7 @@ public interface RedisKeyAsyncCommands { /** * returns the number of references of the value associated with the specified key. - * + * * @param key the key * @return Long */ @@ -178,10 +178,10 @@ public interface RedisKeyAsyncCommands { /** * Remove the expiration from a key. - * + * * @param key the key * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an * associated timeout. */ @@ -189,11 +189,11 @@ public interface RedisKeyAsyncCommands { /** * Set a key's time to live in milliseconds. - * + * * @param key the key * @param milliseconds the milliseconds type: long * @return integer-reply, specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set. */ @@ -201,11 +201,11 @@ public interface RedisKeyAsyncCommands { /** * Set the expiration for a key as a UNIX timestamp specified in milliseconds. - * + * * @param key the key * @param timestamp the milliseconds-timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -213,11 +213,11 @@ public interface RedisKeyAsyncCommands { /** * Set the expiration for a key as a UNIX timestamp specified in milliseconds. - * + * * @param key the key * @param timestamp the milliseconds-timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -225,7 +225,7 @@ public interface RedisKeyAsyncCommands { /** * Get the time to live for a key in milliseconds. - * + * * @param key the key * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description * above). @@ -234,14 +234,14 @@ public interface RedisKeyAsyncCommands { /** * Return a random key from the keyspace. - * + * * @return V bulk-string-reply the random key, or {@literal null} when the database is empty. */ RedisFuture randomkey(); /** * Rename a key. - * + * * @param key the key * @param newKey the newkey type: key * @return String simple-string-reply @@ -250,18 +250,18 @@ public interface RedisKeyAsyncCommands { /** * Rename a key, only if the new key does not exist. - * + * * @param key the key * @param newKey the newkey type: key * @return Boolean integer-reply specifically: - * + * * {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists. */ RedisFuture renamenx(K key, K newKey); /** * Create a key using the provided serialized value, previously obtained using DUMP. - * + * * @param key the key * @param ttl the ttl type: long * @param value the serialized-value type: string @@ -271,7 +271,7 @@ public interface RedisKeyAsyncCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @return List<V> array-reply list of sorted elements. */ @@ -279,7 +279,7 @@ public interface RedisKeyAsyncCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @return Long number of values. @@ -288,7 +288,7 @@ public interface RedisKeyAsyncCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @param sortArgs sort arguments * @return List<V> array-reply list of sorted elements. @@ -297,7 +297,7 @@ public interface RedisKeyAsyncCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param sortArgs sort arguments @@ -307,7 +307,7 @@ public interface RedisKeyAsyncCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @param sortArgs sort arguments * @param destination the destination key to store sort results @@ -317,7 +317,7 @@ public interface RedisKeyAsyncCommands { /** * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created. - * + * * @param keys the keys * @return Long integer-reply the number of found keys. */ @@ -333,7 +333,7 @@ public interface RedisKeyAsyncCommands { /** * Determine the type stored at key. - * + * * @param key the key * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist. */ @@ -341,14 +341,14 @@ public interface RedisKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @return KeyScanCursor<K> scan cursor. */ RedisFuture> scan(); /** * Incrementally iterate the keys space. - * + * * @param scanArgs scan arguments * @return KeyScanCursor<K> scan cursor. */ @@ -356,7 +356,7 @@ public interface RedisKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments * @return KeyScanCursor<K> scan cursor. @@ -365,7 +365,7 @@ public interface RedisKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return KeyScanCursor<K> scan cursor. */ @@ -373,7 +373,7 @@ public interface RedisKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @return StreamScanCursor scan cursor. */ @@ -381,7 +381,7 @@ public interface RedisKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanArgs scan arguments * @return StreamScanCursor scan cursor. @@ -390,7 +390,7 @@ public interface RedisKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -400,7 +400,7 @@ public interface RedisKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return StreamScanCursor scan cursor. diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java index 071461cf84..6cebfd1bf1 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; import java.util.List; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.KeyValue; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.output.ValueStreamingChannel; /** * Asynchronous executed commands for Lists. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface RedisListAsyncCommands { /** * Remove and get the first element in a list, or block until one is available. - * + * * @param timeout the timeout in seconds * @param keys the keys * @return KeyValue<K,V> array-reply specifically: - * + * * A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk * with the first element being the name of the key where an element was popped and the second element being the * value of the popped element. @@ -47,11 +47,11 @@ public interface RedisListAsyncCommands { /** * Remove and get the last element in a list, or block until one is available. - * + * * @param timeout the timeout in seconds * @param keys the keys * @return KeyValue<K,V> array-reply specifically: - * + * * A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk * with the first element being the name of the key where an element was popped and the second element being the * value of the popped element. @@ -60,7 +60,7 @@ public interface RedisListAsyncCommands { /** * Pop a value from a list, push it to another list and return it; or block until one is available. - * + * * @param timeout the timeout in seconds * @param source the source key * @param destination the destination type: key @@ -71,7 +71,7 @@ public interface RedisListAsyncCommands { /** * Get an element from a list by its index. - * + * * @param key the key * @param index the index type: long * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range. @@ -80,7 +80,7 @@ public interface RedisListAsyncCommands { /** * Insert an element before or after another element in a list. - * + * * @param key the key * @param before the before * @param pivot the pivot @@ -92,7 +92,7 @@ public interface RedisListAsyncCommands { /** * Get the length of a list. - * + * * @param key the key * @return Long integer-reply the length of the list at {@code key}. */ @@ -100,7 +100,7 @@ public interface RedisListAsyncCommands { /** * Remove and get the first element in a list. - * + * * @param key the key * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist. */ @@ -108,7 +108,7 @@ public interface RedisListAsyncCommands { /** * Prepend one or multiple values to a list. - * + * * @param key the key * @param values the value * @return Long integer-reply the length of the list after the push operations. @@ -126,7 +126,7 @@ public interface RedisListAsyncCommands { /** * Get a range of elements from a list. - * + * * @param key the key * @param start the start type: long * @param stop the stop type: long @@ -136,7 +136,7 @@ public interface RedisListAsyncCommands { /** * Get a range of elements from a list. - * + * * @param channel the channel * @param key the key * @param start the start type: long @@ -147,7 +147,7 @@ public interface RedisListAsyncCommands { /** * Remove elements from a list. - * + * * @param key the key * @param count the count type: long * @param value the value @@ -157,7 +157,7 @@ public interface RedisListAsyncCommands { /** * Set the value of an element in a list by its index. - * + * * @param key the key * @param index the index type: long * @param value the value @@ -167,7 +167,7 @@ public interface RedisListAsyncCommands { /** * Trim a list to the specified range. - * + * * @param key the key * @param start the start type: long * @param stop the stop type: long @@ -177,7 +177,7 @@ public interface RedisListAsyncCommands { /** * Remove and get the last element in a list. - * + * * @param key the key * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist. */ @@ -185,7 +185,7 @@ public interface RedisListAsyncCommands { /** * Remove the last element in a list, append it to another list and return it. - * + * * @param source the source key * @param destination the destination type: key * @return V bulk-string-reply the element being popped and pushed. @@ -194,7 +194,7 @@ public interface RedisListAsyncCommands { /** * Append one or multiple values to a list. - * + * * @param key the key * @param values the value * @return Long integer-reply the length of the list after the push operation. diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java index f6038c852b..ede1379ee1 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; import java.util.List; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.ScriptOutputType; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.ScriptOutputType; /** * Asynchronous executed commands for Scripting. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface RedisScriptingAsyncCommands { /** * Execute a Lua script server side. - * + * * @param script Lua 5.1 script. * @param type output type * @param keys key names @@ -44,7 +44,7 @@ public interface RedisScriptingAsyncCommands { /** * Execute a Lua script server side. - * + * * @param script Lua 5.1 script. * @param type the type * @param keys the keys @@ -56,7 +56,7 @@ public interface RedisScriptingAsyncCommands { /** * Evaluates a script cached on the server side by its SHA1 digest - * + * * @param digest SHA1 of the script * @param type the type * @param keys the keys @@ -67,7 +67,7 @@ public interface RedisScriptingAsyncCommands { /** * Execute a Lua script server side. - * + * * @param digest SHA1 of the script * @param type the type * @param keys the keys @@ -79,7 +79,7 @@ public interface RedisScriptingAsyncCommands { /** * Check existence of scripts in the script cache. - * + * * @param digests script digests * @return List<Boolean> array-reply The command returns an array of integers that correspond to the specified SHA1 * digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1 @@ -89,21 +89,21 @@ public interface RedisScriptingAsyncCommands { /** * Remove all the scripts from the script cache. - * + * * @return String simple-string-reply */ RedisFuture scriptFlush(); /** * Kill the script currently in execution. - * + * * @return String simple-string-reply */ RedisFuture scriptKill(); /** * Load the specified Lua script into the script cache. - * + * * @param script script content * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache. */ @@ -111,7 +111,7 @@ public interface RedisScriptingAsyncCommands { /** * Create a SHA1 digest from a Lua script. - * + * * @param script script content * @return the SHA1 value */ diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java index af87fe4b33..f558153371 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java @@ -13,50 +13,50 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; import java.util.Date; import java.util.List; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.KillArgs; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.protocol.CommandType; /** * Asynchronous executed commands for Server Control. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface RedisServerAsyncCommands { /** * Asynchronously rewrite the append-only file. - * + * * @return String simple-string-reply always {@code OK}. */ RedisFuture bgrewriteaof(); /** * Asynchronously save the dataset to disk. - * + * * @return String simple-string-reply */ RedisFuture bgsave(); /** * Get the current connection name. - * + * * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set. */ RedisFuture clientGetname(); /** * Set the current connection name. - * + * * @param name the client name * @return simple-string-reply {@code OK} if the connection name was successfully set. */ @@ -64,7 +64,7 @@ public interface RedisServerAsyncCommands { /** * Kill the connection of a client identified by ip:port. - * + * * @param addr ip:port * @return String simple-string-reply {@code OK} if the connection exists and has been closed */ @@ -80,7 +80,7 @@ public interface RedisServerAsyncCommands { /** * Stop processing commands from clients for some time. - * + * * @param timeout the timeout value in milliseconds * @return String simple-string-reply The command returns OK or an error if the timeout is invalid. */ @@ -88,7 +88,7 @@ public interface RedisServerAsyncCommands { /** * Get the list of client connections. - * + * * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF), * each line is composed of a succession of property=value fields separated by a space character. */ @@ -96,14 +96,14 @@ public interface RedisServerAsyncCommands { /** * Returns an array reply of details about all Redis commands. - * + * * @return List<Object> array-reply */ RedisFuture> command(); /** * Returns an array reply of details about the requested commands. - * + * * @param commands the commands to query for * @return List<Object> array-reply */ @@ -111,7 +111,7 @@ public interface RedisServerAsyncCommands { /** * Returns an array reply of details about the requested commands. - * + * * @param commands the commands to query for * @return List<Object> array-reply */ @@ -119,14 +119,14 @@ public interface RedisServerAsyncCommands { /** * Get total number of Redis commands. - * + * * @return Long integer-reply of number of total commands in this Redis server. */ RedisFuture commandCount(); /** * Get the value of a configuration parameter. - * + * * @param parameter name of the parameter * @return List<String> bulk-string-reply */ @@ -134,14 +134,14 @@ public interface RedisServerAsyncCommands { /** * Reset the stats returned by INFO. - * + * * @return String simple-string-reply always {@code OK}. */ RedisFuture configResetstat(); /** * Rewrite the configuration file with the in memory configuration. - * + * * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is * returned. */ @@ -149,7 +149,7 @@ public interface RedisServerAsyncCommands { /** * Set a configuration parameter to the given value. - * + * * @param parameter the parameter name * @param value the parameter value * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned. @@ -158,7 +158,7 @@ public interface RedisServerAsyncCommands { /** * Return the number of keys in the selected database. - * + * * @return Long integer-reply */ RedisFuture dbsize(); @@ -180,7 +180,7 @@ public interface RedisServerAsyncCommands { /** * Get debugging information about a key. - * + * * @param key the key * @return String simple-string-reply */ @@ -220,7 +220,7 @@ public interface RedisServerAsyncCommands { /** * Remove all keys from all databases. - * + * * @return String simple-string-reply */ RedisFuture flushall(); @@ -234,7 +234,7 @@ public interface RedisServerAsyncCommands { /** * Remove all keys from the current database. - * + * * @return String simple-string-reply */ RedisFuture flushdb(); @@ -248,14 +248,14 @@ public interface RedisServerAsyncCommands { /** * Get information and statistics about the server. - * + * * @return String bulk-string-reply as a collection of text lines. */ RedisFuture info(); /** * Get information and statistics about the server. - * + * * @param section the section type: string * @return String bulk-string-reply as a collection of text lines. */ @@ -263,28 +263,28 @@ public interface RedisServerAsyncCommands { /** * Get the UNIX time stamp of the last successful save to disk. - * + * * @return Date integer-reply an UNIX time stamp. */ RedisFuture lastsave(); /** * Synchronously save the dataset to disk. - * + * * @return String simple-string-reply The commands returns OK on success. */ RedisFuture save(); /** * Synchronously save the dataset to disk and then shut down the server. - * + * * @param save {@literal true} force save operation */ void shutdown(boolean save); /** * Make the server a slave of another instance, or promote it as master. - * + * * @param host the host type: string * @param port the port type: string * @return String simple-string-reply @@ -293,21 +293,21 @@ public interface RedisServerAsyncCommands { /** * Promote server as master. - * + * * @return String simple-string-reply */ RedisFuture slaveofNoOne(); /** * Read the slow log. - * + * * @return List<Object> deeply nested multi bulk replies */ RedisFuture> slowlogGet(); /** * Read the slow log. - * + * * @param count the count * @return List<Object> deeply nested multi bulk replies */ @@ -315,25 +315,25 @@ public interface RedisServerAsyncCommands { /** * Obtaining the current length of the slow log. - * + * * @return Long length of the slow log. */ RedisFuture slowlogLen(); /** * Resetting the slow log. - * + * * @return String simple-string-reply The commands returns OK on success. */ RedisFuture slowlogReset(); /** * Return the current server time. - * + * * @return List<V> array-reply specifically: - * + * * A multi bulk reply containing two elements: - * + * * unix time in seconds. microseconds. */ RedisFuture> time(); diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java index 6177ae50f6..a09eae409d 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java @@ -13,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; import java.util.List; import java.util.Set; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.ValueStreamingChannel; /** * Asynchronous executed commands for Sets. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface RedisSetAsyncCommands { /** * Add one or more members to a set. - * + * * @param key the key * @param members the member type: value * @return Long integer-reply the number of elements that were added to the set, not including all the elements already @@ -44,7 +44,7 @@ public interface RedisSetAsyncCommands { /** * Get the number of members in a set. - * + * * @param key the key * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not * exist. @@ -53,7 +53,7 @@ public interface RedisSetAsyncCommands { /** * Subtract multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -61,7 +61,7 @@ public interface RedisSetAsyncCommands { /** * Subtract multiple sets. - * + * * @param channel the channel * @param keys the keys * @return Long count of members of the resulting set. @@ -70,7 +70,7 @@ public interface RedisSetAsyncCommands { /** * Subtract multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -79,7 +79,7 @@ public interface RedisSetAsyncCommands { /** * Intersect multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -87,7 +87,7 @@ public interface RedisSetAsyncCommands { /** * Intersect multiple sets. - * + * * @param channel the channel * @param keys the keys * @return Long count of members of the resulting set. @@ -96,7 +96,7 @@ public interface RedisSetAsyncCommands { /** * Intersect multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -105,11 +105,11 @@ public interface RedisSetAsyncCommands { /** * Determine if a given value is a member of a set. - * + * * @param key the key * @param member the member type: value * @return Boolean integer-reply specifically: - * + * * {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the * set, or if {@code key} does not exist. */ @@ -117,12 +117,12 @@ public interface RedisSetAsyncCommands { /** * Move a member from one set to another. - * + * * @param source the source key * @param destination the destination type: key * @param member the member type: value * @return Boolean integer-reply specifically: - * + * * {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no * operation was performed. */ @@ -130,7 +130,7 @@ public interface RedisSetAsyncCommands { /** * Get all the members in a set. - * + * * @param key the key * @return Set<V> array-reply all elements of the set. */ @@ -138,7 +138,7 @@ public interface RedisSetAsyncCommands { /** * Get all the members in a set. - * + * * @param channel the channel * @param key the keys * @return Long count of members of the resulting set. @@ -147,7 +147,7 @@ public interface RedisSetAsyncCommands { /** * Remove and return a random member from a set. - * + * * @param key the key * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist. */ @@ -164,9 +164,9 @@ public interface RedisSetAsyncCommands { /** * Get one random member from a set. - * + * * @param key the key - * + * * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the * randomly selected element, or {@literal null} when {@code key} does not exist. */ @@ -174,7 +174,7 @@ public interface RedisSetAsyncCommands { /** * Get one or multiple random members from a set. - * + * * @param key the key * @param count the count type: long * @return Set<V> bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply @@ -184,7 +184,7 @@ public interface RedisSetAsyncCommands { /** * Get one or multiple random members from a set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param count the count @@ -194,7 +194,7 @@ public interface RedisSetAsyncCommands { /** * Remove one or more members from a set. - * + * * @param key the key * @param members the member type: value * @return Long integer-reply the number of members that were removed from the set, not including non existing members. @@ -203,7 +203,7 @@ public interface RedisSetAsyncCommands { /** * Add multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -211,7 +211,7 @@ public interface RedisSetAsyncCommands { /** * Add multiple sets. - * + * * @param channel streaming channel that receives a call for every value * @param keys the keys * @return Long count of members of the resulting set. @@ -220,7 +220,7 @@ public interface RedisSetAsyncCommands { /** * Add multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -229,7 +229,7 @@ public interface RedisSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @return ValueScanCursor<V> scan cursor. */ @@ -237,7 +237,7 @@ public interface RedisSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanArgs scan arguments * @return ValueScanCursor<V> scan cursor. @@ -246,7 +246,7 @@ public interface RedisSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -256,7 +256,7 @@ public interface RedisSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return ValueScanCursor<V> scan cursor. @@ -265,7 +265,7 @@ public interface RedisSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @return StreamScanCursor scan cursor. @@ -274,7 +274,7 @@ public interface RedisSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanArgs scan arguments @@ -284,7 +284,7 @@ public interface RedisSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} @@ -295,7 +295,7 @@ public interface RedisSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java index a76354f598..219ed0c723 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java @@ -13,34 +13,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; import java.util.List; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.ScoredValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.ScoredValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Asynchronous executed commands for Sorted Sets. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface RedisSortedSetAsyncCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param score the score * @param member the member - * + * * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -48,11 +48,11 @@ public interface RedisSortedSetAsyncCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...) * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -60,11 +60,11 @@ public interface RedisSortedSetAsyncCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param scoredValues the scored values * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -100,12 +100,12 @@ public interface RedisSortedSetAsyncCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the ke * @param zAddArgs arguments for zadd * @param scoredValues the scored values * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -137,7 +137,7 @@ public interface RedisSortedSetAsyncCommands { /** * Get the number of members in a sorted set. - * + * * @param key the key * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key} * does not exist. @@ -146,7 +146,7 @@ public interface RedisSortedSetAsyncCommands { /** * Count the members in a sorted set with scores within the given values. - * + * * @param key the key * @param min min score * @param max max score @@ -158,7 +158,7 @@ public interface RedisSortedSetAsyncCommands { /** * Count the members in a sorted set with scores within the given values. - * + * * @param key the key * @param min min score * @param max max score @@ -180,7 +180,7 @@ public interface RedisSortedSetAsyncCommands { /** * Increment the score of a member in a sorted set. - * + * * @param key the key * @param amount the increment type: long * @param member the member type: key @@ -191,7 +191,7 @@ public interface RedisSortedSetAsyncCommands { /** * Intersect multiple sorted sets and store the resulting sorted set in a new key. - * + * * @param destination the destination * @param keys the keys * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}. @@ -200,7 +200,7 @@ public interface RedisSortedSetAsyncCommands { /** * Intersect multiple sorted sets and store the resulting sorted set in a new key. - * + * * @param destination the destination * @param storeArgs the storeArgs * @param keys the keys @@ -394,7 +394,7 @@ public interface RedisSortedSetAsyncCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -407,7 +407,7 @@ public interface RedisSortedSetAsyncCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -431,7 +431,7 @@ public interface RedisSortedSetAsyncCommands { /** * Stream over range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -446,7 +446,7 @@ public interface RedisSortedSetAsyncCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java index e58204512b..31369b450e 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.BitFieldArgs; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.SetArgs; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; +import io.lettuce.core.BitFieldArgs; +import io.lettuce.core.KeyValue; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.SetArgs; +import io.lettuce.core.output.KeyValueStreamingChannel; /** * Asynchronous executed commands for Strings. @@ -31,7 +31,7 @@ * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface RedisStringAsyncCommands { diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java rename to src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java index e7f55f29c5..3791ea3f77 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java +++ b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.TransactionResult; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.TransactionResult; /** * Asynchronous executed commands for Transactions. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface RedisTransactionalAsyncCommands { /** * Discard all commands issued after MULTI. - * + * * @return String simple-string-reply always {@code OK}. */ RedisFuture discard(); diff --git a/src/main/java/com/lambdaworks/redis/api/async/package-info.java b/src/main/java/io/lettuce/core/api/async/package-info.java similarity index 62% rename from src/main/java/com/lambdaworks/redis/api/async/package-info.java rename to src/main/java/io/lettuce/core/api/async/package-info.java index b6fa5dbcde..31acaeaeef 100644 --- a/src/main/java/com/lambdaworks/redis/api/async/package-info.java +++ b/src/main/java/io/lettuce/core/api/async/package-info.java @@ -1,4 +1,4 @@ /** * Standalone Redis API for asynchronous executed commands. */ -package com.lambdaworks.redis.api.async; +package io.lettuce.core.api.async; diff --git a/src/main/java/com/lambdaworks/redis/api/package-info.java b/src/main/java/io/lettuce/core/api/package-info.java similarity index 55% rename from src/main/java/com/lambdaworks/redis/api/package-info.java rename to src/main/java/io/lettuce/core/api/package-info.java index 3449aa0a0f..60e47de051 100644 --- a/src/main/java/com/lambdaworks/redis/api/package-info.java +++ b/src/main/java/io/lettuce/core/api/package-info.java @@ -1,4 +1,4 @@ /** * Standalone Redis connection API. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api; diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java rename to src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java index 735e33aa7c..c04300c715 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java +++ b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; import java.util.Map; -import com.lambdaworks.redis.output.CommandOutput; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.ProtocolKeyword; +import io.lettuce.core.output.CommandOutput; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.ProtocolKeyword; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; /** - * + * * Reactive executed commands for basic commands. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface BaseRedisReactiveCommands { /** * Post a message to a channel. - * + * * @param channel the channel type: key * @param message the message type: value * @return Long integer-reply the number of clients that received the message. @@ -47,14 +47,14 @@ public interface BaseRedisReactiveCommands { /** * Lists the currently *active channels*. - * + * * @return K array-reply a list of active channels, optionally matching the specified pattern. */ Flux pubsubChannels(); /** * Lists the currently *active channels*. - * + * * @param channel the key * @return K array-reply a list of active channels, optionally matching the specified pattern. */ @@ -70,14 +70,14 @@ public interface BaseRedisReactiveCommands { /** * Returns the number of subscriptions to patterns. - * + * * @return Long integer-reply the number of patterns all the clients are subscribed to. */ Mono pubsubNumpat(); /** * Echo the given string. - * + * * @param msg the message type: value * @return V bulk-string-reply */ @@ -93,7 +93,7 @@ public interface BaseRedisReactiveCommands { /** * Ping the server. - * + * * @return String simple-string-reply */ Mono ping(); @@ -114,14 +114,14 @@ public interface BaseRedisReactiveCommands { /** * Close the connection. - * + * * @return String simple-string-reply always OK. */ Mono quit(); /** * Wait for replication. - * + * * @param replicas minimum number of replicas * @param timeout timeout in milliseconds * @return number of replicas @@ -150,7 +150,7 @@ public interface BaseRedisReactiveCommands { Flux dispatch(ProtocolKeyword type, CommandOutput output, CommandArgs args); /** - * + * * @return true if the connection is open (connected and not closed). */ boolean isOpen(); diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java rename to src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java index 5de0c6ba20..73409827f2 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java +++ b/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; -import com.lambdaworks.redis.*; +import io.lettuce.core.*; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -25,7 +25,7 @@ * * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface RedisGeoReactiveCommands { diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java rename to src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java index 0eddbd8a14..7b9bb653b9 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java +++ b/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; import reactor.core.publisher.Mono; /** * Reactive executed commands for HyperLogLog (PF* commands). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface RedisHLLReactiveCommands { diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java rename to src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java index dd48f79069..3b8098567a 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java +++ b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; import java.util.Map; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.KeyValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; /** * Reactive executed commands for Hashes (Key-Value pairs). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface RedisHashReactiveCommands { /** * Delete one or more hash fields. - * + * * @param key the key * @param fields the field type: key * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing @@ -48,11 +48,11 @@ public interface RedisHashReactiveCommands { /** * Determine if a hash field exists. - * + * * @param key the key * @param field the field type: key * @return Boolean integer-reply specifically: - * + * * {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field}, * or {@code key} does not exist. */ @@ -60,7 +60,7 @@ public interface RedisHashReactiveCommands { /** * Get the value of a hash field. - * + * * @param key the key * @param field the field type: key * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present @@ -70,7 +70,7 @@ public interface RedisHashReactiveCommands { /** * Increment the integer value of a hash field by the given number. - * + * * @param key the key * @param field the field type: key * @param amount the increment type: long @@ -80,7 +80,7 @@ public interface RedisHashReactiveCommands { /** * Increment the float value of a hash field by the given amount. - * + * * @param key the key * @param field the field type: key * @param amount the increment type: double @@ -90,7 +90,7 @@ public interface RedisHashReactiveCommands { /** * Get all the fields and values in a hash. - * + * * @param key the key * @return Map<K,V> array-reply list of fields and their values stored in the hash, or an empty list when {@code key} * does not exist. @@ -99,17 +99,17 @@ public interface RedisHashReactiveCommands { /** * Stream over all the fields and values in a hash. - * + * * @param channel the channel * @param key the key - * + * * @return Long count of the keys. */ Mono hgetall(KeyValueStreamingChannel channel, K key); /** * Get all the fields in a hash. - * + * * @param key the key * @return K array-reply list of fields in the hash, or an empty list when {@code key} does not exist. */ @@ -117,17 +117,17 @@ public interface RedisHashReactiveCommands { /** * Stream over all the fields in a hash. - * + * * @param channel the channel * @param key the key - * + * * @return Long count of the keys. */ Mono hkeys(KeyStreamingChannel channel, K key); /** * Get the number of fields in a hash. - * + * * @param key the key * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist. */ @@ -135,7 +135,7 @@ public interface RedisHashReactiveCommands { /** * Get the values of all the given hash fields. - * + * * @param key the key * @param fields the field type: key * @return V array-reply list of values associated with the given fields, in the same @@ -144,18 +144,18 @@ public interface RedisHashReactiveCommands { /** * Stream over the values of all the given hash fields. - * + * * @param channel the channel * @param key the key * @param fields the fields - * + * * @return Long count of the keys */ Mono hmget(KeyValueStreamingChannel channel, K key, K... fields); /** * Set multiple hash fields to multiple values. - * + * * @param key the key * @param map the null * @return String simple-string-reply @@ -164,7 +164,7 @@ public interface RedisHashReactiveCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @return MapScanCursor<K, V> map scan cursor. */ @@ -172,7 +172,7 @@ public interface RedisHashReactiveCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanArgs scan arguments * @return MapScanCursor<K, V> map scan cursor. @@ -181,7 +181,7 @@ public interface RedisHashReactiveCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -191,7 +191,7 @@ public interface RedisHashReactiveCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return MapScanCursor<K, V> map scan cursor. @@ -200,7 +200,7 @@ public interface RedisHashReactiveCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @return StreamScanCursor scan cursor. @@ -209,7 +209,7 @@ public interface RedisHashReactiveCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanArgs scan arguments @@ -219,7 +219,7 @@ public interface RedisHashReactiveCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} @@ -230,7 +230,7 @@ public interface RedisHashReactiveCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java rename to src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java index 882bc699d7..d4c8cc318a 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java +++ b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; import java.util.Date; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; /** * Reactive executed commands for Keys (Key manipulation/querying). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface RedisKeyReactiveCommands { @@ -53,7 +53,7 @@ public interface RedisKeyReactiveCommands { /** * Return a serialized version of the value stored at the specified key. - * + * * @param key the key * @return byte[] bulk-string-reply the serialized value. */ @@ -69,11 +69,11 @@ public interface RedisKeyReactiveCommands { /** * Set a key's time to live in seconds. - * + * * @param key the key * @param seconds the seconds type: long * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set. */ @@ -81,11 +81,11 @@ public interface RedisKeyReactiveCommands { /** * Set the expiration for a key as a UNIX timestamp. - * + * * @param key the key * @param timestamp the timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -93,11 +93,11 @@ public interface RedisKeyReactiveCommands { /** * Set the expiration for a key as a UNIX timestamp. - * + * * @param key the key * @param timestamp the timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -105,7 +105,7 @@ public interface RedisKeyReactiveCommands { /** * Find all keys matching the given pattern. - * + * * @param pattern the pattern type: patternkey (pattern) * @return K array-reply list of keys matching {@code pattern}. */ @@ -113,7 +113,7 @@ public interface RedisKeyReactiveCommands { /** * Find all keys matching the given pattern. - * + * * @param channel the channel * @param pattern the pattern * @return Long array-reply list of keys matching {@code pattern}. @@ -122,7 +122,7 @@ public interface RedisKeyReactiveCommands { /** * Atomically transfer a key from a Redis instance to another one. - * + * * @param host the host * @param port the port * @param key the key @@ -146,7 +146,7 @@ public interface RedisKeyReactiveCommands { /** * Move a key to another database. - * + * * @param key the key * @param db the db type: long * @return Boolean integer-reply specifically: @@ -155,7 +155,7 @@ public interface RedisKeyReactiveCommands { /** * returns the kind of internal representation used in order to store the value associated with a key. - * + * * @param key the key * @return String */ @@ -164,7 +164,7 @@ public interface RedisKeyReactiveCommands { /** * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write * operations). - * + * * @param key the key * @return number of seconds since the object stored at the specified key is idle. */ @@ -172,7 +172,7 @@ public interface RedisKeyReactiveCommands { /** * returns the number of references of the value associated with the specified key. - * + * * @param key the key * @return Long */ @@ -180,10 +180,10 @@ public interface RedisKeyReactiveCommands { /** * Remove the expiration from a key. - * + * * @param key the key * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an * associated timeout. */ @@ -191,11 +191,11 @@ public interface RedisKeyReactiveCommands { /** * Set a key's time to live in milliseconds. - * + * * @param key the key * @param milliseconds the milliseconds type: long * @return integer-reply, specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set. */ @@ -203,11 +203,11 @@ public interface RedisKeyReactiveCommands { /** * Set the expiration for a key as a UNIX timestamp specified in milliseconds. - * + * * @param key the key * @param timestamp the milliseconds-timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -215,11 +215,11 @@ public interface RedisKeyReactiveCommands { /** * Set the expiration for a key as a UNIX timestamp specified in milliseconds. - * + * * @param key the key * @param timestamp the milliseconds-timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -227,7 +227,7 @@ public interface RedisKeyReactiveCommands { /** * Get the time to live for a key in milliseconds. - * + * * @param key the key * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description * above). @@ -236,14 +236,14 @@ public interface RedisKeyReactiveCommands { /** * Return a random key from the keyspace. - * + * * @return V bulk-string-reply the random key, or {@literal null} when the database is empty. */ Mono randomkey(); /** * Rename a key. - * + * * @param key the key * @param newKey the newkey type: key * @return String simple-string-reply @@ -252,18 +252,18 @@ public interface RedisKeyReactiveCommands { /** * Rename a key, only if the new key does not exist. - * + * * @param key the key * @param newKey the newkey type: key * @return Boolean integer-reply specifically: - * + * * {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists. */ Mono renamenx(K key, K newKey); /** * Create a key using the provided serialized value, previously obtained using DUMP. - * + * * @param key the key * @param ttl the ttl type: long * @param value the serialized-value type: string @@ -273,7 +273,7 @@ public interface RedisKeyReactiveCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @return V array-reply list of sorted elements. */ @@ -281,7 +281,7 @@ public interface RedisKeyReactiveCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @return Long number of values. @@ -290,7 +290,7 @@ public interface RedisKeyReactiveCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @param sortArgs sort arguments * @return V array-reply list of sorted elements. @@ -299,7 +299,7 @@ public interface RedisKeyReactiveCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param sortArgs sort arguments @@ -309,7 +309,7 @@ public interface RedisKeyReactiveCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @param sortArgs sort arguments * @param destination the destination key to store sort results @@ -319,7 +319,7 @@ public interface RedisKeyReactiveCommands { /** * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created. - * + * * @param keys the keys * @return Long integer-reply the number of found keys. */ @@ -335,7 +335,7 @@ public interface RedisKeyReactiveCommands { /** * Determine the type stored at key. - * + * * @param key the key * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist. */ @@ -343,14 +343,14 @@ public interface RedisKeyReactiveCommands { /** * Incrementally iterate the keys space. - * + * * @return KeyScanCursor<K> scan cursor. */ Mono> scan(); /** * Incrementally iterate the keys space. - * + * * @param scanArgs scan arguments * @return KeyScanCursor<K> scan cursor. */ @@ -358,7 +358,7 @@ public interface RedisKeyReactiveCommands { /** * Incrementally iterate the keys space. - * + * * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments * @return KeyScanCursor<K> scan cursor. @@ -367,7 +367,7 @@ public interface RedisKeyReactiveCommands { /** * Incrementally iterate the keys space. - * + * * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return KeyScanCursor<K> scan cursor. */ @@ -375,7 +375,7 @@ public interface RedisKeyReactiveCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @return StreamScanCursor scan cursor. */ @@ -383,7 +383,7 @@ public interface RedisKeyReactiveCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanArgs scan arguments * @return StreamScanCursor scan cursor. @@ -392,7 +392,7 @@ public interface RedisKeyReactiveCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -402,7 +402,7 @@ public interface RedisKeyReactiveCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return StreamScanCursor scan cursor. diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java rename to src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java index 7fb36bc541..393005297d 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java +++ b/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.KeyValue; +import io.lettuce.core.output.ValueStreamingChannel; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; /** * Reactive executed commands for Lists. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface RedisListReactiveCommands { /** * Remove and get the first element in a list, or block until one is available. - * + * * @param timeout the timeout in seconds * @param keys the keys * @return KeyValue<K,V> array-reply specifically: - * + * * A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk * with the first element being the name of the key where an element was popped and the second element being the * value of the popped element. @@ -47,11 +47,11 @@ public interface RedisListReactiveCommands { /** * Remove and get the last element in a list, or block until one is available. - * + * * @param timeout the timeout in seconds * @param keys the keys * @return KeyValue<K,V> array-reply specifically: - * + * * A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk * with the first element being the name of the key where an element was popped and the second element being the * value of the popped element. @@ -60,7 +60,7 @@ public interface RedisListReactiveCommands { /** * Pop a value from a list, push it to another list and return it; or block until one is available. - * + * * @param timeout the timeout in seconds * @param source the source key * @param destination the destination type: key @@ -71,7 +71,7 @@ public interface RedisListReactiveCommands { /** * Get an element from a list by its index. - * + * * @param key the key * @param index the index type: long * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range. @@ -80,7 +80,7 @@ public interface RedisListReactiveCommands { /** * Insert an element before or after another element in a list. - * + * * @param key the key * @param before the before * @param pivot the pivot @@ -92,7 +92,7 @@ public interface RedisListReactiveCommands { /** * Get the length of a list. - * + * * @param key the key * @return Long integer-reply the length of the list at {@code key}. */ @@ -100,7 +100,7 @@ public interface RedisListReactiveCommands { /** * Remove and get the first element in a list. - * + * * @param key the key * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist. */ @@ -108,7 +108,7 @@ public interface RedisListReactiveCommands { /** * Prepend one or multiple values to a list. - * + * * @param key the key * @param values the value * @return Long integer-reply the length of the list after the push operations. @@ -126,7 +126,7 @@ public interface RedisListReactiveCommands { /** * Get a range of elements from a list. - * + * * @param key the key * @param start the start type: long * @param stop the stop type: long @@ -136,7 +136,7 @@ public interface RedisListReactiveCommands { /** * Get a range of elements from a list. - * + * * @param channel the channel * @param key the key * @param start the start type: long @@ -147,7 +147,7 @@ public interface RedisListReactiveCommands { /** * Remove elements from a list. - * + * * @param key the key * @param count the count type: long * @param value the value @@ -157,7 +157,7 @@ public interface RedisListReactiveCommands { /** * Set the value of an element in a list by its index. - * + * * @param key the key * @param index the index type: long * @param value the value @@ -167,7 +167,7 @@ public interface RedisListReactiveCommands { /** * Trim a list to the specified range. - * + * * @param key the key * @param start the start type: long * @param stop the stop type: long @@ -177,7 +177,7 @@ public interface RedisListReactiveCommands { /** * Remove and get the last element in a list. - * + * * @param key the key * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist. */ @@ -185,7 +185,7 @@ public interface RedisListReactiveCommands { /** * Remove the last element in a list, append it to another list and return it. - * + * * @param source the source key * @param destination the destination type: key * @return V bulk-string-reply the element being popped and pushed. @@ -194,7 +194,7 @@ public interface RedisListReactiveCommands { /** * Append one or multiple values to a list. - * + * * @param key the key * @param values the value * @return Long integer-reply the length of the list after the push operation. diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java rename to src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java index 7e93617b93..e79e649892 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java +++ b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands; import reactor.core.publisher.Mono; /** * A complete reactive and thread-safe Redis API with 400+ Methods. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -38,7 +38,7 @@ public interface RedisReactiveCommands extends RedisHashReactiveCommands extends RedisHashReactiveCommands extends RedisHashReactiveCommands Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface RedisScriptingReactiveCommands { /** * Execute a Lua script server side. - * + * * @param script Lua 5.1 script. * @param type output type * @param keys key names @@ -44,7 +44,7 @@ public interface RedisScriptingReactiveCommands { /** * Execute a Lua script server side. - * + * * @param script Lua 5.1 script. * @param type the type * @param keys the keys @@ -56,7 +56,7 @@ public interface RedisScriptingReactiveCommands { /** * Evaluates a script cached on the server side by its SHA1 digest - * + * * @param digest SHA1 of the script * @param type the type * @param keys the keys @@ -67,7 +67,7 @@ public interface RedisScriptingReactiveCommands { /** * Execute a Lua script server side. - * + * * @param digest SHA1 of the script * @param type the type * @param keys the keys @@ -79,7 +79,7 @@ public interface RedisScriptingReactiveCommands { /** * Check existence of scripts in the script cache. - * + * * @param digests script digests * @return Boolean array-reply The command returns an array of integers that correspond to the specified SHA1 * digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1 @@ -89,21 +89,21 @@ public interface RedisScriptingReactiveCommands { /** * Remove all the scripts from the script cache. - * + * * @return String simple-string-reply */ Mono scriptFlush(); /** * Kill the script currently in execution. - * + * * @return String simple-string-reply */ Mono scriptKill(); /** * Load the specified Lua script into the script cache. - * + * * @param script script content * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache. */ @@ -111,7 +111,7 @@ public interface RedisScriptingReactiveCommands { /** * Create a SHA1 digest from a Lua script. - * + * * @param script script content * @return the SHA1 value */ diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java rename to src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java index 67c8b0bb09..914a2a2d94 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java +++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java @@ -13,51 +13,51 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; import java.util.Date; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.KillArgs; +import io.lettuce.core.protocol.CommandType; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; /** * Reactive executed commands for Server Control. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface RedisServerReactiveCommands { /** * Asynchronously rewrite the append-only file. - * + * * @return String simple-string-reply always {@code OK}. */ Mono bgrewriteaof(); /** * Asynchronously save the dataset to disk. - * + * * @return String simple-string-reply */ Mono bgsave(); /** * Get the current connection name. - * + * * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set. */ Mono clientGetname(); /** * Set the current connection name. - * + * * @param name the client name * @return simple-string-reply {@code OK} if the connection name was successfully set. */ @@ -65,7 +65,7 @@ public interface RedisServerReactiveCommands { /** * Kill the connection of a client identified by ip:port. - * + * * @param addr ip:port * @return String simple-string-reply {@code OK} if the connection exists and has been closed */ @@ -81,7 +81,7 @@ public interface RedisServerReactiveCommands { /** * Stop processing commands from clients for some time. - * + * * @param timeout the timeout value in milliseconds * @return String simple-string-reply The command returns OK or an error if the timeout is invalid. */ @@ -89,7 +89,7 @@ public interface RedisServerReactiveCommands { /** * Get the list of client connections. - * + * * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF), * each line is composed of a succession of property=value fields separated by a space character. */ @@ -97,14 +97,14 @@ public interface RedisServerReactiveCommands { /** * Returns an array reply of details about all Redis commands. - * + * * @return Object array-reply */ Flux command(); /** * Returns an array reply of details about the requested commands. - * + * * @param commands the commands to query for * @return Object array-reply */ @@ -112,7 +112,7 @@ public interface RedisServerReactiveCommands { /** * Returns an array reply of details about the requested commands. - * + * * @param commands the commands to query for * @return Object array-reply */ @@ -120,14 +120,14 @@ public interface RedisServerReactiveCommands { /** * Get total number of Redis commands. - * + * * @return Long integer-reply of number of total commands in this Redis server. */ Mono commandCount(); /** * Get the value of a configuration parameter. - * + * * @param parameter name of the parameter * @return String bulk-string-reply */ @@ -135,14 +135,14 @@ public interface RedisServerReactiveCommands { /** * Reset the stats returned by INFO. - * + * * @return String simple-string-reply always {@code OK}. */ Mono configResetstat(); /** * Rewrite the configuration file with the in memory configuration. - * + * * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is * returned. */ @@ -150,7 +150,7 @@ public interface RedisServerReactiveCommands { /** * Set a configuration parameter to the given value. - * + * * @param parameter the parameter name * @param value the parameter value * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned. @@ -159,7 +159,7 @@ public interface RedisServerReactiveCommands { /** * Return the number of keys in the selected database. - * + * * @return Long integer-reply */ Mono dbsize(); @@ -181,7 +181,7 @@ public interface RedisServerReactiveCommands { /** * Get debugging information about a key. - * + * * @param key the key * @return String simple-string-reply */ @@ -225,7 +225,7 @@ public interface RedisServerReactiveCommands { /** * Remove all keys from all databases. - * + * * @return String simple-string-reply */ Mono flushall(); @@ -239,7 +239,7 @@ public interface RedisServerReactiveCommands { /** * Remove all keys from the current database. - * + * * @return String simple-string-reply */ Mono flushdb(); @@ -253,14 +253,14 @@ public interface RedisServerReactiveCommands { /** * Get information and statistics about the server. - * + * * @return String bulk-string-reply as a collection of text lines. */ Mono info(); /** * Get information and statistics about the server. - * + * * @param section the section type: string * @return String bulk-string-reply as a collection of text lines. */ @@ -268,21 +268,21 @@ public interface RedisServerReactiveCommands { /** * Get the UNIX time stamp of the last successful save to disk. - * + * * @return Date integer-reply an UNIX time stamp. */ Mono lastsave(); /** * Synchronously save the dataset to disk. - * + * * @return String simple-string-reply The commands returns OK on success. */ Mono save(); /** * Synchronously save the dataset to disk and then shut down the server. - * + * * @param save {@literal true} force save operation * @return String simple-string-reply The commands returns OK on success. */ @@ -290,7 +290,7 @@ public interface RedisServerReactiveCommands { /** * Make the server a slave of another instance, or promote it as master. - * + * * @param host the host type: string * @param port the port type: string * @return String simple-string-reply @@ -299,21 +299,21 @@ public interface RedisServerReactiveCommands { /** * Promote server as master. - * + * * @return String simple-string-reply */ Mono slaveofNoOne(); /** * Read the slow log. - * + * * @return Object deeply nested multi bulk replies */ Flux slowlogGet(); /** * Read the slow log. - * + * * @param count the count * @return Object deeply nested multi bulk replies */ @@ -321,25 +321,25 @@ public interface RedisServerReactiveCommands { /** * Obtaining the current length of the slow log. - * + * * @return Long length of the slow log. */ Mono slowlogLen(); /** * Resetting the slow log. - * + * * @return String simple-string-reply The commands returns OK on success. */ Mono slowlogReset(); /** * Return the current server time. - * + * * @return V array-reply specifically: - * + * * A multi bulk reply containing two elements: - * + * * unix time in seconds. microseconds. */ Flux time(); diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java rename to src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java index 80e9a1f44a..3dc60c1d7a 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java +++ b/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; -import com.lambdaworks.redis.ScanArgs; -import com.lambdaworks.redis.ScanCursor; -import com.lambdaworks.redis.StreamScanCursor; -import com.lambdaworks.redis.ValueScanCursor; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.ScanArgs; +import io.lettuce.core.ScanCursor; +import io.lettuce.core.StreamScanCursor; +import io.lettuce.core.ValueScanCursor; +import io.lettuce.core.output.ValueStreamingChannel; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; /** * Reactive executed commands for Sets. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface RedisSetReactiveCommands { /** * Add one or more members to a set. - * + * * @param key the key * @param members the member type: value * @return Long integer-reply the number of elements that were added to the set, not including all the elements already @@ -47,7 +47,7 @@ public interface RedisSetReactiveCommands { /** * Get the number of members in a set. - * + * * @param key the key * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not * exist. @@ -56,7 +56,7 @@ public interface RedisSetReactiveCommands { /** * Subtract multiple sets. - * + * * @param keys the key * @return V array-reply list with members of the resulting set. */ @@ -64,7 +64,7 @@ public interface RedisSetReactiveCommands { /** * Subtract multiple sets. - * + * * @param channel the channel * @param keys the keys * @return Long count of members of the resulting set. @@ -73,7 +73,7 @@ public interface RedisSetReactiveCommands { /** * Subtract multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -82,7 +82,7 @@ public interface RedisSetReactiveCommands { /** * Intersect multiple sets. - * + * * @param keys the key * @return V array-reply list with members of the resulting set. */ @@ -90,7 +90,7 @@ public interface RedisSetReactiveCommands { /** * Intersect multiple sets. - * + * * @param channel the channel * @param keys the keys * @return Long count of members of the resulting set. @@ -99,7 +99,7 @@ public interface RedisSetReactiveCommands { /** * Intersect multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -108,11 +108,11 @@ public interface RedisSetReactiveCommands { /** * Determine if a given value is a member of a set. - * + * * @param key the key * @param member the member type: value * @return Boolean integer-reply specifically: - * + * * {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the * set, or if {@code key} does not exist. */ @@ -120,12 +120,12 @@ public interface RedisSetReactiveCommands { /** * Move a member from one set to another. - * + * * @param source the source key * @param destination the destination type: key * @param member the member type: value * @return Boolean integer-reply specifically: - * + * * {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no * operation was performed. */ @@ -133,7 +133,7 @@ public interface RedisSetReactiveCommands { /** * Get all the members in a set. - * + * * @param key the key * @return V array-reply all elements of the set. */ @@ -141,7 +141,7 @@ public interface RedisSetReactiveCommands { /** * Get all the members in a set. - * + * * @param channel the channel * @param key the keys * @return Long count of members of the resulting set. @@ -150,7 +150,7 @@ public interface RedisSetReactiveCommands { /** * Remove and return a random member from a set. - * + * * @param key the key * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist. */ @@ -167,9 +167,9 @@ public interface RedisSetReactiveCommands { /** * Get one random member from a set. - * + * * @param key the key - * + * * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the * randomly selected element, or {@literal null} when {@code key} does not exist. */ @@ -177,7 +177,7 @@ public interface RedisSetReactiveCommands { /** * Get one or multiple random members from a set. - * + * * @param key the key * @param count the count type: long * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply @@ -187,7 +187,7 @@ public interface RedisSetReactiveCommands { /** * Get one or multiple random members from a set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param count the count @@ -197,7 +197,7 @@ public interface RedisSetReactiveCommands { /** * Remove one or more members from a set. - * + * * @param key the key * @param members the member type: value * @return Long integer-reply the number of members that were removed from the set, not including non existing members. @@ -206,7 +206,7 @@ public interface RedisSetReactiveCommands { /** * Add multiple sets. - * + * * @param keys the key * @return V array-reply list with members of the resulting set. */ @@ -214,7 +214,7 @@ public interface RedisSetReactiveCommands { /** * Add multiple sets. - * + * * @param channel streaming channel that receives a call for every value * @param keys the keys * @return Long count of members of the resulting set. @@ -223,7 +223,7 @@ public interface RedisSetReactiveCommands { /** * Add multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -232,7 +232,7 @@ public interface RedisSetReactiveCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @return ValueScanCursor<V> scan cursor. */ @@ -240,7 +240,7 @@ public interface RedisSetReactiveCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanArgs scan arguments * @return ValueScanCursor<V> scan cursor. @@ -249,7 +249,7 @@ public interface RedisSetReactiveCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -259,7 +259,7 @@ public interface RedisSetReactiveCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return ValueScanCursor<V> scan cursor. @@ -268,7 +268,7 @@ public interface RedisSetReactiveCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @return StreamScanCursor scan cursor. @@ -277,7 +277,7 @@ public interface RedisSetReactiveCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanArgs scan arguments @@ -287,7 +287,7 @@ public interface RedisSetReactiveCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} @@ -298,7 +298,7 @@ public interface RedisSetReactiveCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java rename to src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java index b1b4cd7a3f..3c337e945b 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java +++ b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java @@ -13,35 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.ScoredValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.ScoredValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; /** * Reactive executed commands for Sorted Sets. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface RedisSortedSetReactiveCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param score the score * @param member the member - * + * * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -49,11 +49,11 @@ public interface RedisSortedSetReactiveCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...) * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -61,11 +61,11 @@ public interface RedisSortedSetReactiveCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param scoredValues the scored values * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -101,12 +101,12 @@ public interface RedisSortedSetReactiveCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the ke * @param zAddArgs arguments for zadd * @param scoredValues the scored values * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -138,7 +138,7 @@ public interface RedisSortedSetReactiveCommands { /** * Get the number of members in a sorted set. - * + * * @param key the key * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key} * does not exist. @@ -147,7 +147,7 @@ public interface RedisSortedSetReactiveCommands { /** * Count the members in a sorted set with scores within the given values. - * + * * @param key the key * @param min min score * @param max max score @@ -159,7 +159,7 @@ public interface RedisSortedSetReactiveCommands { /** * Count the members in a sorted set with scores within the given values. - * + * * @param key the key * @param min min score * @param max max score @@ -181,7 +181,7 @@ public interface RedisSortedSetReactiveCommands { /** * Increment the score of a member in a sorted set. - * + * * @param key the key * @param amount the increment type: long * @param member the member type: key @@ -192,7 +192,7 @@ public interface RedisSortedSetReactiveCommands { /** * Intersect multiple sorted sets and store the resulting sorted set in a new key. - * + * * @param destination the destination * @param keys the keys * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}. @@ -201,7 +201,7 @@ public interface RedisSortedSetReactiveCommands { /** * Intersect multiple sorted sets and store the resulting sorted set in a new key. - * + * * @param destination the destination * @param storeArgs the storeArgs * @param keys the keys @@ -395,7 +395,7 @@ public interface RedisSortedSetReactiveCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -408,7 +408,7 @@ public interface RedisSortedSetReactiveCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -432,7 +432,7 @@ public interface RedisSortedSetReactiveCommands { /** * Stream over range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -447,7 +447,7 @@ public interface RedisSortedSetReactiveCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java rename to src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java index 24ad9c610a..b5c72ffcb6 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java +++ b/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; import java.util.Map; -import com.lambdaworks.redis.BitFieldArgs; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.SetArgs; -import com.lambdaworks.redis.Value; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; +import io.lettuce.core.BitFieldArgs; +import io.lettuce.core.KeyValue; +import io.lettuce.core.SetArgs; +import io.lettuce.core.Value; +import io.lettuce.core.output.KeyValueStreamingChannel; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -33,7 +33,7 @@ * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface RedisStringReactiveCommands { diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java rename to src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java index a25836c2aa..30f5d866fd 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java +++ b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; -import com.lambdaworks.redis.TransactionResult; +import io.lettuce.core.TransactionResult; import reactor.core.publisher.Mono; /** * Reactive executed commands for Transactions. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface RedisTransactionalReactiveCommands { /** * Discard all commands issued after MULTI. - * + * * @return String simple-string-reply always {@code OK}. */ Mono discard(); diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java b/src/main/java/io/lettuce/core/api/reactive/package-info.java similarity index 63% rename from src/main/java/com/lambdaworks/redis/api/reactive/package-info.java rename to src/main/java/io/lettuce/core/api/reactive/package-info.java index bd72cba31d..695b9fd7ab 100644 --- a/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java +++ b/src/main/java/io/lettuce/core/api/reactive/package-info.java @@ -1,4 +1,4 @@ /** * Standalone Redis API for commands executed in a reactive manner. */ -package com.lambdaworks.redis.api.reactive; +package io.lettuce.core.api.reactive; diff --git a/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java rename to src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java index b5d567ab86..993b0fe3ae 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.output.CommandOutput; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.ProtocolKeyword; +import io.lettuce.core.output.CommandOutput; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.ProtocolKeyword; /** - * + * * Synchronous executed commands for basic commands. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface BaseRedisCommands { /** * Post a message to a channel. - * + * * @param channel the channel type: key * @param message the message type: value * @return Long integer-reply the number of clients that received the message. @@ -45,14 +45,14 @@ public interface BaseRedisCommands { /** * Lists the currently *active channels*. - * + * * @return List<K> array-reply a list of active channels, optionally matching the specified pattern. */ List pubsubChannels(); /** * Lists the currently *active channels*. - * + * * @param channel the key * @return List<K> array-reply a list of active channels, optionally matching the specified pattern. */ @@ -68,14 +68,14 @@ public interface BaseRedisCommands { /** * Returns the number of subscriptions to patterns. - * + * * @return Long integer-reply the number of patterns all the clients are subscribed to. */ Long pubsubNumpat(); /** * Echo the given string. - * + * * @param msg the message type: value * @return V bulk-string-reply */ @@ -91,7 +91,7 @@ public interface BaseRedisCommands { /** * Ping the server. - * + * * @return String simple-string-reply */ String ping(); @@ -112,14 +112,14 @@ public interface BaseRedisCommands { /** * Close the connection. - * + * * @return String simple-string-reply always OK. */ String quit(); /** * Wait for replication. - * + * * @param replicas minimum number of replicas * @param timeout timeout in milliseconds * @return number of replicas @@ -148,7 +148,7 @@ public interface BaseRedisCommands { T dispatch(ProtocolKeyword type, CommandOutput output, CommandArgs args); /** - * + * * @return true if the connection is open (connected and not closed). */ boolean isOpen(); diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java rename to src/main/java/io/lettuce/core/api/sync/RedisCommands.java index c8ce6c73fe..96a94ccd03 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.api.sync.RedisClusterCommands; /** - * + * * A complete synchronous and thread-safe Redis API with 400+ Methods. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -36,7 +36,7 @@ public interface RedisCommands extends RedisHashCommands, RedisKeyCo /** * Set the default timeout for operations. - * + * * @param timeout the timeout value * @param unit the unit of the timeout value */ @@ -44,7 +44,7 @@ public interface RedisCommands extends RedisHashCommands, RedisKeyCo /** * Authenticate to the server. - * + * * @param password the password * @return String simple-string-reply */ @@ -52,7 +52,7 @@ public interface RedisCommands extends RedisHashCommands, RedisKeyCo /** * Change the selected database for the current Commands. - * + * * @param db the database number * @return String simple-string-reply */ diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java rename to src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java index 625ad6aaae..b6734b49c7 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; import java.util.List; import java.util.Set; -import com.lambdaworks.redis.*; +import io.lettuce.core.*; /** * Synchronous executed commands for the Geo-API. * * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface RedisGeoCommands { diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java rename to src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java index aa7386298d..04ea308c87 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; /** * Synchronous executed commands for HyperLogLog (PF* commands). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 3.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface RedisHLLCommands { diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java rename to src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java index a6be8df68b..199f9d60a4 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.KeyValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Synchronous executed commands for Hashes (Key-Value pairs). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface RedisHashCommands { /** * Delete one or more hash fields. - * + * * @param key the key * @param fields the field type: key * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing @@ -46,11 +46,11 @@ public interface RedisHashCommands { /** * Determine if a hash field exists. - * + * * @param key the key * @param field the field type: key * @return Boolean integer-reply specifically: - * + * * {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field}, * or {@code key} does not exist. */ @@ -58,7 +58,7 @@ public interface RedisHashCommands { /** * Get the value of a hash field. - * + * * @param key the key * @param field the field type: key * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present @@ -68,7 +68,7 @@ public interface RedisHashCommands { /** * Increment the integer value of a hash field by the given number. - * + * * @param key the key * @param field the field type: key * @param amount the increment type: long @@ -78,7 +78,7 @@ public interface RedisHashCommands { /** * Increment the float value of a hash field by the given amount. - * + * * @param key the key * @param field the field type: key * @param amount the increment type: double @@ -88,7 +88,7 @@ public interface RedisHashCommands { /** * Get all the fields and values in a hash. - * + * * @param key the key * @return Map<K,V> array-reply list of fields and their values stored in the hash, or an empty list when {@code key} * does not exist. @@ -97,17 +97,17 @@ public interface RedisHashCommands { /** * Stream over all the fields and values in a hash. - * + * * @param channel the channel * @param key the key - * + * * @return Long count of the keys. */ Long hgetall(KeyValueStreamingChannel channel, K key); /** * Get all the fields in a hash. - * + * * @param key the key * @return List<K> array-reply list of fields in the hash, or an empty list when {@code key} does not exist. */ @@ -115,17 +115,17 @@ public interface RedisHashCommands { /** * Stream over all the fields in a hash. - * + * * @param channel the channel * @param key the key - * + * * @return Long count of the keys. */ Long hkeys(KeyStreamingChannel channel, K key); /** * Get the number of fields in a hash. - * + * * @param key the key * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist. */ @@ -133,7 +133,7 @@ public interface RedisHashCommands { /** * Get the values of all the given hash fields. - * + * * @param key the key * @param fields the field type: key * @return List<V> array-reply list of values associated with the given fields, in the same @@ -142,18 +142,18 @@ public interface RedisHashCommands { /** * Stream over the values of all the given hash fields. - * + * * @param channel the channel * @param key the key * @param fields the fields - * + * * @return Long count of the keys */ Long hmget(KeyValueStreamingChannel channel, K key, K... fields); /** * Set multiple hash fields to multiple values. - * + * * @param key the key * @param map the null * @return String simple-string-reply @@ -162,7 +162,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @return MapScanCursor<K, V> map scan cursor. */ @@ -170,7 +170,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanArgs scan arguments * @return MapScanCursor<K, V> map scan cursor. @@ -179,7 +179,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -189,7 +189,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return MapScanCursor<K, V> map scan cursor. @@ -198,7 +198,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @return StreamScanCursor scan cursor. @@ -207,7 +207,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanArgs scan arguments @@ -217,7 +217,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} @@ -228,7 +228,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java rename to src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java index 285b04d15f..9d0c9f107a 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; import java.util.Date; import java.util.List; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Synchronous executed commands for Keys (Key manipulation/querying). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface RedisKeyCommands { @@ -51,7 +51,7 @@ public interface RedisKeyCommands { /** * Return a serialized version of the value stored at the specified key. - * + * * @param key the key * @return byte[] bulk-string-reply the serialized value. */ @@ -67,11 +67,11 @@ public interface RedisKeyCommands { /** * Set a key's time to live in seconds. - * + * * @param key the key * @param seconds the seconds type: long * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set. */ @@ -79,11 +79,11 @@ public interface RedisKeyCommands { /** * Set the expiration for a key as a UNIX timestamp. - * + * * @param key the key * @param timestamp the timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -91,11 +91,11 @@ public interface RedisKeyCommands { /** * Set the expiration for a key as a UNIX timestamp. - * + * * @param key the key * @param timestamp the timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -103,7 +103,7 @@ public interface RedisKeyCommands { /** * Find all keys matching the given pattern. - * + * * @param pattern the pattern type: patternkey (pattern) * @return List<K> array-reply list of keys matching {@code pattern}. */ @@ -111,7 +111,7 @@ public interface RedisKeyCommands { /** * Find all keys matching the given pattern. - * + * * @param channel the channel * @param pattern the pattern * @return Long array-reply list of keys matching {@code pattern}. @@ -120,7 +120,7 @@ public interface RedisKeyCommands { /** * Atomically transfer a key from a Redis instance to another one. - * + * * @param host the host * @param port the port * @param key the key @@ -144,7 +144,7 @@ public interface RedisKeyCommands { /** * Move a key to another database. - * + * * @param key the key * @param db the db type: long * @return Boolean integer-reply specifically: @@ -153,7 +153,7 @@ public interface RedisKeyCommands { /** * returns the kind of internal representation used in order to store the value associated with a key. - * + * * @param key the key * @return String */ @@ -162,7 +162,7 @@ public interface RedisKeyCommands { /** * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write * operations). - * + * * @param key the key * @return number of seconds since the object stored at the specified key is idle. */ @@ -170,7 +170,7 @@ public interface RedisKeyCommands { /** * returns the number of references of the value associated with the specified key. - * + * * @param key the key * @return Long */ @@ -178,10 +178,10 @@ public interface RedisKeyCommands { /** * Remove the expiration from a key. - * + * * @param key the key * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an * associated timeout. */ @@ -189,11 +189,11 @@ public interface RedisKeyCommands { /** * Set a key's time to live in milliseconds. - * + * * @param key the key * @param milliseconds the milliseconds type: long * @return integer-reply, specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set. */ @@ -201,11 +201,11 @@ public interface RedisKeyCommands { /** * Set the expiration for a key as a UNIX timestamp specified in milliseconds. - * + * * @param key the key * @param timestamp the milliseconds-timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -213,11 +213,11 @@ public interface RedisKeyCommands { /** * Set the expiration for a key as a UNIX timestamp specified in milliseconds. - * + * * @param key the key * @param timestamp the milliseconds-timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -225,7 +225,7 @@ public interface RedisKeyCommands { /** * Get the time to live for a key in milliseconds. - * + * * @param key the key * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description * above). @@ -234,14 +234,14 @@ public interface RedisKeyCommands { /** * Return a random key from the keyspace. - * + * * @return V bulk-string-reply the random key, or {@literal null} when the database is empty. */ V randomkey(); /** * Rename a key. - * + * * @param key the key * @param newKey the newkey type: key * @return String simple-string-reply @@ -250,18 +250,18 @@ public interface RedisKeyCommands { /** * Rename a key, only if the new key does not exist. - * + * * @param key the key * @param newKey the newkey type: key * @return Boolean integer-reply specifically: - * + * * {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists. */ Boolean renamenx(K key, K newKey); /** * Create a key using the provided serialized value, previously obtained using DUMP. - * + * * @param key the key * @param ttl the ttl type: long * @param value the serialized-value type: string @@ -271,7 +271,7 @@ public interface RedisKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @return List<V> array-reply list of sorted elements. */ @@ -279,7 +279,7 @@ public interface RedisKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @return Long number of values. @@ -288,7 +288,7 @@ public interface RedisKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @param sortArgs sort arguments * @return List<V> array-reply list of sorted elements. @@ -297,7 +297,7 @@ public interface RedisKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param sortArgs sort arguments @@ -307,7 +307,7 @@ public interface RedisKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @param sortArgs sort arguments * @param destination the destination key to store sort results @@ -317,7 +317,7 @@ public interface RedisKeyCommands { /** * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created. - * + * * @param keys the keys * @return Long integer-reply the number of found keys. */ @@ -333,7 +333,7 @@ public interface RedisKeyCommands { /** * Determine the type stored at key. - * + * * @param key the key * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist. */ @@ -341,14 +341,14 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @return KeyScanCursor<K> scan cursor. */ KeyScanCursor scan(); /** * Incrementally iterate the keys space. - * + * * @param scanArgs scan arguments * @return KeyScanCursor<K> scan cursor. */ @@ -356,7 +356,7 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments * @return KeyScanCursor<K> scan cursor. @@ -365,7 +365,7 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return KeyScanCursor<K> scan cursor. */ @@ -373,7 +373,7 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @return StreamScanCursor scan cursor. */ @@ -381,7 +381,7 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanArgs scan arguments * @return StreamScanCursor scan cursor. @@ -390,7 +390,7 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -400,7 +400,7 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return StreamScanCursor scan cursor. diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java rename to src/main/java/io/lettuce/core/api/sync/RedisListCommands.java index 93c1b00c0e..c35ef70288 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; import java.util.List; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.KeyValue; +import io.lettuce.core.output.ValueStreamingChannel; /** * Synchronous executed commands for Lists. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface RedisListCommands { /** * Remove and get the first element in a list, or block until one is available. - * + * * @param timeout the timeout in seconds * @param keys the keys * @return KeyValue<K,V> array-reply specifically: - * + * * A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk * with the first element being the name of the key where an element was popped and the second element being the * value of the popped element. @@ -46,11 +46,11 @@ public interface RedisListCommands { /** * Remove and get the last element in a list, or block until one is available. - * + * * @param timeout the timeout in seconds * @param keys the keys * @return KeyValue<K,V> array-reply specifically: - * + * * A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk * with the first element being the name of the key where an element was popped and the second element being the * value of the popped element. @@ -59,7 +59,7 @@ public interface RedisListCommands { /** * Pop a value from a list, push it to another list and return it; or block until one is available. - * + * * @param timeout the timeout in seconds * @param source the source key * @param destination the destination type: key @@ -70,7 +70,7 @@ public interface RedisListCommands { /** * Get an element from a list by its index. - * + * * @param key the key * @param index the index type: long * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range. @@ -79,7 +79,7 @@ public interface RedisListCommands { /** * Insert an element before or after another element in a list. - * + * * @param key the key * @param before the before * @param pivot the pivot @@ -91,7 +91,7 @@ public interface RedisListCommands { /** * Get the length of a list. - * + * * @param key the key * @return Long integer-reply the length of the list at {@code key}. */ @@ -99,7 +99,7 @@ public interface RedisListCommands { /** * Remove and get the first element in a list. - * + * * @param key the key * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist. */ @@ -107,7 +107,7 @@ public interface RedisListCommands { /** * Prepend one or multiple values to a list. - * + * * @param key the key * @param values the value * @return Long integer-reply the length of the list after the push operations. @@ -125,7 +125,7 @@ public interface RedisListCommands { /** * Get a range of elements from a list. - * + * * @param key the key * @param start the start type: long * @param stop the stop type: long @@ -135,7 +135,7 @@ public interface RedisListCommands { /** * Get a range of elements from a list. - * + * * @param channel the channel * @param key the key * @param start the start type: long @@ -146,7 +146,7 @@ public interface RedisListCommands { /** * Remove elements from a list. - * + * * @param key the key * @param count the count type: long * @param value the value @@ -156,7 +156,7 @@ public interface RedisListCommands { /** * Set the value of an element in a list by its index. - * + * * @param key the key * @param index the index type: long * @param value the value @@ -166,7 +166,7 @@ public interface RedisListCommands { /** * Trim a list to the specified range. - * + * * @param key the key * @param start the start type: long * @param stop the stop type: long @@ -176,7 +176,7 @@ public interface RedisListCommands { /** * Remove and get the last element in a list. - * + * * @param key the key * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist. */ @@ -184,7 +184,7 @@ public interface RedisListCommands { /** * Remove the last element in a list, append it to another list and return it. - * + * * @param source the source key * @param destination the destination type: key * @return V bulk-string-reply the element being popped and pushed. @@ -193,7 +193,7 @@ public interface RedisListCommands { /** * Append one or multiple values to a list. - * + * * @param key the key * @param values the value * @return Long integer-reply the length of the list after the push operation. diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java rename to src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java index 705e6a4f4d..f1a7601cbc 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; import java.util.List; -import com.lambdaworks.redis.ScriptOutputType; +import io.lettuce.core.ScriptOutputType; /** * Synchronous executed commands for Scripting. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface RedisScriptingCommands { /** * Execute a Lua script server side. - * + * * @param script Lua 5.1 script. * @param type output type * @param keys key names @@ -43,7 +43,7 @@ public interface RedisScriptingCommands { /** * Execute a Lua script server side. - * + * * @param script Lua 5.1 script. * @param type the type * @param keys the keys @@ -55,7 +55,7 @@ public interface RedisScriptingCommands { /** * Evaluates a script cached on the server side by its SHA1 digest - * + * * @param digest SHA1 of the script * @param type the type * @param keys the keys @@ -66,7 +66,7 @@ public interface RedisScriptingCommands { /** * Execute a Lua script server side. - * + * * @param digest SHA1 of the script * @param type the type * @param keys the keys @@ -78,7 +78,7 @@ public interface RedisScriptingCommands { /** * Check existence of scripts in the script cache. - * + * * @param digests script digests * @return List<Boolean> array-reply The command returns an array of integers that correspond to the specified SHA1 * digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1 @@ -88,21 +88,21 @@ public interface RedisScriptingCommands { /** * Remove all the scripts from the script cache. - * + * * @return String simple-string-reply */ String scriptFlush(); /** * Kill the script currently in execution. - * + * * @return String simple-string-reply */ String scriptKill(); /** * Load the specified Lua script into the script cache. - * + * * @param script script content * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache. */ @@ -110,7 +110,7 @@ public interface RedisScriptingCommands { /** * Create a SHA1 digest from a Lua script. - * + * * @param script script content * @return the SHA1 value */ diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java rename to src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java index 6adcfe2137..360b6a4f74 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java @@ -13,49 +13,49 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; import java.util.Date; import java.util.List; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.KillArgs; +import io.lettuce.core.protocol.CommandType; /** * Synchronous executed commands for Server Control. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface RedisServerCommands { /** * Asynchronously rewrite the append-only file. - * + * * @return String simple-string-reply always {@code OK}. */ String bgrewriteaof(); /** * Asynchronously save the dataset to disk. - * + * * @return String simple-string-reply */ String bgsave(); /** * Get the current connection name. - * + * * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set. */ K clientGetname(); /** * Set the current connection name. - * + * * @param name the client name * @return simple-string-reply {@code OK} if the connection name was successfully set. */ @@ -63,7 +63,7 @@ public interface RedisServerCommands { /** * Kill the connection of a client identified by ip:port. - * + * * @param addr ip:port * @return String simple-string-reply {@code OK} if the connection exists and has been closed */ @@ -79,7 +79,7 @@ public interface RedisServerCommands { /** * Stop processing commands from clients for some time. - * + * * @param timeout the timeout value in milliseconds * @return String simple-string-reply The command returns OK or an error if the timeout is invalid. */ @@ -87,7 +87,7 @@ public interface RedisServerCommands { /** * Get the list of client connections. - * + * * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF), * each line is composed of a succession of property=value fields separated by a space character. */ @@ -95,14 +95,14 @@ public interface RedisServerCommands { /** * Returns an array reply of details about all Redis commands. - * + * * @return List<Object> array-reply */ List command(); /** * Returns an array reply of details about the requested commands. - * + * * @param commands the commands to query for * @return List<Object> array-reply */ @@ -110,7 +110,7 @@ public interface RedisServerCommands { /** * Returns an array reply of details about the requested commands. - * + * * @param commands the commands to query for * @return List<Object> array-reply */ @@ -118,14 +118,14 @@ public interface RedisServerCommands { /** * Get total number of Redis commands. - * + * * @return Long integer-reply of number of total commands in this Redis server. */ Long commandCount(); /** * Get the value of a configuration parameter. - * + * * @param parameter name of the parameter * @return List<String> bulk-string-reply */ @@ -133,14 +133,14 @@ public interface RedisServerCommands { /** * Reset the stats returned by INFO. - * + * * @return String simple-string-reply always {@code OK}. */ String configResetstat(); /** * Rewrite the configuration file with the in memory configuration. - * + * * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is * returned. */ @@ -148,7 +148,7 @@ public interface RedisServerCommands { /** * Set a configuration parameter to the given value. - * + * * @param parameter the parameter name * @param value the parameter value * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned. @@ -157,7 +157,7 @@ public interface RedisServerCommands { /** * Return the number of keys in the selected database. - * + * * @return Long integer-reply */ Long dbsize(); @@ -179,7 +179,7 @@ public interface RedisServerCommands { /** * Get debugging information about a key. - * + * * @param key the key * @return String simple-string-reply */ @@ -219,7 +219,7 @@ public interface RedisServerCommands { /** * Remove all keys from all databases. - * + * * @return String simple-string-reply */ String flushall(); @@ -233,7 +233,7 @@ public interface RedisServerCommands { /** * Remove all keys from the current database. - * + * * @return String simple-string-reply */ String flushdb(); @@ -247,14 +247,14 @@ public interface RedisServerCommands { /** * Get information and statistics about the server. - * + * * @return String bulk-string-reply as a collection of text lines. */ String info(); /** * Get information and statistics about the server. - * + * * @param section the section type: string * @return String bulk-string-reply as a collection of text lines. */ @@ -262,28 +262,28 @@ public interface RedisServerCommands { /** * Get the UNIX time stamp of the last successful save to disk. - * + * * @return Date integer-reply an UNIX time stamp. */ Date lastsave(); /** * Synchronously save the dataset to disk. - * + * * @return String simple-string-reply The commands returns OK on success. */ String save(); /** * Synchronously save the dataset to disk and then shut down the server. - * + * * @param save {@literal true} force save operation */ void shutdown(boolean save); /** * Make the server a slave of another instance, or promote it as master. - * + * * @param host the host type: string * @param port the port type: string * @return String simple-string-reply @@ -292,21 +292,21 @@ public interface RedisServerCommands { /** * Promote server as master. - * + * * @return String simple-string-reply */ String slaveofNoOne(); /** * Read the slow log. - * + * * @return List<Object> deeply nested multi bulk replies */ List slowlogGet(); /** * Read the slow log. - * + * * @param count the count * @return List<Object> deeply nested multi bulk replies */ @@ -314,25 +314,25 @@ public interface RedisServerCommands { /** * Obtaining the current length of the slow log. - * + * * @return Long length of the slow log. */ Long slowlogLen(); /** * Resetting the slow log. - * + * * @return String simple-string-reply The commands returns OK on success. */ String slowlogReset(); /** * Return the current server time. - * + * * @return List<V> array-reply specifically: - * + * * A multi bulk reply containing two elements: - * + * * unix time in seconds. microseconds. */ List time(); diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java similarity index 94% rename from src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java rename to src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java index 0db16cdb97..3d7ec1ef35 100644 --- a/src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java @@ -13,30 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api.sync; import java.util.List; import java.util.Set; -import com.lambdaworks.redis.ScanArgs; -import com.lambdaworks.redis.ScanCursor; -import com.lambdaworks.redis.StreamScanCursor; -import com.lambdaworks.redis.ValueScanCursor; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.ScanArgs; +import io.lettuce.core.ScanCursor; +import io.lettuce.core.StreamScanCursor; +import io.lettuce.core.ValueScanCursor; +import io.lettuce.core.output.ValueStreamingChannel; /** - * ${intent} for Sets. - * + * Synchronous executed commands for Sets. + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface RedisSetCommands { /** * Add one or more members to a set. - * + * * @param key the key * @param members the member type: value * @return Long integer-reply the number of elements that were added to the set, not including all the elements already @@ -46,7 +47,7 @@ public interface RedisSetCommands { /** * Get the number of members in a set. - * + * * @param key the key * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not * exist. @@ -55,7 +56,7 @@ public interface RedisSetCommands { /** * Subtract multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -63,7 +64,7 @@ public interface RedisSetCommands { /** * Subtract multiple sets. - * + * * @param channel the channel * @param keys the keys * @return Long count of members of the resulting set. @@ -72,7 +73,7 @@ public interface RedisSetCommands { /** * Subtract multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -81,7 +82,7 @@ public interface RedisSetCommands { /** * Intersect multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -89,7 +90,7 @@ public interface RedisSetCommands { /** * Intersect multiple sets. - * + * * @param channel the channel * @param keys the keys * @return Long count of members of the resulting set. @@ -98,7 +99,7 @@ public interface RedisSetCommands { /** * Intersect multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -107,11 +108,11 @@ public interface RedisSetCommands { /** * Determine if a given value is a member of a set. - * + * * @param key the key * @param member the member type: value * @return Boolean integer-reply specifically: - * + * * {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the * set, or if {@code key} does not exist. */ @@ -119,12 +120,12 @@ public interface RedisSetCommands { /** * Move a member from one set to another. - * + * * @param source the source key * @param destination the destination type: key * @param member the member type: value * @return Boolean integer-reply specifically: - * + * * {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no * operation was performed. */ @@ -132,7 +133,7 @@ public interface RedisSetCommands { /** * Get all the members in a set. - * + * * @param key the key * @return Set<V> array-reply all elements of the set. */ @@ -140,7 +141,7 @@ public interface RedisSetCommands { /** * Get all the members in a set. - * + * * @param channel the channel * @param key the keys * @return Long count of members of the resulting set. @@ -149,7 +150,7 @@ public interface RedisSetCommands { /** * Remove and return a random member from a set. - * + * * @param key the key * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist. */ @@ -166,9 +167,9 @@ public interface RedisSetCommands { /** * Get one random member from a set. - * + * * @param key the key - * + * * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the * randomly selected element, or {@literal null} when {@code key} does not exist. */ @@ -176,7 +177,7 @@ public interface RedisSetCommands { /** * Get one or multiple random members from a set. - * + * * @param key the key * @param count the count type: long * @return Set<V> bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply @@ -186,7 +187,7 @@ public interface RedisSetCommands { /** * Get one or multiple random members from a set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param count the count @@ -196,7 +197,7 @@ public interface RedisSetCommands { /** * Remove one or more members from a set. - * + * * @param key the key * @param members the member type: value * @return Long integer-reply the number of members that were removed from the set, not including non existing members. @@ -205,7 +206,7 @@ public interface RedisSetCommands { /** * Add multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -213,7 +214,7 @@ public interface RedisSetCommands { /** * Add multiple sets. - * + * * @param channel streaming channel that receives a call for every value * @param keys the keys * @return Long count of members of the resulting set. @@ -222,7 +223,7 @@ public interface RedisSetCommands { /** * Add multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -231,7 +232,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @return ValueScanCursor<V> scan cursor. */ @@ -239,7 +240,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanArgs scan arguments * @return ValueScanCursor<V> scan cursor. @@ -248,7 +249,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -258,7 +259,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return ValueScanCursor<V> scan cursor. @@ -267,7 +268,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @return StreamScanCursor scan cursor. @@ -276,7 +277,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanArgs scan arguments @@ -286,7 +287,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} @@ -297,7 +298,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java rename to src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java index 42baa2c1e6..46a874b3e7 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java @@ -13,34 +13,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; import java.util.List; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.ScoredValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.ScoredValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Synchronous executed commands for Sorted Sets. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface RedisSortedSetCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param score the score * @param member the member - * + * * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -48,11 +48,11 @@ public interface RedisSortedSetCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...) * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -60,11 +60,11 @@ public interface RedisSortedSetCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param scoredValues the scored values * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -100,12 +100,12 @@ public interface RedisSortedSetCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the ke * @param zAddArgs arguments for zadd * @param scoredValues the scored values * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -137,7 +137,7 @@ public interface RedisSortedSetCommands { /** * Get the number of members in a sorted set. - * + * * @param key the key * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key} * does not exist. @@ -146,7 +146,7 @@ public interface RedisSortedSetCommands { /** * Count the members in a sorted set with scores within the given values. - * + * * @param key the key * @param min min score * @param max max score @@ -158,7 +158,7 @@ public interface RedisSortedSetCommands { /** * Count the members in a sorted set with scores within the given values. - * + * * @param key the key * @param min min score * @param max max score @@ -180,7 +180,7 @@ public interface RedisSortedSetCommands { /** * Increment the score of a member in a sorted set. - * + * * @param key the key * @param amount the increment type: long * @param member the member type: key @@ -191,7 +191,7 @@ public interface RedisSortedSetCommands { /** * Intersect multiple sorted sets and store the resulting sorted set in a new key. - * + * * @param destination the destination * @param keys the keys * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}. @@ -200,7 +200,7 @@ public interface RedisSortedSetCommands { /** * Intersect multiple sorted sets and store the resulting sorted set in a new key. - * + * * @param destination the destination * @param storeArgs the storeArgs * @param keys the keys @@ -394,7 +394,7 @@ public interface RedisSortedSetCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -407,7 +407,7 @@ public interface RedisSortedSetCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -431,7 +431,7 @@ public interface RedisSortedSetCommands { /** * Stream over range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -446,7 +446,7 @@ public interface RedisSortedSetCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java rename to src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java index 3d504eeb42..3601db0f4a 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.BitFieldArgs; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.SetArgs; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; +import io.lettuce.core.BitFieldArgs; +import io.lettuce.core.KeyValue; +import io.lettuce.core.SetArgs; +import io.lettuce.core.output.KeyValueStreamingChannel; /** * Synchronous executed commands for Strings. @@ -30,7 +30,7 @@ * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface RedisStringCommands { diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java rename to src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java index 3c3ddd77df..453a6f89a1 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java +++ b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; -import com.lambdaworks.redis.TransactionResult; +import io.lettuce.core.TransactionResult; /** * Synchronous executed commands for Transactions. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface RedisTransactionalCommands { /** * Discard all commands issued after MULTI. - * + * * @return String simple-string-reply always {@code OK}. */ String discard(); diff --git a/src/main/java/com/lambdaworks/redis/api/sync/package-info.java b/src/main/java/io/lettuce/core/api/sync/package-info.java similarity index 62% rename from src/main/java/com/lambdaworks/redis/api/sync/package-info.java rename to src/main/java/io/lettuce/core/api/sync/package-info.java index 6e79bb0948..a1a443a8d7 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/package-info.java +++ b/src/main/java/io/lettuce/core/api/sync/package-info.java @@ -1,4 +1,4 @@ /** * Standalone Redis API for synchronous executed commands. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api.sync; diff --git a/src/main/java/com/lambdaworks/redis/cluster/AbstractClusterNodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/cluster/AbstractClusterNodeConnectionFactory.java rename to src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java index 4f8671e3ad..58910f83dd 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/AbstractClusterNodeConnectionFactory.java +++ b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.net.SocketAddress; import java.util.function.Supplier; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.SocketAddressResolver; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.SocketAddressResolver; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; @@ -63,7 +63,7 @@ public Partitions getPartitions() { /** * Get a {@link Supplier} of {@link SocketAddress} for a - * {@link com.lambdaworks.redis.cluster.ClusterNodeConnectionFactory.ConnectionKey}. + * {@link io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey}. *

    * This {@link Supplier} resolves the requested endpoint on each {@link Supplier#get()}. * diff --git a/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java b/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java rename to src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java index be1e8f2cdd..2a437a31b2 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java +++ b/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * Abstract base class to support node selections. A node selection represents a set of Redis Cluster nodes and allows command * execution on the selected cluster nodes. - * + * * @param API type. * @param Command command interface type to invoke multi-node operations. * @param Key type. diff --git a/src/main/java/com/lambdaworks/redis/cluster/AsyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/cluster/AsyncExecutionsImpl.java rename to src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java index f655b024bf..c215a6ae5d 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/AsyncExecutionsImpl.java +++ b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.Collection; import java.util.Collections; @@ -22,8 +22,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import com.lambdaworks.redis.cluster.api.async.AsyncExecutions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.api.async.AsyncExecutions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java rename to src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java index 6fcf2fbb33..893060c4a3 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java +++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.SocketOptions; -import com.lambdaworks.redis.SslOptions; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.SocketOptions; +import io.lettuce.core.SslOptions; /** * Client Options to control the behavior of {@link RedisClusterClient}. - * + * * @author Mark Paluch */ public class ClusterClientOptions extends ClientOptions { @@ -209,7 +209,7 @@ public ClusterClientOptions build() { * Flag, whether regular cluster topology updates are updated. The client starts updating the cluster topology in the * intervals of {@link #getRefreshPeriod()} /{@link #getRefreshPeriodUnit()}. Defaults to {@literal false}. Returns the * value from {@link ClusterTopologyRefreshOptions} if provided. - * + * * @return {@literal true} it the cluster topology view is updated periodically */ public boolean isRefreshClusterView() { @@ -219,7 +219,7 @@ public boolean isRefreshClusterView() { /** * Period between the regular cluster topology updates. Defaults to {@literal 60}. Returns the value from * {@link ClusterTopologyRefreshOptions} if provided. - * + * * @return the period between the regular cluster topology updates */ public long getRefreshPeriod() { @@ -229,7 +229,7 @@ public long getRefreshPeriod() { /** * Unit for the {@link #getRefreshPeriod()}. Defaults to {@link TimeUnit#SECONDS}. Returns the value from * {@link ClusterTopologyRefreshOptions} if provided. - * + * * @return unit for the {@link #getRefreshPeriod()} */ public TimeUnit getRefreshPeriodUnit() { @@ -240,7 +240,7 @@ public TimeUnit getRefreshPeriodUnit() { * Flag, whether to close stale connections when refreshing the cluster topology. Defaults to {@literal true}. Comes only * into effect if {@link #isRefreshClusterView()} is {@literal true}. Returns the value from * {@link ClusterTopologyRefreshOptions} if provided. - * + * * @return {@literal true} if stale connections are cleaned up after cluster topology updates */ public boolean isCloseStaleConnections() { @@ -249,7 +249,7 @@ public boolean isCloseStaleConnections() { /** * Validate the cluster node membership before allowing connections to a cluster node. Defaults to {@literal true}. - * + * * @return {@literal true} if validation is enabled. */ public boolean isValidateClusterNodeMembership() { @@ -259,7 +259,7 @@ public boolean isValidateClusterNodeMembership() { /** * Number of maximal of cluster redirects ({@literal -MOVED} and {@literal -ASK}) to follow in case a key was moved from one * node to another node. Defaults to {@literal 5}. See {@link ClusterClientOptions#DEFAULT_MAX_REDIRECTS}. - * + * * @return the maximal number of followed cluster redirects */ public int getMaxRedirects() { @@ -268,7 +268,7 @@ public int getMaxRedirects() { /** * The {@link ClusterTopologyRefreshOptions} for detailed control of topology updates. - * + * * @return the {@link ClusterTopologyRefreshOptions}. */ public ClusterTopologyRefreshOptions getTopologyRefreshOptions() { diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java b/src/main/java/io/lettuce/core/cluster/ClusterCommand.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java rename to src/main/java/io/lettuce/core/cluster/ClusterCommand.java index 1db9b7f4b2..3f0b27a40a 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java +++ b/src/main/java/io/lettuce/core/cluster/ClusterCommand.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; - -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandKeyword; -import com.lambdaworks.redis.protocol.CommandWrapper; -import com.lambdaworks.redis.protocol.ProtocolKeyword; -import com.lambdaworks.redis.protocol.RedisCommand; +package io.lettuce.core.cluster; + +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandKeyword; +import io.lettuce.core.protocol.CommandWrapper; +import io.lettuce.core.protocol.ProtocolKeyword; +import io.lettuce.core.protocol.RedisCommand; import io.netty.buffer.ByteBuf; /** diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java similarity index 85% rename from src/main/java/com/lambdaworks/redis/cluster/ClusterConnectionProvider.java rename to src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java index 261564c5b1..a6320e5795 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ClusterConnectionProvider.java +++ b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.io.Closeable; -import com.lambdaworks.redis.ReadFrom; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; +import io.lettuce.core.ReadFrom; +import io.lettuce.core.RedisException; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.models.partitions.Partitions; /** * Connection provider for cluster operations. - * + * * @author Mark Paluch * @since 3.0 */ @@ -33,9 +33,9 @@ interface ClusterConnectionProvider extends Closeable { /** * Provide a connection for the intent and cluster slot. The underlying connection is bound to the nodeId. If the slot * responsibility changes, the connection will not point to the updated nodeId. - * - * @param intent {@link com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent#READ} or - * {@link com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent#WRITE} {@literal READ} connections will be + * + * @param intent {@link io.lettuce.core.cluster.ClusterConnectionProvider.Intent#READ} or + * {@link io.lettuce.core.cluster.ClusterConnectionProvider.Intent#WRITE} {@literal READ} connections will be * provided in {@literal READONLY} mode * @param slot the slot-hash of the key, see {@link SlotHash} * @return a valid connection which handles the slot. @@ -46,9 +46,9 @@ interface ClusterConnectionProvider extends Closeable { /** * Provide a connection for the intent and host/port. The connection can survive cluster topology updates. The connection * * will be closed if the node identified by {@code host} and {@code port} is no longer part of the cluster. - * - * @param intent {@link com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent#READ} or - * {@link com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent#WRITE} {@literal READ} connections will be + * + * @param intent {@link io.lettuce.core.cluster.ClusterConnectionProvider.Intent#READ} or + * {@link io.lettuce.core.cluster.ClusterConnectionProvider.Intent#WRITE} {@literal READ} connections will be * provided in {@literal READONLY} mode * @param host host of the node * @param port port of the node @@ -60,7 +60,7 @@ interface ClusterConnectionProvider extends Closeable { /** * Provide a connection for the intent and nodeId. The connection can survive cluster topology updates. The connection will * be closed if the node identified by {@code nodeId} is no longer part of the cluster. - * + * * * @param intent Connection intent {@literal READ} or {@literal WRITE} * @param nodeId the nodeId of the cluster node @@ -111,14 +111,14 @@ interface ClusterConnectionProvider extends Closeable { /** * Set from which nodes data is read. The setting is used as default for read operations on this connection. See the * documentation for {@link ReadFrom} for more information. - * + * * @param readFrom the read from setting, must not be {@literal null} */ void setReadFrom(ReadFrom readFrom); /** * Gets the {@link ReadFrom} setting for this connection. Defaults to {@link ReadFrom#MASTER} if not set. - * + * * @return the read from setting */ ReadFrom getReadFrom(); diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java rename to src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java index 3989b69c70..4a4feb7922 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java +++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.cluster.SlotHash.getSlot; +import static io.lettuce.core.cluster.SlotHash.getSlot; import java.nio.ByteBuffer; import java.util.*; import java.util.stream.IntStream; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.internal.HostAndPort; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.*; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.ClusterConnectionProvider.Intent; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.internal.HostAndPort; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.*; import io.netty.util.concurrent.EventExecutorGroup; diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterEventListener.java b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/cluster/ClusterEventListener.java rename to src/main/java/io/lettuce/core/cluster/ClusterEventListener.java index 7dcc1b7976..ec1e9d0bd6 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ClusterEventListener.java +++ b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java rename to src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java index afa86b6260..1cbf7219ae 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java +++ b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -26,16 +26,16 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import com.lambdaworks.redis.LettuceFutures; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.internal.AbstractInvocationHandler; +import io.lettuce.core.LettuceFutures; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.sync.RedisClusterCommands; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.internal.AbstractInvocationHandler; /** * Invocation-handler to synchronize API calls which use Futures as backend. This class leverages the need to implement a full diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/cluster/ClusterNodeConnectionFactory.java rename to src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java index 20d109c367..5059df1a89 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeConnectionFactory.java +++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.concurrent.CompletableFuture; import java.util.function.Function; -import com.lambdaworks.redis.ConnectionFuture; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; +import io.lettuce.core.ConnectionFuture; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.ClusterConnectionProvider.Intent; +import io.lettuce.core.cluster.models.partitions.Partitions; /** * Specialized {@link Function} to obtain connections for Redis Cluster nodes. Connecting to a node returns a diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java rename to src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java index 9103c6a71a..a4dd10385c 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java +++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.ArrayList; import java.util.Collection; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.protocol.ConnectionWatchdog; -import com.lambdaworks.redis.protocol.RedisCommand; -import com.lambdaworks.redis.protocol.DefaultEndpoint; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.RedisException; +import io.lettuce.core.protocol.ConnectionWatchdog; +import io.lettuce.core.protocol.RedisCommand; +import io.lettuce.core.protocol.DefaultEndpoint; +import io.lettuce.core.resource.ClientResources; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java rename to src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java index e16002a85f..d5d62cb50c 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java +++ b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; - -import com.lambdaworks.redis.ConnectionFuture; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubListener; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.pubsub.RedisPubSubAdapter; -import com.lambdaworks.redis.pubsub.RedisPubSubListener; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; -import com.lambdaworks.redis.resource.ClientResources; +package io.lettuce.core.cluster; + +import io.lettuce.core.ConnectionFuture; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.pubsub.RedisClusterPubSubListener; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.pubsub.RedisPubSubAdapter; +import io.lettuce.core.pubsub.RedisPubSubListener; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.resource.ClientResources; /** * {@link ClusterConnectionProvider} to provide {@link StatefulRedisPubSubConnection}s for Redis Cluster use. diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java b/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java rename to src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java index 65eb194cea..c0b0ab6309 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java +++ b/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.function.Function; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.*; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.models.role.RedisNodeDescription; import reactor.core.publisher.Mono; /** * Methods to support a Cluster-wide SCAN operation over multiple hosts. - * + * * @author Mark Paluch */ class ClusterScanSupport { @@ -85,7 +85,7 @@ public StreamScanCursor apply(StreamScanCursor streamScanCursor) { /** * Retrieve the cursor to continue the scan. - * + * * @param scanCursor can be {@literal null}. * @return */ @@ -132,7 +132,7 @@ static String getCurrentNodeId(ScanCursor cursor, List nodeIds) { /** * Retrieve a list of node Ids to use for the SCAN operation. - * + * * @param connection * @return */ @@ -235,7 +235,7 @@ interface ClusterScanCursor { /** * State object for a cluster-wide SCAN using Key results. - * + * * @param */ private static class ClusterKeyScanCursor extends KeyScanCursor implements ClusterScanCursor { diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java rename to src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java index f837009a54..cd4d1585a2 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java +++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.*; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Options to control the Cluster topology refreshing of {@link RedisClusterClient}. - * + * * @author Mark Paluch * @since 4.2 */ @@ -284,7 +284,7 @@ public ClusterTopologyRefreshOptions build() { /** * Flag, whether regular cluster topology updates are updated. The client starts updating the cluster topology in the * intervals of {@link #getRefreshPeriod()} /{@link #getRefreshPeriodUnit()}. Defaults to {@literal false}. - * + * * @return {@literal true} it the cluster topology view is updated periodically */ public boolean isPeriodicRefreshEnabled() { @@ -293,7 +293,7 @@ public boolean isPeriodicRefreshEnabled() { /** * Period between the regular cluster topology updates. Defaults to {@literal 60}. - * + * * @return the period between the regular cluster topology updates */ public long getRefreshPeriod() { @@ -302,7 +302,7 @@ public long getRefreshPeriod() { /** * Unit for the {@link #getRefreshPeriod()}. Defaults to {@link TimeUnit#SECONDS}. - * + * * @return unit for the {@link #getRefreshPeriod()} */ public TimeUnit getRefreshPeriodUnit() { @@ -312,7 +312,7 @@ public TimeUnit getRefreshPeriodUnit() { /** * Flag, whether to close stale connections when refreshing the cluster topology. Defaults to {@literal true}. Comes only * into effect if {@link #isPeriodicRefreshEnabled()} is {@literal true}. - * + * * @return {@literal true} if stale connections are cleaned up after cluster topology updates */ public boolean isCloseStaleConnections() { @@ -324,7 +324,7 @@ public boolean isCloseStaleConnections() { * refresh will query all discovered nodes for the cluster topology and calculate the number of clients for each node.If set * to {@literal false}, only the initial seed nodes will be used as sources for topology discovery and the number of clients * will be obtained only for the initial seed nodes. This can be useful when using Redis Cluster with many nodes. - * + * * @return {@link true} if dynamic refresh sources are enabled */ public boolean useDynamicRefreshSources() { diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java rename to src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java index cadb0d6378..a10e296295 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java +++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.resource.ClientResources; import io.netty.util.concurrent.EventExecutorGroup; import io.netty.util.internal.logging.InternalLogger; diff --git a/src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java rename to src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java index 518d10b68e..4251080a77 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java +++ b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.List; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * Dynamic selection of nodes. - * + * * @param API type. * @param Command command interface type to invoke multi-node operations. * @param Key type. diff --git a/src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java similarity index 85% rename from src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java rename to src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java index 7f4ee88078..ad9d88dd16 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java +++ b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.lang.reflect.Proxy; import java.util.Map; @@ -22,20 +22,20 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Predicate; -import com.lambdaworks.redis.RedisCommandInterruptedException; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.sync.NodeSelection; -import com.lambdaworks.redis.cluster.api.sync.NodeSelectionCommands; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.RedisCommandInterruptedException; +import io.lettuce.core.RedisException; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.sync.NodeSelection; +import io.lettuce.core.cluster.api.sync.NodeSelectionCommands; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * Utility to perform and synchronize command executions on multiple cluster nodes. - * + * * @author Mark Paluch */ class MultiNodeExecution { diff --git a/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java rename to src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java index a9077ae8f3..1237cb2735 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java +++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -21,14 +21,14 @@ import java.util.concurrent.*; import java.util.stream.Collectors; -import com.lambdaworks.redis.RedisCommandExecutionException; -import com.lambdaworks.redis.RedisCommandInterruptedException; -import com.lambdaworks.redis.RedisCommandTimeoutException; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.internal.AbstractInvocationHandler; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.RedisCommandExecutionException; +import io.lettuce.core.RedisCommandInterruptedException; +import io.lettuce.core.RedisCommandTimeoutException; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.internal.AbstractInvocationHandler; +import io.lettuce.core.internal.LettuceAssert; /** * Invocation handler to trigger commands on multiple connections and return a holder for the values. diff --git a/src/main/java/com/lambdaworks/redis/cluster/PartitionAccessor.java b/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/PartitionAccessor.java rename to src/main/java/io/lettuce/core/cluster/PartitionAccessor.java index d83ba4baac..b6bd6bc212 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/PartitionAccessor.java +++ b/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.function.Predicate; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * Accessor for Partitions. - * + * * @author Mark Paluch */ class PartitionAccessor { diff --git a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java b/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java similarity index 84% rename from src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java rename to src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java index 64276a2e5c..150f2c7535 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java +++ b/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.Map; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.Partitions; /** - * Consensus API to decide on the {@link com.lambdaworks.redis.cluster.models.partitions.Partitions topology view} to be used by + * Consensus API to decide on the {@link io.lettuce.core.cluster.models.partitions.Partitions topology view} to be used by * {@link RedisClusterClient}. *

    * {@link PartitionsConsensus} takes the current {@link Partitions} and a {@link java.util.Map} of newly retrieved * {@link Partitions} to determine a view that shall be used. Implementing classes may reuse {@link Partitions} from input * arguments or construct a new {@link Partitions} object. - * + * * @author Mark Paluch * @since 4.2 - * @see com.lambdaworks.redis.cluster.models.partitions.Partitions + * @see io.lettuce.core.cluster.models.partitions.Partitions * @see RedisClusterClient */ abstract class PartitionsConsensus { @@ -47,7 +47,7 @@ abstract class PartitionsConsensus { /** * Determine the {@link Partitions} to be used by {@link RedisClusterClient}. - * + * * @param current the currently used topology view, must not be {@literal null}. * @param topologyViews the newly retrieved views, must not be {@literal null}. * @return the resulting {@link Partitions} to be used by {@link RedisClusterClient}. diff --git a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java b/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java rename to src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java index 697fc358a8..31f6dcf396 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java +++ b/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * Implementations for {@link PartitionsConsensus}. - * + * * @author Mark Paluch * @since 4.2 */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java rename to src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java index 798fbcf014..9d93212d0a 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java +++ b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.Map; import java.util.concurrent.CompletableFuture; @@ -22,11 +22,11 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; -import com.lambdaworks.redis.RedisFuture; +import io.lettuce.core.RedisFuture; /** * Pipelining for commands that are executed on multiple cluster nodes. Merges results and emits one composite result. - * + * * @author Mark Paluch */ class PipelinedRedisFuture extends CompletableFuture implements RedisFuture { diff --git a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java rename to src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java index a54ff50f73..f901494a33 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java +++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.Arrays; import java.util.Iterator; @@ -21,17 +21,17 @@ import java.util.function.Function; import java.util.stream.Collectors; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.ClusterNodeConnectionFactory.ConnectionKey; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.HostAndPort; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.models.role.RedisInstance; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.HostAndPort; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.models.role.RedisInstance; +import io.lettuce.core.models.role.RedisNodeDescription; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; diff --git a/src/main/java/com/lambdaworks/redis/cluster/PubSubClusterEndpoint.java b/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/PubSubClusterEndpoint.java rename to src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java index f4286e1326..719756d32f 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/PubSubClusterEndpoint.java +++ b/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubAdapter; -import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubListener; -import com.lambdaworks.redis.pubsub.PubSubEndpoint; -import com.lambdaworks.redis.pubsub.PubSubOutput; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.pubsub.RedisClusterPubSubAdapter; +import io.lettuce.core.cluster.pubsub.RedisClusterPubSubListener; +import io.lettuce.core.pubsub.PubSubEndpoint; +import io.lettuce.core.pubsub.PubSubOutput; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReactiveExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java similarity index 88% rename from src/main/java/com/lambdaworks/redis/cluster/ReactiveExecutionsImpl.java rename to src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java index 9860f69b3b..06faeddd1e 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ReactiveExecutionsImpl.java +++ b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.Collection; import java.util.Map; -import com.lambdaworks.redis.cluster.api.reactive.ReactiveExecutions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.api.reactive.ReactiveExecutions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java rename to src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java index d0cf5cdf0c..e46e0a440f 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java +++ b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.Collections; import java.util.EnumSet; import java.util.Set; -import com.lambdaworks.redis.protocol.CommandType; -import com.lambdaworks.redis.protocol.ProtocolKeyword; +import io.lettuce.core.protocol.CommandType; +import io.lettuce.core.protocol.ProtocolKeyword; /** * Contains all command names that are read-only commands. diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReconnectEventListener.java b/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java similarity index 87% rename from src/main/java/com/lambdaworks/redis/cluster/ReconnectEventListener.java rename to src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java index 4a19ebde59..9332218638 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/ReconnectEventListener.java +++ b/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import com.lambdaworks.redis.ConnectionEvents.Reconnect; -import com.lambdaworks.redis.protocol.ReconnectionListener; +import io.lettuce.core.ConnectionEvents.Reconnect; +import io.lettuce.core.protocol.ReconnectionListener; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java rename to src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java index a3faac49c6..83c79f501d 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java +++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.cluster.ClusterScanSupport.asyncClusterKeyScanCursorMapper; -import static com.lambdaworks.redis.cluster.ClusterScanSupport.asyncClusterStreamScanCursorMapper; -import static com.lambdaworks.redis.cluster.NodeSelectionInvocationHandler.ExecutionModel.ASYNC; -import static com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag.MASTER; +import static io.lettuce.core.cluster.ClusterScanSupport.asyncClusterKeyScanCursorMapper; +import static io.lettuce.core.cluster.ClusterScanSupport.asyncClusterStreamScanCursorMapper; +import static io.lettuce.core.cluster.NodeSelectionInvocationHandler.ExecutionModel.ASYNC; +import static io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag.MASTER; import java.lang.reflect.Proxy; import java.util.*; @@ -26,28 +26,28 @@ import java.util.function.Function; import java.util.function.Predicate; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.async.RedisKeyAsyncCommands; -import com.lambdaworks.redis.api.async.RedisScriptingAsyncCommands; -import com.lambdaworks.redis.api.async.RedisServerAsyncCommands; -import com.lambdaworks.redis.cluster.ClusterScanSupport.ScanCursorMapper; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.async.AsyncNodeSelection; -import com.lambdaworks.redis.cluster.api.async.NodeSelectionAsyncCommands; -import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.output.IntegerOutput; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.async.RedisKeyAsyncCommands; +import io.lettuce.core.api.async.RedisScriptingAsyncCommands; +import io.lettuce.core.api.async.RedisServerAsyncCommands; +import io.lettuce.core.cluster.ClusterScanSupport.ScanCursorMapper; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.async.AsyncNodeSelection; +import io.lettuce.core.cluster.api.async.NodeSelectionAsyncCommands; +import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands; +import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.output.IntegerOutput; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.KeyValueStreamingChannel; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandType; /** * An advanced asynchronous and thread-safe API for a Redis Cluster connection. diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java rename to src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java index 2583b5afd0..aae3544551 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java +++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.cluster.ClusterScanSupport.reactiveClusterKeyScanCursorMapper; -import static com.lambdaworks.redis.cluster.ClusterScanSupport.reactiveClusterStreamScanCursorMapper; -import static com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag.MASTER; +import static io.lettuce.core.cluster.ClusterScanSupport.reactiveClusterKeyScanCursorMapper; +import static io.lettuce.core.cluster.ClusterScanSupport.reactiveClusterStreamScanCursorMapper; +import static io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag.MASTER; import java.util.*; import java.util.function.BiFunction; @@ -29,18 +29,18 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.reactive.RedisKeyReactiveCommands; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; -import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceLists; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.reactive.RedisKeyReactiveCommands; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; +import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceLists; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.KeyValueStreamingChannel; /** * An advanced reactive and thread-safe API to a Redis Cluster connection. diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java rename to src/main/java/io/lettuce/core/cluster/RedisClusterClient.java index 2c4740692e..1d18147459 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java +++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.io.Closeable; import java.net.SocketAddress; @@ -27,32 +27,32 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.cluster.event.ClusterTopologyChangedEvent; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection; -import com.lambdaworks.redis.cluster.topology.ClusterTopologyRefresh; -import com.lambdaworks.redis.cluster.topology.NodeConnectionFactory; -import com.lambdaworks.redis.cluster.topology.TopologyComparators; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceLists; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; -import com.lambdaworks.redis.protocol.CommandHandler; -import com.lambdaworks.redis.protocol.DefaultEndpoint; -import com.lambdaworks.redis.pubsub.PubSubCommandHandler; -import com.lambdaworks.redis.pubsub.PubSubEndpoint; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.SocketAddressResolver; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.cluster.event.ClusterTopologyChangedEvent; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection; +import io.lettuce.core.cluster.topology.ClusterTopologyRefresh; +import io.lettuce.core.cluster.topology.NodeConnectionFactory; +import io.lettuce.core.cluster.topology.TopologyComparators; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceLists; +import io.lettuce.core.output.KeyValueStreamingChannel; +import io.lettuce.core.protocol.CommandHandler; +import io.lettuce.core.protocol.DefaultEndpoint; +import io.lettuce.core.pubsub.PubSubCommandHandler; +import io.lettuce.core.pubsub.PubSubEndpoint; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.SocketAddressResolver; import io.netty.util.concurrent.ScheduledFuture; import io.netty.util.internal.logging.InternalLogger; @@ -72,7 +72,7 @@ *

    *

    * The Redis cluster client provides a {@link RedisAdvancedClusterCommands sync}, {@link RedisAdvancedClusterAsyncCommands - * async} and {@link com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands reactive} API. + * async} and {@link io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands reactive} API. *

    * *

    diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java similarity index 80% rename from src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubAsyncCommandsImpl.java rename to src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java index 9d1deadcb8..ddb0d26e42 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubAsyncCommandsImpl.java +++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.cluster.NodeSelectionInvocationHandler.ExecutionModel.ASYNC; +import static io.lettuce.core.cluster.NodeSelectionInvocationHandler.ExecutionModel.ASYNC; import java.lang.reflect.Proxy; import java.util.HashMap; @@ -24,17 +24,17 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection; -import com.lambdaworks.redis.cluster.pubsub.api.async.NodeSelectionPubSubAsyncCommands; -import com.lambdaworks.redis.cluster.pubsub.api.async.PubSubAsyncNodeSelection; -import com.lambdaworks.redis.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.pubsub.RedisPubSubAsyncCommandsImpl; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; -import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection; +import io.lettuce.core.cluster.pubsub.api.async.NodeSelectionPubSubAsyncCommands; +import io.lettuce.core.cluster.pubsub.api.async.PubSubAsyncNodeSelection; +import io.lettuce.core.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.pubsub.RedisPubSubAsyncCommandsImpl; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java similarity index 80% rename from src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubReactiveCommandsImpl.java rename to src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java index 46bc3f1592..bc867c53b6 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubReactiveCommandsImpl.java +++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.cluster.NodeSelectionInvocationHandler.ExecutionModel.REACTIVE; +import static io.lettuce.core.cluster.NodeSelectionInvocationHandler.ExecutionModel.REACTIVE; import java.lang.reflect.Proxy; import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection; -import com.lambdaworks.redis.cluster.pubsub.api.reactive.NodeSelectionPubSubReactiveCommands; -import com.lambdaworks.redis.cluster.pubsub.api.reactive.PubSubReactiveNodeSelection; -import com.lambdaworks.redis.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.pubsub.RedisPubSubReactiveCommandsImpl; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; -import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection; +import io.lettuce.core.cluster.pubsub.api.reactive.NodeSelectionPubSubReactiveCommands; +import io.lettuce.core.cluster.pubsub.api.reactive.PubSubReactiveNodeSelection; +import io.lettuce.core.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.pubsub.RedisPubSubReactiveCommandsImpl; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterURIUtil.java b/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/RedisClusterURIUtil.java rename to src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java index fcdd7ca2c9..4719564469 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterURIUtil.java +++ b/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.net.URI; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.internal.HostAndPort; +import io.lettuce.core.RedisURI; +import io.lettuce.core.internal.HostAndPort; /** * {@link RedisClusterURIUtil} is a collection of {@link RedisURI}-based utility methods for {@link RedisClusterClient} use. @@ -34,7 +34,7 @@ public class RedisClusterURIUtil { * Parse a Redis Cluster URI with potentially multiple hosts into a {@link List} of {@link RedisURI}. * * An URI follows the syntax: {@code redis://[password@]host[:port][,host2[:port2]]} - * + * * @param uri must not be empty or {@literal null}. * @return {@link List} of {@link RedisURI}. */ @@ -62,7 +62,7 @@ public static List toRedisURIs(URI uri) { /** * Apply {@link RedisURI} settings such as SSL/Timeout/password. - * + * * @param from from {@link RedisURI}. * @param to from {@link RedisURI}. */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java b/src/main/java/io/lettuce/core/cluster/RoundRobin.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java rename to src/main/java/io/lettuce/core/cluster/RoundRobin.java index 7ca004e76d..1ff014a518 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java +++ b/src/main/java/io/lettuce/core/cluster/RoundRobin.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.Collection; /** * Circular element provider. This class allows infinite scrolling over a collection with the possibility to provide an initial * offset. - * + * * @author Mark Paluch */ class RoundRobin { @@ -40,7 +40,7 @@ public RoundRobin(Collection collection, V offset) { /** * Returns the next item. - * + * * @return the next item */ public V next() { diff --git a/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java rename to src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java index 19a713d4bc..62e4b18dbd 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java +++ b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.net.SocketAddress; import java.util.ArrayList; @@ -21,10 +21,10 @@ import java.util.function.Function; import java.util.function.Supplier; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.SocketAddressResolver; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.SocketAddressResolver; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; diff --git a/src/main/java/com/lambdaworks/redis/cluster/SlotHash.java b/src/main/java/io/lettuce/core/cluster/SlotHash.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/cluster/SlotHash.java rename to src/main/java/io/lettuce/core/cluster/SlotHash.java index a9df1901bf..f2b4440181 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/SlotHash.java +++ b/src/main/java/io/lettuce/core/cluster/SlotHash.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.nio.ByteBuffer; import java.util.*; -import com.lambdaworks.codec.CRC16; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.CRC16; +import io.lettuce.core.codec.RedisCodec; /** * Utility to calculate the slot from a key. @@ -111,13 +111,13 @@ private static int indexOf(byte[] haystack, int start, byte needle) { /** * Partition keys by slot-hash. The resulting map honors order of the keys. - * + * * @param codec codec to encode the key * @param keys iterable of keys * @param Key type. * @param Value type. * @result map between slot-hash and an ordered list of keys. - * + * */ static Map> partition(RedisCodec codec, Iterable keys) { diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java similarity index 86% rename from src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java rename to src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java index 2e0d5567f9..12cb54e5b0 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java +++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.protocol.CommandType.AUTH; -import static com.lambdaworks.redis.protocol.CommandType.READONLY; -import static com.lambdaworks.redis.protocol.CommandType.READWRITE; +import static io.lettuce.core.protocol.CommandType.AUTH; +import static io.lettuce.core.protocol.CommandType.READONLY; +import static io.lettuce.core.protocol.CommandType.READWRITE; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; @@ -27,22 +27,22 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; -import com.lambdaworks.redis.cluster.api.sync.NodeSelection; -import com.lambdaworks.redis.cluster.api.sync.NodeSelectionCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.*; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands; +import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; +import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; +import io.lettuce.core.cluster.api.sync.NodeSelection; +import io.lettuce.core.cluster.api.sync.NodeSelectionCommands; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.*; /** * A thread-safe connection to a Redis Cluster. Multiple threads may share one {@link StatefulRedisClusterConnectionImpl} diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java similarity index 79% rename from src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterPubSubConnectionImpl.java rename to src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java index 4f6e3f2656..5a558289ee 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterPubSubConnectionImpl.java +++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.AbstractRedisClient; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubListener; -import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection; -import com.lambdaworks.redis.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands; -import com.lambdaworks.redis.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands; -import com.lambdaworks.redis.cluster.pubsub.api.sync.NodeSelectionPubSubCommands; -import com.lambdaworks.redis.cluster.pubsub.api.sync.PubSubNodeSelection; -import com.lambdaworks.redis.cluster.pubsub.api.sync.RedisClusterPubSubCommands; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.pubsub.RedisPubSubAsyncCommandsImpl; -import com.lambdaworks.redis.pubsub.RedisPubSubReactiveCommandsImpl; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl; -import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands; -import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands; +import io.lettuce.core.AbstractRedisClient; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.RedisException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.pubsub.RedisClusterPubSubListener; +import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection; +import io.lettuce.core.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands; +import io.lettuce.core.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands; +import io.lettuce.core.cluster.pubsub.api.sync.NodeSelectionPubSubCommands; +import io.lettuce.core.cluster.pubsub.api.sync.PubSubNodeSelection; +import io.lettuce.core.cluster.pubsub.api.sync.RedisClusterPubSubCommands; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.pubsub.RedisPubSubAsyncCommandsImpl; +import io.lettuce.core.pubsub.RedisPubSubReactiveCommandsImpl; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl; +import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands; +import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java rename to src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java index a6c228102d..7eab350943 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java +++ b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.List; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * Static selection of nodes. - * + * * @param API type. * @param Command command interface type to invoke multi-node operations. * @param Key type. diff --git a/src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java rename to src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java index ded848df87..ff8606a54f 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java +++ b/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.Collection; import java.util.HashMap; @@ -21,8 +21,8 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; -import com.lambdaworks.redis.cluster.api.sync.Executions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.api.sync.Executions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProvider.java rename to src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java index 47897ce6f5..935bb583e9 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProvider.java +++ b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.Map; import java.util.concurrent.CompletionException; @@ -22,13 +22,13 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; -import com.lambdaworks.redis.ConnectionFuture; -import com.lambdaworks.redis.RedisConnectionException; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.ClusterNodeConnectionFactory.ConnectionKey; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.ConnectionFuture; +import io.lettuce.core.RedisConnectionException; +import io.lettuce.core.RedisException; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey; +import io.lettuce.core.internal.LettuceAssert; /** * Synchronizing provider for Redis Cluster node connections using {@link ClusterNodeConnectionFactory}. diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java b/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java rename to src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java index 46682a0ade..c556edb749 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java +++ b/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api; +package io.lettuce.core.cluster.api; import java.util.Map; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * A node selection represents a set of Redis Cluster nodes. Provides access to particular node connection APIs and allows the * execution of commands on the selected cluster nodes. - * + * * @param API type. * @param Command command interface type to invoke multi-node operations. * @author Mark Paluch @@ -42,7 +42,7 @@ public interface NodeSelectionSupport { /** * Obtain the connection/commands to a particular node. - * + * * @param index index of the node * @return the connection/commands object */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java similarity index 85% rename from src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java rename to src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java index f2a7b15060..3c94985397 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java +++ b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api; +package io.lettuce.core.cluster.api; -import com.lambdaworks.redis.ReadFrom; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.ClusterClientOptions; -import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; +import io.lettuce.core.ReadFrom; +import io.lettuce.core.RedisException; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.ClusterClientOptions; +import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands; +import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.cluster.models.partitions.Partitions; /** * A stateful cluster connection. Advanced cluster connections provide transparent command routing based on the first * command key. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -65,8 +65,8 @@ public interface StatefulRedisClusterConnection extends StatefulConnection * specified {@code nodeId} is no longer part of the cluster. * * Do not close the connections. Otherwise, unpredictable behavior will occur. The nodeId must be part of the cluster and is - * validated against the current topology view in {@link com.lambdaworks.redis.cluster.models.partitions.Partitions}. - * + * validated against the current topology view in {@link io.lettuce.core.cluster.models.partitions.Partitions}. + * * * In contrast to the {@link StatefulRedisClusterConnection}, node-connections do not route commands to other cluster nodes. * @@ -96,14 +96,14 @@ public interface StatefulRedisClusterConnection extends StatefulConnection /** * Set from which nodes data is read. The setting is used as default for read operations on this connection. See the * documentation for {@link ReadFrom} for more information. - * + * * @param readFrom the read from setting, must not be {@literal null} */ void setReadFrom(ReadFrom readFrom); /** * Gets the {@link ReadFrom} setting for this connection. Defaults to {@link ReadFrom#MASTER} if not set. - * + * * @return the read from setting */ ReadFrom getReadFrom(); diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java rename to src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java index 11cf72ac69..a2de1e25ce 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -21,7 +21,7 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * Result holder for a command that was executed asynchronously on multiple nodes. diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java b/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java similarity index 83% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java rename to src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java index c206c4ffc3..f65f5a4714 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.cluster.api.NodeSelectionSupport; /** * Node selection with access to asynchronous executed commands on the set. - * + * * @author Mark Paluch * @since 4.0 */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java index 47b80257d0..60ce7836d0 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.output.CommandOutput; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.ProtocolKeyword; +import io.lettuce.core.output.CommandOutput; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.ProtocolKeyword; /** - * + * * Asynchronous executed commands on a node selection for basic commands. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi */ public interface BaseNodeSelectionAsyncCommands { /** * Post a message to a channel. - * + * * @param channel the channel type: key * @param message the message type: value * @return Long integer-reply the number of clients that received the message. @@ -45,14 +45,14 @@ public interface BaseNodeSelectionAsyncCommands { /** * Lists the currently *active channels*. - * + * * @return List<K> array-reply a list of active channels, optionally matching the specified pattern. */ AsyncExecutions> pubsubChannels(); /** * Lists the currently *active channels*. - * + * * @param channel the key * @return List<K> array-reply a list of active channels, optionally matching the specified pattern. */ @@ -68,14 +68,14 @@ public interface BaseNodeSelectionAsyncCommands { /** * Returns the number of subscriptions to patterns. - * + * * @return Long integer-reply the number of patterns all the clients are subscribed to. */ AsyncExecutions pubsubNumpat(); /** * Echo the given string. - * + * * @param msg the message type: value * @return V bulk-string-reply */ @@ -91,21 +91,21 @@ public interface BaseNodeSelectionAsyncCommands { /** * Ping the server. - * + * * @return String simple-string-reply */ AsyncExecutions ping(); /** * Close the connection. - * + * * @return String simple-string-reply always OK. */ AsyncExecutions quit(); /** * Wait for replication. - * + * * @param replicas minimum number of replicas * @param timeout timeout in milliseconds * @return number of replicas diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java index c6b1b62d1c..1fc4d2e815 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; +import io.lettuce.core.cluster.api.NodeSelectionSupport; /** * Asynchronous and thread-safe Redis API to execute commands on a {@link NodeSelectionSupport}. - * + * * @author Mark Paluch */ public interface NodeSelectionAsyncCommands extends BaseNodeSelectionAsyncCommands, diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java index ad290a4125..4893ffdeed 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.List; import java.util.Set; -import com.lambdaworks.redis.*; +import io.lettuce.core.*; /** * Asynchronous executed commands on a node selection for the Geo-API. * * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi */ public interface NodeSelectionGeoAsyncCommands { diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java index ac0226b4e8..4b08735426 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; /** * Asynchronous executed commands on a node selection for HyperLogLog (PF* commands). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 3.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi */ public interface NodeSelectionHLLAsyncCommands { diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java index 36433c2f61..452655df90 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.KeyValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Asynchronous executed commands on a node selection for Hashes (Key-Value pairs). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi */ public interface NodeSelectionHashAsyncCommands { /** * Delete one or more hash fields. - * + * * @param key the key * @param fields the field type: key * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing @@ -46,11 +46,11 @@ public interface NodeSelectionHashAsyncCommands { /** * Determine if a hash field exists. - * + * * @param key the key * @param field the field type: key * @return Boolean integer-reply specifically: - * + * * {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field}, * or {@code key} does not exist. */ @@ -58,7 +58,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Get the value of a hash field. - * + * * @param key the key * @param field the field type: key * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present @@ -68,7 +68,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Increment the integer value of a hash field by the given number. - * + * * @param key the key * @param field the field type: key * @param amount the increment type: long @@ -78,7 +78,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Increment the float value of a hash field by the given amount. - * + * * @param key the key * @param field the field type: key * @param amount the increment type: double @@ -88,7 +88,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Get all the fields and values in a hash. - * + * * @param key the key * @return Map<K,V> array-reply list of fields and their values stored in the hash, or an empty list when {@code key} * does not exist. @@ -97,17 +97,17 @@ public interface NodeSelectionHashAsyncCommands { /** * Stream over all the fields and values in a hash. - * + * * @param channel the channel * @param key the key - * + * * @return Long count of the keys. */ AsyncExecutions hgetall(KeyValueStreamingChannel channel, K key); /** * Get all the fields in a hash. - * + * * @param key the key * @return List<K> array-reply list of fields in the hash, or an empty list when {@code key} does not exist. */ @@ -115,17 +115,17 @@ public interface NodeSelectionHashAsyncCommands { /** * Stream over all the fields in a hash. - * + * * @param channel the channel * @param key the key - * + * * @return Long count of the keys. */ AsyncExecutions hkeys(KeyStreamingChannel channel, K key); /** * Get the number of fields in a hash. - * + * * @param key the key * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist. */ @@ -133,7 +133,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Get the values of all the given hash fields. - * + * * @param key the key * @param fields the field type: key * @return List<V> array-reply list of values associated with the given fields, in the same @@ -142,18 +142,18 @@ public interface NodeSelectionHashAsyncCommands { /** * Stream over the values of all the given hash fields. - * + * * @param channel the channel * @param key the key * @param fields the fields - * + * * @return Long count of the keys */ AsyncExecutions hmget(KeyValueStreamingChannel channel, K key, K... fields); /** * Set multiple hash fields to multiple values. - * + * * @param key the key * @param map the null * @return String simple-string-reply @@ -162,7 +162,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @return MapScanCursor<K, V> map scan cursor. */ @@ -170,7 +170,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanArgs scan arguments * @return MapScanCursor<K, V> map scan cursor. @@ -179,7 +179,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -189,7 +189,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return MapScanCursor<K, V> map scan cursor. @@ -198,7 +198,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @return StreamScanCursor scan cursor. @@ -207,7 +207,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanArgs scan arguments @@ -217,7 +217,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} @@ -228,7 +228,7 @@ public interface NodeSelectionHashAsyncCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java index 2bf737915e..2085ca4342 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.Date; import java.util.List; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Asynchronous executed commands on a node selection for Keys (Key manipulation/querying). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi */ public interface NodeSelectionKeyAsyncCommands { @@ -51,7 +51,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Return a serialized version of the value stored at the specified key. - * + * * @param key the key * @return byte[] bulk-string-reply the serialized value. */ @@ -67,11 +67,11 @@ public interface NodeSelectionKeyAsyncCommands { /** * Set a key's time to live in seconds. - * + * * @param key the key * @param seconds the seconds type: long * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set. */ @@ -79,11 +79,11 @@ public interface NodeSelectionKeyAsyncCommands { /** * Set the expiration for a key as a UNIX timestamp. - * + * * @param key the key * @param timestamp the timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -91,11 +91,11 @@ public interface NodeSelectionKeyAsyncCommands { /** * Set the expiration for a key as a UNIX timestamp. - * + * * @param key the key * @param timestamp the timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -103,7 +103,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Find all keys matching the given pattern. - * + * * @param pattern the pattern type: patternkey (pattern) * @return List<K> array-reply list of keys matching {@code pattern}. */ @@ -111,7 +111,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Find all keys matching the given pattern. - * + * * @param channel the channel * @param pattern the pattern * @return Long array-reply list of keys matching {@code pattern}. @@ -120,7 +120,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Atomically transfer a key from a Redis instance to another one. - * + * * @param host the host * @param port the port * @param key the key @@ -144,7 +144,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Move a key to another database. - * + * * @param key the key * @param db the db type: long * @return Boolean integer-reply specifically: @@ -153,7 +153,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * returns the kind of internal representation used in order to store the value associated with a key. - * + * * @param key the key * @return String */ @@ -162,7 +162,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write * operations). - * + * * @param key the key * @return number of seconds since the object stored at the specified key is idle. */ @@ -170,7 +170,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * returns the number of references of the value associated with the specified key. - * + * * @param key the key * @return Long */ @@ -178,10 +178,10 @@ public interface NodeSelectionKeyAsyncCommands { /** * Remove the expiration from a key. - * + * * @param key the key * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an * associated timeout. */ @@ -189,11 +189,11 @@ public interface NodeSelectionKeyAsyncCommands { /** * Set a key's time to live in milliseconds. - * + * * @param key the key * @param milliseconds the milliseconds type: long * @return integer-reply, specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set. */ @@ -201,11 +201,11 @@ public interface NodeSelectionKeyAsyncCommands { /** * Set the expiration for a key as a UNIX timestamp specified in milliseconds. - * + * * @param key the key * @param timestamp the milliseconds-timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -213,11 +213,11 @@ public interface NodeSelectionKeyAsyncCommands { /** * Set the expiration for a key as a UNIX timestamp specified in milliseconds. - * + * * @param key the key * @param timestamp the milliseconds-timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -225,7 +225,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Get the time to live for a key in milliseconds. - * + * * @param key the key * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description * above). @@ -234,14 +234,14 @@ public interface NodeSelectionKeyAsyncCommands { /** * Return a random key from the keyspace. - * + * * @return V bulk-string-reply the random key, or {@literal null} when the database is empty. */ AsyncExecutions randomkey(); /** * Rename a key. - * + * * @param key the key * @param newKey the newkey type: key * @return String simple-string-reply @@ -250,18 +250,18 @@ public interface NodeSelectionKeyAsyncCommands { /** * Rename a key, only if the new key does not exist. - * + * * @param key the key * @param newKey the newkey type: key * @return Boolean integer-reply specifically: - * + * * {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists. */ AsyncExecutions renamenx(K key, K newKey); /** * Create a key using the provided serialized value, previously obtained using DUMP. - * + * * @param key the key * @param ttl the ttl type: long * @param value the serialized-value type: string @@ -271,7 +271,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @return List<V> array-reply list of sorted elements. */ @@ -279,7 +279,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @return Long number of values. @@ -288,7 +288,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @param sortArgs sort arguments * @return List<V> array-reply list of sorted elements. @@ -297,7 +297,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param sortArgs sort arguments @@ -307,7 +307,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @param sortArgs sort arguments * @param destination the destination key to store sort results @@ -317,7 +317,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created. - * + * * @param keys the keys * @return Long integer-reply the number of found keys. */ @@ -333,7 +333,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Determine the type stored at key. - * + * * @param key the key * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist. */ @@ -341,14 +341,14 @@ public interface NodeSelectionKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @return KeyScanCursor<K> scan cursor. */ AsyncExecutions> scan(); /** * Incrementally iterate the keys space. - * + * * @param scanArgs scan arguments * @return KeyScanCursor<K> scan cursor. */ @@ -356,7 +356,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments * @return KeyScanCursor<K> scan cursor. @@ -365,7 +365,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return KeyScanCursor<K> scan cursor. */ @@ -373,7 +373,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @return StreamScanCursor scan cursor. */ @@ -381,7 +381,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanArgs scan arguments * @return StreamScanCursor scan cursor. @@ -390,7 +390,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -400,7 +400,7 @@ public interface NodeSelectionKeyAsyncCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return StreamScanCursor scan cursor. diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java index 9aab6b92de..4f0e04a710 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.List; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.KeyValue; +import io.lettuce.core.output.ValueStreamingChannel; /** * Asynchronous executed commands on a node selection for Lists. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi */ public interface NodeSelectionListAsyncCommands { /** * Remove and get the first element in a list, or block until one is available. - * + * * @param timeout the timeout in seconds * @param keys the keys * @return KeyValue<K,V> array-reply specifically: - * + * * A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk * with the first element being the name of the key where an element was popped and the second element being the * value of the popped element. @@ -46,11 +46,11 @@ public interface NodeSelectionListAsyncCommands { /** * Remove and get the last element in a list, or block until one is available. - * + * * @param timeout the timeout in seconds * @param keys the keys * @return KeyValue<K,V> array-reply specifically: - * + * * A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk * with the first element being the name of the key where an element was popped and the second element being the * value of the popped element. @@ -59,7 +59,7 @@ public interface NodeSelectionListAsyncCommands { /** * Pop a value from a list, push it to another list and return it; or block until one is available. - * + * * @param timeout the timeout in seconds * @param source the source key * @param destination the destination type: key @@ -70,7 +70,7 @@ public interface NodeSelectionListAsyncCommands { /** * Get an element from a list by its index. - * + * * @param key the key * @param index the index type: long * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range. @@ -79,7 +79,7 @@ public interface NodeSelectionListAsyncCommands { /** * Insert an element before or after another element in a list. - * + * * @param key the key * @param before the before * @param pivot the pivot @@ -91,7 +91,7 @@ public interface NodeSelectionListAsyncCommands { /** * Get the length of a list. - * + * * @param key the key * @return Long integer-reply the length of the list at {@code key}. */ @@ -99,7 +99,7 @@ public interface NodeSelectionListAsyncCommands { /** * Remove and get the first element in a list. - * + * * @param key the key * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist. */ @@ -107,7 +107,7 @@ public interface NodeSelectionListAsyncCommands { /** * Prepend one or multiple values to a list. - * + * * @param key the key * @param values the value * @return Long integer-reply the length of the list after the push operations. @@ -125,7 +125,7 @@ public interface NodeSelectionListAsyncCommands { /** * Get a range of elements from a list. - * + * * @param key the key * @param start the start type: long * @param stop the stop type: long @@ -135,7 +135,7 @@ public interface NodeSelectionListAsyncCommands { /** * Get a range of elements from a list. - * + * * @param channel the channel * @param key the key * @param start the start type: long @@ -146,7 +146,7 @@ public interface NodeSelectionListAsyncCommands { /** * Remove elements from a list. - * + * * @param key the key * @param count the count type: long * @param value the value @@ -156,7 +156,7 @@ public interface NodeSelectionListAsyncCommands { /** * Set the value of an element in a list by its index. - * + * * @param key the key * @param index the index type: long * @param value the value @@ -166,7 +166,7 @@ public interface NodeSelectionListAsyncCommands { /** * Trim a list to the specified range. - * + * * @param key the key * @param start the start type: long * @param stop the stop type: long @@ -176,7 +176,7 @@ public interface NodeSelectionListAsyncCommands { /** * Remove and get the last element in a list. - * + * * @param key the key * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist. */ @@ -184,7 +184,7 @@ public interface NodeSelectionListAsyncCommands { /** * Remove the last element in a list, append it to another list and return it. - * + * * @param source the source key * @param destination the destination type: key * @return V bulk-string-reply the element being popped and pushed. @@ -193,7 +193,7 @@ public interface NodeSelectionListAsyncCommands { /** * Append one or multiple values to a list. - * + * * @param key the key * @param values the value * @return Long integer-reply the length of the list after the push operation. diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java index 7e6ec4e76f..6d1abf2fd7 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.List; -import com.lambdaworks.redis.ScriptOutputType; +import io.lettuce.core.ScriptOutputType; /** * Asynchronous executed commands on a node selection for Scripting. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi */ public interface NodeSelectionScriptingAsyncCommands { /** * Execute a Lua script server side. - * + * * @param script Lua 5.1 script. * @param type output type * @param keys key names @@ -43,7 +43,7 @@ public interface NodeSelectionScriptingAsyncCommands { /** * Execute a Lua script server side. - * + * * @param script Lua 5.1 script. * @param type the type * @param keys the keys @@ -55,7 +55,7 @@ public interface NodeSelectionScriptingAsyncCommands { /** * Evaluates a script cached on the server side by its SHA1 digest - * + * * @param digest SHA1 of the script * @param type the type * @param keys the keys @@ -66,7 +66,7 @@ public interface NodeSelectionScriptingAsyncCommands { /** * Execute a Lua script server side. - * + * * @param digest SHA1 of the script * @param type the type * @param keys the keys @@ -78,7 +78,7 @@ public interface NodeSelectionScriptingAsyncCommands { /** * Check existence of scripts in the script cache. - * + * * @param digests script digests * @return List<Boolean> array-reply The command returns an array of integers that correspond to the specified SHA1 * digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1 @@ -88,21 +88,21 @@ public interface NodeSelectionScriptingAsyncCommands { /** * Remove all the scripts from the script cache. - * + * * @return String simple-string-reply */ AsyncExecutions scriptFlush(); /** * Kill the script currently in execution. - * + * * @return String simple-string-reply */ AsyncExecutions scriptKill(); /** * Load the specified Lua script into the script cache. - * + * * @param script script content * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache. */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java index aa73c895b0..0c14310977 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java @@ -13,49 +13,49 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.Date; import java.util.List; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.KillArgs; +import io.lettuce.core.protocol.CommandType; /** * Asynchronous executed commands on a node selection for Server Control. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi */ public interface NodeSelectionServerAsyncCommands { /** * Asynchronously rewrite the append-only file. - * + * * @return String simple-string-reply always {@code OK}. */ AsyncExecutions bgrewriteaof(); /** * Asynchronously save the dataset to disk. - * + * * @return String simple-string-reply */ AsyncExecutions bgsave(); /** * Get the current connection name. - * + * * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set. */ AsyncExecutions clientGetname(); /** * Set the current connection name. - * + * * @param name the client name * @return simple-string-reply {@code OK} if the connection name was successfully set. */ @@ -63,7 +63,7 @@ public interface NodeSelectionServerAsyncCommands { /** * Kill the connection of a client identified by ip:port. - * + * * @param addr ip:port * @return String simple-string-reply {@code OK} if the connection exists and has been closed */ @@ -79,7 +79,7 @@ public interface NodeSelectionServerAsyncCommands { /** * Stop processing commands from clients for some time. - * + * * @param timeout the timeout value in milliseconds * @return String simple-string-reply The command returns OK or an error if the timeout is invalid. */ @@ -87,7 +87,7 @@ public interface NodeSelectionServerAsyncCommands { /** * Get the list of client connections. - * + * * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF), * each line is composed of a succession of property=value fields separated by a space character. */ @@ -95,14 +95,14 @@ public interface NodeSelectionServerAsyncCommands { /** * Returns an array reply of details about all Redis commands. - * + * * @return List<Object> array-reply */ AsyncExecutions> command(); /** * Returns an array reply of details about the requested commands. - * + * * @param commands the commands to query for * @return List<Object> array-reply */ @@ -110,7 +110,7 @@ public interface NodeSelectionServerAsyncCommands { /** * Returns an array reply of details about the requested commands. - * + * * @param commands the commands to query for * @return List<Object> array-reply */ @@ -118,14 +118,14 @@ public interface NodeSelectionServerAsyncCommands { /** * Get total number of Redis commands. - * + * * @return Long integer-reply of number of total commands in this Redis server. */ AsyncExecutions commandCount(); /** * Get the value of a configuration parameter. - * + * * @param parameter name of the parameter * @return List<String> bulk-string-reply */ @@ -133,14 +133,14 @@ public interface NodeSelectionServerAsyncCommands { /** * Reset the stats returned by INFO. - * + * * @return String simple-string-reply always {@code OK}. */ AsyncExecutions configResetstat(); /** * Rewrite the configuration file with the in memory configuration. - * + * * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is * returned. */ @@ -148,7 +148,7 @@ public interface NodeSelectionServerAsyncCommands { /** * Set a configuration parameter to the given value. - * + * * @param parameter the parameter name * @param value the parameter value * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned. @@ -157,7 +157,7 @@ public interface NodeSelectionServerAsyncCommands { /** * Return the number of keys in the selected database. - * + * * @return Long integer-reply */ AsyncExecutions dbsize(); @@ -179,7 +179,7 @@ public interface NodeSelectionServerAsyncCommands { /** * Get debugging information about a key. - * + * * @param key the key * @return String simple-string-reply */ @@ -209,7 +209,7 @@ public interface NodeSelectionServerAsyncCommands { /** * Remove all keys from all databases. - * + * * @return String simple-string-reply */ AsyncExecutions flushall(); @@ -223,7 +223,7 @@ public interface NodeSelectionServerAsyncCommands { /** * Remove all keys from the current database. - * + * * @return String simple-string-reply */ AsyncExecutions flushdb(); @@ -237,14 +237,14 @@ public interface NodeSelectionServerAsyncCommands { /** * Get information and statistics about the server. - * + * * @return String bulk-string-reply as a collection of text lines. */ AsyncExecutions info(); /** * Get information and statistics about the server. - * + * * @param section the section type: string * @return String bulk-string-reply as a collection of text lines. */ @@ -252,21 +252,21 @@ public interface NodeSelectionServerAsyncCommands { /** * Get the UNIX time stamp of the last successful save to disk. - * + * * @return Date integer-reply an UNIX time stamp. */ AsyncExecutions lastsave(); /** * Synchronously save the dataset to disk. - * + * * @return String simple-string-reply The commands returns OK on success. */ AsyncExecutions save(); /** * Make the server a slave of another instance, or promote it as master. - * + * * @param host the host type: string * @param port the port type: string * @return String simple-string-reply @@ -275,21 +275,21 @@ public interface NodeSelectionServerAsyncCommands { /** * Promote server as master. - * + * * @return String simple-string-reply */ AsyncExecutions slaveofNoOne(); /** * Read the slow log. - * + * * @return List<Object> deeply nested multi bulk replies */ AsyncExecutions> slowlogGet(); /** * Read the slow log. - * + * * @param count the count * @return List<Object> deeply nested multi bulk replies */ @@ -297,25 +297,25 @@ public interface NodeSelectionServerAsyncCommands { /** * Obtaining the current length of the slow log. - * + * * @return Long length of the slow log. */ AsyncExecutions slowlogLen(); /** * Resetting the slow log. - * + * * @return String simple-string-reply The commands returns OK on success. */ AsyncExecutions slowlogReset(); /** * Return the current server time. - * + * * @return List<V> array-reply specifically: - * + * * A multi bulk reply containing two elements: - * + * * unix time in seconds. microseconds. */ AsyncExecutions> time(); diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java index 6986a9b072..5aa225e87f 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.List; import java.util.Set; -import com.lambdaworks.redis.ScanArgs; -import com.lambdaworks.redis.ScanCursor; -import com.lambdaworks.redis.StreamScanCursor; -import com.lambdaworks.redis.ValueScanCursor; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.ScanArgs; +import io.lettuce.core.ScanCursor; +import io.lettuce.core.StreamScanCursor; +import io.lettuce.core.ValueScanCursor; +import io.lettuce.core.output.ValueStreamingChannel; /** * Asynchronous executed commands on a node selection for Sets. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi */ public interface NodeSelectionSetAsyncCommands { /** * Add one or more members to a set. - * + * * @param key the key * @param members the member type: value * @return Long integer-reply the number of elements that were added to the set, not including all the elements already @@ -47,7 +47,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Get the number of members in a set. - * + * * @param key the key * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not * exist. @@ -56,7 +56,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Subtract multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -64,7 +64,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Subtract multiple sets. - * + * * @param channel the channel * @param keys the keys * @return Long count of members of the resulting set. @@ -73,7 +73,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Subtract multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -82,7 +82,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Intersect multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -90,7 +90,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Intersect multiple sets. - * + * * @param channel the channel * @param keys the keys * @return Long count of members of the resulting set. @@ -99,7 +99,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Intersect multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -108,11 +108,11 @@ public interface NodeSelectionSetAsyncCommands { /** * Determine if a given value is a member of a set. - * + * * @param key the key * @param member the member type: value * @return Boolean integer-reply specifically: - * + * * {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the * set, or if {@code key} does not exist. */ @@ -120,12 +120,12 @@ public interface NodeSelectionSetAsyncCommands { /** * Move a member from one set to another. - * + * * @param source the source key * @param destination the destination type: key * @param member the member type: value * @return Boolean integer-reply specifically: - * + * * {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no * operation was performed. */ @@ -133,7 +133,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Get all the members in a set. - * + * * @param key the key * @return Set<V> array-reply all elements of the set. */ @@ -141,7 +141,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Get all the members in a set. - * + * * @param channel the channel * @param key the keys * @return Long count of members of the resulting set. @@ -150,7 +150,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Remove and return a random member from a set. - * + * * @param key the key * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist. */ @@ -167,9 +167,9 @@ public interface NodeSelectionSetAsyncCommands { /** * Get one random member from a set. - * + * * @param key the key - * + * * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the * randomly selected element, or {@literal null} when {@code key} does not exist. */ @@ -177,7 +177,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Get one or multiple random members from a set. - * + * * @param key the key * @param count the count type: long * @return Set<V> bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply @@ -187,7 +187,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Get one or multiple random members from a set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param count the count @@ -197,7 +197,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Remove one or more members from a set. - * + * * @param key the key * @param members the member type: value * @return Long integer-reply the number of members that were removed from the set, not including non existing members. @@ -206,7 +206,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Add multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -214,7 +214,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Add multiple sets. - * + * * @param channel streaming channel that receives a call for every value * @param keys the keys * @return Long count of members of the resulting set. @@ -223,7 +223,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Add multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -232,7 +232,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @return ValueScanCursor<V> scan cursor. */ @@ -240,7 +240,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanArgs scan arguments * @return ValueScanCursor<V> scan cursor. @@ -249,7 +249,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -259,7 +259,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return ValueScanCursor<V> scan cursor. @@ -268,7 +268,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @return StreamScanCursor scan cursor. @@ -277,7 +277,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanArgs scan arguments @@ -287,7 +287,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} @@ -298,7 +298,7 @@ public interface NodeSelectionSetAsyncCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java index 2824320f06..9170a8cb66 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java @@ -13,34 +13,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.List; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.ScoredValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.ScoredValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Asynchronous executed commands on a node selection for Sorted Sets. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi */ public interface NodeSelectionSortedSetAsyncCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param score the score * @param member the member - * + * * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -48,11 +48,11 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...) * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -60,11 +60,11 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param scoredValues the scored values * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -100,12 +100,12 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the ke * @param zAddArgs arguments for zadd * @param scoredValues the scored values * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -137,7 +137,7 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Get the number of members in a sorted set. - * + * * @param key the key * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key} * does not exist. @@ -146,7 +146,7 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Count the members in a sorted set with scores within the given values. - * + * * @param key the key * @param min min score * @param max max score @@ -158,7 +158,7 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Count the members in a sorted set with scores within the given values. - * + * * @param key the key * @param min min score * @param max max score @@ -180,7 +180,7 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Increment the score of a member in a sorted set. - * + * * @param key the key * @param amount the increment type: long * @param member the member type: key @@ -191,7 +191,7 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Intersect multiple sorted sets and store the resulting sorted set in a new key. - * + * * @param destination the destination * @param keys the keys * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}. @@ -200,7 +200,7 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Intersect multiple sorted sets and store the resulting sorted set in a new key. - * + * * @param destination the destination * @param storeArgs the storeArgs * @param keys the keys @@ -394,7 +394,7 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -407,7 +407,7 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -431,7 +431,7 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Stream over range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -446,7 +446,7 @@ public interface NodeSelectionSortedSetAsyncCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java index 43aaa246f1..f60a119346 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.BitFieldArgs; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.SetArgs; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; +import io.lettuce.core.BitFieldArgs; +import io.lettuce.core.KeyValue; +import io.lettuce.core.SetArgs; +import io.lettuce.core.output.KeyValueStreamingChannel; /** * Asynchronous executed commands on a node selection for Strings. @@ -30,7 +30,7 @@ * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi */ public interface NodeSelectionStringAsyncCommands { diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java index fc913e0941..25941a6363 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.List; import java.util.Map; import java.util.function.Predicate; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.async.RedisKeyAsyncCommands; -import com.lambdaworks.redis.api.async.RedisScriptingAsyncCommands; -import com.lambdaworks.redis.api.async.RedisServerAsyncCommands; -import com.lambdaworks.redis.api.async.RedisStringAsyncCommands; -import com.lambdaworks.redis.cluster.ClusterClientOptions; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.output.KeyStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.api.async.RedisKeyAsyncCommands; +import io.lettuce.core.api.async.RedisScriptingAsyncCommands; +import io.lettuce.core.api.async.RedisServerAsyncCommands; +import io.lettuce.core.api.async.RedisStringAsyncCommands; +import io.lettuce.core.cluster.ClusterClientOptions; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.output.KeyStreamingChannel; /** * Advanced asynchronous and thread-safe Redis Cluster API. diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java index 9e63cd812a..376015f524 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.api.async.*; +import io.lettuce.core.KeyValue; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.api.async.*; /** * A complete asynchronous and thread-safe cluster Redis API with 400+ Methods. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -39,7 +39,7 @@ public interface RedisClusterAsyncCommands /** * Set the default timeout for operations. - * + * * @param timeout the timeout value * @param unit the unit of the timeout value */ @@ -47,7 +47,7 @@ public interface RedisClusterAsyncCommands /** * Authenticate to the server. - * + * * @param password the password * @return String simple-string-reply */ @@ -149,7 +149,7 @@ public interface RedisClusterAsyncCommands /** * Obtain details about all cluster nodes. Can be parsed using - * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse} + * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse} * * @return String bulk-string-reply as a collection of text lines */ @@ -157,7 +157,7 @@ public interface RedisClusterAsyncCommands /** * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using - * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse} + * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse} * * @param nodeId node id of the master node * @return List<String> array-reply list of slaves. The command returns data in the same format as @@ -195,7 +195,7 @@ public interface RedisClusterAsyncCommands /** * Returns an integer identifying the hash slot the specified key hashes to. This command is mainly useful for debugging and * testing, since it exposes via an API the underlying Redis implementation of the hashing algorithm. Basically the same as - * {@link com.lambdaworks.redis.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem. + * {@link io.lettuce.core.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem. * * @param key the key. * @return Integer reply: The hash slot number. @@ -223,7 +223,7 @@ public interface RedisClusterAsyncCommands /** * Get array of cluster slots to node mappings. - * + * * @return RedisFuture<List<Object>> array-reply nested list of slot ranges with IP/Port mappings. */ RedisFuture> clusterSlots(); diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/package-info.java b/src/main/java/io/lettuce/core/cluster/api/async/package-info.java similarity index 57% rename from src/main/java/com/lambdaworks/redis/cluster/api/async/package-info.java rename to src/main/java/io/lettuce/core/cluster/api/async/package-info.java index ed12267be8..c1297ebb83 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/async/package-info.java +++ b/src/main/java/io/lettuce/core/cluster/api/async/package-info.java @@ -1,4 +1,4 @@ /** * Redis Cluster API for asynchronous executed commands. */ -package com.lambdaworks.redis.cluster.api.async; +package io.lettuce.core.cluster.api.async; diff --git a/src/main/java/io/lettuce/core/cluster/api/package-info.java b/src/main/java/io/lettuce/core/cluster/api/package-info.java new file mode 100644 index 0000000000..3d6f8eb663 --- /dev/null +++ b/src/main/java/io/lettuce/core/cluster/api/package-info.java @@ -0,0 +1,4 @@ +/** + * Redis Cluster connection API. + */ +package io.lettuce.core.cluster.api; diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java b/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java rename to src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java index 264b234d4a..e4c4080b3c 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java +++ b/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.reactive; +package io.lettuce.core.cluster.api.reactive; import java.util.Collection; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; import reactor.core.publisher.Flux; @@ -31,7 +31,7 @@ public interface ReactiveExecutions { /** * Return a {@link Flux} that contains a combined stream of the multi-node execution. - * + * * @return */ Flux flux(); diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java rename to src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java index 9da78d7d24..cc3a3bf356 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.reactive; +package io.lettuce.core.cluster.api.reactive; import java.util.Map; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.reactive.RedisKeyReactiveCommands; -import com.lambdaworks.redis.api.reactive.RedisScriptingReactiveCommands; -import com.lambdaworks.redis.api.reactive.RedisServerReactiveCommands; -import com.lambdaworks.redis.api.reactive.RedisStringReactiveCommands; -import com.lambdaworks.redis.cluster.ClusterClientOptions; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.output.KeyStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.api.reactive.RedisKeyReactiveCommands; +import io.lettuce.core.api.reactive.RedisScriptingReactiveCommands; +import io.lettuce.core.api.reactive.RedisServerReactiveCommands; +import io.lettuce.core.api.reactive.RedisStringReactiveCommands; +import io.lettuce.core.cluster.ClusterClientOptions; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.output.KeyStreamingChannel; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java rename to src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java index 0808aacaf8..7a17470333 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.reactive; +package io.lettuce.core.cluster.api.reactive; import java.util.Map; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.api.reactive.*; +import io.lettuce.core.KeyValue; +import io.lettuce.core.api.reactive.*; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; /** * A complete reactive and thread-safe cluster Redis API with 400+ Methods. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -39,7 +39,7 @@ public interface RedisClusterReactiveCommands extends RedisHashReactiveCom /** * Set the default timeout for operations. - * + * * @param timeout the timeout value * @param unit the unit of the timeout value */ @@ -47,7 +47,7 @@ public interface RedisClusterReactiveCommands extends RedisHashReactiveCom /** * Authenticate to the server. - * + * * @param password the password * @return String simple-string-reply */ @@ -149,7 +149,7 @@ public interface RedisClusterReactiveCommands extends RedisHashReactiveCom /** * Obtain details about all cluster nodes. Can be parsed using - * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse} + * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse} * * @return String bulk-string-reply as a collection of text lines */ @@ -157,7 +157,7 @@ public interface RedisClusterReactiveCommands extends RedisHashReactiveCom /** * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using - * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse} + * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse} * * @param nodeId node id of the master node * @return List<String> array-reply list of slaves. The command returns data in the same format as @@ -195,7 +195,7 @@ public interface RedisClusterReactiveCommands extends RedisHashReactiveCom /** * Returns an integer identifying the hash slot the specified key hashes to. This command is mainly useful for debugging and * testing, since it exposes via an API the underlying Redis implementation of the hashing algorithm. Basically the same as - * {@link com.lambdaworks.redis.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem. + * {@link io.lettuce.core.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem. * * @param key the key. * @return Integer reply: The hash slot number. diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java b/src/main/java/io/lettuce/core/cluster/api/reactive/package-info.java similarity index 58% rename from src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java rename to src/main/java/io/lettuce/core/cluster/api/reactive/package-info.java index 30e8b76556..d24fca4350 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java +++ b/src/main/java/io/lettuce/core/cluster/api/reactive/package-info.java @@ -1,4 +1,4 @@ /** * Redis Cluster API for commands executed in a reactive manner. */ -package com.lambdaworks.redis.cluster.api.reactive; +package io.lettuce.core.cluster.api.reactive; diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java index 834b4b8cfd..bf4bf606e8 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.List; import java.util.Map; /** - * + * * Synchronous executed commands on a node selection for basic commands. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi */ public interface BaseNodeSelectionCommands { /** * Post a message to a channel. - * + * * @param channel the channel type: key * @param message the message type: value * @return Long integer-reply the number of clients that received the message. @@ -41,14 +41,14 @@ public interface BaseNodeSelectionCommands { /** * Lists the currently *active channels*. - * + * * @return List<K> array-reply a list of active channels, optionally matching the specified pattern. */ Executions> pubsubChannels(); /** * Lists the currently *active channels*. - * + * * @param channel the key * @return List<K> array-reply a list of active channels, optionally matching the specified pattern. */ @@ -64,14 +64,14 @@ public interface BaseNodeSelectionCommands { /** * Returns the number of subscriptions to patterns. - * + * * @return Long integer-reply the number of patterns all the clients are subscribed to. */ Executions pubsubNumpat(); /** * Echo the given string. - * + * * @param msg the message type: value * @return V bulk-string-reply */ @@ -87,21 +87,21 @@ public interface BaseNodeSelectionCommands { /** * Ping the server. - * + * * @return String simple-string-reply */ Executions ping(); /** * Close the connection. - * + * * @return String simple-string-reply always OK. */ Executions quit(); /** * Wait for replication. - * + * * @param replicas minimum number of replicas * @param timeout timeout in milliseconds * @return number of replicas diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java b/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java rename to src/main/java/io/lettuce/core/cluster/api/sync/Executions.java index 302b1206f2..d13a85dd73 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.*; import java.util.concurrent.CompletionStage; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * Result holder for a command that was executed synchronously on multiple nodes. - * + * * @author Mark Paluch * @since 4.0 */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java similarity index 85% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java index 1f330a9449..d78c1b767d 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.api.NodeSelectionSupport; /** * Node selection with access to synchronous executed commands on the set. Commands are triggered concurrently to the selected * nodes and synchronized afterwards. - * + * * @author Mark Paluch * @since 4.0 */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java index e85baa1f00..3c3e95f193 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; +import io.lettuce.core.cluster.api.NodeSelectionSupport; /** * Synchronous and thread-safe Redis API to execute commands on a {@link NodeSelectionSupport}. - * + * * @author Mark Paluch */ public interface NodeSelectionCommands extends BaseNodeSelectionCommands, NodeSelectionHashCommands, diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java index fce9623874..b4f45c4fa9 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.List; import java.util.Set; -import com.lambdaworks.redis.*; +import io.lettuce.core.*; /** * Synchronous executed commands on a node selection for the Geo-API. * * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi */ public interface NodeSelectionGeoCommands { diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHLLCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHLLCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java index 29f124010a..b7ff92766d 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHLLCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; /** * Synchronous executed commands on a node selection for HyperLogLog (PF* commands). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 3.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi */ public interface NodeSelectionHLLCommands { diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java index 2c4764680e..67f9e8c3bb 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.KeyValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Synchronous executed commands on a node selection for Hashes (Key-Value pairs). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi */ public interface NodeSelectionHashCommands { /** * Delete one or more hash fields. - * + * * @param key the key * @param fields the field type: key * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing @@ -46,11 +46,11 @@ public interface NodeSelectionHashCommands { /** * Determine if a hash field exists. - * + * * @param key the key * @param field the field type: key * @return Boolean integer-reply specifically: - * + * * {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field}, * or {@code key} does not exist. */ @@ -58,7 +58,7 @@ public interface NodeSelectionHashCommands { /** * Get the value of a hash field. - * + * * @param key the key * @param field the field type: key * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present @@ -68,7 +68,7 @@ public interface NodeSelectionHashCommands { /** * Increment the integer value of a hash field by the given number. - * + * * @param key the key * @param field the field type: key * @param amount the increment type: long @@ -78,7 +78,7 @@ public interface NodeSelectionHashCommands { /** * Increment the float value of a hash field by the given amount. - * + * * @param key the key * @param field the field type: key * @param amount the increment type: double @@ -88,7 +88,7 @@ public interface NodeSelectionHashCommands { /** * Get all the fields and values in a hash. - * + * * @param key the key * @return Map<K,V> array-reply list of fields and their values stored in the hash, or an empty list when {@code key} * does not exist. @@ -97,17 +97,17 @@ public interface NodeSelectionHashCommands { /** * Stream over all the fields and values in a hash. - * + * * @param channel the channel * @param key the key - * + * * @return Long count of the keys. */ Executions hgetall(KeyValueStreamingChannel channel, K key); /** * Get all the fields in a hash. - * + * * @param key the key * @return List<K> array-reply list of fields in the hash, or an empty list when {@code key} does not exist. */ @@ -115,17 +115,17 @@ public interface NodeSelectionHashCommands { /** * Stream over all the fields in a hash. - * + * * @param channel the channel * @param key the key - * + * * @return Long count of the keys. */ Executions hkeys(KeyStreamingChannel channel, K key); /** * Get the number of fields in a hash. - * + * * @param key the key * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist. */ @@ -133,7 +133,7 @@ public interface NodeSelectionHashCommands { /** * Get the values of all the given hash fields. - * + * * @param key the key * @param fields the field type: key * @return List<V> array-reply list of values associated with the given fields, in the same @@ -142,18 +142,18 @@ public interface NodeSelectionHashCommands { /** * Stream over the values of all the given hash fields. - * + * * @param channel the channel * @param key the key * @param fields the fields - * + * * @return Long count of the keys */ Executions hmget(KeyValueStreamingChannel channel, K key, K... fields); /** * Set multiple hash fields to multiple values. - * + * * @param key the key * @param map the null * @return String simple-string-reply @@ -162,7 +162,7 @@ public interface NodeSelectionHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @return MapScanCursor<K, V> map scan cursor. */ @@ -170,7 +170,7 @@ public interface NodeSelectionHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanArgs scan arguments * @return MapScanCursor<K, V> map scan cursor. @@ -179,7 +179,7 @@ public interface NodeSelectionHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -189,7 +189,7 @@ public interface NodeSelectionHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return MapScanCursor<K, V> map scan cursor. @@ -198,7 +198,7 @@ public interface NodeSelectionHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @return StreamScanCursor scan cursor. @@ -207,7 +207,7 @@ public interface NodeSelectionHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanArgs scan arguments @@ -217,7 +217,7 @@ public interface NodeSelectionHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} @@ -228,7 +228,7 @@ public interface NodeSelectionHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java index d241449851..07e44f5c46 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.Date; import java.util.List; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Synchronous executed commands on a node selection for Keys (Key manipulation/querying). - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi */ public interface NodeSelectionKeyCommands { @@ -51,7 +51,7 @@ public interface NodeSelectionKeyCommands { /** * Return a serialized version of the value stored at the specified key. - * + * * @param key the key * @return byte[] bulk-string-reply the serialized value. */ @@ -67,11 +67,11 @@ public interface NodeSelectionKeyCommands { /** * Set a key's time to live in seconds. - * + * * @param key the key * @param seconds the seconds type: long * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set. */ @@ -79,11 +79,11 @@ public interface NodeSelectionKeyCommands { /** * Set the expiration for a key as a UNIX timestamp. - * + * * @param key the key * @param timestamp the timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -91,11 +91,11 @@ public interface NodeSelectionKeyCommands { /** * Set the expiration for a key as a UNIX timestamp. - * + * * @param key the key * @param timestamp the timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -103,7 +103,7 @@ public interface NodeSelectionKeyCommands { /** * Find all keys matching the given pattern. - * + * * @param pattern the pattern type: patternkey (pattern) * @return List<K> array-reply list of keys matching {@code pattern}. */ @@ -111,7 +111,7 @@ public interface NodeSelectionKeyCommands { /** * Find all keys matching the given pattern. - * + * * @param channel the channel * @param pattern the pattern * @return Long array-reply list of keys matching {@code pattern}. @@ -120,7 +120,7 @@ public interface NodeSelectionKeyCommands { /** * Atomically transfer a key from a Redis instance to another one. - * + * * @param host the host * @param port the port * @param key the key @@ -144,7 +144,7 @@ public interface NodeSelectionKeyCommands { /** * Move a key to another database. - * + * * @param key the key * @param db the db type: long * @return Boolean integer-reply specifically: @@ -153,7 +153,7 @@ public interface NodeSelectionKeyCommands { /** * returns the kind of internal representation used in order to store the value associated with a key. - * + * * @param key the key * @return String */ @@ -162,7 +162,7 @@ public interface NodeSelectionKeyCommands { /** * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write * operations). - * + * * @param key the key * @return number of seconds since the object stored at the specified key is idle. */ @@ -170,7 +170,7 @@ public interface NodeSelectionKeyCommands { /** * returns the number of references of the value associated with the specified key. - * + * * @param key the key * @return Long */ @@ -178,10 +178,10 @@ public interface NodeSelectionKeyCommands { /** * Remove the expiration from a key. - * + * * @param key the key * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an * associated timeout. */ @@ -189,11 +189,11 @@ public interface NodeSelectionKeyCommands { /** * Set a key's time to live in milliseconds. - * + * * @param key the key * @param milliseconds the milliseconds type: long * @return integer-reply, specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set. */ @@ -201,11 +201,11 @@ public interface NodeSelectionKeyCommands { /** * Set the expiration for a key as a UNIX timestamp specified in milliseconds. - * + * * @param key the key * @param timestamp the milliseconds-timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -213,11 +213,11 @@ public interface NodeSelectionKeyCommands { /** * Set the expiration for a key as a UNIX timestamp specified in milliseconds. - * + * * @param key the key * @param timestamp the milliseconds-timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -225,7 +225,7 @@ public interface NodeSelectionKeyCommands { /** * Get the time to live for a key in milliseconds. - * + * * @param key the key * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description * above). @@ -234,14 +234,14 @@ public interface NodeSelectionKeyCommands { /** * Return a random key from the keyspace. - * + * * @return V bulk-string-reply the random key, or {@literal null} when the database is empty. */ Executions randomkey(); /** * Rename a key. - * + * * @param key the key * @param newKey the newkey type: key * @return String simple-string-reply @@ -250,18 +250,18 @@ public interface NodeSelectionKeyCommands { /** * Rename a key, only if the new key does not exist. - * + * * @param key the key * @param newKey the newkey type: key * @return Boolean integer-reply specifically: - * + * * {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists. */ Executions renamenx(K key, K newKey); /** * Create a key using the provided serialized value, previously obtained using DUMP. - * + * * @param key the key * @param ttl the ttl type: long * @param value the serialized-value type: string @@ -271,7 +271,7 @@ public interface NodeSelectionKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @return List<V> array-reply list of sorted elements. */ @@ -279,7 +279,7 @@ public interface NodeSelectionKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @return Long number of values. @@ -288,7 +288,7 @@ public interface NodeSelectionKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @param sortArgs sort arguments * @return List<V> array-reply list of sorted elements. @@ -297,7 +297,7 @@ public interface NodeSelectionKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param sortArgs sort arguments @@ -307,7 +307,7 @@ public interface NodeSelectionKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @param sortArgs sort arguments * @param destination the destination key to store sort results @@ -317,7 +317,7 @@ public interface NodeSelectionKeyCommands { /** * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created. - * + * * @param keys the keys * @return Long integer-reply the number of found keys. */ @@ -333,7 +333,7 @@ public interface NodeSelectionKeyCommands { /** * Determine the type stored at key. - * + * * @param key the key * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist. */ @@ -341,14 +341,14 @@ public interface NodeSelectionKeyCommands { /** * Incrementally iterate the keys space. - * + * * @return KeyScanCursor<K> scan cursor. */ Executions> scan(); /** * Incrementally iterate the keys space. - * + * * @param scanArgs scan arguments * @return KeyScanCursor<K> scan cursor. */ @@ -356,7 +356,7 @@ public interface NodeSelectionKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments * @return KeyScanCursor<K> scan cursor. @@ -365,7 +365,7 @@ public interface NodeSelectionKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return KeyScanCursor<K> scan cursor. */ @@ -373,7 +373,7 @@ public interface NodeSelectionKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @return StreamScanCursor scan cursor. */ @@ -381,7 +381,7 @@ public interface NodeSelectionKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanArgs scan arguments * @return StreamScanCursor scan cursor. @@ -390,7 +390,7 @@ public interface NodeSelectionKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -400,7 +400,7 @@ public interface NodeSelectionKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return StreamScanCursor scan cursor. diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java index e6d5484183..40587e53b5 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.List; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.KeyValue; +import io.lettuce.core.output.ValueStreamingChannel; /** * Synchronous executed commands on a node selection for Lists. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi */ public interface NodeSelectionListCommands { /** * Remove and get the first element in a list, or block until one is available. - * + * * @param timeout the timeout in seconds * @param keys the keys * @return KeyValue<K,V> array-reply specifically: - * + * * A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk * with the first element being the name of the key where an element was popped and the second element being the * value of the popped element. @@ -46,11 +46,11 @@ public interface NodeSelectionListCommands { /** * Remove and get the last element in a list, or block until one is available. - * + * * @param timeout the timeout in seconds * @param keys the keys * @return KeyValue<K,V> array-reply specifically: - * + * * A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk * with the first element being the name of the key where an element was popped and the second element being the * value of the popped element. @@ -59,7 +59,7 @@ public interface NodeSelectionListCommands { /** * Pop a value from a list, push it to another list and return it; or block until one is available. - * + * * @param timeout the timeout in seconds * @param source the source key * @param destination the destination type: key @@ -70,7 +70,7 @@ public interface NodeSelectionListCommands { /** * Get an element from a list by its index. - * + * * @param key the key * @param index the index type: long * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range. @@ -79,7 +79,7 @@ public interface NodeSelectionListCommands { /** * Insert an element before or after another element in a list. - * + * * @param key the key * @param before the before * @param pivot the pivot @@ -91,7 +91,7 @@ public interface NodeSelectionListCommands { /** * Get the length of a list. - * + * * @param key the key * @return Long integer-reply the length of the list at {@code key}. */ @@ -99,7 +99,7 @@ public interface NodeSelectionListCommands { /** * Remove and get the first element in a list. - * + * * @param key the key * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist. */ @@ -107,7 +107,7 @@ public interface NodeSelectionListCommands { /** * Prepend one or multiple values to a list. - * + * * @param key the key * @param values the value * @return Long integer-reply the length of the list after the push operations. @@ -125,7 +125,7 @@ public interface NodeSelectionListCommands { /** * Get a range of elements from a list. - * + * * @param key the key * @param start the start type: long * @param stop the stop type: long @@ -135,7 +135,7 @@ public interface NodeSelectionListCommands { /** * Get a range of elements from a list. - * + * * @param channel the channel * @param key the key * @param start the start type: long @@ -146,7 +146,7 @@ public interface NodeSelectionListCommands { /** * Remove elements from a list. - * + * * @param key the key * @param count the count type: long * @param value the value @@ -156,7 +156,7 @@ public interface NodeSelectionListCommands { /** * Set the value of an element in a list by its index. - * + * * @param key the key * @param index the index type: long * @param value the value @@ -166,7 +166,7 @@ public interface NodeSelectionListCommands { /** * Trim a list to the specified range. - * + * * @param key the key * @param start the start type: long * @param stop the stop type: long @@ -176,7 +176,7 @@ public interface NodeSelectionListCommands { /** * Remove and get the last element in a list. - * + * * @param key the key * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist. */ @@ -184,7 +184,7 @@ public interface NodeSelectionListCommands { /** * Remove the last element in a list, append it to another list and return it. - * + * * @param source the source key * @param destination the destination type: key * @return V bulk-string-reply the element being popped and pushed. @@ -193,7 +193,7 @@ public interface NodeSelectionListCommands { /** * Append one or multiple values to a list. - * + * * @param key the key * @param values the value * @return Long integer-reply the length of the list after the push operation. diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java index c8498524ba..fc6455d6e7 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.List; -import com.lambdaworks.redis.ScriptOutputType; +import io.lettuce.core.ScriptOutputType; /** * Synchronous executed commands on a node selection for Scripting. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi */ public interface NodeSelectionScriptingCommands { /** * Execute a Lua script server side. - * + * * @param script Lua 5.1 script. * @param type output type * @param keys key names @@ -43,7 +43,7 @@ public interface NodeSelectionScriptingCommands { /** * Execute a Lua script server side. - * + * * @param script Lua 5.1 script. * @param type the type * @param keys the keys @@ -55,7 +55,7 @@ public interface NodeSelectionScriptingCommands { /** * Evaluates a script cached on the server side by its SHA1 digest - * + * * @param digest SHA1 of the script * @param type the type * @param keys the keys @@ -66,7 +66,7 @@ public interface NodeSelectionScriptingCommands { /** * Execute a Lua script server side. - * + * * @param digest SHA1 of the script * @param type the type * @param keys the keys @@ -78,7 +78,7 @@ public interface NodeSelectionScriptingCommands { /** * Check existence of scripts in the script cache. - * + * * @param digests script digests * @return List<Boolean> array-reply The command returns an array of integers that correspond to the specified SHA1 * digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1 @@ -88,21 +88,21 @@ public interface NodeSelectionScriptingCommands { /** * Remove all the scripts from the script cache. - * + * * @return String simple-string-reply */ Executions scriptFlush(); /** * Kill the script currently in execution. - * + * * @return String simple-string-reply */ Executions scriptKill(); /** * Load the specified Lua script into the script cache. - * + * * @param script script content * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache. */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java index 4779b8beec..4136f59b4a 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java @@ -13,49 +13,49 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.Date; import java.util.List; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.KillArgs; +import io.lettuce.core.protocol.CommandType; /** * Synchronous executed commands on a node selection for Server Control. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi */ public interface NodeSelectionServerCommands { /** * Asynchronously rewrite the append-only file. - * + * * @return String simple-string-reply always {@code OK}. */ Executions bgrewriteaof(); /** * Asynchronously save the dataset to disk. - * + * * @return String simple-string-reply */ Executions bgsave(); /** * Get the current connection name. - * + * * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set. */ Executions clientGetname(); /** * Set the current connection name. - * + * * @param name the client name * @return simple-string-reply {@code OK} if the connection name was successfully set. */ @@ -63,7 +63,7 @@ public interface NodeSelectionServerCommands { /** * Kill the connection of a client identified by ip:port. - * + * * @param addr ip:port * @return String simple-string-reply {@code OK} if the connection exists and has been closed */ @@ -79,7 +79,7 @@ public interface NodeSelectionServerCommands { /** * Stop processing commands from clients for some time. - * + * * @param timeout the timeout value in milliseconds * @return String simple-string-reply The command returns OK or an error if the timeout is invalid. */ @@ -87,7 +87,7 @@ public interface NodeSelectionServerCommands { /** * Get the list of client connections. - * + * * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF), * each line is composed of a succession of property=value fields separated by a space character. */ @@ -95,14 +95,14 @@ public interface NodeSelectionServerCommands { /** * Returns an array reply of details about all Redis commands. - * + * * @return List<Object> array-reply */ Executions> command(); /** * Returns an array reply of details about the requested commands. - * + * * @param commands the commands to query for * @return List<Object> array-reply */ @@ -110,7 +110,7 @@ public interface NodeSelectionServerCommands { /** * Returns an array reply of details about the requested commands. - * + * * @param commands the commands to query for * @return List<Object> array-reply */ @@ -118,14 +118,14 @@ public interface NodeSelectionServerCommands { /** * Get total number of Redis commands. - * + * * @return Long integer-reply of number of total commands in this Redis server. */ Executions commandCount(); /** * Get the value of a configuration parameter. - * + * * @param parameter name of the parameter * @return List<String> bulk-string-reply */ @@ -133,14 +133,14 @@ public interface NodeSelectionServerCommands { /** * Reset the stats returned by INFO. - * + * * @return String simple-string-reply always {@code OK}. */ Executions configResetstat(); /** * Rewrite the configuration file with the in memory configuration. - * + * * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is * returned. */ @@ -148,7 +148,7 @@ public interface NodeSelectionServerCommands { /** * Set a configuration parameter to the given value. - * + * * @param parameter the parameter name * @param value the parameter value * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned. @@ -157,7 +157,7 @@ public interface NodeSelectionServerCommands { /** * Return the number of keys in the selected database. - * + * * @return Long integer-reply */ Executions dbsize(); @@ -179,7 +179,7 @@ public interface NodeSelectionServerCommands { /** * Get debugging information about a key. - * + * * @param key the key * @return String simple-string-reply */ @@ -209,7 +209,7 @@ public interface NodeSelectionServerCommands { /** * Remove all keys from all databases. - * + * * @return String simple-string-reply */ Executions flushall(); @@ -223,7 +223,7 @@ public interface NodeSelectionServerCommands { /** * Remove all keys from the current database. - * + * * @return String simple-string-reply */ Executions flushdb(); @@ -237,14 +237,14 @@ public interface NodeSelectionServerCommands { /** * Get information and statistics about the server. - * + * * @return String bulk-string-reply as a collection of text lines. */ Executions info(); /** * Get information and statistics about the server. - * + * * @param section the section type: string * @return String bulk-string-reply as a collection of text lines. */ @@ -252,21 +252,21 @@ public interface NodeSelectionServerCommands { /** * Get the UNIX time stamp of the last successful save to disk. - * + * * @return Date integer-reply an UNIX time stamp. */ Executions lastsave(); /** * Synchronously save the dataset to disk. - * + * * @return String simple-string-reply The commands returns OK on success. */ Executions save(); /** * Make the server a slave of another instance, or promote it as master. - * + * * @param host the host type: string * @param port the port type: string * @return String simple-string-reply @@ -275,21 +275,21 @@ public interface NodeSelectionServerCommands { /** * Promote server as master. - * + * * @return String simple-string-reply */ Executions slaveofNoOne(); /** * Read the slow log. - * + * * @return List<Object> deeply nested multi bulk replies */ Executions> slowlogGet(); /** * Read the slow log. - * + * * @param count the count * @return List<Object> deeply nested multi bulk replies */ @@ -297,25 +297,25 @@ public interface NodeSelectionServerCommands { /** * Obtaining the current length of the slow log. - * + * * @return Long length of the slow log. */ Executions slowlogLen(); /** * Resetting the slow log. - * + * * @return String simple-string-reply The commands returns OK on success. */ Executions slowlogReset(); /** * Return the current server time. - * + * * @return List<V> array-reply specifically: - * + * * A multi bulk reply containing two elements: - * + * * unix time in seconds. microseconds. */ Executions> time(); diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java index 11f815be83..f903ce13ef 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.List; import java.util.Set; -import com.lambdaworks.redis.ScanArgs; -import com.lambdaworks.redis.ScanCursor; -import com.lambdaworks.redis.StreamScanCursor; -import com.lambdaworks.redis.ValueScanCursor; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.ScanArgs; +import io.lettuce.core.ScanCursor; +import io.lettuce.core.StreamScanCursor; +import io.lettuce.core.ValueScanCursor; +import io.lettuce.core.output.ValueStreamingChannel; /** * Synchronous executed commands on a node selection for Sets. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi */ public interface NodeSelectionSetCommands { /** * Add one or more members to a set. - * + * * @param key the key * @param members the member type: value * @return Long integer-reply the number of elements that were added to the set, not including all the elements already @@ -47,7 +47,7 @@ public interface NodeSelectionSetCommands { /** * Get the number of members in a set. - * + * * @param key the key * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not * exist. @@ -56,7 +56,7 @@ public interface NodeSelectionSetCommands { /** * Subtract multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -64,7 +64,7 @@ public interface NodeSelectionSetCommands { /** * Subtract multiple sets. - * + * * @param channel the channel * @param keys the keys * @return Long count of members of the resulting set. @@ -73,7 +73,7 @@ public interface NodeSelectionSetCommands { /** * Subtract multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -82,7 +82,7 @@ public interface NodeSelectionSetCommands { /** * Intersect multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -90,7 +90,7 @@ public interface NodeSelectionSetCommands { /** * Intersect multiple sets. - * + * * @param channel the channel * @param keys the keys * @return Long count of members of the resulting set. @@ -99,7 +99,7 @@ public interface NodeSelectionSetCommands { /** * Intersect multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -108,11 +108,11 @@ public interface NodeSelectionSetCommands { /** * Determine if a given value is a member of a set. - * + * * @param key the key * @param member the member type: value * @return Boolean integer-reply specifically: - * + * * {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the * set, or if {@code key} does not exist. */ @@ -120,12 +120,12 @@ public interface NodeSelectionSetCommands { /** * Move a member from one set to another. - * + * * @param source the source key * @param destination the destination type: key * @param member the member type: value * @return Boolean integer-reply specifically: - * + * * {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no * operation was performed. */ @@ -133,7 +133,7 @@ public interface NodeSelectionSetCommands { /** * Get all the members in a set. - * + * * @param key the key * @return Set<V> array-reply all elements of the set. */ @@ -141,7 +141,7 @@ public interface NodeSelectionSetCommands { /** * Get all the members in a set. - * + * * @param channel the channel * @param key the keys * @return Long count of members of the resulting set. @@ -150,7 +150,7 @@ public interface NodeSelectionSetCommands { /** * Remove and return a random member from a set. - * + * * @param key the key * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist. */ @@ -167,9 +167,9 @@ public interface NodeSelectionSetCommands { /** * Get one random member from a set. - * + * * @param key the key - * + * * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the * randomly selected element, or {@literal null} when {@code key} does not exist. */ @@ -177,7 +177,7 @@ public interface NodeSelectionSetCommands { /** * Get one or multiple random members from a set. - * + * * @param key the key * @param count the count type: long * @return Set<V> bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply @@ -187,7 +187,7 @@ public interface NodeSelectionSetCommands { /** * Get one or multiple random members from a set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param count the count @@ -197,7 +197,7 @@ public interface NodeSelectionSetCommands { /** * Remove one or more members from a set. - * + * * @param key the key * @param members the member type: value * @return Long integer-reply the number of members that were removed from the set, not including non existing members. @@ -206,7 +206,7 @@ public interface NodeSelectionSetCommands { /** * Add multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -214,7 +214,7 @@ public interface NodeSelectionSetCommands { /** * Add multiple sets. - * + * * @param channel streaming channel that receives a call for every value * @param keys the keys * @return Long count of members of the resulting set. @@ -223,7 +223,7 @@ public interface NodeSelectionSetCommands { /** * Add multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -232,7 +232,7 @@ public interface NodeSelectionSetCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @return ValueScanCursor<V> scan cursor. */ @@ -240,7 +240,7 @@ public interface NodeSelectionSetCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanArgs scan arguments * @return ValueScanCursor<V> scan cursor. @@ -249,7 +249,7 @@ public interface NodeSelectionSetCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -259,7 +259,7 @@ public interface NodeSelectionSetCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return ValueScanCursor<V> scan cursor. @@ -268,7 +268,7 @@ public interface NodeSelectionSetCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @return StreamScanCursor scan cursor. @@ -277,7 +277,7 @@ public interface NodeSelectionSetCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanArgs scan arguments @@ -287,7 +287,7 @@ public interface NodeSelectionSetCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} @@ -298,7 +298,7 @@ public interface NodeSelectionSetCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java index 0e51823977..84d305d927 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java @@ -13,34 +13,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.List; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.ScoredValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.ScoredValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Synchronous executed commands on a node selection for Sorted Sets. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi */ public interface NodeSelectionSortedSetCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param score the score * @param member the member - * + * * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -48,11 +48,11 @@ public interface NodeSelectionSortedSetCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...) * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -60,11 +60,11 @@ public interface NodeSelectionSortedSetCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param scoredValues the scored values * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -100,12 +100,12 @@ public interface NodeSelectionSortedSetCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the ke * @param zAddArgs arguments for zadd * @param scoredValues the scored values * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -137,7 +137,7 @@ public interface NodeSelectionSortedSetCommands { /** * Get the number of members in a sorted set. - * + * * @param key the key * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key} * does not exist. @@ -146,7 +146,7 @@ public interface NodeSelectionSortedSetCommands { /** * Count the members in a sorted set with scores within the given values. - * + * * @param key the key * @param min min score * @param max max score @@ -158,7 +158,7 @@ public interface NodeSelectionSortedSetCommands { /** * Count the members in a sorted set with scores within the given values. - * + * * @param key the key * @param min min score * @param max max score @@ -180,7 +180,7 @@ public interface NodeSelectionSortedSetCommands { /** * Increment the score of a member in a sorted set. - * + * * @param key the key * @param amount the increment type: long * @param member the member type: key @@ -191,7 +191,7 @@ public interface NodeSelectionSortedSetCommands { /** * Intersect multiple sorted sets and store the resulting sorted set in a new key. - * + * * @param destination the destination * @param keys the keys * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}. @@ -200,7 +200,7 @@ public interface NodeSelectionSortedSetCommands { /** * Intersect multiple sorted sets and store the resulting sorted set in a new key. - * + * * @param destination the destination * @param storeArgs the storeArgs * @param keys the keys @@ -394,7 +394,7 @@ public interface NodeSelectionSortedSetCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -407,7 +407,7 @@ public interface NodeSelectionSortedSetCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -431,7 +431,7 @@ public interface NodeSelectionSortedSetCommands { /** * Stream over range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -446,7 +446,7 @@ public interface NodeSelectionSortedSetCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java index d10d413b16..7ec226380a 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.BitFieldArgs; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.SetArgs; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; +import io.lettuce.core.BitFieldArgs; +import io.lettuce.core.KeyValue; +import io.lettuce.core.SetArgs; +import io.lettuce.core.output.KeyValueStreamingChannel; /** * Synchronous executed commands on a node selection for Strings. @@ -30,7 +30,7 @@ * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi + * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi */ public interface NodeSelectionStringCommands { diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java index f301435685..c3caf6d765 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.List; import java.util.Map; import java.util.function.Predicate; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.sync.RedisKeyCommands; -import com.lambdaworks.redis.api.sync.RedisScriptingCommands; -import com.lambdaworks.redis.api.sync.RedisServerCommands; -import com.lambdaworks.redis.api.sync.RedisStringCommands; -import com.lambdaworks.redis.cluster.ClusterClientOptions; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.output.KeyStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.api.sync.RedisKeyCommands; +import io.lettuce.core.api.sync.RedisScriptingCommands; +import io.lettuce.core.api.sync.RedisServerCommands; +import io.lettuce.core.api.sync.RedisStringCommands; +import io.lettuce.core.cluster.ClusterClientOptions; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.output.KeyStreamingChannel; /** * Advanced synchronous and thread-safe Redis Cluster API. - * + * * @author Mark Paluch * @since 4.0 */ @@ -41,7 +41,7 @@ public interface RedisAdvancedClusterCommands extends RedisClusterCommands /** * Retrieve a connection to the specified cluster node using the nodeId. Host and port are looked up in the node list. In * contrast to the {@link RedisAdvancedClusterCommands}, node-connections do not route commands to other cluster nodes - * + * * @param nodeId the node Id * @return a connection to the requested cluster node */ @@ -52,7 +52,7 @@ public interface RedisAdvancedClusterCommands extends RedisClusterCommands * {@link RedisAdvancedClusterCommands}, node-connections do not route commands to other cluster nodes. Host and port * connections are verified by default for cluster membership, see * {@link ClusterClientOptions#isValidateClusterNodeMembership()}. - * + * * @param host the host * @param port the port * @return a connection to the requested cluster node @@ -159,7 +159,7 @@ default NodeSelection all() { /** * Get the values of all the given keys with pipelining. Cross-slot keys will result in multiple calls to the particular * cluster nodes. - * + * * @param keys the key * @return List<V> array-reply list of values at the specified keys. * @see RedisStringCommands#mget(Object[]) @@ -169,7 +169,7 @@ default NodeSelection all() { /** * Set multiple keys to multiple values with pipelining. Cross-slot keys will result in multiple calls to the particular * cluster nodes. - * + * * @param map the map * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail. * @see RedisStringCommands#mset(Map) @@ -179,10 +179,10 @@ default NodeSelection all() { /** * Set multiple keys to multiple values, only if none of the keys exist with pipelining. Cross-slot keys will result in * multiple calls to the particular cluster nodes. - * + * * @param map the null * @return Boolean integer-reply specifically: - * + * * {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed). * @see RedisStringCommands#msetnx(Map) */ @@ -266,7 +266,7 @@ default NodeSelection all() { /** * Synchronously save the dataset to disk and then shut down all nodes of the cluster. - * + * * @param save {@literal true} force save operation * @see RedisServerCommands#shutdown(boolean) */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java rename to src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java index 4621f7d0d1..a5f9fdaa6f 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; import java.util.List; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.api.sync.*; +import io.lettuce.core.api.sync.*; /** * A complete synchronous and thread-safe Redis Cluster API with 400+ Methods. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -60,7 +60,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Meet another cluster node to include the node into the cluster. The command starts the cluster handshake and returns with * {@literal OK} when the node was added to the cluster. - * + * * @param ip IP address of the host * @param port port number. * @return String simple-string-reply @@ -69,7 +69,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Blacklist and remove the cluster node from the cluster. - * + * * @param nodeId the node Id * @return String simple-string-reply */ @@ -77,7 +77,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Adds slots to the cluster node. The current node will become the master for the specified slots. - * + * * @param slots one or more slots from {@literal 0} to {@literal 16384} * @return String simple-string-reply */ @@ -85,7 +85,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Removes slots from the cluster node. - * + * * @param slots one or more slots from {@literal 0} to {@literal 16384} * @return String simple-string-reply */ @@ -94,7 +94,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Assign a slot to a node. The command migrates the specified slot from the current node to the specified node in * {@code nodeId} - * + * * @param slot the slot * @param nodeId the id of the node that will become the master for the slot * @return String simple-string-reply @@ -112,7 +112,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Flag a slot as {@literal MIGRATING} (outgoing) towards the node specified in {@code nodeId}. The slot must be handled by * the current node in order to be migrated. - * + * * @param slot the slot * @param nodeId the id of the node is targeted to become the master for the slot * @return String simple-string-reply @@ -121,7 +121,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Flag a slot as {@literal IMPORTING} (incoming) from the node specified in {@code nodeId}. - * + * * @param slot the slot * @param nodeId the id of the node is the master of the slot * @return String simple-string-reply @@ -130,29 +130,29 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Get information and statistics about the cluster viewed by the current node. - * + * * @return String bulk-string-reply as a collection of text lines. */ String clusterInfo(); /** * Obtain the nodeId for the currently connected node. - * + * * @return String simple-string-reply */ String clusterMyId(); /** * Obtain details about all cluster nodes. Can be parsed using - * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse} - * + * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse} + * * @return String bulk-string-reply as a collection of text lines */ String clusterNodes(); /** * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using - * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse} + * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse} * * @param nodeId node id of the master node * @return List<String> array-reply list of slaves. The command returns data in the same format as @@ -162,7 +162,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Retrieve the list of keys within the {@code slot}. - * + * * @param slot the slot * @param count maximal number of keys * @return List<K> array-reply list of keys @@ -190,7 +190,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Returns an integer identifying the hash slot the specified key hashes to. This command is mainly useful for debugging and * testing, since it exposes via an API the underlying Redis implementation of the hashing algorithm. Basically the same as - * {@link com.lambdaworks.redis.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem. + * {@link io.lettuce.core.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem. * * @param key the key. * @return Integer reply: The hash slot number. @@ -218,7 +218,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Get array of cluster slots to node mappings. - * + * * @return List<Object> array-reply nested list of slot ranges with IP/Port mappings. */ List clusterSlots(); @@ -233,7 +233,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Turn this node into a slave of the node with the id {@code nodeId}. - * + * * @param nodeId master node id * @return String simple-string-reply */ @@ -241,7 +241,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Failover a cluster node. Turns the currently connected node into a master and the master into its slave. - * + * * @param force do not coordinate with master if {@literal true} * @return String simple-string-reply */ @@ -258,7 +258,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red *
  • The new configuration is saved and the cluster state updated
    • *
  • If the node was a slave, the whole data set is flushed away
    • * - * + * * @param hard {@literal true} for hard reset. Generates a new nodeId and currentEpoch/configEpoch are set to 0 * @return String simple-string-reply */ @@ -266,7 +266,7 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Delete all the slots associated with the specified node. The number of deleted slots is returned. - * + * * @return String simple-string-reply */ String clusterFlushslots(); @@ -274,14 +274,14 @@ public interface RedisClusterCommands extends RedisHashCommands, Red /** * Tells a Redis cluster slave node that the client is ok reading possibly stale data and is not interested in running write * queries. - * + * * @return String simple-string-reply */ String readOnly(); /** * Resets readOnly flag. - * + * * @return String simple-string-reply */ String readWrite(); diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/package-info.java b/src/main/java/io/lettuce/core/cluster/api/sync/package-info.java similarity index 57% rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/package-info.java rename to src/main/java/io/lettuce/core/cluster/api/sync/package-info.java index 8c779ca1f9..12e9559f96 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/package-info.java +++ b/src/main/java/io/lettuce/core/cluster/api/sync/package-info.java @@ -1,4 +1,4 @@ /** * Redis Cluster API for synchronous executed commands. */ -package com.lambdaworks.redis.cluster.api.sync; +package io.lettuce.core.cluster.api.sync; diff --git a/src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java b/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java rename to src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java index 24adfab348..7b9eabd145 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java +++ b/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.event; +package io.lettuce.core.cluster.event; import java.util.Collections; import java.util.List; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.event.Event; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.event.Event; /** * Signals a discovered cluster topology change. The event carries the view {@link #before()} and {@link #after} the change. - * + * * @author Mark Paluch * @since 3.4 */ @@ -34,7 +34,7 @@ public class ClusterTopologyChangedEvent implements Event { /** * Creates a new {@link ClusterTopologyChangedEvent}. - * + * * @param before the cluster topology view before the topology changed, must not be {@literal null} * @param after the cluster topology view after the topology changed, must not be {@literal null} */ @@ -45,7 +45,7 @@ public ClusterTopologyChangedEvent(List before, List before() { @@ -54,7 +54,7 @@ public List before() { /** * Returns the cluster topology view after the topology changed. - * + * * @return the cluster topology view after the topology changed. */ public List after() { diff --git a/src/main/java/io/lettuce/core/cluster/event/package-info.java b/src/main/java/io/lettuce/core/cluster/event/package-info.java new file mode 100644 index 0000000000..1b6ed4555a --- /dev/null +++ b/src/main/java/io/lettuce/core/cluster/event/package-info.java @@ -0,0 +1,5 @@ +/** + * Cluster event types. + */ +package io.lettuce.core.cluster.event; + diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/ClusterPartitionParser.java b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/cluster/models/partitions/ClusterPartitionParser.java rename to src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java index a3ef6ea978..cbe853b9f2 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/ClusterPartitionParser.java +++ b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.models.partitions; +package io.lettuce.core.cluster.models.partitions; import java.util.*; import java.util.regex.Pattern; import java.util.stream.Collectors; -import com.lambdaworks.redis.LettuceStrings; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.internal.HostAndPort; -import com.lambdaworks.redis.internal.LettuceLists; +import io.lettuce.core.LettuceStrings; +import io.lettuce.core.RedisException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.internal.HostAndPort; +import io.lettuce.core.internal.LettuceLists; /** * Parser for node information output of {@code CLUSTER NODES} and {@code CLUSTER SLAVES}. - * + * * @author Mark Paluch * @since 3.0 */ @@ -65,7 +65,7 @@ private ClusterPartitionParser() { /** * Parse partition lines into Partitions object. - * + * * @param nodes output of CLUSTER NODES * @return the partitions object. */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java rename to src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java index d2a9a7be6e..41e5a03720 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java +++ b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.models.partitions; +package io.lettuce.core.cluster.models.partitions; import java.util.*; -import com.lambdaworks.redis.cluster.SlotHash; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.cluster.SlotHash; +import io.lettuce.core.internal.LettuceAssert; /** * Cluster topology view. An instance of {@link Partitions} provides access to the partitions of a Redis Cluster. A partition is @@ -33,8 +33,8 @@ * Topology changes are: * *
      - *
    • Changes in {@link com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag#MASTER}/ - * {@link com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag#SLAVE} state
      • + *
    • Changes in {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag#MASTER}/ + * {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag#SLAVE} state
      • *
    • Newly added or removed nodes to/from the Redis Cluster
      • *
    • Changes in {@link RedisClusterNode#getSlots()} responsibility
      • *
    • Changes to the {@link RedisClusterNode#getSlaveOf() slave replication source} (the master of a slave)
      • diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNode.java rename to src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java index e86037a1fe..6c670b0fa4 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNode.java +++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.models.partitions; +package io.lettuce.core.cluster.models.partitions; import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Set; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceSets; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.RedisURI; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceSets; +import io.lettuce.core.models.role.RedisNodeDescription; /** * Representation of a Redis Cluster node. A {@link RedisClusterNode} is identified by its {@code nodeId}. A * {@link RedisClusterNode} can be a {@link #getRole() responsible master} for zero to - * {@link com.lambdaworks.redis.cluster.SlotHash#SLOT_COUNT 16384} slots, a slave of one {@link #getSlaveOf() master} of carry - * different {@link com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag flags}. - * + * {@link io.lettuce.core.cluster.SlotHash#SLOT_COUNT 16384} slots, a slave of one {@link #getSlaveOf() master} of carry + * different {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag flags}. + * * @author Mark Paluch * @since 3.0 */ @@ -79,7 +79,7 @@ public RedisClusterNode(RedisClusterNode redisClusterNode) { /** * Create a new instance of {@link RedisClusterNode} by passing the {@code nodeId} - * + * * @param nodeId the nodeId * @return a new instance of {@link RedisClusterNode} */ @@ -95,7 +95,7 @@ public RedisURI getUri() { /** * Sets thhe connection point details. Usually the host/ip/port where a particular Redis Cluster node server is running. - * + * * @param uri the {@link RedisURI}, must not be {@literal null} */ public void setUri(RedisURI uri) { @@ -109,7 +109,7 @@ public String getNodeId() { /** * Sets {@code nodeId}. - * + * * @param nodeId the {@code nodeId} */ public void setNodeId(String nodeId) { @@ -124,7 +124,7 @@ public boolean isConnected() { /** * Sets the {@code connected} flag. The {@code connected} flag describes whether the node which provided details about the * node is connected to the particular {@link RedisClusterNode}. - * + * * @param connected the {@code connected} flag */ public void setConnected(boolean connected) { @@ -137,7 +137,7 @@ public String getSlaveOf() { /** * Sets the replication source. - * + * * @param slaveOf the replication source, can be {@literal null} */ public void setSlaveOf(String slaveOf) { @@ -150,7 +150,7 @@ public long getPingSentTimestamp() { /** * Sets the last {@code pingSentTimestamp}. - * + * * @param pingSentTimestamp the last {@code pingSentTimestamp} */ public void setPingSentTimestamp(long pingSentTimestamp) { @@ -163,7 +163,7 @@ public long getPongReceivedTimestamp() { /** * Sets the last {@code pongReceivedTimestamp}. - * + * * @param pongReceivedTimestamp the last {@code pongReceivedTimestamp} */ public void setPongReceivedTimestamp(long pongReceivedTimestamp) { @@ -176,7 +176,7 @@ public long getConfigEpoch() { /** * Sets the {@code configEpoch}. - * + * * @param configEpoch the {@code configEpoch} */ public void setConfigEpoch(long configEpoch) { @@ -189,9 +189,9 @@ public List getSlots() { /** * Sets the list of slots for which this {@link RedisClusterNode} is the - * {@link com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag#MASTER}. The list is empty if this node + * {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag#MASTER}. The list is empty if this node * is not a master or the node is not responsible for any slots at all. - * + * * @param slots list of slots, must not be {@literal null} but may be empty */ public void setSlots(List slots) { @@ -205,8 +205,8 @@ public Set getFlags() { } /** - * Set of {@link com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag node flags}. - * + * Set of {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag node flags}. + * * @param flags the set of node flags. */ public void setFlags(Set flags) { @@ -257,7 +257,7 @@ public String toString() { } /** - * + * * @param nodeFlag the node flag * @return true if the {@linkplain NodeFlag} is contained within the flags. */ @@ -266,7 +266,7 @@ public boolean is(NodeFlag nodeFlag) { } /** - * + * * @param slot the slot hash * @return true if the slot is contained within the handled slots. */ @@ -275,9 +275,9 @@ public boolean hasSlot(int slot) { } /** - * Returns the {@link com.lambdaworks.redis.models.role.RedisInstance.Role} of the Redis Cluster node based on the + * Returns the {@link io.lettuce.core.models.role.RedisInstance.Role} of the Redis Cluster node based on the * {@link #getFlags() flags}. - * + * * @return the Redis Cluster node role */ @Override diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/package-info.java b/src/main/java/io/lettuce/core/cluster/models/partitions/package-info.java similarity index 62% rename from src/main/java/com/lambdaworks/redis/cluster/models/partitions/package-info.java rename to src/main/java/io/lettuce/core/cluster/models/partitions/package-info.java index 761bc33538..46df050ab5 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/package-info.java +++ b/src/main/java/io/lettuce/core/cluster/models/partitions/package-info.java @@ -1,4 +1,4 @@ /** * Model and parser for the {@code CLUSTER NODES} and {@code CLUSTER SLAVES} output. */ -package com.lambdaworks.redis.cluster.models.partitions; +package io.lettuce.core.cluster.models.partitions; diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java rename to src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java index e09320e577..d55070aad4 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java +++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.models.slots; +package io.lettuce.core.cluster.models.slots; import java.io.Serializable; import java.util.ArrayList; @@ -21,10 +21,10 @@ import java.util.List; import java.util.Set; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.internal.HostAndPort; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.internal.HostAndPort; +import io.lettuce.core.internal.LettuceAssert; /** * Represents a range of slots together with its master and slaves. diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParser.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParser.java rename to src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java index 90ed428d3d..6bb63b2276 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParser.java +++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.models.slots; +package io.lettuce.core.cluster.models.slots; import java.util.*; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * Parser for redis CLUSTER SLOTS command output. - * + * * @author Mark Paluch * @since 3.0 */ @@ -37,8 +37,8 @@ private ClusterSlotsParser() { /** * Parse the output of the redis CLUSTER SLOTS command and convert it to a list of - * {@link com.lambdaworks.redis.cluster.models.slots.ClusterSlotRange} - * + * {@link io.lettuce.core.cluster.models.slots.ClusterSlotRange} + * * @param clusterSlotsOutput output of CLUSTER SLOTS command * @return List>ClusterSlotRange> */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/slots/package-info.java b/src/main/java/io/lettuce/core/cluster/models/slots/package-info.java similarity index 55% rename from src/main/java/com/lambdaworks/redis/cluster/models/slots/package-info.java rename to src/main/java/io/lettuce/core/cluster/models/slots/package-info.java index 288791e2d9..005245a04b 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/models/slots/package-info.java +++ b/src/main/java/io/lettuce/core/cluster/models/slots/package-info.java @@ -1,4 +1,4 @@ /** * Model and parser for the {@code CLUSTER SLOTS} output. */ -package com.lambdaworks.redis.cluster.models.slots; +package io.lettuce.core.cluster.models.slots; diff --git a/src/main/java/io/lettuce/core/cluster/package-info.java b/src/main/java/io/lettuce/core/cluster/package-info.java new file mode 100644 index 0000000000..26a38ed9b1 --- /dev/null +++ b/src/main/java/io/lettuce/core/cluster/package-info.java @@ -0,0 +1,4 @@ +/** + * Client for Redis Cluster, see {@link io.lettuce.core.cluster.RedisClusterClient}. + */ +package io.lettuce.core.cluster; diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubAdapter.java b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubAdapter.java rename to src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java index 4b279848de..d7918989bd 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubAdapter.java +++ b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub; +package io.lettuce.core.cluster.pubsub; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * Convenience adapter with an empty implementation of all {@link RedisClusterPubSubListener} callback methods. diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java rename to src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java index 5479c94717..e46f13a161 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java +++ b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub; +package io.lettuce.core.cluster.pubsub; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * Interface for Redis Cluster Pub/Sub listeners. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -29,7 +29,7 @@ public interface RedisClusterPubSubListener { /** * Message received from a channel subscription. - * + * * @param node the {@link RedisClusterNode} where the {@literal message} originates. * @param channel Channel. * @param message Message. @@ -57,7 +57,7 @@ public interface RedisClusterPubSubListener { /** * Subscribed to a pattern. - * + * * @param pattern Pattern. * @param count Subscription count. */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/StatefulRedisClusterPubSubConnection.java b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/StatefulRedisClusterPubSubConnection.java rename to src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java index a0e9358256..39771cca8a 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/StatefulRedisClusterPubSubConnection.java +++ b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub; +package io.lettuce.core.cluster.pubsub; import java.util.function.Predicate; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.cluster.ClusterClientOptions; -import com.lambdaworks.redis.cluster.api.sync.NodeSelection; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands; -import com.lambdaworks.redis.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands; -import com.lambdaworks.redis.cluster.pubsub.api.sync.RedisClusterPubSubCommands; -import com.lambdaworks.redis.pubsub.RedisPubSubListener; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.RedisException; +import io.lettuce.core.cluster.ClusterClientOptions; +import io.lettuce.core.cluster.api.sync.NodeSelection; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands; +import io.lettuce.core.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands; +import io.lettuce.core.cluster.pubsub.api.sync.RedisClusterPubSubCommands; +import io.lettuce.core.pubsub.RedisPubSubListener; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; /** * A stateful Pub/Sub connection for Redis Cluster use. This connection type is intended for Pub/Sub messaging with Redis @@ -101,7 +101,7 @@ public interface StatefulRedisClusterPubSubConnection extends StatefulRedi * specified {@code nodeId} is no longer part of the cluster. * * Do not close the connections. Otherwise, unpredictable behavior will occur. The nodeId must be part of the cluster and is - * validated against the current topology view in {@link com.lambdaworks.redis.cluster.models.partitions.Partitions}. + * validated against the current topology view in {@link io.lettuce.core.cluster.models.partitions.Partitions}. * * @param nodeId the node Id * @return a connection to the requested cluster node @@ -137,7 +137,7 @@ public interface StatefulRedisClusterPubSubConnection extends StatefulRedi * connection facade. Registered {@link RedisPubSubListener} will receive messages from individual node subscriptions. *

      * Node event propagation is disabled by default. - * + * * @param enabled {@literal true} to enable node message propagation; {@literal false} (default) to disable message * propagation. */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java index 10e367ae1b..7da4b188cc 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub.api.async; +package io.lettuce.core.cluster.pubsub.api.async; -import com.lambdaworks.redis.cluster.api.async.AsyncExecutions; +import io.lettuce.core.cluster.api.async.AsyncExecutions; /** * Asynchronous executed commands on a node selection for Pub/Sub. - * + * * @author Mark Paluch * @since 4.4 */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java similarity index 82% rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java rename to src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java index 6cad1ae454..f183b4b98d 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java +++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub.api.async; +package io.lettuce.core.cluster.pubsub.api.async; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands; /** * Node selection with access to asynchronous executed commands on the set. - * + * * @author Mark Paluch * @since 4.4 */ diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java rename to src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java index 39d6826233..898635bf5a 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java +++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub.api.async; +package io.lettuce.core.cluster.pubsub.api.async; import java.util.function.Predicate; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection; -import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection; +import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands; /** * Asynchronous and thread-safe Redis Cluster PubSub API. Operations are executed either on the main connection or a diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java rename to src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java index 24dddfe903..196272241f 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java +++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub.api.reactive; +package io.lettuce.core.cluster.pubsub.api.reactive; -import com.lambdaworks.redis.cluster.api.reactive.ReactiveExecutions; +import io.lettuce.core.cluster.api.reactive.ReactiveExecutions; /** * Reactive executed commands on a node selection for Pub/Sub. diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java similarity index 77% rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java rename to src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java index 1125a6abe9..4d9323f7bb 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java +++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub.api.reactive; +package io.lettuce.core.cluster.pubsub.api.reactive; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands; -import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands; +import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands; /** * Node selection with access to {@link RedisPubSubCommands}. diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java rename to src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java index 0f15a30a31..e09ed28101 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java +++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub.api.reactive; +package io.lettuce.core.cluster.pubsub.api.reactive; import java.util.function.Predicate; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection; -import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection; +import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands; /** * Reactive and thread-safe Redis Cluster PubSub API. Operations are executed either on the main connection or a diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java rename to src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java index 87984dfdb1..73e6c2bcf4 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java +++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub.api.sync; +package io.lettuce.core.cluster.pubsub.api.sync; -import com.lambdaworks.redis.cluster.api.sync.Executions; +import io.lettuce.core.cluster.api.sync.Executions; /** * Synchronous executed commands on a node selection for Pub/Sub. diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/PubSubNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java similarity index 82% rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/PubSubNodeSelection.java rename to src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java index 4362952d4b..f7d00ede1d 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/PubSubNodeSelection.java +++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub.api.sync; +package io.lettuce.core.cluster.pubsub.api.sync; -import com.lambdaworks.redis.cluster.api.NodeSelectionSupport; -import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands; +import io.lettuce.core.cluster.api.NodeSelectionSupport; +import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands; /** * Node selection with access to {@link RedisPubSubCommands}. diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java rename to src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java index 4bd2df92d3..e3145f62e0 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java +++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub.api.sync; +package io.lettuce.core.cluster.pubsub.api.sync; import java.util.function.Predicate; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection; -import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection; +import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands; /** * Synchronous and thread-safe Redis Cluster PubSub API. Operations are executed either on the main connection or a diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java rename to src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java index da15091ef1..df058f429d 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java +++ b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -21,9 +21,9 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.RedisConnectionException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; +import io.lettuce.core.RedisConnectionException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java rename to src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java index cf6628e738..a2c273a85e 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java +++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; import java.net.SocketAddress; import java.util.*; @@ -23,13 +23,13 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.SocketAddressResolver; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.SocketAddressResolver; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java rename to src/main/java/io/lettuce/core/cluster/topology/Connections.java index f23c045662..1fa0381294 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java +++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; import java.util.Map; import java.util.TreeMap; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandKeyword; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandKeyword; +import io.lettuce.core.protocol.CommandType; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java rename to src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java index b425b97aeb..6720a65e11 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java +++ b/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; import java.net.SocketAddress; -import com.lambdaworks.redis.ConnectionFuture; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.ConnectionFuture; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.RedisCodec; /** * Factory interface to obtain {@link StatefulRedisConnection connections} to Redis cluster nodes. diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyView.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyView.java rename to src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java index 6fb1b51ceb..bbaf6a8855 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyView.java +++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; import java.util.concurrent.ExecutionException; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViews.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViews.java rename to src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java index 9a04065935..af686b0d0d 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViews.java +++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; import java.util.*; diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/RedisClusterNodeSnapshot.java b/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/cluster/topology/RedisClusterNodeSnapshot.java rename to src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java index 694f1e5f09..a0493fc326 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/topology/RedisClusterNodeSnapshot.java +++ b/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java rename to src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java index 57d03fdb59..8a6070d530 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java +++ b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; import java.util.Collection; import java.util.concurrent.Future; diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java b/src/main/java/io/lettuce/core/cluster/topology/Requests.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java rename to src/main/java/io/lettuce/core/cluster/topology/Requests.java index bf3a555fe7..2104402d4f 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java +++ b/src/main/java/io/lettuce/core/cluster/topology/Requests.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.RedisURI; +import io.lettuce.core.RedisURI; /** * Encapsulates asynchronously executed commands to multiple {@link RedisURI nodes}. - * + * * @author Mark Paluch */ class Requests { diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/TimedAsyncCommand.java b/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/cluster/topology/TimedAsyncCommand.java rename to src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java index 31900e54c9..206af6ecae 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/topology/TimedAsyncCommand.java +++ b/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.protocol.RedisCommand; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/TopologyComparators.java b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/cluster/topology/TopologyComparators.java rename to src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java index 5eca01d168..54e1b5c2fc 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/topology/TopologyComparators.java +++ b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceLists; -import com.lambdaworks.redis.internal.LettuceSets; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceLists; +import io.lettuce.core.internal.LettuceSets; /** * Comparators for {@link RedisClusterNode} and {@link RedisURI}. diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/package-info.java b/src/main/java/io/lettuce/core/cluster/topology/package-info.java similarity index 51% rename from src/main/java/com/lambdaworks/redis/cluster/topology/package-info.java rename to src/main/java/io/lettuce/core/cluster/topology/package-info.java index 9dcaa601a2..c83ce64b7e 100644 --- a/src/main/java/com/lambdaworks/redis/cluster/topology/package-info.java +++ b/src/main/java/io/lettuce/core/cluster/topology/package-info.java @@ -1,5 +1,5 @@ /** * Support for cluster topology refresh. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; diff --git a/src/main/java/com/lambdaworks/codec/Base16.java b/src/main/java/io/lettuce/core/codec/Base16.java similarity index 94% rename from src/main/java/com/lambdaworks/codec/Base16.java rename to src/main/java/io/lettuce/core/codec/Base16.java index 39dce556d3..2647ae11ee 100644 --- a/src/main/java/com/lambdaworks/codec/Base16.java +++ b/src/main/java/io/lettuce/core/codec/Base16.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.codec; +package io.lettuce.core.codec; /** * High-performance base16 (AKA hex) codec. - * + * * @author Will Glozer */ public class Base16 { @@ -42,10 +42,10 @@ private Base16() { /** * Encode bytes to base16 chars. - * + * * @param src Bytes to encode. * @param upper Use upper or lowercase chars. - * + * * @return Encoded chars. */ public static char[] encode(byte[] src, boolean upper) { diff --git a/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java rename to src/main/java/io/lettuce/core/codec/ByteArrayCodec.java index ace3afaf87..e117a5f866 100644 --- a/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java +++ b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; import java.nio.ByteBuffer; @@ -21,7 +21,7 @@ /** * A {@link RedisCodec} that uses plain byte arrays without further transformations. - * + * * @author Mark Paluch * @since 3.3 */ diff --git a/src/main/java/com/lambdaworks/redis/codec/ByteBufferInputStream.java b/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/codec/ByteBufferInputStream.java rename to src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java index 9575f0af21..610a03ca8f 100644 --- a/src/main/java/com/lambdaworks/redis/codec/ByteBufferInputStream.java +++ b/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/lambdaworks/codec/CRC16.java b/src/main/java/io/lettuce/core/codec/CRC16.java similarity index 97% rename from src/main/java/com/lambdaworks/codec/CRC16.java rename to src/main/java/io/lettuce/core/codec/CRC16.java index 219105a5f5..2ca8471002 100644 --- a/src/main/java/com/lambdaworks/codec/CRC16.java +++ b/src/main/java/io/lettuce/core/codec/CRC16.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.codec; +package io.lettuce.core.codec; /** * @author Mark Paluch @@ -59,7 +59,7 @@ private CRC16() { /** * Create a CRC16 checksum from the bytes. - * + * * @param bytes input bytes * @return CRC16 as interger value */ diff --git a/src/main/java/com/lambdaworks/redis/codec/CompressionCodec.java b/src/main/java/io/lettuce/core/codec/CompressionCodec.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/codec/CompressionCodec.java rename to src/main/java/io/lettuce/core/codec/CompressionCodec.java index c710f0efc1..70e5ce6f18 100644 --- a/src/main/java/com/lambdaworks/redis/codec/CompressionCodec.java +++ b/src/main/java/io/lettuce/core/codec/CompressionCodec.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -25,19 +25,19 @@ import java.util.zip.GZIPOutputStream; import java.util.zip.InflaterInputStream; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * A compressing/decompressing {@link RedisCodec} that wraps a typed {@link RedisCodec codec} and compresses values using GZIP - * or Deflate. See {@link com.lambdaworks.redis.codec.CompressionCodec.CompressionType} for supported compression types. - * + * or Deflate. See {@link io.lettuce.core.codec.CompressionCodec.CompressionType} for supported compression types. + * * @author Mark Paluch */ public class CompressionCodec { /** * A {@link RedisCodec} that compresses values from a delegating {@link RedisCodec}. - * + * * @param delegate codec used for key-value encoding/decoding, must not be {@literal null}. * @param compressionType the compression type, must not be {@literal null}. * @param Key type. diff --git a/src/main/java/com/lambdaworks/redis/codec/RedisCodec.java b/src/main/java/io/lettuce/core/codec/RedisCodec.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/codec/RedisCodec.java rename to src/main/java/io/lettuce/core/codec/RedisCodec.java index 1bbde04db4..6e0a53849c 100644 --- a/src/main/java/com/lambdaworks/redis/codec/RedisCodec.java +++ b/src/main/java/io/lettuce/core/codec/RedisCodec.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; import java.nio.ByteBuffer; diff --git a/src/main/java/com/lambdaworks/redis/codec/StringCodec.java b/src/main/java/io/lettuce/core/codec/StringCodec.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/codec/StringCodec.java rename to src/main/java/io/lettuce/core/codec/StringCodec.java index 168ffd2ca2..36d415159a 100644 --- a/src/main/java/com/lambdaworks/redis/codec/StringCodec.java +++ b/src/main/java/io/lettuce/core/codec/StringCodec.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; import java.nio.ByteBuffer; import java.nio.CharBuffer; @@ -22,8 +22,8 @@ import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.LettuceCharsets; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.LettuceCharsets; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; @@ -58,7 +58,7 @@ public StringCodec() { /** * Creates a new {@link StringCodec} for the given {@link Charset} that encodes and decodes keys and values. - * + * * @param charset must not be {@literal null}. */ public StringCodec(Charset charset) { @@ -157,7 +157,7 @@ public ByteBuffer encodeValue(String value) { /** * Compatibility implementation. - * + * * @param key * @return */ diff --git a/src/main/java/com/lambdaworks/redis/codec/ToByteBufEncoder.java b/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/codec/ToByteBufEncoder.java rename to src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java index a25c322813..dbc52acaf3 100644 --- a/src/main/java/com/lambdaworks/redis/codec/ToByteBufEncoder.java +++ b/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; import io.netty.buffer.ByteBuf; @@ -25,7 +25,7 @@ * the {@link RedisCodec#encodeKey(Object)} and {@link RedisCodec#encodeValue(Object)} methods to ensure compatibility for users * that access the {@link RedisCodec} API only. *

      - * + * * @author Mark Paluch * @since 4.3 */ diff --git a/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java rename to src/main/java/io/lettuce/core/codec/Utf8StringCodec.java index 5996608824..5c128c005c 100644 --- a/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java +++ b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; -import com.lambdaworks.redis.protocol.LettuceCharsets; +import io.lettuce.core.protocol.LettuceCharsets; /** * A {@link RedisCodec} that handles UTF-8 encoded keys and values. - * + * * @author Will Glozer * @author Mark Paluch * @see StringCodec diff --git a/src/main/java/com/lambdaworks/redis/codec/package-info.java b/src/main/java/io/lettuce/core/codec/package-info.java similarity index 56% rename from src/main/java/com/lambdaworks/redis/codec/package-info.java rename to src/main/java/io/lettuce/core/codec/package-info.java index 82dcb30d79..62a717318d 100644 --- a/src/main/java/com/lambdaworks/redis/codec/package-info.java +++ b/src/main/java/io/lettuce/core/codec/package-info.java @@ -1,4 +1,4 @@ /** * Codecs for key/value type conversion. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java similarity index 88% rename from src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommand.java rename to src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java index a1e4df4bea..c5acd2c92b 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommand.java +++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.LettuceFutures; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.dynamic.domain.Timeout; -import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.LettuceFutures; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.dynamic.domain.Timeout; +import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.protocol.RedisCommand; /** * An {@link ExecutableCommand} that is executed asynchronously or synchronously. - * + * * @author Mark Paluch * @since 5.0 */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java similarity index 86% rename from src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java rename to src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java index a1080c5a2a..b28f0d7a5f 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java +++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.List; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver; +import io.lettuce.core.internal.LettuceAssert; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java similarity index 87% rename from src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommand.java rename to src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java index 7b42047a6f..51d624d7a2 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommand.java +++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.LettuceFutures; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.dynamic.batch.BatchException; -import com.lambdaworks.redis.dynamic.batch.CommandBatching; -import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.LettuceFutures; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.dynamic.batch.BatchException; +import io.lettuce.core.dynamic.batch.CommandBatching; +import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.protocol.RedisCommand; /** * Executable command that uses a {@link Batcher} for command execution. - * + * * @author Mark Paluch * @since 5.0 */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategy.java rename to src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java index b058c3112c..3f931a35a5 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategy.java +++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.Arrays; import java.util.HashSet; @@ -21,12 +21,12 @@ import java.util.Set; import java.util.concurrent.ExecutionException; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.batch.BatchExecutor; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver; -import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.batch.BatchExecutor; +import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver; +import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters; +import io.lettuce.core.internal.LettuceAssert; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/dynamic/BatchTasks.java b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/dynamic/BatchTasks.java rename to src/main/java/io/lettuce/core/dynamic/BatchTasks.java index b5feb7cb39..b2b7790a0a 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/BatchTasks.java +++ b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.Collections; import java.util.Iterator; import java.util.List; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.protocol.RedisCommand; /** * Result of a batching request. Contains references to the batched {@link RedisCommand}s. - * + * * @author Mark Paluch * @since 5.0 */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/Batcher.java b/src/main/java/io/lettuce/core/dynamic/Batcher.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/dynamic/Batcher.java rename to src/main/java/io/lettuce/core/dynamic/Batcher.java index 29abaae6eb..1c162c46f3 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/Batcher.java +++ b/src/main/java/io/lettuce/core/dynamic/Batcher.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; -import com.lambdaworks.redis.dynamic.batch.CommandBatching; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.dynamic.batch.CommandBatching; +import io.lettuce.core.protocol.RedisCommand; /** * Command batcher to enqueue commands and flush a batch once a flush is requested or a configured command threshold is reached. - * + * * @author Mark Paluch * @since 5.0 * @see SimpleBatcher @@ -36,7 +36,7 @@ public interface Batcher { /** * Add command to the {@link Batcher}. - * + * * @param command the command to batch. * @param batching invocation-specific {@link CommandBatching} control. May be {@literal null} to use default batching * settings. diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java rename to src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java index c78397cbd4..79d9e8899e 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java +++ b/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.Iterator; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor; -import com.lambdaworks.redis.dynamic.support.ClassTypeInformation; -import com.lambdaworks.redis.dynamic.support.TypeInformation; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.parameter.MethodParametersAccessor; +import io.lettuce.core.dynamic.support.ClassTypeInformation; +import io.lettuce.core.dynamic.support.TypeInformation; +import io.lettuce.core.internal.LettuceAssert; /** * Codec-aware {@link MethodParametersAccessor}. Identifies key and value types by checking value compatibility with * {@link RedisCodec} types. - * + * * @author Mark Paluch * @since 5.0 */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java b/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java rename to src/main/java/io/lettuce/core/dynamic/CommandCreationException.java index a0ccf78cae..b04affc79b 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java +++ b/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; -import com.lambdaworks.redis.RedisException; +import io.lettuce.core.RedisException; /** * Exception thrown if a command cannot be constructed from a {@link CommandMethod}. - * + * * @author Mark Paluch * @since 5.0 */ @@ -29,7 +29,7 @@ public class CommandCreationException extends RedisException { /** * Create a new {@link CommandCreationException} given {@link CommandMethod} and a message. - * + * * @param commandMethod must not be {@literal null}. * @param msg must not be {@literal null}. */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java b/src/main/java/io/lettuce/core/dynamic/CommandFactory.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java rename to src/main/java/io/lettuce/core/dynamic/CommandFactory.java index 7d89ac45d8..cfdb685212 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java +++ b/src/main/java/io/lettuce/core/dynamic/CommandFactory.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.protocol.RedisCommand; /** * Strategy interface to create {@link RedisCommand}s. @@ -29,7 +29,7 @@ interface CommandFactory { /** * Create a new {@link RedisCommand} given {@code parameters}. - * + * * @param parameters must not be {@literal null}. * @return the {@link RedisCommand}. */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java rename to src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java index c97e3bbf56..df254b859f 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java +++ b/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; /** * Strategy interface to resolve a {@link CommandFactory}. - * + * * @since 5.0 */ interface CommandFactoryResolver { /** * Resolve a {@link CommandFactory} given a{@link DeclaredCommandMethod} and {@link RedisCommandsMetadata}. - * + * * @param method must not be {@literal null}. * @param redisCommandsMetadata must not be {@literal null}. * @return the {@link CommandFactory}. diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java b/src/main/java/io/lettuce/core/dynamic/CommandMethod.java similarity index 77% rename from src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java rename to src/main/java/io/lettuce/core/dynamic/CommandMethod.java index 914ef05765..c16c0b2092 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java +++ b/src/main/java/io/lettuce/core/dynamic/CommandMethod.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.concurrent.Future; -import com.lambdaworks.redis.dynamic.parameter.Parameter; -import com.lambdaworks.redis.dynamic.parameter.Parameters; -import com.lambdaworks.redis.dynamic.support.ResolvableType; +import io.lettuce.core.dynamic.parameter.Parameter; +import io.lettuce.core.dynamic.parameter.Parameters; +import io.lettuce.core.dynamic.support.ResolvableType; /** * Abstraction of a method that is designated to execute a Redis command method. Enriches the standard {@link Method} interface - * with specific information that is necessary to construct {@link com.lambdaworks.redis.protocol.RedisCommand} for the method. - * + * with specific information that is necessary to construct {@link io.lettuce.core.protocol.RedisCommand} for the method. + * * @author Mark Paluch * @since 5.0 */ @@ -43,18 +43,18 @@ public interface CommandMethod { Method getMethod(); /** - * @return declared {@link Method} return {@link com.lambdaworks.redis.dynamic.support.TypeInformation}. + * @return declared {@link Method} return {@link io.lettuce.core.dynamic.support.TypeInformation}. */ ResolvableType getReturnType(); /** - * @return the actual {@link Method} return {@link com.lambdaworks.redis.dynamic.support.TypeInformation} after unwrapping. + * @return the actual {@link Method} return {@link io.lettuce.core.dynamic.support.TypeInformation} after unwrapping. */ ResolvableType getActualReturnType(); /** * Lookup a method annotation. - * + * * @param annotationClass the annotation class. * @return the annotation object or {@literal null} if not found. */ @@ -83,7 +83,7 @@ public interface CommandMethod { boolean isReactiveExecution(); /** - * @return {@literal true} if the method defines a {@link com.lambdaworks.redis.dynamic.batch.CommandBatching} argument. + * @return {@literal true} if the method defines a {@link io.lettuce.core.dynamic.batch.CommandBatching} argument. */ boolean isBatchExecution(); } diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java b/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java rename to src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java index 6125f75f81..3be70bec07 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java +++ b/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; /** * Exception thrown if the command syntax is invalid. - * + * * @author Mark Paluch * @since 5.0 */ @@ -25,7 +25,7 @@ public class CommandMethodSyntaxException extends CommandCreationException { /** * Create a new {@link CommandMethodSyntaxException} given {@link CommandMethod} and a message. - * + * * @param commandMethod must not be {@literal null}. * @param msg must not be {@literal null}. */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java b/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java rename to src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java index f820454b21..4c6d73cf17 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java +++ b/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; -import com.lambdaworks.redis.dynamic.segment.CommandSegments; +import io.lettuce.core.dynamic.segment.CommandSegments; /** * Verifies {@link CommandMethod} declarations by checking available Redis commands. - * + * * @author Mark Paluch * @since 5.0 */ @@ -34,7 +34,7 @@ interface CommandMethodVerifier { /** * Verify a {@link CommandMethod} with its {@link CommandSegments}. This method verifies that the command exists and that * the required number of arguments is declared. - * + * * @param commandSegments must not be {@literal null}. * @param commandMethod must not be {@literal null}. */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java similarity index 79% rename from src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java rename to src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java index 3e05505e5b..382640ce89 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java +++ b/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; - -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.CodecAwareMethodParametersAccessor.TypeContext; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactory; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver; -import com.lambdaworks.redis.dynamic.output.OutputSelector; -import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters; -import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor; -import com.lambdaworks.redis.dynamic.segment.CommandSegments; -import com.lambdaworks.redis.output.CommandOutput; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.RedisCommand; +package io.lettuce.core.dynamic; + +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.CodecAwareMethodParametersAccessor.TypeContext; +import io.lettuce.core.dynamic.output.CommandOutputFactory; +import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver; +import io.lettuce.core.dynamic.output.OutputSelector; +import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters; +import io.lettuce.core.dynamic.parameter.MethodParametersAccessor; +import io.lettuce.core.dynamic.segment.CommandSegments; +import io.lettuce.core.output.CommandOutput; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.RedisCommand; /** * {@link CommandFactory} based on {@link CommandSegments}. @@ -91,7 +91,7 @@ public RedisCommand createCommand(Object[] parameters) { CommandArgs args = new CommandArgs<>(redisCodec); CommandOutput output = outputFactory.create(redisCodec); - Command command = new com.lambdaworks.redis.protocol.Command<>(this.segments.getCommandType(), + Command command = new io.lettuce.core.protocol.Command<>(this.segments.getCommandType(), output, args); parameterBinder.bind(args, redisCodec, segments, parametersAccessor); diff --git a/src/main/java/com/lambdaworks/redis/dynamic/Commands.java b/src/main/java/io/lettuce/core/dynamic/Commands.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/Commands.java rename to src/main/java/io/lettuce/core/dynamic/Commands.java index 69548b7262..ae4cc0f6e0 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/Commands.java +++ b/src/main/java/io/lettuce/core/dynamic/Commands.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; /** * Marker interface for dynamic Redis commands. Typically used by Redis Command Interfaces as extension point to discover * interface declarations. - * + * * @author Mark Paluch * @since 5.0 */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ConversionService.java b/src/main/java/io/lettuce/core/dynamic/ConversionService.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/dynamic/ConversionService.java rename to src/main/java/io/lettuce/core/dynamic/ConversionService.java index efff7cdb02..9d86c905dd 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/ConversionService.java +++ b/src/main/java/io/lettuce/core/dynamic/ConversionService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.HashMap; import java.util.List; @@ -21,9 +21,9 @@ import java.util.Optional; import java.util.function.Function; -import com.lambdaworks.redis.dynamic.support.ClassTypeInformation; -import com.lambdaworks.redis.dynamic.support.TypeInformation; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.dynamic.support.ClassTypeInformation; +import io.lettuce.core.dynamic.support.TypeInformation; +import io.lettuce.core.internal.LettuceAssert; /** * @author Mark Paluch @@ -34,7 +34,7 @@ class ConversionService { /** * Register a converter {@link Function}. - * + * * @param converter the converter. */ public void addConverter(Function converter) { @@ -93,7 +93,7 @@ final class ConvertiblePair { /** * Create a new source-to-target pair. - * + * * @param sourceType the source type * @param targetType the target type */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ConvertingCommand.java b/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/dynamic/ConvertingCommand.java rename to src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java index 4f71bc8deb..68e770243d 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/ConvertingCommand.java +++ b/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.concurrent.ExecutionException; /** * A {@link ExecutableCommand} that uses {@link ConversionService} to convert the result of a decorated * {@link ExecutableCommand}. - * + * * @author Mark Paluch * @since 5.0 */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java b/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java rename to src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java index 6d20679bd7..9ca880f50a 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java +++ b/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -24,18 +24,18 @@ import org.reactivestreams.Publisher; -import com.lambdaworks.redis.dynamic.batch.BatchExecutor; -import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters; -import com.lambdaworks.redis.dynamic.parameter.Parameter; -import com.lambdaworks.redis.dynamic.parameter.Parameters; -import com.lambdaworks.redis.dynamic.support.ResolvableType; -import com.lambdaworks.redis.dynamic.support.TypeInformation; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.dynamic.batch.BatchExecutor; +import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters; +import io.lettuce.core.dynamic.parameter.Parameter; +import io.lettuce.core.dynamic.parameter.Parameters; +import io.lettuce.core.dynamic.support.ResolvableType; +import io.lettuce.core.dynamic.support.TypeInformation; +import io.lettuce.core.internal.LettuceAssert; /** * Abstraction of a method that is designated to execute a Redis command method. Enriches the standard {@link Method} interface - * with specific information that is necessary to construct {@link com.lambdaworks.redis.protocol.RedisCommand} for the method. - * + * with specific information that is necessary to construct {@link io.lettuce.core.protocol.RedisCommand} for the method. + * * @author Mark Paluch * @since 5.0 */ @@ -51,7 +51,7 @@ public class DeclaredCommandMethod implements CommandMethod { /** * Create a new {@link DeclaredCommandMethod} given a {@link Method}. - * + * * @param method must not be null. */ private DeclaredCommandMethod(Method method) { @@ -60,7 +60,7 @@ private DeclaredCommandMethod(Method method) { /** * Create a new {@link DeclaredCommandMethod} given a {@link Method} and {@link Parameters}. - * + * * @param method must not be null. * @param parameters must not be null. */ @@ -95,7 +95,7 @@ private DeclaredCommandMethod(Method method, ExecutionSpecificParameters paramet /** * Create a new {@link DeclaredCommandMethod} given a {@link Method}. - * + * * @param method must not be null. */ public static CommandMethod create(Method method) { @@ -136,7 +136,7 @@ public ResolvableType getActualReturnType() { /** * Lookup a method annotation. - * + * * @param annotationClass the annotation class. * @return the annotation object or {@literal null} if not found. */ @@ -179,7 +179,7 @@ public boolean isReactiveExecution() { } /** - * @return {@literal true} if the method defines a {@link com.lambdaworks.redis.dynamic.batch.CommandBatching} argument. + * @return {@literal true} if the method defines a {@link io.lettuce.core.dynamic.batch.CommandBatching} argument. */ @Override public boolean isBatchExecution() { diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifier.java b/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifier.java rename to src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java index c37a5102ba..87f85317ba 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifier.java +++ b/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.dynamic.parameter.Parameter; -import com.lambdaworks.redis.dynamic.segment.CommandSegments; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceLists; -import com.lambdaworks.redis.models.command.CommandDetail; +import io.lettuce.core.*; +import io.lettuce.core.dynamic.parameter.Parameter; +import io.lettuce.core.dynamic.segment.CommandSegments; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceLists; +import io.lettuce.core.models.command.CommandDetail; /** * Verifies {@link CommandMethod} declarations by checking available Redis commands. - * + * * @author Mark Paluch * @since 5.0 */ @@ -57,7 +57,7 @@ public DefaultCommandMethodVerifier(List commandDetails) { /** * Verify a {@link CommandMethod} with its {@link CommandSegments}. This method verifies that the command exists and that * the required number of arguments is declared. - * + * * @param commandSegments * @param commandMethod */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java rename to src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java index b96b7a6585..61392d65ab 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java +++ b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.dynamic.annotation.Key; -import com.lambdaworks.redis.dynamic.annotation.Value; -import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor; -import com.lambdaworks.redis.dynamic.parameter.Parameter; -import com.lambdaworks.redis.dynamic.parameter.Parameters; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.*; +import io.lettuce.core.dynamic.annotation.Key; +import io.lettuce.core.dynamic.annotation.Value; +import io.lettuce.core.dynamic.parameter.MethodParametersAccessor; +import io.lettuce.core.dynamic.parameter.Parameter; +import io.lettuce.core.dynamic.parameter.Parameters; +import io.lettuce.core.internal.LettuceAssert; /** * Default {@link MethodParametersAccessor} implementation. @@ -94,7 +94,7 @@ public boolean isBindableNullValue(int index) { Parameter bindableParameter = parameters.getBindableParameter(index); - if (bindableParameter.isAssignableTo(Limit.class) || bindableParameter.isAssignableTo(com.lambdaworks.redis.Value.class) + if (bindableParameter.isAssignableTo(Limit.class) || bindableParameter.isAssignableTo(io.lettuce.core.Value.class) || bindableParameter.isAssignableTo(KeyValue.class) || bindableParameter.isAssignableTo(ScoredValue.class) || bindableParameter.isAssignableTo(GeoCoordinates.class) || bindableParameter.isAssignableTo(Range.class)) { return false; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java b/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java rename to src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java index 9f63f4943d..1c7dbd6eb0 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java +++ b/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -23,11 +23,11 @@ import java.util.HashSet; import java.util.Set; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Default implementation of {@link RedisCommandsMetadata}. - * + * * @author Mark Paluch * @since 5.0 */ @@ -40,7 +40,7 @@ class DefaultRedisCommandsMetadata implements RedisCommandsMetadata { /** * Create {@link DefaultRedisCommandsMetadata} given a {@link Class command interface}. - * + * * @param apiInterface must not be {@literal null}. */ DefaultRedisCommandsMetadata(Class apiInterface) { diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommand.java rename to src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java index d209d5d18f..113053941e 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommand.java +++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.concurrent.ExecutionException; /** * An executable command that can be executed calling {@link #execute(Object[])}. - * + * * @author Mark Paluch * @since 5.0 */ @@ -27,7 +27,7 @@ interface ExecutableCommand { /** * Executes the {@link ExecutableCommand} with the given parameters. - * + * * @param parameters * @return */ @@ -35,7 +35,7 @@ interface ExecutableCommand { /** * Returns the {@link CommandMethod}. - * + * * @return */ CommandMethod getCommandMethod(); diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java rename to src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java index 5c9a12bc41..068b9e22b6 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java +++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.lang.reflect.Method; /** * Strategy interface to resolve {@link ExecutableCommand} from a {@link Method} and {@link RedisCommandsMetadata}. - * + * * @author Mark Paluch * @since 5.0 */ @@ -27,7 +27,7 @@ interface ExecutableCommandLookupStrategy { /** * Resolve a {@link ExecutableCommand} given the {@link Method} and {@link RedisCommandsMetadata}. - * + * * @param method must not be {@literal null}. * @param metadata must not be {@literal null}. * @return the {@link ExecutableCommand}. diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategySupport.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java similarity index 86% rename from src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategySupport.java rename to src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java index 6c7d961561..9f1236801b 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategySupport.java +++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.List; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver; -import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver; -import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory; -import com.lambdaworks.redis.dynamic.segment.CommandSegments; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.codec.AnnotationRedisCodecResolver; +import io.lettuce.core.dynamic.output.CodecAwareOutputFactoryResolver; +import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver; +import io.lettuce.core.dynamic.segment.AnnotationCommandSegmentFactory; +import io.lettuce.core.dynamic.segment.CommandSegments; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java rename to src/main/java/io/lettuce/core/dynamic/ParameterBinder.java index 4ef062f468..f15f2719c8 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java +++ b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; -import static com.lambdaworks.redis.protocol.CommandKeyword.LIMIT; +import static io.lettuce.core.protocol.CommandKeyword.LIMIT; import java.lang.reflect.Array; import java.nio.ByteBuffer; import java.util.*; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor; -import com.lambdaworks.redis.dynamic.segment.CommandSegment; -import com.lambdaworks.redis.dynamic.segment.CommandSegments; -import com.lambdaworks.redis.dynamic.segment.CommandSegment.ArgumentContribution; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.ProtocolKeyword; +import io.lettuce.core.*; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.parameter.MethodParametersAccessor; +import io.lettuce.core.dynamic.segment.CommandSegment; +import io.lettuce.core.dynamic.segment.CommandSegments; +import io.lettuce.core.dynamic.segment.CommandSegment.ArgumentContribution; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.ProtocolKeyword; /** * Parameter binder for {@link CommandSegments}-based Redis Commands. @@ -43,7 +43,7 @@ class ParameterBinder { /** * Bind {@link CommandSegments} and method parameters to {@link CommandArgs}. - * + * * @param args the command arguments. * @param codec the codec. * @param commandSegments the command segments. diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java similarity index 79% rename from src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java rename to src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java index 8b2390b637..74551ae5f5 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java +++ b/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactory; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver; -import com.lambdaworks.redis.dynamic.output.OutputSelector; -import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters; -import com.lambdaworks.redis.dynamic.segment.CommandSegments; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.output.CommandOutputFactory; +import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver; +import io.lettuce.core.dynamic.output.OutputSelector; +import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters; +import io.lettuce.core.dynamic.segment.CommandSegments; /** * {@link CommandSegmentCommandFactory} for Reactive Command execution. - * + * * @author Mark Paluch */ class ReactiveCommandSegmentCommandFactory extends CommandSegmentCommandFactory { @@ -60,7 +60,7 @@ protected CommandOutputFactory resolveCommandOutputFactory(OutputSelector output } /** - * @return {@literal true} if the resolved {@link com.lambdaworks.redis.output.CommandOutput} should use streaming. + * @return {@literal true} if the resolved {@link io.lettuce.core.output.CommandOutput} should use streaming. */ public boolean isStreamingExecution() { return streamingExecution; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommand.java rename to src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java index 079316e3f6..c537447512 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommand.java +++ b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; -import com.lambdaworks.redis.AbstractRedisReactiveCommands; +import io.lettuce.core.AbstractRedisReactiveCommands; /** * An {@link ExecutableCommand} that is executed using reactive infrastructure. - * + * * @author Mark Paluch * @since 5.0 */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java similarity index 87% rename from src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java rename to src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java index f3d43d2ab0..adfed751db 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java +++ b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.List; -import com.lambdaworks.redis.AbstractRedisReactiveCommands; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver; -import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver; -import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory; -import com.lambdaworks.redis.dynamic.segment.CommandSegments; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.AbstractRedisReactiveCommands; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.codec.AnnotationRedisCodecResolver; +import io.lettuce.core.dynamic.output.CodecAwareOutputFactoryResolver; +import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver; +import io.lettuce.core.dynamic.segment.AnnotationCommandSegmentFactory; +import io.lettuce.core.dynamic.segment.CommandSegments; +import io.lettuce.core.internal.LettuceAssert; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java b/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java rename to src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java index f5b79ac79e..4901dda767 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java +++ b/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.function.Function; @@ -27,8 +27,8 @@ import rx.Single; import rx.internal.reactivestreams.PublisherAdapter; -import com.lambdaworks.redis.dynamic.ReactiveTypes.ReactiveLibrary; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.dynamic.ReactiveTypes.ReactiveLibrary; +import io.lettuce.core.internal.LettuceAssert; import io.reactivex.BackpressureStrategy; import io.reactivex.Flowable; @@ -42,7 +42,7 @@ class ReactiveTypeAdapters { /** * Register adapters in the conversion service. - * + * * @param conversionService */ static void registerIn(ConversionService conversionService) { diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypes.java b/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypes.java rename to src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java index 7066cebf95..ac7d86727e 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypes.java +++ b/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.*; import java.util.Map.Entry; @@ -21,8 +21,8 @@ import org.reactivestreams.Publisher; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceClassUtils; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceClassUtils; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -249,4 +249,4 @@ public boolean isNoValue() { return this.isNoValue; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java rename to src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java index 9fee67502f..42ddb92bd6 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java +++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java @@ -13,33 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.lang.reflect.Method; import java.util.*; import org.springframework.util.Assert; -import com.lambdaworks.redis.AbstractRedisReactiveCommands; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.dynamic.batch.BatchSize; -import com.lambdaworks.redis.dynamic.intercept.InvocationProxyFactory; -import com.lambdaworks.redis.dynamic.intercept.MethodInterceptor; -import com.lambdaworks.redis.dynamic.intercept.MethodInvocation; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver; -import com.lambdaworks.redis.dynamic.output.OutputRegistry; -import com.lambdaworks.redis.dynamic.output.OutputRegistryCommandOutputFactoryResolver; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceLists; -import com.lambdaworks.redis.models.command.CommandDetail; -import com.lambdaworks.redis.models.command.CommandDetailParser; -import com.lambdaworks.redis.protocol.LettuceCharsets; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.AbstractRedisReactiveCommands; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.dynamic.batch.BatchSize; +import io.lettuce.core.dynamic.intercept.InvocationProxyFactory; +import io.lettuce.core.dynamic.intercept.MethodInterceptor; +import io.lettuce.core.dynamic.intercept.MethodInvocation; +import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver; +import io.lettuce.core.dynamic.output.OutputRegistry; +import io.lettuce.core.dynamic.output.OutputRegistryCommandOutputFactoryResolver; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceLists; +import io.lettuce.core.models.command.CommandDetail; +import io.lettuce.core.models.command.CommandDetailParser; +import io.lettuce.core.protocol.LettuceCharsets; +import io.lettuce.core.protocol.RedisCommand; /** * Factory to create Redis Command interface instances. @@ -78,7 +78,7 @@ public interface MyRedisCommands { * * @author Mark Paluch * @since 5.0 - * @see com.lambdaworks.redis.dynamic.annotation.Command + * @see io.lettuce.core.dynamic.annotation.Command * @see CommandMethod */ public class RedisCommandFactory { @@ -94,7 +94,7 @@ public class RedisCommandFactory { /** * Create a new {@link CommandFactory} given {@link StatefulConnection}. - * + * * @param connection must not be {@literal null}. */ public RedisCommandFactory(StatefulConnection connection) { @@ -139,7 +139,7 @@ private List getCommands(StatefulConnection connection) { /** * Set a {@link CommandOutputFactoryResolver}. - * + * * @param commandOutputFactoryResolver must not be {@literal null}. */ public void setCommandOutputFactoryResolver(CommandOutputFactoryResolver commandOutputFactoryResolver) { @@ -151,7 +151,7 @@ public void setCommandOutputFactoryResolver(CommandOutputFactoryResolver command /** * Enables/disables command verification which checks the command name against Redis {@code COMMAND} and the argument count. - * + * * @param verifyCommandMethods {@literal true} to enable command verification (default) or {@literal false} to disable * command verification. */ @@ -161,7 +161,7 @@ public void setVerifyCommandMethods(boolean verifyCommandMethods) { /** * Returns a Redis Commands interface instance for the given interface. - * + * * @param commandInterface must not be {@literal null}. * @param command interface type. * @return the implemented Redis Commands interface. diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java rename to src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java index 4a35f662b1..930ec4c524 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java +++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -21,7 +21,7 @@ /** * Interface exposing Redis command interface metadata. - * + * * @author Mark Paluch * @since 5.0 */ @@ -38,7 +38,7 @@ interface RedisCommandsMetadata { /** * Lookup an interface annotation. - * + * * @param annotationClass the annotation class. * @return the annotation object or {@literal null} if not found. */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/SimpleBatcher.java b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/SimpleBatcher.java rename to src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java index db2bd98b9e..ab881081ef 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/SimpleBatcher.java +++ b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.dynamic.batch.CommandBatching; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.dynamic.batch.CommandBatching; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.RedisCommand; import io.netty.util.internal.shaded.org.jctools.queues.atomic.MpscLinkedAtomicQueue; @@ -33,7 +33,7 @@ *
    • Reaches the configured {@link #batchSize}
      • *
    • Encounters a {@link CommandBatching#flush() force flush}
      • *
    - * + * * @author Mark Paluch */ class SimpleBatcher implements Batcher { diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java b/src/main/java/io/lettuce/core/dynamic/annotation/Command.java similarity index 86% rename from src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java rename to src/main/java/io/lettuce/core/dynamic/annotation/Command.java index 773fb62e03..40fbe85fad 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java +++ b/src/main/java/io/lettuce/core/dynamic/annotation/Command.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.annotation; +package io.lettuce.core.dynamic.annotation; import java.lang.annotation.*; -import com.lambdaworks.redis.dynamic.domain.Timeout; +import io.lettuce.core.dynamic.domain.Timeout; /** * Redis command method annotation specifying a command string. A command string can contain the command name, a sequence of @@ -25,15 +25,15 @@ *

    * Parameters: Parameters can be referenced by their name {@code :myArg} or index {@code ?0}. Additional, not referenced * parameters are appended to the command in the order of their appearance. Declared parameters are matched against - * {@link com.lambdaworks.redis.codec.RedisCodec} for codec resolution. Additional parameter types such as {@link Timeout} + * {@link io.lettuce.core.codec.RedisCodec} for codec resolution. Additional parameter types such as {@link Timeout} * control execution behavior and are not added to command arguments. *

    * Usage: - * + * * 

      *     @Command("SET ?0 ?1")
  *     public String setKey(String key, String value)
- * 
+ *
  *     @Command("SET :key :value")
  *     public String setKeyNamed(@Param("key") String key, @Param("value") String value)
  *
    @@ -47,7 +47,7 @@ * @see Param * @see Key * @see Value - * @see com.lambdaworks.redis.dynamic.codec.RedisCodecResolver + * @see io.lettuce.core.dynamic.codec.RedisCodecResolver */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java b/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java rename to src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java index cc4d4957d0..d8dd220ef0 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java +++ b/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.annotation; +package io.lettuce.core.dynamic.annotation; import java.lang.annotation.*; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java b/src/main/java/io/lettuce/core/dynamic/annotation/Key.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java rename to src/main/java/io/lettuce/core/dynamic/annotation/Key.java index fdc61163e9..a3a4de69ab 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java +++ b/src/main/java/io/lettuce/core/dynamic/annotation/Key.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.annotation; +package io.lettuce.core.dynamic.annotation; import java.lang.annotation.*; /** * Marker annotation to declare a method parameter as key. - * + * * @author Mark Paluch * @see Value * @since 5.0 diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java b/src/main/java/io/lettuce/core/dynamic/annotation/Param.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java rename to src/main/java/io/lettuce/core/dynamic/annotation/Param.java index f52117a6da..62f01958ca 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java +++ b/src/main/java/io/lettuce/core/dynamic/annotation/Param.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.annotation; +package io.lettuce.core.dynamic.annotation; import java.lang.annotation.*; @@ -31,7 +31,7 @@ /** * Name of the parameter. - * + * * @return */ String value(); diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java b/src/main/java/io/lettuce/core/dynamic/annotation/Value.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java rename to src/main/java/io/lettuce/core/dynamic/annotation/Value.java index 729f125193..6842b3e920 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java +++ b/src/main/java/io/lettuce/core/dynamic/annotation/Value.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.annotation; +package io.lettuce.core.dynamic.annotation; import java.lang.annotation.*; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java b/src/main/java/io/lettuce/core/dynamic/annotation/package-info.java similarity index 65% rename from src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java rename to src/main/java/io/lettuce/core/dynamic/annotation/package-info.java index 00242bde76..43894661b0 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java +++ b/src/main/java/io/lettuce/core/dynamic/annotation/package-info.java @@ -1,4 +1,4 @@ /** * Central domain abstractions to be used in combination with Redis Command interfaces. */ -package com.lambdaworks.redis.dynamic.annotation; +package io.lettuce.core.dynamic.annotation; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchException.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/dynamic/batch/BatchException.java rename to src/main/java/io/lettuce/core/dynamic/batch/BatchException.java index 63fe23566c..8daadcb95e 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchException.java +++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.batch; +package io.lettuce.core.dynamic.batch; import java.util.Collections; import java.util.List; -import com.lambdaworks.redis.RedisCommandExecutionException; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.RedisCommandExecutionException; +import io.lettuce.core.protocol.RedisCommand; /** * Batch exception to collect multiple errors from batched command execution. *

    * Commands that fail during the batch cause a {@link BatchException} while non-failed commands remain executed successfully. - * + * * @author Mark Paluch * @since 5.0 * @see BatchExecutor @@ -38,7 +38,7 @@ public class BatchException extends RedisCommandExecutionException { /** * Create a new {@link BatchException}. - * + * * @param failedCommands {@link List} of failed {@link RedisCommand}s. */ public BatchException(List> failedCommands) { diff --git a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchExecutor.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/batch/BatchExecutor.java rename to src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java index 163126b108..85ccf988bb 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchExecutor.java +++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.batch; +package io.lettuce.core.dynamic.batch; /** * Batch executor interface to enforce command queue flushing using {@link BatchSize}. @@ -22,7 +22,7 @@ * the batch size is not reached, commands remain not executed. *

    * Commands that fail during the batch cause a {@link BatchException} while non-failed commands remain executed successfully. - * + * * @author Mark Paluch * @since 5.0 * @see BatchSize @@ -31,7 +31,7 @@ public interface BatchExecutor { /** * Flush the command queue resulting in the queued commands being executed. - * + * * @throws BatchException if at least one command failed. */ void flush() throws BatchException; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchSize.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/dynamic/batch/BatchSize.java rename to src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java index fad81fda7f..0139051983 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchSize.java +++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.batch; +package io.lettuce.core.dynamic.batch; import java.lang.annotation.*; @@ -21,20 +21,20 @@ * Redis command method annotation declaring a command interface to use batching with a specified {@code batchSize}. *

    * Usage: - * + * * 

      * @BatchSize(50)
  * public interface MyCommands extends Commands {
- *  
+ *
  *   public void set(String key, String value);
- *  
+ *
  *   public RedisFuture<String> get(String key)
  * }
  *
    *

    * Command batching executes commands in a deferred nature. This also means that at the time of invocation no result is * available. Batching can be only used with synchronous methods without a return value ({@code void}) or asynchronous methods - * returning a {@link com.lambdaworks.redis.RedisFuture}. Reactive command batching is not supported because reactive executed + * returning a {@link io.lettuce.core.RedisFuture}. Reactive command batching is not supported because reactive executed * commands maintain an own subscription lifecycle that is decoupled from command method batching. *

    * Command methods participating in batching share a single batch queue. All method invocations are queued until reaching the @@ -47,7 +47,7 @@ * {@link BatchExecutor#flush() flushed}. If the batch size is not reached, commands remain not executed. *

    * Batching command interfaces are thread-safe and can be shared amongst multiple threads. - * + * * @author Mark Paluch * @since 5.0 * @see CommandBatching @@ -60,7 +60,7 @@ /** * Declares the batch size for the command method. - * + * * @return a positive, non-zero number of commands. */ int value(); diff --git a/src/main/java/com/lambdaworks/redis/dynamic/batch/CommandBatching.java b/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/dynamic/batch/CommandBatching.java rename to src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java index 25b8f5b083..60a02d39ef 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/batch/CommandBatching.java +++ b/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java @@ -13,34 +13,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.batch; +package io.lettuce.core.dynamic.batch; /** * Programmatic command batching API. *

    * {@link CommandBatching} is used to queue commands in a batch queue and flush the command queue on command invocation. Usage: - * + * * 

      * public interface MyCommands extends Commands {
- *  
+ *
  *   public void set(String key, String value, CommandBatching batching);
- *  
+ *
  *   public RedisFuture<String> get(String key, CommandBatching batching)
  * }
- * 
+ *
  * MyCommands commands = …
- * 
- * commands.set("key", "value", CommandBatching.queue()); 
+ *
+ * commands.set("key", "value", CommandBatching.queue());
  * commands.get("key", CommandBatching.flush());
  *
    *

    * Using {@link CommandBatching} in a method signature turns the command method into a batched command method.
    * Command batching executes commands in a deferred nature. This also means that at the time of invocation no result is * available. Batching can be only used with synchronous methods without a return value ({@code void}) or asynchronous methods - * returning a {@link com.lambdaworks.redis.RedisFuture}. Reactive command batching is not supported because reactive executed + * returning a {@link io.lettuce.core.RedisFuture}. Reactive command batching is not supported because reactive executed * commands maintain an own subscription lifecycle that is decoupled from command method batching. *

    - * + * * @author Mark Paluch * @since 5.0 * @see BatchSize @@ -49,7 +49,7 @@ public abstract class CommandBatching { /** * Flush the command batch queue after adding a command to the batch queue. - * + * * @return {@link CommandBatching} to flush the command batch queue after adding a command to the batch queue. */ public static CommandBatching flush() { @@ -58,7 +58,7 @@ public static CommandBatching flush() { /** * Enqueue the command to the batch queue. - * + * * @return {@link CommandBatching} to enqueue the command to the batch queue. */ public static CommandBatching queue() { diff --git a/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java rename to src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java index 431da9ee7c..771d50b42c 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java +++ b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.codec; +package io.lettuce.core.dynamic.codec; import java.util.*; import java.util.stream.Collectors; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.CommandMethod; -import com.lambdaworks.redis.dynamic.annotation.Key; -import com.lambdaworks.redis.dynamic.annotation.Value; -import com.lambdaworks.redis.dynamic.parameter.Parameter; -import com.lambdaworks.redis.dynamic.support.ClassTypeInformation; -import com.lambdaworks.redis.dynamic.support.TypeInformation; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceLists; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.CommandMethod; +import io.lettuce.core.dynamic.annotation.Key; +import io.lettuce.core.dynamic.annotation.Value; +import io.lettuce.core.dynamic.parameter.Parameter; +import io.lettuce.core.dynamic.support.ClassTypeInformation; +import io.lettuce.core.dynamic.support.TypeInformation; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceLists; /** * Annotation-based {@link RedisCodecResolver}. Considers {@code @Key} and {@code @Value} annotations of method parameters to @@ -227,10 +227,10 @@ protected static class ParameterWrappers { static { - WRAPPERS.add(com.lambdaworks.redis.Value.class); - WRAPPERS.add(com.lambdaworks.redis.KeyValue.class); - WRAPPERS.add(com.lambdaworks.redis.ScoredValue.class); - WRAPPERS.add(com.lambdaworks.redis.Range.class); + WRAPPERS.add(io.lettuce.core.Value.class); + WRAPPERS.add(io.lettuce.core.KeyValue.class); + WRAPPERS.add(io.lettuce.core.ScoredValue.class); + WRAPPERS.add(io.lettuce.core.Range.class); WRAPPERS.add(List.class); WRAPPERS.add(Collection.class); @@ -238,10 +238,10 @@ protected static class ParameterWrappers { WRAPPERS.add(Iterable.class); WRAPPERS.add(Map.class); - WITH_VALUE_TYPE.add(com.lambdaworks.redis.Value.class); - WITH_VALUE_TYPE.add(com.lambdaworks.redis.KeyValue.class); - WITH_KEY_TYPE.add(com.lambdaworks.redis.KeyValue.class); - WITH_VALUE_TYPE.add(com.lambdaworks.redis.ScoredValue.class); + WITH_VALUE_TYPE.add(io.lettuce.core.Value.class); + WITH_VALUE_TYPE.add(io.lettuce.core.KeyValue.class); + WITH_KEY_TYPE.add(io.lettuce.core.KeyValue.class); + WITH_VALUE_TYPE.add(io.lettuce.core.ScoredValue.class); WITH_KEY_TYPE.add(Map.class); WITH_VALUE_TYPE.add(Map.class); diff --git a/src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java similarity index 87% rename from src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java rename to src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java index 593046455a..a54e698112 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java +++ b/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.codec; +package io.lettuce.core.dynamic.codec; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.CommandMethod; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.CommandMethod; /** * Strategy interface to resolve a {@link RedisCodec} for a {@link CommandMethod}. @@ -28,7 +28,7 @@ public interface RedisCodecResolver { /** * Resolve a {@link RedisCodec} for the given {@link CommandMethod}. - * + * * @param commandMethod must not be {@literal null}. * @return the resolved {@link RedisCodec} or {@literal null} if not resolvable. */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java b/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java rename to src/main/java/io/lettuce/core/dynamic/domain/Timeout.java index 513ae812ca..9bf219f817 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java +++ b/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.domain; +package io.lettuce.core.dynamic.domain; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.dynamic.annotation.Command; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.dynamic.annotation.Command; +import io.lettuce.core.internal.LettuceAssert; /** * Timeout value object to represent a timeout value with its {@link TimeUnit}. - * + * * @author Mark Paluch * @since 5.0 * @see Command @@ -43,7 +43,7 @@ private Timeout(long timeout, TimeUnit timeUnit) { /** * Create a {@link Timeout}. - * + * * @param timeout the timeout value, must be non-negative. * @param timeUnit the associated {@link TimeUnit}, must not be {@literal null}. * @return the {@link Timeout}. diff --git a/src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java b/src/main/java/io/lettuce/core/dynamic/domain/package-info.java similarity index 60% rename from src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java rename to src/main/java/io/lettuce/core/dynamic/domain/package-info.java index 66a8ab00ad..cfec978b77 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java +++ b/src/main/java/io/lettuce/core/dynamic/domain/package-info.java @@ -1,4 +1,4 @@ /** * Core annotations to be used with Redis Command interfaces. */ -package com.lambdaworks.redis.dynamic.domain; +package io.lettuce.core.dynamic.domain; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java b/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvocation.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java rename to src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvocation.java index a7698a3101..e3bc01aa94 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java +++ b/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvocation.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.intercept; +package io.lettuce.core.dynamic.intercept; import java.lang.reflect.Method; /** * Default implementation of {@link MethodInvocation} - * + * * @author Mark Paluch */ abstract class DefaultMethodInvocation implements MethodInvocation { diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java rename to src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java index 1f3a1baee2..efd5b69c2f 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java +++ b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.intercept; +package io.lettuce.core.dynamic.intercept; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.internal.AbstractInvocationHandler; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.AbstractInvocationHandler; +import io.lettuce.core.internal.LettuceAssert; /** * Factory to create invocation proxies. diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java rename to src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java index b7af3a53ad..858142c628 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java +++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.intercept; +package io.lettuce.core.dynamic.intercept; /** * Intercepts calls on an interface on its way to the target. These are nested "on top" of the target. @@ -29,7 +29,7 @@ public interface MethodInterceptor { /** * Implement this method to perform extra treatments before and after the invocation. Polite implementations would certainly * like to invoke {@link MethodInvocation#proceed()}. - * + * * @param invocation the method invocation * @return the result of the call to {@link MethodInvocation#proceed()}, might be intercepted by the interceptor. * @throws Throwable if the interceptors or the target-object throws an exception. diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptorChain.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptorChain.java rename to src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java index 9d664736a5..2a28158e43 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptorChain.java +++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.intercept; +package io.lettuce.core.dynamic.intercept; import java.lang.reflect.Method; import java.util.Iterator; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java rename to src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java index c16b5a9baf..0cbf2d1cea 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java +++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.intercept; +package io.lettuce.core.dynamic.intercept; import java.lang.reflect.Method; @@ -33,7 +33,7 @@ public interface MethodInvocation { * Proceed to the next interceptor in the chain. *

    * The implementation and the semantics of this method depends on the actual joinpoint type (see the children interfaces). - * + * * @return see the children interfaces' proceed definition * @throws Throwable if the invocation throws an exception */ diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/package-info.java b/src/main/java/io/lettuce/core/dynamic/intercept/package-info.java new file mode 100644 index 0000000000..36416377dc --- /dev/null +++ b/src/main/java/io/lettuce/core/dynamic/intercept/package-info.java @@ -0,0 +1,4 @@ +/** + * Invocation proxy support. + */ +package io.lettuce.core.dynamic.intercept; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java rename to src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java index eab6e4e17b..19900f0c10 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java +++ b/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.output; +package io.lettuce.core.dynamic.output; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** * {@link RedisCodec}-aware implementation of {@link CommandOutputFactoryResolver}. This implementation inspects * {@link RedisCodec} regarding its type and enhances {@link OutputSelector} for {@link CommandOutputFactory} resolution. - * + * * @author Mark Paluch * @since 5.0 */ @@ -32,7 +32,7 @@ public class CodecAwareOutputFactoryResolver implements CommandOutputFactoryReso /** * Create a new {@link CodecAwareOutputFactoryResolver} given {@link CommandOutputFactoryResolver} and {@link RedisCodec}. - * + * * @param delegate must not be {@literal null}. * @param redisCodec must not be {@literal null}. */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java similarity index 88% rename from src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java rename to src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java index a53d1eb5b1..e54f9438b4 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java +++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.output; +package io.lettuce.core.dynamic.output; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.output.CommandOutput; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.output.CommandOutput; /** * Strategy interface to create {@link CommandOutput} given {@link RedisCodec}. @@ -31,7 +31,7 @@ public interface CommandOutputFactory { /** * Create and initialize a new {@link CommandOutput} given {@link RedisCodec}. - * + * * @param codec must not be {@literal null}. * @param Key type. * @param Value type. diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java similarity index 79% rename from src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java rename to src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java index 95988051a9..704dc159cc 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java +++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.output; +package io.lettuce.core.dynamic.output; /** * Strategy interface to resolve a {@link CommandOutputFactory} based on a {@link OutputSelector}. Resolution of - * {@link CommandOutputFactory} is based on {@link com.lambdaworks.redis.dynamic.CommandMethod} result types and can be + * {@link CommandOutputFactory} is based on {@link io.lettuce.core.dynamic.CommandMethod} result types and can be * influenced whether the result type is a key or value result type. Additional type variables (based on the used - * {@link com.lambdaworks.redis.codec.RedisCodec} are hints to improve output resolution. - * + * {@link io.lettuce.core.codec.RedisCodec} are hints to improve output resolution. + * * @author Mark Paluch * @since 5.0 * @see OutputSelector @@ -28,20 +28,20 @@ public interface CommandOutputFactoryResolver { /** - * Resolve a regular {@link CommandOutputFactory} that produces the {@link com.lambdaworks.redis.output.CommandOutput} + * Resolve a regular {@link CommandOutputFactory} that produces the {@link io.lettuce.core.output.CommandOutput} * result component type. - * + * * @param outputSelector must not be {@literal null}. * @return the {@link CommandOutputFactory} if resolved, {@literal null} otherwise. */ CommandOutputFactory resolveCommandOutput(OutputSelector outputSelector); /** - * Resolve a streaming {@link CommandOutputFactory} that produces the {@link com.lambdaworks.redis.output.StreamingOutput} + * Resolve a streaming {@link CommandOutputFactory} that produces the {@link io.lettuce.core.output.StreamingOutput} * result component type. * * @param outputSelector must not be {@literal null}. - * @return the {@link CommandOutputFactory} that implements {@link com.lambdaworks.redis.output.StreamingOutput} if + * @return the {@link CommandOutputFactory} that implements {@link io.lettuce.core.output.StreamingOutput} if * resolved, {@literal null} otherwise. */ CommandOutputFactory resolveStreamingCommandOutput(OutputSelector outputSelector); diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java rename to src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java index 71a9caf860..9d092403cb 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java +++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.output; +package io.lettuce.core.dynamic.output; -import com.lambdaworks.redis.dynamic.support.ResolvableType; +import io.lettuce.core.dynamic.support.ResolvableType; /** * Base class for {@link CommandOutputFactory} resolution such as {@link OutputRegistryCommandOutputFactoryResolver}. *

    * This class provides methods to check provider/selector type assignability. Subclasses are responsible for calling methods in * this class in the correct order. - * + * * @author Mark Paluch */ public abstract class CommandOutputResolverSupport { @@ -31,7 +31,7 @@ public abstract class CommandOutputResolverSupport { * Overridable hook to check whether {@code selector} can be assigned from the provider type {@code provider}. *

    * This method descends the component type hierarchy and considers primitive/wrapper type conversion. - * + * * @param selector must not be {@literal null}. * @param provider must not be {@literal null}. * @return {@literal true} if selector can be assigned from its provider type. diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java rename to src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java index cf2e2ff4dc..35983fcbfd 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java +++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.output; +package io.lettuce.core.dynamic.output; import java.lang.reflect.TypeVariable; import java.util.ArrayList; @@ -21,16 +21,16 @@ import java.util.List; import java.util.Map; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.support.ClassTypeInformation; -import com.lambdaworks.redis.dynamic.support.ResolvableType; -import com.lambdaworks.redis.dynamic.support.TypeInformation; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.*; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.support.ClassTypeInformation; +import io.lettuce.core.dynamic.support.ResolvableType; +import io.lettuce.core.dynamic.support.TypeInformation; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.*; /** * Registry for {@link CommandOutput} types and their {@link CommandOutputFactory factories}. - * + * * @author Mark Paluch * @since 5.0 * @see CommandOutput @@ -81,7 +81,7 @@ public OutputRegistry() { /** * Create a new {@link OutputRegistry}. - * + * * @param registerBuiltin {@literal true} to register builtin {@link CommandOutput} types. */ public OutputRegistry(boolean registerBuiltin) { @@ -93,7 +93,7 @@ public OutputRegistry(boolean registerBuiltin) { /** * Register a {@link CommandOutput} type with its {@link CommandOutputFactory}. - * + * * @param commandOutputClass must not be {@literal null}. * @param commandOutputFactory must not be {@literal null}. */ @@ -108,7 +108,7 @@ public OutputRegistry(boolean registerBuiltin) { /** * Return the registry map. - * + * * @return map of {@link OutputType} to {@link CommandOutputFactory}. */ Map getRegistry() { @@ -144,7 +144,7 @@ private static List getOutputTypes(Class co /** * Retrieve {@link OutputType} for a {@link StreamingOutput} type. - * + * * @param commandOutputClass * @return */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java rename to src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java index f15df526aa..a30fdcaa79 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java +++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.output; +package io.lettuce.core.dynamic.output; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.lambdaworks.redis.dynamic.support.ClassTypeInformation; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.CommandOutput; +import io.lettuce.core.dynamic.support.ClassTypeInformation; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.CommandOutput; /** * {@link CommandOutputFactoryResolver} using {@link OutputRegistry} to resolve a {@link CommandOutputFactory}. *

    * Types registered in {@link OutputRegistry} are inspected for the types they produce and matched with the declared repository * method. If resolution yields multiple {@link CommandOutput}s, the first matched output is used. - * + * * @author Mark Paluch * @since 5.0 * @see OutputRegistry @@ -43,7 +43,7 @@ public class OutputRegistryCommandOutputFactoryResolver extends CommandOutputRes /** * Create a new {@link OutputRegistryCommandOutputFactoryResolver} given {@link OutputRegistry}. - * + * * @param outputRegistry must not be {@literal null}. */ public OutputRegistryCommandOutputFactoryResolver(OutputRegistry outputRegistry) { diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java b/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java similarity index 81% rename from src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java rename to src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java index 04d60b5ac0..cc7bd550f4 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java +++ b/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.output; +package io.lettuce.core.dynamic.output; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.support.ResolvableType; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.support.ResolvableType; +import io.lettuce.core.internal.LettuceAssert; /** * Selector {@link CommandOutputFactory} resolution. *

    - * A {@link OutputSelector} is based on the result {@link ResolvableType} and {@link com.lambdaworks.redis.codec.RedisCodec}. - * The codec supplies types for generics resolution of {@link com.lambdaworks.redis.output.CommandOutput}. + * A {@link OutputSelector} is based on the result {@link ResolvableType} and {@link io.lettuce.core.codec.RedisCodec}. + * The codec supplies types for generics resolution of {@link io.lettuce.core.output.CommandOutput}. * * @author Mark Paluch * @since 5.0 @@ -35,7 +35,7 @@ public class OutputSelector { /** * Creates a new {@link OutputSelector} given {@link ResolvableType} and {@link RedisCodec}. - * + * * @param outputType must not be {@literal null}. * @param redisCodec must not be {@literal null}. */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java b/src/main/java/io/lettuce/core/dynamic/output/OutputType.java similarity index 80% rename from src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java rename to src/main/java/io/lettuce/core/dynamic/output/OutputType.java index 22f9a2cb9e..a4051f4e1a 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java +++ b/src/main/java/io/lettuce/core/dynamic/output/OutputType.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.output; +package io.lettuce.core.dynamic.output; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.support.ResolvableType; -import com.lambdaworks.redis.dynamic.support.TypeInformation; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.CommandOutput; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.support.ResolvableType; +import io.lettuce.core.dynamic.support.TypeInformation; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.CommandOutput; /** - * Type descriptor for a {@link com.lambdaworks.redis.output.CommandOutput}. + * Type descriptor for a {@link io.lettuce.core.output.CommandOutput}. *

    * This value object describes the primary output type and the produced {@link TypeInformation} by the {@link CommandOutput} * type. *

    * {@link OutputType} makes a distinction whether a {@link CommandOutput} is a - * {@link com.lambdaworks.redis.output.StreamingOutput} by providing {@code streaming}. Streaming outputs produce usually a + * {@link io.lettuce.core.output.StreamingOutput} by providing {@code streaming}. Streaming outputs produce usually a * component type hence they require an own {@link OutputType} descriptor. - * + * * @author Mark Paluch * @since 5.0 */ @@ -42,11 +42,11 @@ public class OutputType { /** * Create a new {@link OutputType} given {@code primaryType}, the {@code commandOutputClass}, {@link TypeInformation} and - * whether the {@link OutputType} is for a {@link com.lambdaworks.redis.output.StreamingOutput}. - * + * whether the {@link OutputType} is for a {@link io.lettuce.core.output.StreamingOutput}. + * * @param commandOutputClass must not be {@literal null}. * @param typeInformation must not be {@literal null}. - * @param streaming {@literal true} if the type descriptor concerns the {@link com.lambdaworks.redis.output.StreamingOutput} + * @param streaming {@literal true} if the type descriptor concerns the {@link io.lettuce.core.output.StreamingOutput} */ OutputType(Class commandOutputClass, TypeInformation typeInformation, boolean streaming) { diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java b/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java rename to src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java index 6a5049154c..2112a42120 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java +++ b/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.output; +package io.lettuce.core.dynamic.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.output.CommandOutput; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.output.CommandOutput; /** * {@link Void} command output to consume data silently without actually processing it. - * + * * @author Mark Paluch * @since 5.0 */ diff --git a/src/main/java/io/lettuce/core/dynamic/output/package-info.java b/src/main/java/io/lettuce/core/dynamic/output/package-info.java new file mode 100644 index 0000000000..efdb055558 --- /dev/null +++ b/src/main/java/io/lettuce/core/dynamic/output/package-info.java @@ -0,0 +1,4 @@ +/** + * {@link io.lettuce.core.output.CommandOutput} resolution support. + */ +package io.lettuce.core.dynamic.output; diff --git a/src/main/java/io/lettuce/core/dynamic/package-info.java b/src/main/java/io/lettuce/core/dynamic/package-info.java new file mode 100644 index 0000000000..c77695040d --- /dev/null +++ b/src/main/java/io/lettuce/core/dynamic/package-info.java @@ -0,0 +1,4 @@ +/** + * Core package for Redis Command Interface support through {@link io.lettuce.core.dynamic.RedisCommandFactory}. + */ +package io.lettuce.core.dynamic; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java b/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java rename to src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java index fdd2aa44a7..fcccd62b94 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java +++ b/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.parameter; +package io.lettuce.core.dynamic.parameter; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; -import com.lambdaworks.redis.dynamic.batch.CommandBatching; -import com.lambdaworks.redis.dynamic.domain.Timeout; +import io.lettuce.core.dynamic.batch.CommandBatching; +import io.lettuce.core.dynamic.domain.Timeout; /** * {@link Parameters}-implementation specific to execution. This implementation considers {@link Timeout} for a command method * applying the appropriate synchronization and {@link CommandBatching} to batch commands. - * + * * @author Mark Paluch * @since 5.0 * @see Timeout @@ -40,7 +40,7 @@ public class ExecutionSpecificParameters extends Parameters A findAnnotation(Class annotationType) { /** * Return all parameter annotations. - * + * * @return the {@link List} of annotation objects. */ public List getAnnotations() { @@ -123,7 +123,7 @@ public TypeInformation getTypeInformation() { /** * Check whether the parameter is assignable to {@code target}. - * + * * @param target must not be {@literal null}. * @return */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java b/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java rename to src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java index b38d1a4347..a849e8c008 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java +++ b/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.parameter; +package io.lettuce.core.dynamic.parameter; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Base class to abstract method {@link Parameter}s. - * + * * @author Mark Paluch */ public abstract class Parameters

    implements Iterable

    { @@ -55,7 +55,7 @@ public Parameters(Method method) { /** * Create a new {@link Parameters} for given a {@link Method} at {@code parameterIndex}. - * + * * @param method must not be {@literal null}. * @param parameterIndex the parameter index. * @return the {@link Parameter}. @@ -90,7 +90,7 @@ public List

    getParameters() { /** * Get the bindable parameter according it's logical position in the command. Declarative position may differ because of * special parameters interleaved. - * + * * @param index * @return the {@link Parameter}. */ diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/package-info.java b/src/main/java/io/lettuce/core/dynamic/parameter/package-info.java new file mode 100644 index 0000000000..4b0c60c051 --- /dev/null +++ b/src/main/java/io/lettuce/core/dynamic/parameter/package-info.java @@ -0,0 +1,4 @@ +/** + * Parameter access and descriptors. + */ +package io.lettuce.core.dynamic.parameter; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java b/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java rename to src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java index 061252a7cb..912f61de6e 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java +++ b/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.segment; +package io.lettuce.core.dynamic.segment; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.regex.Pattern; -import com.lambdaworks.redis.LettuceStrings; -import com.lambdaworks.redis.dynamic.annotation.Command; -import com.lambdaworks.redis.dynamic.annotation.CommandNaming; -import com.lambdaworks.redis.dynamic.annotation.CommandNaming.LetterCase; -import com.lambdaworks.redis.dynamic.annotation.CommandNaming.Strategy; -import com.lambdaworks.redis.dynamic.CommandMethod; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.LettuceStrings; +import io.lettuce.core.dynamic.annotation.Command; +import io.lettuce.core.dynamic.annotation.CommandNaming; +import io.lettuce.core.dynamic.annotation.CommandNaming.LetterCase; +import io.lettuce.core.dynamic.annotation.CommandNaming.Strategy; +import io.lettuce.core.dynamic.CommandMethod; +import io.lettuce.core.internal.LettuceAssert; /** * {@link CommandSegmentFactory} implementation that creates {@link CommandSegments} considering {@link Command} and * {@link CommandNaming} annotations. - * + * * @author Mark Paluch * @since 5.0 */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java rename to src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java index bb7dcea60b..44f73d2143 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java +++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.segment; +package io.lettuce.core.dynamic.segment; -import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.dynamic.parameter.MethodParametersAccessor; +import io.lettuce.core.internal.LettuceAssert; /** * Value object representing a segment within a Redis Command. @@ -30,7 +30,7 @@ public abstract class CommandSegment { /** * Create a constant {@link CommandSegment}. - * + * * @param content must not be empty or {@literal null}. * @return the {@link CommandSegment}. */ @@ -40,7 +40,7 @@ public static CommandSegment constant(String content) { /** * Create a named parameter reference {@link CommandSegment}. - * + * * @param name must not be empty or {@literal null}. * @return */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java rename to src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java index 88f6206a96..8058adcf3b 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java +++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.segment; +package io.lettuce.core.dynamic.segment; -import com.lambdaworks.redis.dynamic.CommandMethod; +import io.lettuce.core.dynamic.CommandMethod; /** * Strategy interface to create {@link CommandSegments} for a {@link CommandMethod}. - * + * * @author Mark Paluch * @since 5.0 */ @@ -27,7 +27,7 @@ public interface CommandSegmentFactory { /** * Create {@link CommandSegments} for a {@link CommandMethod}. - * + * * @param commandMethod must not be {@literal null}. * @return the {@link CommandSegments}. */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java rename to src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java index 2ade7d378d..b5c0703ad4 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java +++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.segment; +package io.lettuce.core.dynamic.segment; import java.util.Collections; import java.util.Iterator; import java.util.List; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.ProtocolKeyword; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.ProtocolKeyword; /** * Value object abstracting multiple {@link CommandSegment}s. - * + * * @author Mark Paluch * @since 5.0 */ @@ -35,7 +35,7 @@ public class CommandSegments implements Iterable { /** * Create {@link CommandSegments} given a {@link List} of {@link CommandSegment}s. - * + * * @param segments must not be {@literal null.} */ public CommandSegments(List segments) { diff --git a/src/main/java/io/lettuce/core/dynamic/segment/package-info.java b/src/main/java/io/lettuce/core/dynamic/segment/package-info.java new file mode 100644 index 0000000000..a605d1ca31 --- /dev/null +++ b/src/main/java/io/lettuce/core/dynamic/segment/package-info.java @@ -0,0 +1,4 @@ +/** + * Support for {@link io.lettuce.core.dynamic.segment.CommandSegments} and segment parsing. + */ +package io.lettuce.core.dynamic.segment; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java rename to src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java index 73a33b5a64..589584792c 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java +++ b/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; @@ -21,11 +21,11 @@ import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.dynamic.annotation.Param; +import io.lettuce.core.dynamic.annotation.Param; /** * {@link ParameterNameDiscoverer} based on {@link Param} annotations to resolve parameter names. - * + * * @author Mark Paluch */ public class AnnotationParameterNameDiscoverer implements ParameterNameDiscoverer { diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java rename to src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java index 729f0c5921..95cf3cbde7 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java +++ b/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.ref.Reference; import java.lang.ref.WeakReference; @@ -23,8 +23,8 @@ import java.util.*; import java.util.Map.Entry; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceClassUtils; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceClassUtils; /** * {@link TypeInformation} for a plain {@link Class}. @@ -51,7 +51,7 @@ public class ClassTypeInformation extends TypeDiscoverer { /** * Simple factory method to easily create new instances of {@link ClassTypeInformation}. - * + * * @param * @param type must not be {@literal null}. * @return @@ -74,7 +74,7 @@ public static ClassTypeInformation from(Class type) { /** * Creates a {@link TypeInformation} from the given method's return type. - * + * * @param method must not be {@literal null}. * @return */ @@ -98,7 +98,7 @@ public static TypeInformation fromMethodParameter(Method method, int inde /** * Creates {@link ClassTypeInformation} for the given type. - * + * * @param type */ ClassTypeInformation(Class type) { @@ -109,7 +109,7 @@ public static TypeInformation fromMethodParameter(Method method, int inde /** * Return the user-defined class for the given class: usually simply the given class, but the original class in case of a * CGLIB-generated subclass. - * + * * @param clazz the class to check * @return the user-defined class */ @@ -125,7 +125,7 @@ private static Class getUserClass(Class clazz) { /** * Little helper to allow us to create a generified map, actually just to satisfy the compiler. - * + * * @param type must not be {@literal null}. * @return */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java rename to src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java index 4d803c6ec4..34e27a37ff 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java +++ b/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -22,7 +22,7 @@ /** * Composite {@link ParameterNameDiscoverer} to resolve parameter names using multiple {@link ParameterNameDiscoverer}s. - * + * * @author Mark Paluch */ public class CompositeParameterNameDiscoverer implements ParameterNameDiscoverer { diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java rename to src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java index 26bad0ac3c..b6ceca5856 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java +++ b/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.reflect.Array; import java.lang.reflect.GenericArrayType; @@ -31,7 +31,7 @@ class GenericArrayTypeInformation extends ParentTypeAwareTypeInformation { /** * Creates a new {@link GenericArrayTypeInformation} for the given {@link GenericArrayTypeInformation} and * {@link TypeDiscoverer}. - * + * * @param type must not be {@literal null}. * @param parent must not be {@literal null}. * @param typeVariableMap must not be {@literal null}. diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java b/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java rename to src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java index b74e13026a..4e95a9dc0e 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java +++ b/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -44,7 +44,7 @@ public static Map getTypeVariableMap(Class clazz) { /** * Resolve the type arguments of the given generic interface against the given target class which is assumed to implement * the generic interface and possibly declare concrete types for its type variables. - * + * * @param clazz the target class to check against * @param genericIfc the generic interface or superclass to resolve the type argument from * @return the resolved type of each argument, with the array size matching the number of actual type arguments, or diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java b/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java rename to src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java index e93c65c263..c634bca384 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java +++ b/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.annotation.Annotation; import java.lang.reflect.*; import java.util.HashMap; import java.util.Map; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Helper class that encapsulates the specification of a method parameter, i.e. a {@link Method} or {@link Constructor} plus a @@ -53,7 +53,7 @@ public class MethodParameter { /** * Create a new {@code MethodParameter} for the given method, with nesting level 1. - * + * * @param method the Method to specify a parameter for * @param parameterIndex the index of the parameter: -1 for the method return type; 0 for the first method parameter; 1 for * the second method parameter, etc. @@ -64,7 +64,7 @@ public MethodParameter(Method method, int parameterIndex) { /** * Create a new {@code MethodParameter} for the given method. - * + * * @param method the Method to specify a parameter for * @param parameterIndex the index of the parameter: -1 for the method return type; 0 for the first method parameter; 1 for * the second method parameter, etc. @@ -83,7 +83,7 @@ public MethodParameter(Method method, int parameterIndex, int nestingLevel) { /** * Create a new MethodParameter for the given constructor, with nesting level 1. - * + * * @param constructor the Constructor to specify a parameter for * @param parameterIndex the index of the parameter */ @@ -93,7 +93,7 @@ public MethodParameter(Constructor constructor, int parameterIndex) { /** * Create a new MethodParameter for the given constructor. - * + * * @param constructor the Constructor to specify a parameter for * @param parameterIndex the index of the parameter * @param nestingLevel the nesting level of the target type (typically 1; e.g. in case of a List of Lists, 1 would indicate @@ -110,7 +110,7 @@ public MethodParameter(Constructor constructor, int parameterIndex, int nesti /** * Copy constructor, resulting in an independent MethodParameter object based on the same metadata and cache state that the * original object was in. - * + * * @param original the original MethodParameter object to copy from */ public MethodParameter(MethodParameter original) { @@ -132,7 +132,7 @@ public MethodParameter(MethodParameter original) { * Return the wrapped Method, if any. *

    * Note: Either Method or Constructor is available. - * + * * @return the Method, or {@code null} if none */ public Method getMethod() { @@ -143,7 +143,7 @@ public Method getMethod() { * Return the wrapped Constructor, if any. *

    * Note: Either Method or Constructor is available. - * + * * @return the Constructor, or {@code null} if none */ public Constructor getConstructor() { @@ -152,7 +152,7 @@ public Constructor getConstructor() { /** * Returns the wrapped member. - * + * * @return the Method or Constructor as Member */ public Member getMember() { @@ -168,7 +168,7 @@ public Member getMember() { /** * Returns the wrapped annotated element. - * + * * @return the Method or Constructor as AnnotatedElement */ public AnnotatedElement getAnnotatedElement() { @@ -191,7 +191,7 @@ public Class getDeclaringClass() { /** * Return the index of the method/constructor parameter. - * + * * @return the parameter index (-1 in case of the return type) */ public int getParameterIndex() { @@ -200,7 +200,7 @@ public int getParameterIndex() { /** * Increase this parameter's nesting level. - * + * * @see #getNestingLevel() */ public void increaseNestingLevel() { @@ -209,7 +209,7 @@ public void increaseNestingLevel() { /** * Decrease this parameter's nesting level. - * + * * @see #getNestingLevel() */ public void decreaseNestingLevel() { @@ -227,7 +227,7 @@ public int getNestingLevel() { /** * Set the type index for the current nesting level. - * + * * @param typeIndex the corresponding type index (or {@code null} for the default type index) * @see #getNestingLevel() */ @@ -237,7 +237,7 @@ public void setTypeIndexForCurrentLevel(int typeIndex) { /** * Return the type index for the current nesting level. - * + * * @return the corresponding type index, or {@code null} if none specified (indicating the default type index) * @see #getNestingLevel() */ @@ -247,7 +247,7 @@ public Integer getTypeIndexForCurrentLevel() { /** * Return the type index for the specified nesting level. - * + * * @param nestingLevel the nesting level to check * @return the corresponding type index, or {@code null} if none specified (indicating the default type index) */ @@ -285,7 +285,7 @@ void setParameterType(Class parameterType) { /** * Return the type of the method/constructor parameter. - * + * * @return the parameter type (never {@code null}) */ public Class getParameterType() { @@ -302,7 +302,7 @@ public Class getParameterType() { /** * Return the generic type of the method/constructor parameter. - * + * * @return the parameter type (never {@code null}) */ public Type getGenericParameterType() { @@ -319,7 +319,7 @@ public Type getGenericParameterType() { /** * Return the nested type of the method/constructor parameter. - * + * * @return the parameter type (never {@code null}) * @see #getNestingLevel() */ @@ -349,7 +349,7 @@ public Class getNestedParameterType() { /** * Return the nested generic type of the method/constructor parameter. - * + * * @return the parameter type (never {@code null}) * @see #getNestingLevel() */ @@ -378,7 +378,7 @@ public Annotation[] getMethodAnnotations() { /** * Return the method/constructor annotation of the given type, if available. - * + * * @param annotationType the annotation type to look for * @return the annotation object, or {@code null} if not found */ @@ -404,7 +404,7 @@ public Annotation[] getParameterAnnotations() { /** * Return the parameter annotation of the given type, if available. - * + * * @param annotationType the annotation type to look for * @return the annotation object, or {@code null} if not found */ @@ -445,7 +445,7 @@ public void initParameterNameDiscovery(ParameterNameDiscoverer parameterNameDisc /** * Return the name of the method/constructor parameter. - * + * * @return the parameter name (may be {@code null} if no parameter name metadata is contained in the class file or no * {@link #initParameterNameDiscovery ParameterNameDiscoverer} has been set to begin with) */ @@ -466,7 +466,7 @@ public String getParameterName() { * A template method to post-process a given annotation instance before returning it to the caller. *

    * The default implementation simply returns the given annotation as-is. - * + * * @param annotation the annotation about to be returned * @return the post-processed annotation (or simply the original one) */ @@ -478,7 +478,7 @@ protected A adaptAnnotation(A annotation) { * A template method to post-process a given annotation array before returning it to the caller. *

    * The default implementation simply returns the given annotation array as-is. - * + * * @param annotations the annotation array about to be returned * @return the post-processed annotation array (or simply the original one) */ @@ -507,7 +507,7 @@ public int hashCode() { * Create a new MethodParameter for the given method or constructor. *

    * This is a convenience constructor for scenarios where a Method or Constructor reference is treated in a generic fashion. - * + * * @param methodOrConstructor the Method or Constructor to specify a parameter for * @param parameterIndex the index of the parameter * @return the corresponding MethodParameter instance diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java rename to src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java index 5794365a3a..41f6721c41 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java +++ b/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -29,7 +29,7 @@ public interface ParameterNameDiscoverer { /** * Return parameter names for this method, or {@code null} if they cannot be determined. - * + * * @param method method to find parameter names for * @return an array of parameter names if the names can be resolved, or {@code null} if they cannot */ @@ -37,7 +37,7 @@ public interface ParameterNameDiscoverer { /** * Return parameter names for this constructor, or {@code null} if they cannot be determined. - * + * * @param ctor constructor to find parameter names for * @return an array of parameter names if the names can be resolved, or {@code null} if they cannot */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java rename to src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java index d5b115887d..a59f3ecd4f 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java +++ b/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; import java.util.*; -import com.lambdaworks.redis.LettuceStrings; +import io.lettuce.core.LettuceStrings; /** * Base class for all types that include parametrization of some kind. Crucial as we have to take note of the parent class we @@ -33,7 +33,7 @@ class ParametrizedTypeInformation extends ParentTypeAwareTypeInformation { /** * Creates a new {@link ParametrizedTypeInformation} for the given {@link Type} and parent {@link TypeDiscoverer}. - * + * * @param type must not be {@literal null} * @param parent must not be {@literal null} */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java rename to src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java index 935b5064a2..75d1a42911 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java +++ b/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; @@ -30,7 +30,7 @@ abstract class ParentTypeAwareTypeInformation extends TypeDiscoverer { /** * Creates a new {@link ParentTypeAwareTypeInformation}. - * + * * @param type must not be {@literal null}. * @param parent must not be {@literal null}. * @param map must not be {@literal null}. @@ -43,7 +43,7 @@ protected ParentTypeAwareTypeInformation(Type type, TypeDiscoverer parent, Ma /** * Merges the type variable maps of the given parent with the new map. - * + * * @param parent must not be {@literal null}. * @param map must not be {@literal null}. * @return diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java b/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java rename to src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java index 4bcd5a6561..a06e718387 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java +++ b/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.reflect.*; import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Simple utility class for working with the reflection API and handling reflection exceptions. @@ -36,7 +36,7 @@ public abstract class ReflectionUtils { * has a primitive type. *

    * Thrown exceptions are handled via a call to {@link #handleReflectionException(Exception)}. - * + * * @param field the field to get * @param target the target object from which to get the field * @return the field's current value @@ -56,7 +56,7 @@ public static Object getField(Field field, Object target) { * superclasses up to {@code Object}. *

    * Returns {@code null} if no {@link Method} can be found. - * + * * @param clazz the class to introspect * @param name the name of the method * @return the Method object, or {@code null} if none found @@ -70,7 +70,7 @@ public static Method findMethod(Class clazz, String name) { * superclasses up to {@code Object}. *

    * Returns {@code null} if no {@link Method} can be found. - * + * * @param clazz the class to introspect * @param name the name of the method * @param paramTypes the parameter types of the method (may be {@code null} to indicate any signature) @@ -98,7 +98,7 @@ public static Method findMethod(Class clazz, String name, Class... paramTy * {@code null} when invoking a static {@link Method}. *

    * Thrown exceptions are handled via a call to {@link #handleReflectionException}. - * + * * @param method the method to invoke * @param target the target object to invoke the method on * @return the invocation result, if any @@ -113,7 +113,7 @@ public static Object invokeMethod(Method method, Object target) { * be {@code null} when invoking a static {@link Method}. *

    * Thrown exceptions are handled via a call to {@link #handleReflectionException}. - * + * * @param method the method to invoke * @param target the target object to invoke the method on * @param args the invocation arguments (may be {@code null}) @@ -134,7 +134,7 @@ public static Object invokeMethod(Method method, Object target, Object... args) *

    * Throws the underlying RuntimeException or Error in case of an InvocationTargetException with such a root cause. Throws an * IllegalStateException with an appropriate message or UndeclaredThrowableException otherwise. - * + * * @param ex the reflection exception to handle */ public static void handleReflectionException(Exception ex) { @@ -159,7 +159,7 @@ public static void handleReflectionException(Exception ex) { *

    * Throws the underlying RuntimeException or Error in case of such a root cause. Throws an UndeclaredThrowableException * otherwise. - * + * * @param ex the invocation target exception to handle */ public static void handleInvocationTargetException(InvocationTargetException ex) { @@ -173,7 +173,7 @@ public static void handleInvocationTargetException(InvocationTargetException ex) *

    * Rethrows the underlying exception cast to a {@link RuntimeException} or {@link Error} if appropriate; otherwise, throws * an {@link UndeclaredThrowableException}. - * + * * @param ex the exception to rethrow * @throws RuntimeException the rethrown exception */ @@ -191,7 +191,7 @@ public static void rethrowRuntimeException(Throwable ex) { * Perform the given callback operation on all matching methods of the given class and superclasses. *

    * The same named method occurring on subclass and superclass will appear twice, unless excluded by a {@link MethodFilter}. - * + * * @param clazz the class to introspect * @param mc the callback to invoke for each method * @see #doWithMethods(Class, MethodCallback, MethodFilter) @@ -206,7 +206,7 @@ public static void doWithMethods(Class clazz, MethodCallback mc) { *

    * The same named method occurring on subclass and superclass will appear twice, unless excluded by the specified * {@link MethodFilter}. - * + * * @param clazz the class to introspect * @param mc the callback to invoke for each method * @param mf the filter that determines the methods to apply the callback to @@ -237,7 +237,7 @@ public static void doWithMethods(Class clazz, MethodCallback mc, MethodFilter * This variant retrieves {@link Class#getDeclaredMethods()} from a local cache in order to avoid the JVM's SecurityManager * check and defensive array copying. In addition, it also includes Java 8 default methods from locally implemented * interfaces, since those are effectively to be treated just like declared methods. - * + * * @param clazz the class to introspect * @return the cached array of methods * @see Class#getDeclaredMethods() @@ -278,7 +278,7 @@ private static List findConcreteMethodsOnInterfaces(Class clazz) { /** * Invoke the given callback on all fields in the target class, going up the class hierarchy to get all declared fields. - * + * * @param clazz the target class to analyze * @param fc the callback to invoke for each field */ @@ -288,7 +288,7 @@ public static void doWithFields(Class clazz, FieldCallback fc) { /** * Invoke the given callback on all fields in the target class, going up the class hierarchy to get all declared fields. - * + * * @param clazz the target class to analyze * @param fc the callback to invoke for each field * @param ff the filter that determines the fields to apply the callback to @@ -319,7 +319,7 @@ public interface MethodCallback { /** * Perform an operation using the given method. - * + * * @param method the method to operate on */ void doWith(Method method) throws IllegalArgumentException, IllegalAccessException; @@ -332,7 +332,7 @@ public interface MethodFilter { /** * Determine whether the given method matches. - * + * * @param method the method to check */ boolean matches(Method method); @@ -345,7 +345,7 @@ public interface FieldCallback { /** * Perform an operation using the given field. - * + * * @param field the field to operate on */ void doWith(Field field) throws IllegalArgumentException, IllegalAccessException; @@ -358,7 +358,7 @@ public interface FieldFilter { /** * Determine whether the given field matches. - * + * * @param field the field to check */ boolean matches(Field field); diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java b/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java rename to src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java index bbaaae8f08..83e57ed727 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java +++ b/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.io.Serializable; import java.lang.reflect.*; @@ -22,11 +22,11 @@ import java.util.IdentityHashMap; import java.util.Map; -import com.lambdaworks.redis.LettuceStrings; -import com.lambdaworks.redis.dynamic.support.TypeWrapper.MethodParameterTypeProvider; -import com.lambdaworks.redis.dynamic.support.TypeWrapper.TypeProvider; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceClassUtils; +import io.lettuce.core.LettuceStrings; +import io.lettuce.core.dynamic.support.TypeWrapper.MethodParameterTypeProvider; +import io.lettuce.core.dynamic.support.TypeWrapper.TypeProvider; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceClassUtils; /** * Encapsulates a Java {@link java.lang.reflect.Type}, providing access to {@link #getSuperType() supertypes}, @@ -147,7 +147,7 @@ public Object getSource() { /** * Determine whether the given object is an instance of this {@code ResolvableType}. - * + * * @param obj the object to check * @see #isAssignableFrom(Class) */ @@ -157,7 +157,7 @@ public boolean isInstance(Object obj) { /** * Determine whether this {@code ResolvableType} is assignable from the specified other type. - * + * * @param other the type to be checked against (as a {@code Class}) * @see #isAssignableFrom(ResolvableType) */ @@ -171,7 +171,7 @@ public boolean isAssignableFrom(Class other) { * Attempts to follow the same rules as the Java compiler, considering whether both the {@link #resolve() resolved} * {@code Class} is {@link Class#isAssignableFrom(Class) assignable from} the given type as well as whether all * {@link #getGenerics() generics} are assignable. - * + * * @param other the type to be checked against (as a {@code ResolvableType}) * @return {@code true} if the specified other type can be assigned to this {@code ResolvableType}; {@code false} otherwise */ @@ -273,7 +273,7 @@ private boolean isAssignableFrom(ResolvableType other, Map matchedBe /** * Return {@code true} if this type resolves to a Class that represents an array. - * + * * @see #getComponentType() */ public boolean isArray() { @@ -287,7 +287,7 @@ public boolean isArray() { /** * Return the ResolvableType representing the component type of the array or {@link #NONE} if this type does not represent * an array. - * + * * @see #isArray() */ public ResolvableType getComponentType() { @@ -310,7 +310,7 @@ public ResolvableType getComponentType() { /** * Convenience method to return this type as a resolvable {@link Collection} type. Returns {@link #NONE} if this type does * not implement or extend {@link Collection}. - * + * * @see #as(Class) * @see #asMap() */ @@ -321,7 +321,7 @@ public ResolvableType asCollection() { /** * Convenience method to return this type as a resolvable {@link Map} type. Returns {@link #NONE} if this type does not * implement or extend {@link Map}. - * + * * @see #as(Class) * @see #asCollection() */ @@ -333,7 +333,7 @@ public ResolvableType asMap() { * Return this type as a {@link ResolvableType} of the specified class. Searches {@link #getSuperType() supertype} and * {@link #getInterfaces() interface} hierarchies to find a match, returning {@link #NONE} if this type does not implement * or extend the specified class. - * + * * @param type the required class type * @return a {@link ResolvableType} representing this object as the specified type, or {@link #NONE} if not resolvable as * that type @@ -361,7 +361,7 @@ public ResolvableType as(Class type) { /** * Return a {@link ResolvableType} representing the direct supertype of this type. If no supertype is available this method * returns {@link #NONE}. - * + * * @see #getInterfaces() */ public ResolvableType getSuperType() { @@ -378,7 +378,7 @@ public ResolvableType getSuperType() { /** * Return a {@link ResolvableType} array representing the direct interfaces implemented by this type. If this type does not * implement any interfaces an empty array is returned. - * + * * @see #getSuperType() */ public ResolvableType[] getInterfaces() { @@ -395,7 +395,7 @@ public ResolvableType[] getInterfaces() { /** * Return {@code true} if this type contains generic parameters. - * + * * @see #getGeneric(int...) * @see #getGenerics() */ @@ -486,7 +486,7 @@ private boolean isWildcardWithoutBounds() { /** * Return a {@link ResolvableType} for the specified nesting level. See {@link #getNested(int, Map)} for details. - * + * * @param nestingLevel the nesting level * @return the {@link ResolvableType} type, or {@code #NONE} */ @@ -509,7 +509,7 @@ public ResolvableType getNested(int nestingLevel) { *

    * If a type does not {@link #hasGenerics() contain} generics the {@link #getSuperType() supertype} hierarchy will be * considered. - * + * * @param nestingLevel the required nesting level, indexed from 1 for the current type, 2 for the first nested generic, 3 * for the second and so on * @param typeIndexesPerLevel a map containing the generic index for a given nesting level (may be {@code null}) @@ -540,7 +540,7 @@ public ResolvableType getNested(int nestingLevel, Map typeInde * {@code String} from the nested {@code List}. For convenience, if no indexes are specified the first generic is returned. *

    * If no generic is available at the specified indexes {@link #NONE} is returned. - * + * * @param indexes the indexes that refer to the generic parameter (may be omitted to return the first generic) * @return a {@link ResolvableType} for the specified generic or {@link #NONE} * @see #hasGenerics() @@ -567,7 +567,7 @@ public ResolvableType getGeneric(int... indexes) { * Return an array of {@link ResolvableType}s representing the generic parameters of this type. If no generics are available * an empty array is returned. If you need to access a specific generic consider using the {@link #getGeneric(int...)} * method as it allows access to nested generics and protects against {@code IndexOutOfBoundsExceptions}. - * + * * @return an array of {@link ResolvableType}s representing the generic parameters (never {@code null}) * @see #hasGenerics() * @see #getGeneric(int...) @@ -598,7 +598,7 @@ public ResolvableType[] getGenerics() { /** * Convenience method that will {@link #getGenerics() get} and {@link #resolve() resolve} generic parameters. - * + * * @return an array of resolved generic parameters (the resulting array will never be {@code null}, but it may contain * {@code null} elements}) * @see #getGenerics() @@ -611,7 +611,7 @@ public Class[] resolveGenerics() { /** * Convenience method that will {@link #getGenerics() get} and {@link #resolve() resolve} generic parameters, using the * specified {@code fallback} if any type cannot be resolved. - * + * * @param fallback the fallback class to use if resolution fails (may be {@code null}) * @return an array of resolved generic parameters (the resulting array will never be {@code null}, but it may contain * {@code null} elements}) @@ -630,7 +630,7 @@ public Class[] resolveGenerics(Class fallback) { /** * Convenience method that will {@link #getGeneric(int...) get} and {@link #resolve() resolve} a specific generic * parameters. - * + * * @param indexes the indexes that refer to the generic parameter (may be omitted to return the first generic) * @return a resolved {@link Class} or {@code null} * @see #getGeneric(int...) @@ -644,7 +644,7 @@ public Class resolveGeneric(int... indexes) { * Resolve this type to a {@link java.lang.Class}, returning {@code null} if the type cannot be resolved. This method will * consider bounds of {@link TypeVariable}s and {@link WildcardType}s if direct resolution fails; however, bounds of * {@code Object.class} will be ignored. - * + * * @return the resolved {@link Class}, or {@code null} if not resolvable * @see #resolve(Class) * @see #resolveGeneric(int...) @@ -658,7 +658,7 @@ public Class resolve() { * Resolve this type to a {@link java.lang.Class}, returning the specified {@code fallback} if the type cannot be resolved. * This method will consider bounds of {@link TypeVariable}s and {@link WildcardType}s if direct resolution fails; however, * bounds of {@code Object.class} will be ignored. - * + * * @param fallback the fallback class to use if resolution fails (may be {@code null}) * @return the resolved {@link Class} or the {@code fallback} * @see #resolve() @@ -819,7 +819,7 @@ public String toString() { /** * Return a {@link ResolvableType} for the specified {@link Class}, using the full generic type information for * assignability checks. For example: {@code ResolvableType.forClass(MyArrayList.class)}. - * + * * @param sourceClass the source class ({@code null} is semantically equivalent to {@code Object.class} for typical use * cases here} * @return a {@link ResolvableType} for the specified class @@ -834,7 +834,7 @@ public static ResolvableType forClass(Class sourceClass) { * Return a {@link ResolvableType} for the specified {@link Class}, doing assignability checks against the raw class only * (analogous to {@link Class#isAssignableFrom}, which this serves as a wrapper for. For example: * {@code ResolvableType.forClass(MyArrayList.class)}. - * + * * @param sourceClass the source class ({@code null} is semantically equivalent to {@code Object.class} for typical use * cases here} * @return a {@link ResolvableType} for the specified class @@ -853,7 +853,7 @@ public boolean isAssignableFrom(Class other) { /** * Return a {@link ResolvableType} for the specified {@link Class} with a given implementation. For example: * {@code ResolvableType.forClass(List.class, MyArrayList.class)}. - * + * * @param sourceClass the source class (must not be {@code null} * @param implementationClass the implementation class * @return a {@link ResolvableType} for the specified class backed by the given implementation class @@ -868,7 +868,7 @@ public static ResolvableType forClass(Class sourceClass, Class implementat /** * Return a {@link ResolvableType} for the specified {@link Class} with pre-declared generics. - * + * * @param sourceClass the source class * @param generics the generics of the class * @return a {@link ResolvableType} for the specific class and generics @@ -886,7 +886,7 @@ public static ResolvableType forClassWithGenerics(Class sourceClass, Class /** * Return a {@link ResolvableType} for the specified {@link Class} with pre-declared generics. - * + * * @param sourceClass the source class * @param generics the generics of the class * @return a {@link ResolvableType} for the specific class and generics @@ -911,7 +911,7 @@ public static ResolvableType forClassWithGenerics(Class sourceClass, Resolvab /** * Return a {@link ResolvableType} for the specified {@link Method} return type. - * + * * @param method the source for the method return type * @return a {@link ResolvableType} for the specified method return * @see #forMethodReturnType(Method, Class) @@ -924,7 +924,7 @@ public static ResolvableType forMethodReturnType(Method method) { /** * Return a {@link ResolvableType} for the specified {@link Method} return type. Use this variant when the class that * declares the method includes generic parameter variables that are satisfied by the implementation class. - * + * * @param method the source for the method return type * @param implementationClass the implementation class * @return a {@link ResolvableType} for the specified method return @@ -939,7 +939,7 @@ public static ResolvableType forMethodReturnType(Method method, Class impleme /** * Return a {@link ResolvableType} for the specified {@link Method} parameter. - * + * * @param method the source method (must not be {@code null}) * @param parameterIndex the parameter index * @return a {@link ResolvableType} for the specified method parameter @@ -955,7 +955,7 @@ public static ResolvableType forMethodParameter(Method method, int parameterInde * Return a {@link ResolvableType} for the specified {@link Method} parameter with a given implementation. Use this variant * when the class that declares the method includes generic parameter variables that are satisfied by the implementation * class. - * + * * @param method the source method (must not be {@code null}) * @param parameterIndex the parameter index * @param implementationClass the implementation class @@ -972,7 +972,7 @@ public static ResolvableType forMethodParameter(Method method, int parameterInde /** * Return a {@link ResolvableType} for the specified {@link MethodParameter}. - * + * * @param methodParameter the source method parameter (must not be {@code null}) * @return a {@link ResolvableType} for the specified method parameter * @see #forMethodParameter(Method, int) @@ -985,7 +985,7 @@ public static ResolvableType forMethodParameter(MethodParameter methodParameter) * Return a {@link ResolvableType} for the specified {@link MethodParameter} with a given implementation type. Use this * variant when the class that declares the method includes generic parameter variables that are satisfied by the * implementation type. - * + * * @param methodParameter the source method parameter (must not be {@code null}) * @param implementationType the implementation type * @return a {@link ResolvableType} for the specified method parameter @@ -1002,7 +1002,7 @@ public static ResolvableType forMethodParameter(MethodParameter methodParameter, /** * Return a {@link ResolvableType} for the specified {@link MethodParameter}, overriding the target type to resolve with a * specific given type. - * + * * @param methodParameter the source method parameter (must not be {@code null}) * @param targetType the type to resolve (a part of the method parameter's type) * @return a {@link ResolvableType} for the specified method parameter @@ -1017,7 +1017,7 @@ public static ResolvableType forMethodParameter(MethodParameter methodParameter, /** * Resolve the top-level parameter type of the given {@code MethodParameter}. - * + * * @param methodParameter the method parameter to resolve * @see MethodParameter#setParameterType */ @@ -1030,7 +1030,7 @@ static void resolveMethodParameter(MethodParameter methodParameter) { /** * Return a {@link ResolvableType} as a array of the specified {@code componentType}. - * + * * @param componentType the component type * @return a {@link ResolvableType} as an array of the specified component type */ @@ -1051,7 +1051,7 @@ private static ResolvableType[] forTypes(Type[] types, VariableResolver owner) { /** * Return a {@link ResolvableType} for the specified {@link Type}. Note: The resulting {@link ResolvableType} may not be * {@link Serializable}. - * + * * @param type the source type or {@code null} * @return a {@link ResolvableType} for the specified {@link Type} * @see #forType(Type, ResolvableType) @@ -1063,7 +1063,7 @@ public static ResolvableType forType(Type type) { /** * Return a {@link ResolvableType} for the specified {@link Type} backed by the given owner type. Note: The resulting * {@link ResolvableType} may not be {@link Serializable}. - * + * * @param type the source type or {@code null} * @param owner the owner type used to resolve variables * @return a {@link ResolvableType} for the specified {@link Type} and owner @@ -1079,7 +1079,7 @@ public static ResolvableType forType(Type type, ResolvableType owner) { /** * Return a {@link ResolvableType} for the specified {@link Type} backed by a given {@link VariableResolver}. - * + * * @param type the source type or {@code null} * @param variableResolver the variable resolver or {@code null} * @return a {@link ResolvableType} for the specified {@link Type} and {@link VariableResolver} @@ -1090,7 +1090,7 @@ public static ResolvableType forType(Type type, VariableResolver variableResolve /** * Return a {@link ResolvableType} for the specified {@link Type} backed by a given {@link VariableResolver}. - * + * * @param type the source type or {@code null} * @param typeProvider the type provider or {@code null} * @param variableResolver the variable resolver or {@code null} @@ -1125,7 +1125,7 @@ public interface VariableResolver extends Serializable { /** * Resolve the specified variable. - * + * * @param variable the variable to resolve * @return the resolved variable, or {@code null} if not found */ @@ -1230,7 +1230,7 @@ private static class WildcardBounds { /** * Internal constructor to create a new {@link WildcardBounds} instance. - * + * * @param kind the kind of bounds * @param bounds the bounds * @see #get(ResolvableType) @@ -1249,7 +1249,7 @@ public boolean isSameKind(WildcardBounds bounds) { /** * Return {@code true} if this bounds is assignable to all the specified types. - * + * * @param types the types to test against * @return {@code true} if this bounds is assignable to all types */ @@ -1278,7 +1278,7 @@ public ResolvableType[] getBounds() { /** * Get a {@link WildcardBounds} instance for the specified type, returning {@code null} if the specified type cannot be * resolved to a {@link WildcardType}. - * + * * @param type the source type * @return a {@link WildcardBounds} instance or {@code null} */ @@ -1314,7 +1314,7 @@ enum Kind { *

    * Compares arrays with {@code Arrays.equals}, performing an equality check based on the array elements rather than the * array reference. - * + * * @param o1 first Object to compare * @param o2 second Object to compare * @return whether the given objects are equal diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java rename to src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java index a7c826fa48..f72e4c9027 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java +++ b/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java rename to src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java index b0e71adeb0..1815c9b8d0 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java +++ b/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.reflect.*; import java.util.*; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Basic {@link TypeDiscoverer} that contains basic functionality to discover property types. @@ -39,7 +39,7 @@ class TypeDiscoverer implements TypeInformation { /** * Creates a new {@link TypeDiscoverer} for the given type and type variable map. - * + * * @param type must not be {@literal null}. * @param typeVariableMap must not be {@literal null}. */ @@ -55,7 +55,7 @@ protected TypeDiscoverer(Type type, Map, Type> typeVariableMap) /** * Returns the type variable map. - * + * * @return */ public Map, Type> getTypeVariableMap() { @@ -64,7 +64,7 @@ public Map, Type> getTypeVariableMap() { /** * Creates {@link TypeInformation} for the given {@link Type}. - * + * * @param fieldType * @return */ @@ -117,7 +117,7 @@ protected TypeInformation createInfo(Type fieldType) { /** * Resolves the given type into a plain {@link Class}. - * + * * @param type * @return */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java rename to src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java index 167a92c7b0..9345daef7f 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java +++ b/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -31,7 +31,7 @@ public interface TypeInformation { /** * Returns the {@link TypeInformation}s for the parameters of the given {@link Constructor}. - * + * * @param constructor must not be {@literal null}. * @return */ @@ -41,14 +41,14 @@ public interface TypeInformation { * Returns whether the type can be considered a collection, which means it's a container of elements, e.g. a * {@link java.util.Collection} and {@link java.lang.reflect.Array} or anything implementing {@link Iterable}. If this * returns {@literal true} you can expect {@link #getComponentType()} to return a non-{@literal null} value. - * + * * @return */ boolean isCollectionLike(); /** * Returns the component type for {@link java.util.Collection}s or the key type for {@link java.util.Map}s. - * + * * @return */ TypeInformation getComponentType(); @@ -56,28 +56,28 @@ public interface TypeInformation { /** * Returns whether the property is a {@link java.util.Map}. If this returns {@literal true} you can expect * {@link #getComponentType()} as well as {@link #getMapValueType()} to return something not {@literal null}. - * + * * @return */ boolean isMap(); /** * Will return the type of the value in case the underlying type is a {@link java.util.Map}. - * + * * @return */ TypeInformation getMapValueType(); /** * Returns the type of the property. Will resolve generics and the generic context of - * + * * @return */ Class getType(); /** * Returns a {@link ClassTypeInformation} to represent the {@link TypeInformation} of the raw type of the current instance. - * + * * @return */ ClassTypeInformation getRawTypeInformation(); @@ -85,7 +85,7 @@ public interface TypeInformation { /** * Transparently returns the {@link java.util.Map} value type if the type is a {@link java.util.Map}, returns the component * type if the type {@link #isCollectionLike()} or the simple type if none of this applies. - * + * * @return */ TypeInformation getActualType(); @@ -93,7 +93,7 @@ public interface TypeInformation { /** * Returns a {@link TypeInformation} for the return type of the given {@link Method}. Will potentially resolve generics * information against the current types type parameter bindings. - * + * * @param method must not be {@literal null}. * @return */ @@ -101,7 +101,7 @@ public interface TypeInformation { /** * Returns the {@link TypeInformation}s for the parameters of the given {@link Method}. - * + * * @param method must not be {@literal null}. * @return */ @@ -109,7 +109,7 @@ public interface TypeInformation { /** * Returns the {@link TypeInformation} for the given raw super type. - * + * * @param superType must not be {@literal null}. * @return the {@link TypeInformation} for the given raw super type or {@literal null} in case the current * {@link TypeInformation} does not implement the given type. @@ -120,7 +120,7 @@ public interface TypeInformation { * Returns if the current {@link TypeInformation} can be safely assigned to the given one. Mimics semantics of * {@link Class#isAssignableFrom(Class)} but takes generics into account. Thus it will allow to detect that a * {@code List} is assignable to {@code List}. - * + * * @param target * @return */ @@ -128,7 +128,7 @@ public interface TypeInformation { /** * Returns the {@link TypeInformation} for the type arguments of the current {@link TypeInformation}. - * + * * @return */ List> getTypeArguments(); diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java rename to src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java index 3d0ffae9fa..a3b1e4cf68 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java +++ b/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Special {@link TypeDiscoverer} to determine the actual type for a {@link TypeVariable}. Will consider the context the @@ -36,7 +36,7 @@ public class TypeVariableTypeInformation extends ParentTypeAwareTypeInformati /** * Creates a bew {@link TypeVariableTypeInformation} for the given {@link TypeVariable} owning {@link Type} and parent * {@link TypeDiscoverer}. - * + * * @param variable must not be {@literal null} * @param owningType must not be {@literal null} * @param parent @@ -67,7 +67,7 @@ public Class getType() { /** * Returns the index of the type parameter binding the given {@link TypeVariable}. - * + * * @param variable * @return */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java b/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java rename to src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java index 9e784ab900..29ea0ba463 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java +++ b/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; import java.lang.reflect.*; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Internal utility class that can be used to obtain wrapped {@link Serializable} variants of {@link java.lang.reflect.Type}s. @@ -109,7 +109,7 @@ public Type getType() { /** * Unwrap the given type, effectively returning the original non-serializable type. - * + * * @param type the type to unwrap * @return the original non-serializable type */ diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformation.java rename to src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java index 47680f3530..a641f42f25 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformation.java +++ b/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java b/src/main/java/io/lettuce/core/dynamic/support/package-info.java similarity index 57% rename from src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java rename to src/main/java/io/lettuce/core/dynamic/support/package-info.java index 283d71df4b..c393cb8389 100644 --- a/src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java +++ b/src/main/java/io/lettuce/core/dynamic/support/package-info.java @@ -1,4 +1,4 @@ /** * Support classes imported from the Spring Framework. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; diff --git a/src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java b/src/main/java/io/lettuce/core/event/DefaultEventBus.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java rename to src/main/java/io/lettuce/core/event/DefaultEventBus.java index a80911706a..09d7e39315 100644 --- a/src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java +++ b/src/main/java/io/lettuce/core/event/DefaultEventBus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event; +package io.lettuce.core.event; import reactor.core.publisher.Flux; import reactor.core.publisher.TopicProcessor; @@ -21,7 +21,7 @@ /** * Default implementation for an {@link EventBus}. Events are published using a {@link Scheduler}. - * + * * @author Mark Paluch * @since 3.4 */ diff --git a/src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java b/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java rename to src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java index 2283d574a6..a3220988a2 100644 --- a/src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java +++ b/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event; +package io.lettuce.core.event; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.metrics.CommandLatencyCollectorOptions; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.metrics.CommandLatencyCollectorOptions; /** * The default implementation of {@link CommandLatencyCollectorOptions}. @@ -99,7 +99,7 @@ public TimeUnit eventEmitIntervalUnit() { /** * Create a new {@link DefaultEventPublisherOptions} using default settings. - * + * * @return a new instance of a default {@link DefaultEventPublisherOptions} instance */ public static DefaultEventPublisherOptions create() { @@ -108,7 +108,7 @@ public static DefaultEventPublisherOptions create() { /** * Create a disabled {@link DefaultEventPublisherOptions} using default settings. - * + * * @return a new instance of a default {@link DefaultEventPublisherOptions} instance with disabled event emission */ public static DefaultEventPublisherOptions disabled() { diff --git a/src/main/java/com/lambdaworks/redis/event/Event.java b/src/main/java/io/lettuce/core/event/Event.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/event/Event.java rename to src/main/java/io/lettuce/core/event/Event.java index c6101cadcc..1a79a478a9 100644 --- a/src/main/java/com/lambdaworks/redis/event/Event.java +++ b/src/main/java/io/lettuce/core/event/Event.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event; +package io.lettuce.core.event; /** * * Marker-interface for events that are published over the event bus. - * + * * @author Mark Paluch * @since 3.4 */ diff --git a/src/main/java/com/lambdaworks/redis/event/EventBus.java b/src/main/java/io/lettuce/core/event/EventBus.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/event/EventBus.java rename to src/main/java/io/lettuce/core/event/EventBus.java index 758c8ca44f..309dbd8710 100644 --- a/src/main/java/com/lambdaworks/redis/event/EventBus.java +++ b/src/main/java/io/lettuce/core/event/EventBus.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event; +package io.lettuce.core.event; import reactor.core.publisher.Flux; /** * Interface for an EventBus. Events can be published over the bus that are delivered to the subscribers. - * + * * @author Mark Paluch * @since 3.4 */ diff --git a/src/main/java/com/lambdaworks/redis/event/EventPublisherOptions.java b/src/main/java/io/lettuce/core/event/EventPublisherOptions.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/event/EventPublisherOptions.java rename to src/main/java/io/lettuce/core/event/EventPublisherOptions.java index 5fbeed4fd7..be8df5211b 100644 --- a/src/main/java/com/lambdaworks/redis/event/EventPublisherOptions.java +++ b/src/main/java/io/lettuce/core/event/EventPublisherOptions.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event; +package io.lettuce.core.event; import java.util.concurrent.TimeUnit; /** * Configuration interface for command latency collection. - * + * * @author Mark Paluch */ public interface EventPublisherOptions { /** * Returns the interval for emit metrics. - * + * * @return the interval for emit metrics */ long eventEmitInterval(); diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/event/connection/ConnectedEvent.java rename to src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java index 4f5644113e..d127c2b83b 100644 --- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectedEvent.java +++ b/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event.connection; +package io.lettuce.core.event.connection; import java.net.SocketAddress; /** * Event for a established TCP-level connection. - * + * * @author Mark Paluch * @since 3.4 */ diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionActivatedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/event/connection/ConnectionActivatedEvent.java rename to src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java index 0c67cf0a4f..6a45e2dbb9 100644 --- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionActivatedEvent.java +++ b/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event.connection; +package io.lettuce.core.event.connection; import java.net.SocketAddress; -import com.lambdaworks.redis.ClientOptions; +import io.lettuce.core.ClientOptions; /** * Event for a connection activation (after SSL-handshake, {@link ClientOptions#isPingBeforeActivateConnection() PING before * activation}, and buffered command replay). - * + * * @author Mark Paluch * @since 3.4 */ diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionDeactivatedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/event/connection/ConnectionDeactivatedEvent.java rename to src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java index 17ef1a9bc6..51620f4b53 100644 --- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionDeactivatedEvent.java +++ b/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event.connection; +package io.lettuce.core.event.connection; import java.net.SocketAddress; /** * Event for a connection deactivation. - * + * * @author Mark Paluch * @since 3.4 */ diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java similarity index 85% rename from src/main/java/com/lambdaworks/redis/event/connection/ConnectionEvent.java rename to src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java index f8a26c0d53..a32e3d280b 100644 --- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEvent.java +++ b/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event.connection; +package io.lettuce.core.event.connection; -import com.lambdaworks.redis.ConnectionId; -import com.lambdaworks.redis.event.Event; +import io.lettuce.core.ConnectionId; +import io.lettuce.core.event.Event; /** * Interface for Connection-related events - * + * * @author Mark Paluch * @since 3.4 */ diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java b/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java rename to src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java index 1834d8572e..a3a8e528c2 100644 --- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java +++ b/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event.connection; +package io.lettuce.core.event.connection; import java.net.SocketAddress; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * @author Mark Paluch @@ -38,7 +38,7 @@ abstract class ConnectionEventSupport implements ConnectionEvent { /** * Returns the local address. - * + * * @return the local address */ public SocketAddress localAddress() { @@ -47,7 +47,7 @@ public SocketAddress localAddress() { /** * Returns the remote address. - * + * * @return the remote address */ public SocketAddress remoteAddress() { diff --git a/src/main/java/com/lambdaworks/redis/event/connection/DisconnectedEvent.java b/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/event/connection/DisconnectedEvent.java rename to src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java index d425ae58de..cf14b0d196 100644 --- a/src/main/java/com/lambdaworks/redis/event/connection/DisconnectedEvent.java +++ b/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event.connection; +package io.lettuce.core.event.connection; import java.net.SocketAddress; /** * Event for a disconnect on TCP-level. - * + * * @author Mark Paluch * @since 3.4 */ diff --git a/src/main/java/io/lettuce/core/event/connection/package-info.java b/src/main/java/io/lettuce/core/event/connection/package-info.java new file mode 100644 index 0000000000..70df7b17c5 --- /dev/null +++ b/src/main/java/io/lettuce/core/event/connection/package-info.java @@ -0,0 +1,5 @@ +/** + * Connection-related events. + */ +package io.lettuce.core.event.connection; + diff --git a/src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java b/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java similarity index 87% rename from src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java rename to src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java index 68acb8f97b..fdc4c169de 100644 --- a/src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java +++ b/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event.metrics; +package io.lettuce.core.event.metrics; import java.util.Map; -import com.lambdaworks.redis.event.Event; -import com.lambdaworks.redis.metrics.CommandLatencyId; -import com.lambdaworks.redis.metrics.CommandMetrics; +import io.lettuce.core.event.Event; +import io.lettuce.core.metrics.CommandLatencyId; +import io.lettuce.core.metrics.CommandMetrics; /** * Event that transports command latency metrics. This event carries latencies for multiple commands and connections. - * + * * @author Mark Paluch */ public class CommandLatencyEvent implements Event { @@ -36,7 +36,7 @@ public CommandLatencyEvent(Map latencies) { /** * Returns the latencies mapped between {@link CommandLatencyId connection/command} and the {@link CommandMetrics metrics}. - * + * * @return the latency map. */ public Map getLatencies() { diff --git a/src/main/java/com/lambdaworks/redis/event/metrics/DefaultCommandLatencyEventPublisher.java b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/event/metrics/DefaultCommandLatencyEventPublisher.java rename to src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java index 3771565a82..e05f09ca08 100644 --- a/src/main/java/com/lambdaworks/redis/event/metrics/DefaultCommandLatencyEventPublisher.java +++ b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event.metrics; +package io.lettuce.core.event.metrics; -import com.lambdaworks.redis.event.EventBus; -import com.lambdaworks.redis.event.EventPublisherOptions; -import com.lambdaworks.redis.metrics.CommandLatencyCollector; +import io.lettuce.core.event.EventBus; +import io.lettuce.core.event.EventPublisherOptions; +import io.lettuce.core.metrics.CommandLatencyCollector; import io.netty.util.concurrent.EventExecutorGroup; import io.netty.util.concurrent.ScheduledFuture; /** * Default implementation of a {@link CommandLatencyCollector} for command latencies. - * + * * @author Mark Paluch */ public class DefaultCommandLatencyEventPublisher implements MetricEventPublisher { diff --git a/src/main/java/com/lambdaworks/redis/event/metrics/MetricEventPublisher.java b/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/event/metrics/MetricEventPublisher.java rename to src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java index 2ed948a5f4..5d017f855f 100644 --- a/src/main/java/com/lambdaworks/redis/event/metrics/MetricEventPublisher.java +++ b/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event.metrics; +package io.lettuce.core.event.metrics; -import com.lambdaworks.redis.event.Event; +import io.lettuce.core.event.Event; /** * Event publisher which publishes metrics by the use of {@link Event events}. - * + * * @author Mark Paluch * @since 3.4 */ @@ -32,7 +32,7 @@ public interface MetricEventPublisher { /** * Returns {@literal true} if the metric collector is enabled. - * + * * @return {@literal true} if the metric collector is enabled */ boolean isEnabled(); diff --git a/src/main/java/io/lettuce/core/event/metrics/package-info.java b/src/main/java/io/lettuce/core/event/metrics/package-info.java new file mode 100644 index 0000000000..a40d1f39ba --- /dev/null +++ b/src/main/java/io/lettuce/core/event/metrics/package-info.java @@ -0,0 +1,5 @@ +/** + * Metric events and publishing. + */ +package io.lettuce.core.event.metrics; + diff --git a/src/main/java/com/lambdaworks/redis/event/package-info.java b/src/main/java/io/lettuce/core/event/package-info.java similarity index 55% rename from src/main/java/com/lambdaworks/redis/event/package-info.java rename to src/main/java/io/lettuce/core/event/package-info.java index 633e6bba7f..3a6dd1e4bd 100644 --- a/src/main/java/com/lambdaworks/redis/event/package-info.java +++ b/src/main/java/io/lettuce/core/event/package-info.java @@ -1,5 +1,5 @@ /** * Event publishing and subscription. */ -package com.lambdaworks.redis.event; +package io.lettuce.core.event; diff --git a/src/main/java/com/lambdaworks/redis/internal/AbstractInvocationHandler.java b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java similarity index 99% rename from src/main/java/com/lambdaworks/redis/internal/AbstractInvocationHandler.java rename to src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java index fb3846e4db..3d7ce18da1 100644 --- a/src/main/java/com/lambdaworks/redis/internal/AbstractInvocationHandler.java +++ b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.internal; +package io.lettuce.core.internal; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; @@ -23,7 +23,7 @@ /** * Abstract base class for invocation handlers. - * + * * @since 4.2 */ public abstract class AbstractInvocationHandler implements InvocationHandler { @@ -42,7 +42,7 @@ public abstract class AbstractInvocationHandler implements InvocationHandler { * *

  • other method calls are dispatched to {@link #handleInvocation}. * - * + * * @param proxy the proxy instance that the method was invoked on * * @param method the {@code Method} instance corresponding to the interface method invoked on the proxy instance. The @@ -83,7 +83,7 @@ public final Object invoke(Object proxy, Method method, Object[] args) throws Th /** * {@link #invoke} delegates to this method upon any method invocation on the proxy instance, except {@link Object#equals}, * {@link Object#hashCode} and {@link Object#toString}. The result will be returned as the proxied method's return value. - * + * *

    * Unlike {@link #invoke}, {@code args} will never be null. When the method has no parameter, an empty array is passed in. * @@ -123,7 +123,7 @@ public boolean equals(Object obj) { /** * By default delegates to {@link Object#hashCode}. The dynamic proxies' {@code hashCode()} will delegate to this method. * Subclasses can override this method to provide custom equality. - * + * * @return a hash code value for this object. */ @Override @@ -134,7 +134,7 @@ public int hashCode() { /** * By default delegates to {@link Object#toString}. The dynamic proxies' {@code toString()} will delegate to this method. * Subclasses can override this method to provide custom string representation for the proxies. - * + * * @return a string representation of the object. */ @Override diff --git a/src/main/java/com/lambdaworks/redis/internal/HostAndPort.java b/src/main/java/io/lettuce/core/internal/HostAndPort.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/internal/HostAndPort.java rename to src/main/java/io/lettuce/core/internal/HostAndPort.java index d6e2fb0c76..da2af0fe30 100644 --- a/src/main/java/com/lambdaworks/redis/internal/HostAndPort.java +++ b/src/main/java/io/lettuce/core/internal/HostAndPort.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.internal; +package io.lettuce.core.internal; -import com.lambdaworks.redis.LettuceStrings; +import io.lettuce.core.LettuceStrings; /** * An immutable representation of a host and port. - * + * * @author Mark Paluch * @since 4.2 */ @@ -31,7 +31,7 @@ public class HostAndPort { public final int port; /** - * + * * @param hostText must not be empty or {@literal null}. * @param port */ @@ -44,7 +44,7 @@ private HostAndPort(String hostText, int port) { /** * Create a {@link HostAndPort} of {@code host} and {@code port} - * + * * @param host the hostname * @param port a valid port * @return the {@link HostAndPort} of {@code host} and {@code port} diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java b/src/main/java/io/lettuce/core/internal/LettuceAssert.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java rename to src/main/java/io/lettuce/core/internal/LettuceAssert.java index 611a6bf4d1..ab1a770d49 100644 --- a/src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java +++ b/src/main/java/io/lettuce/core/internal/LettuceAssert.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.internal; +package io.lettuce.core.internal; -import com.lambdaworks.redis.LettuceStrings; +import io.lettuce.core.LettuceStrings; import java.util.Collection; /** * Assertion utility class that assists in validating arguments. This class is part of the internal API and may change without * further notice. - * + * * @author Mark Paluch */ public class LettuceAssert { diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java b/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java rename to src/main/java/io/lettuce/core/internal/LettuceClassUtils.java index f3b2792638..6535aecbfe 100644 --- a/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java +++ b/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.internal; +package io.lettuce.core.internal; import java.util.IdentityHashMap; import java.util.Map; -import com.lambdaworks.redis.JavaRuntime; +import io.lettuce.core.JavaRuntime; /** * Miscellaneous class utility methods. Mainly for internal use within the framework. @@ -57,7 +57,7 @@ public class LettuceClassUtils { /** * Determine whether the {@link Class} identified by the supplied name is present and can be loaded. Will return * {@code false} if either the class or one of its dependencies is not present or cannot be loaded. - * + * * @param className the name of the class to check * @return whether the specified class is present */ @@ -73,7 +73,7 @@ public static boolean isPresent(String className) { /** * Loads a class using the {@link #getDefaultClassLoader()}. - * + * * @param className * @return */ @@ -137,7 +137,7 @@ private static ClassLoader getDefaultClassLoader() { /** * Check if the right-hand side type may be assigned to the left-hand side type, assuming setting by reflection. Considers * primitive wrapper classes as assignable to the corresponding primitive types. - * + * * @param lhsType the target type * @param rhsType the value type that should be assigned to the target type * @return if the target type is assignable from the value type diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java b/src/main/java/io/lettuce/core/internal/LettuceFactories.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java rename to src/main/java/io/lettuce/core/internal/LettuceFactories.java index d8f93dd18a..f95370b50b 100644 --- a/src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java +++ b/src/main/java/io/lettuce/core/internal/LettuceFactories.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.internal; +package io.lettuce.core.internal; import java.util.ArrayDeque; import java.util.Deque; diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceLists.java b/src/main/java/io/lettuce/core/internal/LettuceLists.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/internal/LettuceLists.java rename to src/main/java/io/lettuce/core/internal/LettuceLists.java index f66374e8f7..d4c519897d 100644 --- a/src/main/java/com/lambdaworks/redis/internal/LettuceLists.java +++ b/src/main/java/io/lettuce/core/internal/LettuceLists.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.internal; +package io.lettuce.core.internal; import java.util.*; /** * Static utility methods for {@link List} instances. This class is part of the internal API and may change without further * notice. - * + * * @author Mark Paluch * @since 4.2 */ @@ -35,7 +35,7 @@ private LettuceLists() { /** * Creates a new {@link ArrayList} containing all elements from {@code elements}. - * + * * @param elements the elements that the list should contain, must not be {@literal null}. * @param the element type * @return a new {@link ArrayList} containing all elements from {@code elements}. @@ -52,7 +52,7 @@ public static List newList(T... elements) { /** * Creates a new {@link ArrayList} containing all elements from {@code elements}. - * + * * @param elements the elements that the list should contain, must not be {@literal null}. * @param the element type * @return a new {@link ArrayList} containing all elements from {@code elements}. @@ -70,7 +70,7 @@ public static List newList(Iterable elements) { /** * Creates a new {@link ArrayList} containing all elements from {@code elements}. - * + * * @param elements the elements that the list should contain, must not be {@literal null}. * @param the element type * @return a new {@link ArrayList} containing all elements from {@code elements}. diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceSets.java b/src/main/java/io/lettuce/core/internal/LettuceSets.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/internal/LettuceSets.java rename to src/main/java/io/lettuce/core/internal/LettuceSets.java index 2499ab4ecc..4e0a5c6a8e 100644 --- a/src/main/java/com/lambdaworks/redis/internal/LettuceSets.java +++ b/src/main/java/io/lettuce/core/internal/LettuceSets.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.internal; +package io.lettuce.core.internal; import java.util.Collection; import java.util.Collections; @@ -23,7 +23,7 @@ /** * Static utility methods for {@link Set} instances. This class is part of the internal API and may change without further * notice. - * + * * @author Mark Paluch * @since 4.2 */ @@ -39,7 +39,7 @@ private LettuceSets() { /** * Creates a new {@code HashSet} containing all elements from {@code elements}. - * + * * @param elements the elements that the set should contain, must not be {@literal null}. * @param the element type * @return a new {@code HashSet} containing all elements from {@code elements}. @@ -54,7 +54,7 @@ public static Set newHashSet(Collection elements) { /** * Creates a new {@code HashSet} containing all elements from {@code elements}. - * + * * @param elements the elements that the set should contain, must not be {@literal null}. * @param the element type * @return a new {@code HashSet} containing all elements from {@code elements}. @@ -76,7 +76,7 @@ public static Set newHashSet(Iterable elements) { /** * Creates a new {@code HashSet} containing all elements from {@code elements}. - * + * * @param elements the elements that the set should contain, must not be {@literal null}. * @param the element type * @return a new {@code HashSet} containing all elements from {@code elements}. diff --git a/src/main/java/com/lambdaworks/redis/internal/package-info.java b/src/main/java/io/lettuce/core/internal/package-info.java similarity index 76% rename from src/main/java/com/lambdaworks/redis/internal/package-info.java rename to src/main/java/io/lettuce/core/internal/package-info.java index a886c39099..283e588ea7 100644 --- a/src/main/java/com/lambdaworks/redis/internal/package-info.java +++ b/src/main/java/io/lettuce/core/internal/package-info.java @@ -1,6 +1,6 @@ /** * Contains internal API. Classes in this package are part of the internal API and may change without further notice. - * + * * @since 4.2 */ -package com.lambdaworks.redis.internal; +package io.lettuce.core.internal; diff --git a/src/main/java/com/lambdaworks/redis/masterslave/AsyncConnections.java b/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/masterslave/AsyncConnections.java rename to src/main/java/io/lettuce/core/masterslave/AsyncConnections.java index a136d0d97c..bcd156719f 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/AsyncConnections.java +++ b/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import java.util.ArrayList; import java.util.List; @@ -24,9 +24,9 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.RedisConnectionException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; +import io.lettuce.core.RedisConnectionException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/masterslave/Connections.java b/src/main/java/io/lettuce/core/masterslave/Connections.java similarity index 85% rename from src/main/java/com/lambdaworks/redis/masterslave/Connections.java rename to src/main/java/io/lettuce/core/masterslave/Connections.java index 1d84f48243..e85c6f8f36 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/Connections.java +++ b/src/main/java/io/lettuce/core/masterslave/Connections.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import java.util.Map; import java.util.TreeMap; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandKeyword; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandKeyword; +import io.lettuce.core.protocol.CommandType; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java rename to src/main/java/io/lettuce/core/masterslave/MasterSlave.java index 1f3685e29e..346df0bebe 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java +++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import java.util.*; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceLists; -import com.lambdaworks.redis.models.role.RedisInstance; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceLists; +import io.lettuce.core.models.role.RedisInstance; +import io.lettuce.core.models.role.RedisNodeDescription; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; @@ -35,7 +35,7 @@ *

    * This API allows connections to Redis Master/Slave setups which run either in a static Master/Slave setup or are managed by * Redis Sentinel. Master-Slave connections can discover topologies and select a source for read operations using - * {@link com.lambdaworks.redis.ReadFrom}. + * {@link io.lettuce.core.ReadFrom}. *

    *

    * diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java rename to src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java index 6ffed9b59a..f47be471b6 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java +++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import java.util.Collection; -import com.lambdaworks.redis.ReadFrom; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.masterslave.MasterSlaveConnectionProvider.Intent; -import com.lambdaworks.redis.protocol.ConnectionFacade; -import com.lambdaworks.redis.protocol.ProtocolKeyword; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.ReadFrom; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.RedisException; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent; +import io.lettuce.core.protocol.ConnectionFacade; +import io.lettuce.core.protocol.ProtocolKeyword; +import io.lettuce.core.protocol.RedisCommand; /** * Channel writer/dispatcher that dispatches commands based on the intent to different connections. diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java rename to src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java index fc5a9494dc..40b6192944 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java +++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; -import static com.lambdaworks.redis.masterslave.MasterSlaveUtils.findNodeByHostAndPort; +import static io.lettuce.core.masterslave.MasterSlaveUtils.findNodeByHostAndPort; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; -import com.lambdaworks.redis.ReadFrom; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceSets; -import com.lambdaworks.redis.models.role.RedisInstance; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.ReadFrom; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceSets; +import io.lettuce.core.models.role.RedisInstance; +import io.lettuce.core.models.role.RedisNodeDescription; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; @@ -71,8 +71,8 @@ public class MasterSlaveConnectionProvider { /** * Retrieve a {@link StatefulRedisConnection} by the intent. - * {@link com.lambdaworks.redis.masterslave.MasterSlaveConnectionProvider.Intent#WRITE} intentions use the master - * connection, {@link com.lambdaworks.redis.masterslave.MasterSlaveConnectionProvider.Intent#READ} intentions lookup one or + * {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#WRITE} intentions use the master + * connection, {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#READ} intentions lookup one or * more read candidates using the {@link ReadFrom} setting. * * @param intent command intent diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java rename to src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java index cdbc5c9508..54f34cd5fc 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java +++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.models.role.RedisInstance; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.RedisException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.models.role.RedisInstance; +import io.lettuce.core.models.role.RedisNodeDescription; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java rename to src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java index fe6550e58f..dbe6734c5b 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java +++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; -import static com.lambdaworks.redis.masterslave.MasterSlaveUtils.findNodeByUri; +import static io.lettuce.core.masterslave.MasterSlaveUtils.findNodeByUri; import java.util.ArrayList; import java.util.HashMap; @@ -24,21 +24,21 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisCommandInterruptedException; -import com.lambdaworks.redis.RedisConnectionException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisCommandInterruptedException; +import io.lettuce.core.RedisConnectionException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.models.role.RedisNodeDescription; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; /** * Utility to refresh the Master-Slave topology view based on {@link RedisNodeDescription}. - * + * * @author Mark Paluch */ class MasterSlaveTopologyRefresh { @@ -58,7 +58,7 @@ public MasterSlaveTopologyRefresh(RedisClient client, TopologyProvider topologyP /** * Load master slave nodes. Result contains an ordered list of {@link RedisNodeDescription}s. The sort key is the latency. * Nodes with lower latency come first. - * + * * @param seed collection of {@link RedisURI}s * @return mapping between {@link RedisURI} and {@link Partitions} */ diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java rename to src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java index df345b7c79..a67804a3e5 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java +++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import java.util.Collection; import java.util.Comparator; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.RedisURI; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.models.role.RedisNodeDescription; /** * @author Mark Paluch @@ -30,7 +30,7 @@ class MasterSlaveUtils { /** * Check if properties changed. - * + * * @param o1 the first object to be compared. * @param o2 the second object to be compared. * @return {@literal true} if {@code MASTER} or {@code SLAVE} flags changed or the URIs are changed. @@ -52,7 +52,7 @@ static boolean isChanged(Collection o1, Collection nodes /** * Lookup a {@link RedisNodeDescription} by {@code host} and {@code port}. - * + * * @param nodes * @param host * @param port @@ -81,7 +81,7 @@ static RedisNodeDescription findNodeByHostAndPort(Collection timeoutConsumer) { diff --git a/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnection.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnection.java rename to src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java index 8b6d2d50f3..d24210f115 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnection.java +++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; -import com.lambdaworks.redis.ReadFrom; -import com.lambdaworks.redis.api.StatefulRedisConnection; +import io.lettuce.core.ReadFrom; +import io.lettuce.core.api.StatefulRedisConnection; /** * Redis Master-Slave connection. The connection allows slave reads by setting {@link ReadFrom}. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -31,14 +31,14 @@ public interface StatefulRedisMasterSlaveConnection extends StatefulRedisC /** * Set from which nodes data is read. The setting is used as default for read operations on this connection. See the * documentation for {@link ReadFrom} for more information. - * + * * @param readFrom the read from setting, must not be {@literal null} */ void setReadFrom(ReadFrom readFrom); /** * Gets the {@link ReadFrom} setting for this connection. Defaults to {@link ReadFrom#MASTER} if not set. - * + * * @return the read from setting */ ReadFrom getReadFrom(); diff --git a/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnectionImpl.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnectionImpl.java rename to src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java index 04cca47e98..9e264945a1 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnectionImpl.java +++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.ReadFrom; -import com.lambdaworks.redis.StatefulRedisConnectionImpl; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.ReadFrom; +import io.lettuce.core.StatefulRedisConnectionImpl; +import io.lettuce.core.codec.RedisCodec; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTopologyProvider.java rename to src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java index 93e6085311..19392855b9 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTopologyProvider.java +++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.models.role.RedisInstance; -import com.lambdaworks.redis.models.role.RedisNodeDescription; -import com.lambdaworks.redis.models.role.RoleParser; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.models.role.RedisInstance; +import io.lettuce.core.models.role.RedisNodeDescription; +import io.lettuce.core.models.role.RoleParser; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; @@ -33,7 +33,7 @@ * Topology provider for a static node collection. This provider uses a static collection of nodes to determine the role of each * {@link RedisURI node}. Node roles may change during runtime but the configuration must remain the same. This * {@link TopologyProvider} does not auto-discover nodes. - * + * * @author Mark Paluch */ public class StaticMasterSlaveTopologyProvider implements TopologyProvider { diff --git a/src/main/java/com/lambdaworks/redis/masterslave/TimedAsyncCommand.java b/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/masterslave/TimedAsyncCommand.java rename to src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java index f595f9cefe..7b638cf087 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/TimedAsyncCommand.java +++ b/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.protocol.RedisCommand; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/lambdaworks/redis/masterslave/Timeout.java b/src/main/java/io/lettuce/core/masterslave/Timeout.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/masterslave/Timeout.java rename to src/main/java/io/lettuce/core/masterslave/Timeout.java index 6cad33ddea..7c990c3173 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/Timeout.java +++ b/src/main/java/io/lettuce/core/masterslave/Timeout.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import java.util.concurrent.TimeUnit; /** * Value object to represent a timeout. - * + * * @author Mark Paluch * @since 4.2 */ diff --git a/src/main/java/com/lambdaworks/redis/masterslave/TopologyComparators.java b/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/masterslave/TopologyComparators.java rename to src/main/java/io/lettuce/core/masterslave/TopologyComparators.java index be98fbba0f..1c3376029b 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/TopologyComparators.java +++ b/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import java.util.Comparator; import java.util.Map; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.RedisURI; +import io.lettuce.core.models.role.RedisNodeDescription; /** * Comparators for {@link RedisNodeDescription} and {@link RedisURI}. diff --git a/src/main/java/com/lambdaworks/redis/masterslave/TopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java similarity index 87% rename from src/main/java/com/lambdaworks/redis/masterslave/TopologyProvider.java rename to src/main/java/io/lettuce/core/masterslave/TopologyProvider.java index 7711e382d9..7a7d2b0ff9 100644 --- a/src/main/java/com/lambdaworks/redis/masterslave/TopologyProvider.java +++ b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import java.util.List; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.RedisException; +import io.lettuce.core.models.role.RedisNodeDescription; /** * Topology provider for Master-Slave topology discovery during runtime. Implementors of this interface return an unordered list * of {@link RedisNodeDescription} instances. - * + * * @author Mark Paluch * @since 4.1 */ @@ -32,7 +32,7 @@ public interface TopologyProvider { /** * Lookup nodes within the topology. - * + * * @return list of {@link RedisNodeDescription} instances * @throws RedisException on errors that occured during the lookup */ diff --git a/src/main/java/io/lettuce/core/masterslave/package-info.java b/src/main/java/io/lettuce/core/masterslave/package-info.java new file mode 100644 index 0000000000..6af53bc1c8 --- /dev/null +++ b/src/main/java/io/lettuce/core/masterslave/package-info.java @@ -0,0 +1,5 @@ +/** + * Client support for Redis Master/Slave setups. {@link io.lettuce.core.masterslave.MasterSlave} supports self-managed, + * Redis Sentinel-managed, AWS ElastiCache and Azure Redis managed Master/Slave setups. + */ +package io.lettuce.core.masterslave; diff --git a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollector.java rename to src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java index c4761a89b3..0a67e0b3ba 100644 --- a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollector.java +++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.metrics; +package io.lettuce.core.metrics; import java.net.SocketAddress; import java.util.Map; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.protocol.ProtocolKeyword; +import io.lettuce.core.protocol.ProtocolKeyword; /** * {@link MetricCollector} for command latencies. Command latencies are collected per connection (identified by local/remote @@ -28,7 +28,7 @@ *

  • Latency between command send and first response (first response received)
    • *
  • Latency between command send and command completion (complete response received)
    • * - * + * * @author Mark Paluch * @since 3.4 */ @@ -36,7 +36,7 @@ public interface CommandLatencyCollector extends MetricCollector { @@ -45,7 +45,7 @@ protected CommandLatencyId(SocketAddress localAddress, SocketAddress remoteAddre /** * Create a new instance of {@link CommandLatencyId}. - * + * * @param localAddress the local address * @param remoteAddress the remote address * @param commandType the command type @@ -57,7 +57,7 @@ public static CommandLatencyId create(SocketAddress localAddress, SocketAddress /** * Returns the local address. - * + * * @return the local address */ public SocketAddress localAddress() { @@ -66,7 +66,7 @@ public SocketAddress localAddress() { /** * Returns the remote address. - * + * * @return the remote address */ public SocketAddress remoteAddress() { @@ -75,7 +75,7 @@ public SocketAddress remoteAddress() { /** * Returns the command type. - * + * * @return the command type */ public ProtocolKeyword commandType() { diff --git a/src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java b/src/main/java/io/lettuce/core/metrics/CommandMetrics.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java rename to src/main/java/io/lettuce/core/metrics/CommandMetrics.java index f8747c906c..48979be2a7 100644 --- a/src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java +++ b/src/main/java/io/lettuce/core/metrics/CommandMetrics.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.metrics; +package io.lettuce.core.metrics; import java.util.Map; import java.util.concurrent.TimeUnit; /** * Latency metrics for commands. This class provides the count, time unit and firstResponse/completion latencies. - * + * * @author Mark Paluch */ public class CommandMetrics { @@ -38,7 +38,7 @@ public CommandMetrics(long count, TimeUnit timeUnit, CommandLatency firstRespons } /** - * + * * @return the count */ public long getCount() { @@ -46,7 +46,7 @@ public long getCount() { } /** - * + * * @return the time unit for the {@link #getFirstResponse()} and {@link #getCompletion()} latencies. */ public TimeUnit getTimeUnit() { @@ -54,7 +54,7 @@ public TimeUnit getTimeUnit() { } /** - * + * * @return latencies between send and the first command response */ public CommandLatency getFirstResponse() { @@ -62,7 +62,7 @@ public CommandLatency getFirstResponse() { } /** - * + * * @return latencies between send and the command completion */ public CommandLatency getCompletion() { @@ -92,7 +92,7 @@ public CommandLatency(long min, long max, Map percentiles) { } /** - * + * * @return the minimum time */ public long getMin() { @@ -100,7 +100,7 @@ public long getMin() { } /** - * + * * @return the maximum time */ public long getMax() { @@ -108,7 +108,7 @@ public long getMax() { } /** - * + * * @return percentile mapping */ public Map getPercentiles() { diff --git a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java rename to src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java index c310fad35f..52dfb19854 100644 --- a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java +++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.metrics; +package io.lettuce.core.metrics; -import com.lambdaworks.redis.metrics.CommandMetrics.CommandLatency; -import com.lambdaworks.redis.protocol.CommandType; -import com.lambdaworks.redis.protocol.ProtocolKeyword; +import io.lettuce.core.metrics.CommandMetrics.CommandLatency; +import io.lettuce.core.protocol.CommandType; +import io.lettuce.core.protocol.ProtocolKeyword; import io.netty.channel.local.LocalAddress; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import static com.lambdaworks.redis.internal.LettuceClassUtils.isPresent; +import static io.lettuce.core.internal.LettuceClassUtils.isPresent; /** * Default implementation of a {@link CommandLatencyCollector} for command latencies. diff --git a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java rename to src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java index 8a56a323d1..c565f03207 100644 --- a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java +++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.metrics; +package io.lettuce.core.metrics; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * The default implementation of {@link CommandLatencyCollectorOptions}. @@ -93,7 +93,7 @@ private Builder() { /** * Disable the latency collector. - * + * * @return this */ public Builder disable() { @@ -104,7 +104,7 @@ public Builder disable() { /** * Set the target unit for the latencies. Defaults to {@link TimeUnit#MILLISECONDS}. See * {@link DefaultCommandLatencyCollectorOptions#DEFAULT_TARGET_UNIT}. - * + * * @param targetUnit the target unit, must not be {@literal null} * @return this * @@ -120,7 +120,7 @@ public Builder targetUnit(TimeUnit targetUnit) { * {@link DefaultCommandLatencyCollectorOptions#DEFAULT_TARGET_PERCENTILES}. * * @param targetPercentiles the percentiles which should be emitted, must not be {@literal null} - * + * * @return this */ public Builder targetPercentiles(double[] targetPercentiles) { @@ -135,7 +135,7 @@ public Builder targetPercentiles(double[] targetPercentiles) { * * @param resetLatenciesAfterEvent {@literal true} if the recorded latencies should be reset once the metrics event was * emitted - * + * * @return this */ public Builder resetLatenciesAfterEvent(boolean resetLatenciesAfterEvent) { diff --git a/src/main/java/com/lambdaworks/redis/metrics/MetricCollector.java b/src/main/java/io/lettuce/core/metrics/MetricCollector.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/metrics/MetricCollector.java rename to src/main/java/io/lettuce/core/metrics/MetricCollector.java index 4fde596c65..b5617cbd03 100644 --- a/src/main/java/com/lambdaworks/redis/metrics/MetricCollector.java +++ b/src/main/java/io/lettuce/core/metrics/MetricCollector.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.metrics; +package io.lettuce.core.metrics; /** * Generic metrics collector interface. A metrics collector collects metrics and emits metric events. - * + * * @author Mark Paluch * @param data type of the metrics * @since 3.4 @@ -32,14 +32,14 @@ public interface MetricCollector { /** * Returns the collected/aggregated metrics. - * + * * @return the the collected/aggregated metrics */ T retrieveMetrics(); /** * Returns {@literal true} if the metric collector is enabled. - * + * * @return {@literal true} if the metric collector is enabled */ boolean isEnabled(); diff --git a/src/main/java/com/lambdaworks/redis/metrics/package-info.java b/src/main/java/io/lettuce/core/metrics/package-info.java similarity index 52% rename from src/main/java/com/lambdaworks/redis/metrics/package-info.java rename to src/main/java/io/lettuce/core/metrics/package-info.java index f62aa504a8..b3be1f51ff 100644 --- a/src/main/java/com/lambdaworks/redis/metrics/package-info.java +++ b/src/main/java/io/lettuce/core/metrics/package-info.java @@ -1,5 +1,5 @@ /** * Collectors for client metrics. */ -package com.lambdaworks.redis.metrics; +package io.lettuce.core.metrics; diff --git a/src/main/java/com/lambdaworks/redis/models/command/CommandDetail.java b/src/main/java/io/lettuce/core/models/command/CommandDetail.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/models/command/CommandDetail.java rename to src/main/java/io/lettuce/core/models/command/CommandDetail.java index 215764ca77..147882da0c 100644 --- a/src/main/java/com/lambdaworks/redis/models/command/CommandDetail.java +++ b/src/main/java/io/lettuce/core/models/command/CommandDetail.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.models.command; +package io.lettuce.core.models.command; import java.io.Serializable; import java.util.Set; @@ -37,7 +37,7 @@ public CommandDetail() { /** * Constructs a {@link CommandDetail} - * + * * @param name name of the command, must not be {@literal null} * @param arity command arity specification * @param flags set of flags, must not be {@literal null} but may be empty diff --git a/src/main/java/com/lambdaworks/redis/models/command/CommandDetailParser.java b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/models/command/CommandDetailParser.java rename to src/main/java/io/lettuce/core/models/command/CommandDetailParser.java index 7689b996b1..f403ce616a 100644 --- a/src/main/java/com/lambdaworks/redis/models/command/CommandDetailParser.java +++ b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.models.command; +package io.lettuce.core.models.command; import java.util.*; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Parser for redis     COMMAND/COMMAND INFOcommand output. - * + * * @author Mark Paluch * @since 3.0 */ @@ -61,7 +61,7 @@ private CommandDetailParser() { /** * Parse the output of the redis COMMAND/COMMAND INFO command and convert to a list of {@link CommandDetail}. - * + * * @param commandOutput the command output, must not be {@literal null} * @return RedisInstance */ diff --git a/src/main/java/com/lambdaworks/redis/models/command/package-info.java b/src/main/java/io/lettuce/core/models/command/package-info.java similarity index 65% rename from src/main/java/com/lambdaworks/redis/models/command/package-info.java rename to src/main/java/io/lettuce/core/models/command/package-info.java index d4dacfe222..79a0bba9ea 100644 --- a/src/main/java/com/lambdaworks/redis/models/command/package-info.java +++ b/src/main/java/io/lettuce/core/models/command/package-info.java @@ -1,4 +1,4 @@ /** * Model and parser to for the {@code COMMAND} and {@code COMMAND INFO} output. */ -package com.lambdaworks.redis.models.command; +package io.lettuce.core.models.command; diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisInstance.java b/src/main/java/io/lettuce/core/models/role/RedisInstance.java similarity index 85% rename from src/main/java/com/lambdaworks/redis/models/role/RedisInstance.java rename to src/main/java/io/lettuce/core/models/role/RedisInstance.java index 0fa1dad871..5e4fdbf698 100644 --- a/src/main/java/com/lambdaworks/redis/models/role/RedisInstance.java +++ b/src/main/java/io/lettuce/core/models/role/RedisInstance.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.models.role; +package io.lettuce.core.models.role; /** * Represents a redis instance according to the {@code ROLE} output. - * + * * @author Mark Paluch * @since 3.0 */ public interface RedisInstance { /** - * - * @return Redis instance role, see {@link com.lambdaworks.redis.models.role.RedisInstance.Role} + * + * @return Redis instance role, see {@link io.lettuce.core.models.role.RedisInstance.Role} */ Role getRole(); diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisMasterInstance.java b/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/models/role/RedisMasterInstance.java rename to src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java index f9d51f709b..5bdf8934a1 100644 --- a/src/main/java/com/lambdaworks/redis/models/role/RedisMasterInstance.java +++ b/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.models.role; +package io.lettuce.core.models.role; import java.io.Serializable; import java.util.Collections; import java.util.List; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Represents a master instance. - * + * * @author Mark Paluch * @since 3.0 */ @@ -38,7 +38,7 @@ public RedisMasterInstance() { /** * Constructs a {@link RedisMasterInstance} - * + * * @param replicationOffset the replication offset * @param slaves list of slaves, must not be {@literal null} but may be empty */ @@ -50,7 +50,7 @@ public RedisMasterInstance(long replicationOffset, List slav /** * - * @return always {@link com.lambdaworks.redis.models.role.RedisInstance.Role#MASTER} + * @return always {@link io.lettuce.core.models.role.RedisInstance.Role#MASTER} */ @Override public Role getRole() { diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisNodeDescription.java b/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/models/role/RedisNodeDescription.java rename to src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java index c224aaf64e..fcf1e7b2ac 100644 --- a/src/main/java/com/lambdaworks/redis/models/role/RedisNodeDescription.java +++ b/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.models.role; +package io.lettuce.core.models.role; -import com.lambdaworks.redis.RedisURI; +import io.lettuce.core.RedisURI; /** * Description of a single Redis Node. - * + * * @author Mark Paluch * @since 4.0 */ public interface RedisNodeDescription extends RedisInstance { /** - * + * * @return the URI of the node */ RedisURI getUri(); diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisSentinelInstance.java b/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/models/role/RedisSentinelInstance.java rename to src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java index c596d89c53..872b7a16f1 100644 --- a/src/main/java/com/lambdaworks/redis/models/role/RedisSentinelInstance.java +++ b/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.models.role; +package io.lettuce.core.models.role; import java.io.Serializable; import java.util.Collections; import java.util.List; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Redis sentinel instance. - * + * * @author Mark Paluch * @since 3.0 */ @@ -36,7 +36,7 @@ public RedisSentinelInstance() { /** * Constructs a {@link RedisSentinelInstance} - * + * * @param monitoredMasters list of monitored masters, must not be {@literal null} but may be empty */ public RedisSentinelInstance(List monitoredMasters) { @@ -46,7 +46,7 @@ public RedisSentinelInstance(List monitoredMasters) { /** * - * @return always {@link com.lambdaworks.redis.models.role.RedisInstance.Role#SENTINEL} + * @return always {@link io.lettuce.core.models.role.RedisInstance.Role#SENTINEL} */ @Override public Role getRole() { diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisSlaveInstance.java b/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/models/role/RedisSlaveInstance.java rename to src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java index 854cb579ff..030d7dc7e4 100644 --- a/src/main/java/com/lambdaworks/redis/models/role/RedisSlaveInstance.java +++ b/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.models.role; +package io.lettuce.core.models.role; import java.io.Serializable; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Redis slave instance. - * + * * @author Mark Paluch * @since 3.0 */ @@ -35,7 +35,7 @@ public RedisSlaveInstance() { /** * Constructs a {@link RedisSlaveInstance} - * + * * @param master master for the replication, must not be {@literal null} * @param state slave state, must not be {@literal null} */ @@ -48,7 +48,7 @@ public RedisSlaveInstance() { /** * - * @return always {@link com.lambdaworks.redis.models.role.RedisInstance.Role#SLAVE} + * @return always {@link io.lettuce.core.models.role.RedisInstance.Role#SLAVE} */ @Override public Role getRole() { diff --git a/src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java b/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java rename to src/main/java/io/lettuce/core/models/role/ReplicationPartner.java index 524b3cdf41..764a867668 100644 --- a/src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java +++ b/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.models.role; +package io.lettuce.core.models.role; import java.io.Serializable; -import com.lambdaworks.redis.internal.HostAndPort; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.HostAndPort; +import io.lettuce.core.internal.LettuceAssert; /** * Replication partner providing the host and the replication offset. - * + * * @author Mark Paluch * @since 3.0 */ @@ -37,7 +37,7 @@ public ReplicationPartner() { /** * Constructs a replication partner. - * + * * @param host host information, must not be {@literal null} * @param replicationOffset the replication offset */ diff --git a/src/main/java/com/lambdaworks/redis/models/role/RoleParser.java b/src/main/java/io/lettuce/core/models/role/RoleParser.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/models/role/RoleParser.java rename to src/main/java/io/lettuce/core/models/role/RoleParser.java index 34e8ac7d81..1d51f6d75a 100644 --- a/src/main/java/com/lambdaworks/redis/models/role/RoleParser.java +++ b/src/main/java/io/lettuce/core/models/role/RoleParser.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.models.role; +package io.lettuce.core.models.role; import java.util.*; -import com.lambdaworks.redis.internal.HostAndPort; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.HostAndPort; +import io.lettuce.core.internal.LettuceAssert; /** * Parser for redis ROLE command output. - * + * * @author Mark Paluch * @since 3.0 */ @@ -58,7 +58,7 @@ private RoleParser() { /** * Parse the output of the redis ROLE command and convert to a RedisInstance. - * + * * @param roleOutput output of the redis ROLE command * @return RedisInstance */ diff --git a/src/main/java/com/lambdaworks/redis/models/role/package-info.java b/src/main/java/io/lettuce/core/models/role/package-info.java similarity index 57% rename from src/main/java/com/lambdaworks/redis/models/role/package-info.java rename to src/main/java/io/lettuce/core/models/role/package-info.java index 884e807c15..2f6c92c430 100644 --- a/src/main/java/com/lambdaworks/redis/models/role/package-info.java +++ b/src/main/java/io/lettuce/core/models/role/package-info.java @@ -1,4 +1,4 @@ /** * Model and parser for the {@code ROLE} output. */ -package com.lambdaworks.redis.models.role; +package io.lettuce.core.models.role; diff --git a/src/main/java/com/lambdaworks/redis/output/ArrayOutput.java b/src/main/java/io/lettuce/core/output/ArrayOutput.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/output/ArrayOutput.java rename to src/main/java/io/lettuce/core/output/ArrayOutput.java index 9f0b91d053..2816154513 100644 --- a/src/main/java/com/lambdaworks/redis/output/ArrayOutput.java +++ b/src/main/java/io/lettuce/core/output/ArrayOutput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.ArrayDeque; @@ -21,15 +21,15 @@ import java.util.Deque; import java.util.List; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * {@link java.util.List} of objects and lists to support dynamic nested structures (List with mixed content of values and * sublists). - * + * * @param Key type. * @param Value type. - * + * * @author Mark Paluch */ public class ArrayOutput extends CommandOutput> { diff --git a/src/main/java/com/lambdaworks/redis/output/BooleanListOutput.java b/src/main/java/io/lettuce/core/output/BooleanListOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/BooleanListOutput.java rename to src/main/java/io/lettuce/core/output/BooleanListOutput.java index b95fa2e3fa..7b2c1e6e9b 100644 --- a/src/main/java/com/lambdaworks/redis/output/BooleanListOutput.java +++ b/src/main/java/io/lettuce/core/output/BooleanListOutput.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** * {@link java.util.List} of boolean output. diff --git a/src/main/java/com/lambdaworks/redis/output/BooleanOutput.java b/src/main/java/io/lettuce/core/output/BooleanOutput.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/output/BooleanOutput.java rename to src/main/java/io/lettuce/core/output/BooleanOutput.java index 4a06f52b4e..8fdc696311 100644 --- a/src/main/java/com/lambdaworks/redis/output/BooleanOutput.java +++ b/src/main/java/io/lettuce/core/output/BooleanOutput.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * Boolean output. The actual value is returned as an integer where 0 indicates false and 1 indicates true, or as a null bulk * reply for script output. - * + * * @param Key type. * @param Value type. * @author Will Glozer diff --git a/src/main/java/com/lambdaworks/redis/output/ByteArrayOutput.java b/src/main/java/io/lettuce/core/output/ByteArrayOutput.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/output/ByteArrayOutput.java rename to src/main/java/io/lettuce/core/output/ByteArrayOutput.java index 3351d44968..df4630284d 100644 --- a/src/main/java/com/lambdaworks/redis/output/ByteArrayOutput.java +++ b/src/main/java/io/lettuce/core/output/ByteArrayOutput.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * Byte array output. - * + * * @param Key type. * @param Value type. * @author Will Glozer diff --git a/src/main/java/com/lambdaworks/redis/output/CommandOutput.java b/src/main/java/io/lettuce/core/output/CommandOutput.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/output/CommandOutput.java rename to src/main/java/io/lettuce/core/output/CommandOutput.java index a78970aff2..e16bb35674 100644 --- a/src/main/java/com/lambdaworks/redis/output/CommandOutput.java +++ b/src/main/java/io/lettuce/core/output/CommandOutput.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** * Abstract representation of the output of a redis command. - * + * * @param Key type. * @param Value type. * @param Output type. @@ -36,7 +36,7 @@ public abstract class CommandOutput { /** * Initialize a new instance that encodes and decodes keys and values using the supplied codec. - * + * * @param codec Codec used to encode/decode keys and values, must not be {@literal null}. * @param output Initial value of output. */ @@ -48,7 +48,7 @@ public CommandOutput(RedisCodec codec, T output) { /** * Get the command output. - * + * * @return The command output. */ public T get() { @@ -58,7 +58,7 @@ public T get() { /** * Set the command output to a sequence of bytes, or null. Concrete {@link CommandOutput} implementations must override this * method unless they only receive an integer value which cannot be null. - * + * * @param bytes The command output, or null. */ public void set(ByteBuffer bytes) { @@ -68,7 +68,7 @@ public void set(ByteBuffer bytes) { /** * Set the command output to a 64-bit signed integer. Concrete {@link CommandOutput} implementations must override this * method unless they only receive a byte array value. - * + * * @param integer The command output. */ public void set(long integer) { @@ -77,7 +77,7 @@ public void set(long integer) { /** * Set command output to an error message from the server. - * + * * @param error Error message. */ public void setError(ByteBuffer error) { @@ -86,7 +86,7 @@ public void setError(ByteBuffer error) { /** * Set command output to an error message from the client. - * + * * @param error Error message. */ public void setError(String error) { @@ -95,7 +95,7 @@ public void setError(String error) { /** * Check if the command resulted in an error. - * + * * @return true if command resulted in an error. */ public boolean hasError() { @@ -104,7 +104,7 @@ public boolean hasError() { /** * Get the error that occurred. - * + * * @return The error. */ public String getError() { @@ -113,9 +113,9 @@ public String getError() { /** * Mark the command output complete. - * + * * @param depth Remaining depth of output queue. - * + * */ public void complete(int depth) { // nothing to do by default @@ -145,7 +145,7 @@ public String toString() { /** * Mark the beginning of a multi sequence (array). - * + * * @param count expected number of elements in this multi sequence. */ public void multi(int count) { diff --git a/src/main/java/com/lambdaworks/redis/output/DateOutput.java b/src/main/java/io/lettuce/core/output/DateOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/DateOutput.java rename to src/main/java/io/lettuce/core/output/DateOutput.java index ae9403da62..d9e9c8c3d1 100644 --- a/src/main/java/com/lambdaworks/redis/output/DateOutput.java +++ b/src/main/java/io/lettuce/core/output/DateOutput.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.util.Date; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * Date output with no milliseconds. - * + * * @param Key type. * @param Value type. * @author Will Glozer diff --git a/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java b/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java rename to src/main/java/io/lettuce/core/output/DefaultTransactionResult.java index 78c14fd7a8..1e1070281d 100644 --- a/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java +++ b/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.util.Iterator; import java.util.List; import java.util.stream.Stream; -import com.lambdaworks.redis.TransactionResult; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.TransactionResult; +import io.lettuce.core.internal.LettuceAssert; /** * Result of a {@code MULTI} transaction. - * + * * @author Mark Paluch * @since 5.0 */ @@ -35,7 +35,7 @@ class DefaultTransactionResult implements Iterable, TransactionResult { /** * Creates a new {@link DefaultTransactionResult}. - * + * * @param wasRolledBack {@literal true} if the transaction was rolled back. * @param result the transaction result, must not be {@literal null}. */ diff --git a/src/main/java/com/lambdaworks/redis/output/DoubleOutput.java b/src/main/java/io/lettuce/core/output/DoubleOutput.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/output/DoubleOutput.java rename to src/main/java/io/lettuce/core/output/DoubleOutput.java index b30b3ab642..6f0c403fbd 100644 --- a/src/main/java/com/lambdaworks/redis/output/DoubleOutput.java +++ b/src/main/java/io/lettuce/core/output/DoubleOutput.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; import static java.lang.Double.parseDouble; /** * Double output, may be null. - * + * * @param Key type. * @param Value type. * @author Will Glozer diff --git a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java similarity index 87% rename from src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java rename to src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java index dcb175549b..cd70831b95 100644 --- a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java +++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import static java.lang.Double.parseDouble; @@ -21,10 +21,10 @@ import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.GeoCoordinates; -import com.lambdaworks.redis.Value; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.GeoCoordinates; +import io.lettuce.core.Value; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** * A list output that creates a list with {@link GeoCoordinates}'s. diff --git a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java rename to src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java index bd36d82441..6bd381cffc 100644 --- a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java +++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import static java.lang.Double.parseDouble; @@ -21,10 +21,10 @@ import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.GeoCoordinates; -import com.lambdaworks.redis.Value; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.GeoCoordinates; +import io.lettuce.core.Value; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** * A list output that creates a list with {@link GeoCoordinates} {@link Value}s. diff --git a/src/main/java/com/lambdaworks/redis/output/GeoWithinListOutput.java b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/output/GeoWithinListOutput.java rename to src/main/java/io/lettuce/core/output/GeoWithinListOutput.java index f6c1f24caa..9e39a47413 100644 --- a/src/main/java/com/lambdaworks/redis/output/GeoWithinListOutput.java +++ b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import static java.lang.Double.parseDouble; @@ -21,10 +21,10 @@ import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.GeoCoordinates; -import com.lambdaworks.redis.GeoWithin; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.GeoCoordinates; +import io.lettuce.core.GeoWithin; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** * A list output that creates a list with either double/long or {@link GeoCoordinates}'s. diff --git a/src/main/java/com/lambdaworks/redis/output/IntegerOutput.java b/src/main/java/io/lettuce/core/output/IntegerOutput.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/output/IntegerOutput.java rename to src/main/java/io/lettuce/core/output/IntegerOutput.java index 612cb35104..26cc79bc0c 100644 --- a/src/main/java/com/lambdaworks/redis/output/IntegerOutput.java +++ b/src/main/java/io/lettuce/core/output/IntegerOutput.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * 64-bit integer output, may be null. - * + * * @param Key type. * @param Value type. * @author Will Glozer diff --git a/src/main/java/com/lambdaworks/redis/output/KeyListOutput.java b/src/main/java/io/lettuce/core/output/KeyListOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/KeyListOutput.java rename to src/main/java/io/lettuce/core/output/KeyListOutput.java index bc3d03347e..950dd58984 100644 --- a/src/main/java/com/lambdaworks/redis/output/KeyListOutput.java +++ b/src/main/java/io/lettuce/core/output/KeyListOutput.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** * {@link List} of keys output. diff --git a/src/main/java/com/lambdaworks/redis/output/KeyOutput.java b/src/main/java/io/lettuce/core/output/KeyOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/KeyOutput.java rename to src/main/java/io/lettuce/core/output/KeyOutput.java index 866a99ecce..7874c89444 100644 --- a/src/main/java/com/lambdaworks/redis/output/KeyOutput.java +++ b/src/main/java/io/lettuce/core/output/KeyOutput.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * Key output. - * + * * @param Key type. * @param Value type. - * + * * @author Will Glozer */ public class KeyOutput extends CommandOutput { diff --git a/src/main/java/com/lambdaworks/redis/output/KeyScanOutput.java b/src/main/java/io/lettuce/core/output/KeyScanOutput.java similarity index 83% rename from src/main/java/com/lambdaworks/redis/output/KeyScanOutput.java rename to src/main/java/io/lettuce/core/output/KeyScanOutput.java index 022e51c86f..a733bb19df 100644 --- a/src/main/java/com/lambdaworks/redis/output/KeyScanOutput.java +++ b/src/main/java/io/lettuce/core/output/KeyScanOutput.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.KeyScanCursor; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.KeyScanCursor; +import io.lettuce.core.codec.RedisCodec; /** - * {@link com.lambdaworks.redis.KeyScanCursor} for scan cursor output. - * + * {@link io.lettuce.core.KeyScanCursor} for scan cursor output. + * * @param Key type. * @param Value type. * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/output/KeyScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/KeyScanStreamingOutput.java rename to src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java index 3d3316ddc1..fff2515b1e 100644 --- a/src/main/java/com/lambdaworks/redis/output/KeyScanStreamingOutput.java +++ b/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.StreamScanCursor; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.StreamScanCursor; +import io.lettuce.core.codec.RedisCodec; /** * Streaming API for multiple Keys. You can implement this interface in order to receive a call to {@code onKey} on every key. * Key uniqueness is not guaranteed. - * + * * @param Key type. * @param Value type. * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java b/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java rename to src/main/java/io/lettuce/core/output/KeyStreamingChannel.java index 418b866185..893d709622 100644 --- a/src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java +++ b/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; /** * Streaming API for multiple Keys. You can implement this interface in order to receive a call to {@code onKey} on every key. * Key uniqueness is not guaranteed. - * + * * @param Key type. * @author Mark Paluch * @since 3.0 @@ -27,7 +27,7 @@ public interface KeyStreamingChannel extends StreamingChannel{ /** * Called on every incoming key. - * + * * @param key the key */ void onKey(K key); diff --git a/src/main/java/com/lambdaworks/redis/output/KeyStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/output/KeyStreamingOutput.java rename to src/main/java/io/lettuce/core/output/KeyStreamingOutput.java index 9837f4a0e8..f70b8db3db 100644 --- a/src/main/java/com/lambdaworks/redis/output/KeyStreamingOutput.java +++ b/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * Streaming-Output of Keys. Returns the count of all keys (including null). - * + * * @param Key type. * @param Value type. * @author Mark Paluch - * + * */ public class KeyStreamingOutput extends CommandOutput { private final KeyStreamingChannel channel; diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java b/src/main/java/io/lettuce/core/output/KeyValueListOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java rename to src/main/java/io/lettuce/core/output/KeyValueListOutput.java index 04edc56cd0..001ef201a9 100644 --- a/src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java +++ b/src/main/java/io/lettuce/core/output/KeyValueListOutput.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.KeyValue; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** * {@link List} of values output. diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java b/src/main/java/io/lettuce/core/output/KeyValueOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java rename to src/main/java/io/lettuce/core/output/KeyValueOutput.java index 0222f2b1da..4acb015f86 100644 --- a/src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java +++ b/src/main/java/io/lettuce/core/output/KeyValueOutput.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.KeyValue; +import io.lettuce.core.codec.RedisCodec; import java.nio.ByteBuffer; diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/KeyValueScanStreamingOutput.java rename to src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java index 019cd9473d..bef7f75bc5 100644 --- a/src/main/java/com/lambdaworks/redis/output/KeyValueScanStreamingOutput.java +++ b/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.StreamScanCursor; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.StreamScanCursor; +import io.lettuce.core.codec.RedisCodec; /** * Streaming-Output of Key Value Pairs. Returns the count of all Key-Value pairs (including null). - * + * * @param Key type. * @param Value type. - * + * * @author Mark Paluch */ public class KeyValueScanStreamingOutput extends ScanOutput { diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java rename to src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java index 94370bd48e..10ebcc9888 100644 --- a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java +++ b/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; /** * Streaming API for multiple keys and values (tuples). You can implement this interface in order to receive a call to * {@code onKeyValue} on every key-value. - * + * * @param Value type. * @author Mark Paluch * @since 5.0 @@ -28,7 +28,7 @@ public interface KeyValueStreamingChannel extends StreamingChannel { /** * Called on every incoming key/value pair. - * + * * @param key the key * @param value the value */ diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java rename to src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java index 366ce5cdb3..7052abf680 100644 --- a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java +++ b/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.Iterator; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * Streaming-Output of Key Value Pairs. Returns the count of all Key-Value pairs (including null). - * + * * @param Key type. * @param Value type. - * + * * @author Mark Paluch */ public class KeyValueStreamingOutput extends CommandOutput { diff --git a/src/main/java/com/lambdaworks/redis/output/ListOfMapsOutput.java b/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/output/ListOfMapsOutput.java rename to src/main/java/io/lettuce/core/output/ListOfMapsOutput.java index ce021060cf..e4fb298571 100644 --- a/src/main/java/com/lambdaworks/redis/output/ListOfMapsOutput.java +++ b/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -21,14 +21,14 @@ import java.util.List; import java.util.Map; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * {@link java.util.List} of maps output. - * + * * @param Key type. * @param Value type. - * + * * @author Will Glozer */ public class ListOfMapsOutput extends CommandOutput>> { diff --git a/src/main/java/com/lambdaworks/redis/output/ListSubscriber.java b/src/main/java/io/lettuce/core/output/ListSubscriber.java similarity index 87% rename from src/main/java/com/lambdaworks/redis/output/ListSubscriber.java rename to src/main/java/io/lettuce/core/output/ListSubscriber.java index b2a54d40d4..1b9aaab8e4 100644 --- a/src/main/java/com/lambdaworks/redis/output/ListSubscriber.java +++ b/src/main/java/io/lettuce/core/output/ListSubscriber.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.util.List; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.StreamingOutput.Subscriber; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.StreamingOutput.Subscriber; /** * Simple subscriber diff --git a/src/main/java/com/lambdaworks/redis/output/MapOutput.java b/src/main/java/io/lettuce/core/output/MapOutput.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/output/MapOutput.java rename to src/main/java/io/lettuce/core/output/MapOutput.java index 5344c5bc52..e30cb4e04f 100644 --- a/src/main/java/com/lambdaworks/redis/output/MapOutput.java +++ b/src/main/java/io/lettuce/core/output/MapOutput.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.LinkedHashMap; import java.util.Map; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * {@link Map} of keys and values output. diff --git a/src/main/java/com/lambdaworks/redis/output/MapScanOutput.java b/src/main/java/io/lettuce/core/output/MapScanOutput.java similarity index 85% rename from src/main/java/com/lambdaworks/redis/output/MapScanOutput.java rename to src/main/java/io/lettuce/core/output/MapScanOutput.java index 1844e2d827..0014f4b390 100644 --- a/src/main/java/com/lambdaworks/redis/output/MapScanOutput.java +++ b/src/main/java/io/lettuce/core/output/MapScanOutput.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.MapScanCursor; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.MapScanCursor; +import io.lettuce.core.codec.RedisCodec; /** - * {@link com.lambdaworks.redis.MapScanCursor} for scan cursor output. - * + * {@link io.lettuce.core.MapScanCursor} for scan cursor output. + * * @param Key type. * @param Value type. * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/output/MultiOutput.java b/src/main/java/io/lettuce/core/output/MultiOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/MultiOutput.java rename to src/main/java/io/lettuce/core/output/MultiOutput.java index 3cdfd0100e..c00eeb7bdf 100644 --- a/src/main/java/com/lambdaworks/redis/output/MultiOutput.java +++ b/src/main/java/io/lettuce/core/output/MultiOutput.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import java.util.Queue; -import com.lambdaworks.redis.RedisCommandExecutionException; -import com.lambdaworks.redis.TransactionResult; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceFactories; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.RedisCommandExecutionException; +import io.lettuce.core.TransactionResult; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceFactories; +import io.lettuce.core.protocol.RedisCommand; /** * Output of all commands within a MULTI block. diff --git a/src/main/java/com/lambdaworks/redis/output/NestedMultiOutput.java b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/output/NestedMultiOutput.java rename to src/main/java/io/lettuce/core/output/NestedMultiOutput.java index d72a2bc399..a59460b1b5 100644 --- a/src/main/java/com/lambdaworks/redis/output/NestedMultiOutput.java +++ b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Deque; import java.util.List; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceFactories; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceFactories; /** * {@link List} of command outputs, possibly deeply nested. - * + * * @param Key type. * @param Value type. * @author Will Glozer diff --git a/src/main/java/com/lambdaworks/redis/output/ScanOutput.java b/src/main/java/io/lettuce/core/output/ScanOutput.java similarity index 88% rename from src/main/java/com/lambdaworks/redis/output/ScanOutput.java rename to src/main/java/io/lettuce/core/output/ScanOutput.java index 5b38f8da5d..d1a6c05f8f 100644 --- a/src/main/java/com/lambdaworks/redis/output/ScanOutput.java +++ b/src/main/java/io/lettuce/core/output/ScanOutput.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.LettuceStrings; -import com.lambdaworks.redis.ScanCursor; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.LettuceStrings; +import io.lettuce.core.ScanCursor; +import io.lettuce.core.codec.RedisCodec; /** * Cursor handling output. - * + * * @param Key type. * @param Value type. * @param Cursor type. diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java rename to src/main/java/io/lettuce/core/output/ScoredValueListOutput.java index 2d30b990e4..6a79169eb5 100644 --- a/src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java +++ b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.ScoredValue; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.ScoredValue; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** * {@link List} of values and their associated scores. diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java similarity index 83% rename from src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java rename to src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java index 87ea706fed..8a2fc35713 100644 --- a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java +++ b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.ScoredValue; -import com.lambdaworks.redis.ScoredValueScanCursor; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.ScoredValue; +import io.lettuce.core.ScoredValueScanCursor; +import io.lettuce.core.codec.RedisCodec; /** - * {@link com.lambdaworks.redis.ScoredValueScanCursor} for scan cursor output. - * + * {@link io.lettuce.core.ScoredValueScanCursor} for scan cursor output. + * * @param Key type. * @param Value type. * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java rename to src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java index 11e5174b10..a923e72797 100644 --- a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java +++ b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.ScoredValue; -import com.lambdaworks.redis.StreamScanCursor; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.ScoredValue; +import io.lettuce.core.StreamScanCursor; +import io.lettuce.core.codec.RedisCodec; /** * Streaming-Output of of values and their associated scores. Returns the count of all values (including null). - * + * * @param Key type. * @param Value type. * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java rename to src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java index 33eaa2b3c1..f08e849444 100644 --- a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java +++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; -import com.lambdaworks.redis.ScoredValue; +import io.lettuce.core.ScoredValue; /** * Streaming API for multiple Keys. You can implement this interface in order to receive a call to {@code onValue} on every * value. - * + * * @param Value type. * @author Mark Paluch * @since 3.0 @@ -29,7 +29,7 @@ public interface ScoredValueStreamingChannel extends StreamingChannel { /** * Called on every incoming ScoredValue. - * + * * @param value the scored value */ void onValue(ScoredValue value); diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java rename to src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java index 782b0987de..debda979ca 100644 --- a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java +++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.ScoredValue; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.ScoredValue; +import io.lettuce.core.codec.RedisCodec; /** * Streaming-Output of of values and their associated scores. Returns the count of all values (including null). - * + * * @author Mark Paluch * @param Key type. * @param Value type. diff --git a/src/main/java/com/lambdaworks/redis/output/StatusOutput.java b/src/main/java/io/lettuce/core/output/StatusOutput.java similarity index 87% rename from src/main/java/com/lambdaworks/redis/output/StatusOutput.java rename to src/main/java/io/lettuce/core/output/StatusOutput.java index 32d52e27a1..5877b8d466 100644 --- a/src/main/java/com/lambdaworks/redis/output/StatusOutput.java +++ b/src/main/java/io/lettuce/core/output/StatusOutput.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; -import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer; +import static io.lettuce.core.protocol.LettuceCharsets.buffer; /** * Status message output. - * + * * @param Key type. * @param Value type. * @author Will Glozer diff --git a/src/main/java/com/lambdaworks/redis/output/StreamingChannel.java b/src/main/java/io/lettuce/core/output/StreamingChannel.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/output/StreamingChannel.java rename to src/main/java/io/lettuce/core/output/StreamingChannel.java index 2fc0bbe3c9..7b5e19fc29 100644 --- a/src/main/java/com/lambdaworks/redis/output/StreamingChannel.java +++ b/src/main/java/io/lettuce/core/output/StreamingChannel.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; /** * Marker interface for streaming channels. - * + * * @author Mark Paluch * @since 5.0 */ diff --git a/src/main/java/com/lambdaworks/redis/output/StreamingOutput.java b/src/main/java/io/lettuce/core/output/StreamingOutput.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/output/StreamingOutput.java rename to src/main/java/io/lettuce/core/output/StreamingOutput.java index 0849803bfb..14ea0082d3 100644 --- a/src/main/java/com/lambdaworks/redis/output/StreamingOutput.java +++ b/src/main/java/io/lettuce/core/output/StreamingOutput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; /** * Implementors of this class support a streaming {@link CommandOutput} while the command is still processed. The receiving diff --git a/src/main/java/com/lambdaworks/redis/output/StringListOutput.java b/src/main/java/io/lettuce/core/output/StringListOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/StringListOutput.java rename to src/main/java/io/lettuce/core/output/StringListOutput.java index 206d45a930..e99fccd05a 100644 --- a/src/main/java/com/lambdaworks/redis/output/StringListOutput.java +++ b/src/main/java/io/lettuce/core/output/StringListOutput.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** * {@link List} of string output. diff --git a/src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java b/src/main/java/io/lettuce/core/output/StringValueListOutput.java similarity index 87% rename from src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java rename to src/main/java/io/lettuce/core/output/StringValueListOutput.java index 7a669dabfa..d3eaff0b5d 100644 --- a/src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java +++ b/src/main/java/io/lettuce/core/output/StringValueListOutput.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.Value; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.Value; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** - * {@link List} of {@link com.lambdaworks.redis.Value} output. + * {@link List} of {@link io.lettuce.core.Value} output. * * @param Key type. * @param Value type. diff --git a/src/main/java/com/lambdaworks/redis/output/ValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueListOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/ValueListOutput.java rename to src/main/java/io/lettuce/core/output/ValueListOutput.java index 5a3a302a83..138030ec07 100644 --- a/src/main/java/com/lambdaworks/redis/output/ValueListOutput.java +++ b/src/main/java/io/lettuce/core/output/ValueListOutput.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** * {@link List} of values output. diff --git a/src/main/java/com/lambdaworks/redis/output/ValueOutput.java b/src/main/java/io/lettuce/core/output/ValueOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/ValueOutput.java rename to src/main/java/io/lettuce/core/output/ValueOutput.java index d8ee0bdc44..1cc33d3ad7 100644 --- a/src/main/java/com/lambdaworks/redis/output/ValueOutput.java +++ b/src/main/java/io/lettuce/core/output/ValueOutput.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * Value output. - * + * * @param Key type. * @param Value type. - * + * * @author Will Glozer */ public class ValueOutput extends CommandOutput { diff --git a/src/main/java/com/lambdaworks/redis/output/ValueScanOutput.java b/src/main/java/io/lettuce/core/output/ValueScanOutput.java similarity index 83% rename from src/main/java/com/lambdaworks/redis/output/ValueScanOutput.java rename to src/main/java/io/lettuce/core/output/ValueScanOutput.java index eabfeb2ae8..068f930c6f 100644 --- a/src/main/java/com/lambdaworks/redis/output/ValueScanOutput.java +++ b/src/main/java/io/lettuce/core/output/ValueScanOutput.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.ValueScanCursor; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.ValueScanCursor; +import io.lettuce.core.codec.RedisCodec; /** - * {@link com.lambdaworks.redis.ValueScanCursor} for scan cursor output. - * + * {@link io.lettuce.core.ValueScanCursor} for scan cursor output. + * * @param Key type. * @param Value type. * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/output/ValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/output/ValueScanStreamingOutput.java rename to src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java index 4abc1feda2..a10b3a8e3f 100644 --- a/src/main/java/com/lambdaworks/redis/output/ValueScanStreamingOutput.java +++ b/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.StreamScanCursor; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.StreamScanCursor; +import io.lettuce.core.codec.RedisCodec; /** * Streaming API for multiple Values. You can implement this interface in order to receive a call to {@code onValue} on every * key. - * + * * @param Key type. * @param Value type. * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/output/ValueSetOutput.java b/src/main/java/io/lettuce/core/output/ValueSetOutput.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/output/ValueSetOutput.java rename to src/main/java/io/lettuce/core/output/ValueSetOutput.java index 2870303e50..db0f75dae6 100644 --- a/src/main/java/com/lambdaworks/redis/output/ValueSetOutput.java +++ b/src/main/java/io/lettuce/core/output/ValueSetOutput.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.HashSet; import java.util.Set; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * {@link Set} of value output. - * + * * @param Key type. * @param Value type. - * + * * @author Will Glozer */ public class ValueSetOutput extends CommandOutput> { diff --git a/src/main/java/com/lambdaworks/redis/output/ValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/output/ValueStreamingChannel.java rename to src/main/java/io/lettuce/core/output/ValueStreamingChannel.java index e90e5db115..fd47ce28dd 100644 --- a/src/main/java/com/lambdaworks/redis/output/ValueStreamingChannel.java +++ b/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; /** * Streaming API for multiple Keys. You can implement this interface in order to receive a call to {@code onValue} on every * value. - * + * * @param Value type. * @author Mark Paluch * @since 3.0 @@ -27,7 +27,7 @@ public interface ValueStreamingChannel { /** * Called on every incoming value. - * + * * @param value the value */ void onValue(V value); diff --git a/src/main/java/com/lambdaworks/redis/output/ValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/output/ValueStreamingOutput.java rename to src/main/java/io/lettuce/core/output/ValueStreamingOutput.java index 0fae37d092..a948a84cb0 100644 --- a/src/main/java/com/lambdaworks/redis/output/ValueStreamingOutput.java +++ b/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.codec.RedisCodec; /** * Streaming-Output of Values. Returns the count of all values (including null). - * + * * @param Key type. * @param Value type. * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueValueListOutput.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java rename to src/main/java/io/lettuce/core/output/ValueValueListOutput.java index 030edba528..e08f718a9d 100644 --- a/src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java +++ b/src/main/java/io/lettuce/core/output/ValueValueListOutput.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.Value; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.Value; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; /** * {@link List} of {@link Value} wrapped values output. diff --git a/src/main/java/com/lambdaworks/redis/output/package-info.java b/src/main/java/io/lettuce/core/output/package-info.java similarity index 69% rename from src/main/java/com/lambdaworks/redis/output/package-info.java rename to src/main/java/io/lettuce/core/output/package-info.java index 988528e46d..fe6ec2fce2 100644 --- a/src/main/java/com/lambdaworks/redis/output/package-info.java +++ b/src/main/java/io/lettuce/core/output/package-info.java @@ -1,4 +1,4 @@ /** * Implementation of different output protocols including the Streaming API. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; diff --git a/src/main/java/io/lettuce/core/package-info.java b/src/main/java/io/lettuce/core/package-info.java new file mode 100644 index 0000000000..de06bc9552 --- /dev/null +++ b/src/main/java/io/lettuce/core/package-info.java @@ -0,0 +1,4 @@ +/** + * The redis client package containing {@link io.lettuce.core.RedisClient} for regular and sentinel operations. + */ +package io.lettuce.core; diff --git a/src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java rename to src/main/java/io/lettuce/core/protocol/AsyncCommand.java index 8018ada89f..78c1726d63 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java +++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java @@ -13,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import com.lambdaworks.redis.RedisCommandExecutionException; -import com.lambdaworks.redis.RedisCommandInterruptedException; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.CommandOutput; +import io.lettuce.core.RedisCommandExecutionException; +import io.lettuce.core.RedisCommandInterruptedException; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.CommandOutput; import io.netty.buffer.ByteBuf; /** * An asynchronous redis command and its result. All successfully executed commands will eventually return a * {@link CommandOutput} object. - * + * * @param Key type. * @param Value type. * @param Command output type. - * + * * @author Mark Paluch */ public class AsyncCommand extends CompletableFuture implements RedisCommand, RedisFuture, @@ -44,9 +44,9 @@ public class AsyncCommand extends CompletableFuture implements Redis protected RedisCommand command; /** - * + * * @param command the command, must not be {@literal null}. - * + * */ public AsyncCommand(RedisCommand command) { LettuceAssert.notNull(command, "RedisCommand must not be null"); @@ -73,7 +73,7 @@ public boolean await(long timeout, TimeUnit unit) { /** * Get the object that holds this command's output. - * + * * @return The command output object. */ @Override @@ -174,5 +174,5 @@ public void onComplete(Consumer action) { public RedisCommand getDelegate() { return command; } - + } diff --git a/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java b/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java rename to src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java index 1cfd0eb65b..025fcae28b 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java +++ b/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.ScriptOutputType; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.output.*; +import io.lettuce.core.RedisException; +import io.lettuce.core.ScriptOutputType; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.output.*; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/protocol/ChannelLogDescriptor.java b/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/protocol/ChannelLogDescriptor.java rename to src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java index 28b2936a72..1f4da87f5a 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/ChannelLogDescriptor.java +++ b/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import io.netty.channel.Channel; diff --git a/src/main/java/com/lambdaworks/redis/protocol/Command.java b/src/main/java/io/lettuce/core/protocol/Command.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/protocol/Command.java rename to src/main/java/io/lettuce/core/protocol/Command.java index aea8e5de0d..c9854decb6 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/Command.java +++ b/src/main/java/io/lettuce/core/protocol/Command.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.CommandOutput; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.CommandOutput; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java rename to src/main/java/io/lettuce/core/protocol/CommandArgs.java index bdcbca1e67..c86f3c9109 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java +++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -21,11 +21,11 @@ import java.util.List; import java.util.Map; -import com.lambdaworks.redis.LettuceStrings; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.codec.ToByteBufEncoder; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.LettuceStrings; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.codec.ToByteBufEncoder; +import io.lettuce.core.internal.LettuceAssert; import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; @@ -38,13 +38,13 @@ *

    * Usage *

    - * + * * 
      *     
  *         new CommandArgs<>(codec).addKey(key).addValue(value).add(CommandKeyword.FORCE);
  *     
  *
    - * + * * @param Key type. * @param Value type. * @author Will Glozer @@ -80,7 +80,7 @@ public int count() { /** * Adds a key argument. - * + * * @param key the key * @return the command args. */ @@ -96,7 +96,7 @@ public CommandArgs addKey(K key) { /** * Add multiple key arguments. - * + * * @param keys must not be {@literal null}. * @return the command args. */ @@ -112,7 +112,7 @@ public CommandArgs addKeys(Iterable keys) { /** * Add multiple key arguments. - * + * * @param keys must not be {@literal null}. * @return the command args. */ @@ -128,7 +128,7 @@ public CommandArgs addKeys(K... keys) { /** * Add a value argument. - * + * * @param value the value * @return the command args. */ @@ -140,7 +140,7 @@ public CommandArgs addValue(V value) { /** * Add multiple value arguments. - * + * * @param values must not be {@literal null}. * @return the command args. */ @@ -156,7 +156,7 @@ public CommandArgs addValues(Iterable values) { /** * Add multiple value arguments. - * + * * @param values must not be {@literal null}. * @return the command args. */ @@ -172,7 +172,7 @@ public CommandArgs addValues(V... values) { /** * Add a map (hash) argument. - * + * * @param map the map, must not be {@literal null}. * @return the command args. */ @@ -189,7 +189,7 @@ public CommandArgs add(Map map) { /** * Add a string argument. The argument is represented as bulk string. - * + * * @param s the string. * @return the command args. */ @@ -205,7 +205,7 @@ public CommandArgs add(String s) { /** * Add an 64-bit integer (long) argument. - * + * * @param n the argument. * @return the command args. */ @@ -221,7 +221,7 @@ public CommandArgs add(long n) { /** * Add a double argument. - * + * * @param n the double argument. * @return the command args. */ @@ -233,7 +233,7 @@ public CommandArgs add(double n) { /** * Add a byte-array argument. The argument is represented as bulk string. - * + * * @param value the byte-array. * @return the command args. */ @@ -245,7 +245,7 @@ public CommandArgs add(byte[] value) { /** * Add a {@link CommandKeyword} argument. The argument is represented as bulk string. - * + * * @param keyword must not be {@literal null}. * @return the command args. */ @@ -257,7 +257,7 @@ public CommandArgs add(CommandKeyword keyword) { /** * Add a {@link CommandType} argument. The argument is represented as bulk string. - * + * * @param type must not be {@literal null}. * @return the command args. */ @@ -269,7 +269,7 @@ public CommandArgs add(CommandType type) { /** * Add a {@link ProtocolKeyword} argument. The argument is represented as bulk string. - * + * * @param keyword the keyword, must not be {@literal null} * @return the command args. */ @@ -313,7 +313,7 @@ public String toCommandString() { /** * Returns the first integer argument. - * + * * @return the first integer argument or {@literal null}. */ public Long getFirstInteger() { @@ -322,7 +322,7 @@ public Long getFirstInteger() { /** * Returns the first string argument. - * + * * @return the first string argument or {@literal null}. */ public String getFirstString() { @@ -331,7 +331,7 @@ public String getFirstString() { /** * Returns the first key argument in its byte-encoded representation. - * + * * @return the first key argument in its byte-encoded representation or {@literal null}. */ public ByteBuffer getFirstEncodedKey() { @@ -349,7 +349,7 @@ public ByteBuffer getFirstEncodedKey() { /** * Encode the {@link CommandArgs} and write the arguments to the {@link ByteBuf}. - * + * * @param buf the target buffer. */ public void encode(ByteBuf buf) { @@ -366,7 +366,7 @@ static abstract class SingularArgument { /** * Encode the argument and write it to the {@code buffer}. - * + * * @param buffer */ abstract void encode(ByteBuf buffer); @@ -501,7 +501,7 @@ static class IntegerCache { static final IntegerArgument cache[]; static { - int high = Integer.getInteger("biz.paluch.redis.CommandArgs.IntegerCache", 128); + int high = Integer.getInteger("io.lettuce.core.CommandArgs.IntegerCache", 128); cache = new IntegerArgument[high]; for (int i = 0; i < high; i++) { cache[i] = new IntegerArgument(i); diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java rename to src/main/java/io/lettuce/core/protocol/CommandEncoder.java index a9eb2430b9..402571748f 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java +++ b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.nio.charset.Charset; import java.util.Collection; @@ -29,7 +29,7 @@ /** * A netty {@link ChannelHandler} responsible for encoding commands. - * + * * @author Mark Paluch */ public class CommandEncoder extends MessageToByteEncoder { diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java rename to src/main/java/io/lettuce/core/protocol/CommandHandler.java index 23bdc7e8cb..202300c9b8 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java +++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.io.IOException; import java.net.SocketAddress; @@ -24,12 +24,12 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicLong; -import com.lambdaworks.redis.ConnectionEvents; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceFactories; -import com.lambdaworks.redis.internal.LettuceSets; -import com.lambdaworks.redis.output.CommandOutput; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.ConnectionEvents; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceFactories; +import io.lettuce.core.internal.LettuceSets; +import io.lettuce.core.output.CommandOutput; +import io.lettuce.core.resource.ClientResources; import io.netty.buffer.ByteBuf; import io.netty.channel.*; diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java rename to src/main/java/io/lettuce/core/protocol/CommandKeyword.java index 990b48daa7..54ac8ff952 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java +++ b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; /** * Keyword modifiers for redis commands. - * + * * @author Will Glozer */ public enum CommandKeyword implements ProtocolKeyword { diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/protocol/CommandType.java rename to src/main/java/io/lettuce/core/protocol/CommandType.java index 5e087a0cde..368af7f1f5 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/CommandType.java +++ b/src/main/java/io/lettuce/core/protocol/CommandType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; /** * Redis commands. diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java rename to src/main/java/io/lettuce/core/protocol/CommandWrapper.java index 56d1ad0806..8bf8bf69cc 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java +++ b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import com.lambdaworks.redis.output.CommandOutput; +import io.lettuce.core.output.CommandOutput; import io.netty.buffer.ByteBuf; /** * Wrapper for a command. - * + * * @author Mark Paluch */ public class CommandWrapper implements RedisCommand, CompleteableCommand, DecoratedCommand { @@ -118,7 +118,7 @@ public RedisCommand getDelegate() { /** * Unwrap a wrapped command. - * + * * @param wrapped * @param * @param diff --git a/src/main/java/com/lambdaworks/redis/protocol/CompleteableCommand.java b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/protocol/CompleteableCommand.java rename to src/main/java/io/lettuce/core/protocol/CompleteableCommand.java index f3747dd315..bbef912cc2 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/CompleteableCommand.java +++ b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.util.function.Consumer; diff --git a/src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java b/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java rename to src/main/java/io/lettuce/core/protocol/ConnectionFacade.java index 9ab1ae349e..bcead7d168 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java +++ b/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; /** * Represents a stateful connection facade. Connections can be activated and deactivated and particular actions can be executed * upon connection activation/deactivation. - * + * * @author Mark Paluch */ public interface ConnectionFacade { diff --git a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java rename to src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java index 8699004b30..39e5806518 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java +++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.net.SocketAddress; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.ConnectionEvents; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.resource.Delay; -import com.lambdaworks.redis.resource.Delay.StatefulDelay; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.ConnectionEvents; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.resource.Delay; +import io.lettuce.core.resource.Delay.StatefulDelay; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; @@ -38,7 +38,7 @@ /** * A netty {@link ChannelHandler} responsible for monitoring the channel and reconnecting when the connection is lost. - * + * * @author Will Glozer * @author Mark Paluch */ @@ -68,7 +68,7 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter { /** * Create a new watchdog that adds to new connections to the supplied {@link ChannelGroup} and establishes a new * {@link Channel} when disconnected, while reconnect is true. The socketAddressSupplier can supply the reconnect address. - * + * * @param reconnectDelay reconnect delay, must not be {@literal null} * @param clientOptions client options for the current connection, must not be {@literal null} * @param bootstrap Configuration for new channels, must not be {@literal null} @@ -226,7 +226,7 @@ public void run(final Timeout timeout) throws Exception { /** * Reconnect to the remote address that the closed channel was connected to. This creates a new {@link ChannelPipeline} with * the same handler instances contained in the old channel's pipeline. - * + * * @param attempt attempt counter * * @throws Exception when reconnection fails. diff --git a/src/main/java/com/lambdaworks/redis/protocol/DecoratedCommand.java b/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/protocol/DecoratedCommand.java rename to src/main/java/io/lettuce/core/protocol/DecoratedCommand.java index 56f46acf0c..18235f3b0b 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/DecoratedCommand.java +++ b/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; /** * A decorated command allowing access to the underlying {@link #getDelegate()}. - * + * * @author Mark Paluch */ public interface DecoratedCommand { /** * The underlying command. - * + * * @return never {@literal null}. */ RedisCommand getDelegate(); diff --git a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java rename to src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java index 10ff7db922..567aaaeacd 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java +++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; -import static com.lambdaworks.redis.protocol.CommandHandler.SUPPRESS_IO_EXCEPTION_MESSAGES; +import static io.lettuce.core.protocol.CommandHandler.SUPPRESS_IO_EXCEPTION_MESSAGES; import java.io.IOException; import java.nio.channels.ClosedChannelException; @@ -24,12 +24,12 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Supplier; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.ConnectionEvents; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceFactories; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.ConnectionEvents; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.RedisException; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceFactories; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; diff --git a/src/main/java/com/lambdaworks/redis/protocol/DemandAware.java b/src/main/java/io/lettuce/core/protocol/DemandAware.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/protocol/DemandAware.java rename to src/main/java/io/lettuce/core/protocol/DemandAware.java index f713444d97..d2e617b65c 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/DemandAware.java +++ b/src/main/java/io/lettuce/core/protocol/DemandAware.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; /** * Interface for demand-aware components. @@ -38,7 +38,7 @@ interface Sink { * Returns {@literal true} if the {@link Sink} has demand or {@literal false} if the source has no demand. * {@literal false} means either the {@link Sink} has no demand in general because data is not needed or the current * demand is saturated. - * + * * @return {@literal true} if the {@link Sink} demands data. */ boolean hasDemand(); @@ -46,7 +46,7 @@ interface Sink { /** * Sets the {@link Source} for a {@link Sink}. The {@link Sink} is notified by this {@link Source} if the source * indicates new demand or the sink catches up so it's ready to receive more data. - * + * * @param source the reference to the data {@link Source}, must not be {@literal null}. */ void setSource(Source source); diff --git a/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java b/src/main/java/io/lettuce/core/protocol/Endpoint.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/protocol/Endpoint.java rename to src/main/java/io/lettuce/core/protocol/Endpoint.java index e0d73b15f4..75f0e23bbc 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java +++ b/src/main/java/io/lettuce/core/protocol/Endpoint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.util.Optional; @@ -29,28 +29,28 @@ public interface Endpoint { /** * Notify about channel activation. - * + * * @param channel the channel */ void notifyChannelActive(Channel channel); /** * Notify about channel deactivation. - * + * * @param channel the channel */ void notifyChannelInactive(Channel channel); /** * Notify about an exception occured in channel/command processing - * + * * @param t the Exception */ void notifyException(Throwable t); /** * Register a component holding a queue. - * + * * @param queueHolder the queue holder. */ void registerQueue(HasQueuedCommands queueHolder); @@ -64,14 +64,14 @@ public interface Endpoint { /** * Signal the endpoint to drain queued commands from the queue holder. - * + * * @param queuedCommands the queue holder. */ void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands); /** * Associate a {@link ConnectionWatchdog} with the {@link Endpoint}. - * + * * @param connectionWatchdog the connection watchdog, may be empty. */ void registerConnectionWatchdog(Optional connectionWatchdog); diff --git a/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java b/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java rename to src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java index b68e99b726..f72c101d57 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java +++ b/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.util.Queue; @@ -27,7 +27,7 @@ public interface HasQueuedCommands { /** * The queue holding commands. - * + * * @return the queue */ Queue> getQueue(); diff --git a/src/main/java/com/lambdaworks/redis/protocol/LettuceCharsets.java b/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/protocol/LettuceCharsets.java rename to src/main/java/io/lettuce/core/protocol/LettuceCharsets.java index e6724aeb4b..18ac4ea616 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/LettuceCharsets.java +++ b/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.nio.ByteBuffer; import java.nio.charset.Charset; /** * {@link Charset}-related utilities. - * + * * @author Will Glozer */ public class LettuceCharsets { @@ -44,7 +44,7 @@ private LettuceCharsets() { /** * Create a ByteBuffer from a string using ASCII encoding. - * + * * @param s the string * @return ByteBuffer */ diff --git a/src/main/java/com/lambdaworks/redis/protocol/ProtocolKeyword.java b/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/protocol/ProtocolKeyword.java rename to src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java index 13398a58c4..b2bd9d1700 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/ProtocolKeyword.java +++ b/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; /** * Interface for protocol keywords providing an encoded representation. - * + * * @author Mark Paluch */ public interface ProtocolKeyword { /** - * + * * @return byte[] encoded representation. - * + * */ byte[] getBytes(); diff --git a/src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java b/src/main/java/io/lettuce/core/protocol/QueuedCommands.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java rename to src/main/java/io/lettuce/core/protocol/QueuedCommands.java index 67094a0c89..78d7da2781 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java +++ b/src/main/java/io/lettuce/core/protocol/QueuedCommands.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.util.ArrayList; import java.util.Collection; @@ -25,7 +25,7 @@ /** * Registry for all queued commands. This class allows to register/unregister {@link HasQueuedCommands queue holders}. It * provides queue maintenance commands. - * + * * @author Mark Paluch */ class QueuedCommands { @@ -34,7 +34,7 @@ class QueuedCommands { /** * Register queue holder. - * + * * @param queueHolder the queue holder, must not be {@literal null}. */ void register(HasQueuedCommands queueHolder) { @@ -52,7 +52,7 @@ void unregister(HasQueuedCommands queueHolder) { /** * Remove a command from all registered queues. - * + * * @param command the command. */ public void remove(RedisCommand command) { @@ -76,7 +76,7 @@ void removeAll(Collection> commands) { /** * Drain commands from all queues. - * + * * @return the commands. */ List> drainCommands() { @@ -101,7 +101,7 @@ void removeAll(Collection> commands) { /** * Check whether the registered queues exceed a global sized of the {@code requestQueueSize}. - * + * * @param requestQueueSize the queue size limit. * @return {@literal true} if there are more queued commands than {@code requestQueueSize} */ diff --git a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java rename to src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java index 9b83519049..73fbdf6832 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java +++ b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.net.SocketAddress; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Supplier; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.RedisChannelInitializer; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.RedisChannelInitializer; +import io.lettuce.core.internal.LettuceAssert; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; diff --git a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionListener.java b/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/protocol/ReconnectionListener.java rename to src/main/java/io/lettuce/core/protocol/ReconnectionListener.java index 902bc6f279..b8a9fec58a 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionListener.java +++ b/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; -import com.lambdaworks.redis.ConnectionEvents; +import io.lettuce.core.ConnectionEvents; /** * Listener for reconnection events. - * + * * @author Mark Paluch * @since 4.2 */ @@ -34,7 +34,7 @@ public void onReconnect(ConnectionEvents.Reconnect reconnect) { /** * Listener method notified on a reconnection attempt. - * + * * @param reconnect the event payload. */ void onReconnect(ConnectionEvents.Reconnect reconnect); diff --git a/src/main/java/com/lambdaworks/redis/protocol/RedisCommand.java b/src/main/java/io/lettuce/core/protocol/RedisCommand.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/protocol/RedisCommand.java rename to src/main/java/io/lettuce/core/protocol/RedisCommand.java index a5dac8dfc0..780022724a 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/RedisCommand.java +++ b/src/main/java/io/lettuce/core/protocol/RedisCommand.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; -import com.lambdaworks.redis.output.CommandOutput; +import io.lettuce.core.output.CommandOutput; import io.netty.buffer.ByteBuf; /** @@ -23,7 +23,7 @@ * * Commands can be wrapped. Outer commands have to notify inner commands but inner commands do not communicate with outer * commands. - * + * * @author Mark Paluch * @param Key type. * @param Value type. @@ -34,7 +34,7 @@ public interface RedisCommand { /** * The command output. Can be null. - * + * * @return the command output. */ CommandOutput getOutput(); @@ -50,7 +50,7 @@ public interface RedisCommand { void cancel(); /** - * + * * @return the current command args */ CommandArgs getArgs(); @@ -90,7 +90,7 @@ public interface RedisCommand { /** * Set a new output. Only possible as long as the command is not completed/cancelled. - * + * * @param output the new command output * @throws IllegalStateException if the command is cancelled/completed */ diff --git a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java rename to src/main/java/io/lettuce/core/protocol/RedisStateMachine.java index 29841201c0..d350af0345 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java +++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; -import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer; -import static com.lambdaworks.redis.protocol.RedisStateMachine.State.Type.*; +import static io.lettuce.core.protocol.LettuceCharsets.buffer; +import static io.lettuce.core.protocol.RedisStateMachine.State.Type.*; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.concurrent.atomic.AtomicBoolean; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.output.CommandOutput; - +import io.lettuce.core.RedisException; +import io.lettuce.core.output.CommandOutput; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufProcessor; import io.netty.buffer.PooledByteBufAllocator; @@ -56,7 +55,7 @@ public class RedisStateMachine { && nettyBufferVersion.artifactVersion().startsWith("4.0"); if (!USE_NETTY40_BYTEBUF_COMPATIBILITY) { try { - LONG_PROCESSOR_CLASS = Class.forName("com.lambdaworks.redis.protocol.RedisStateMachine$Netty41LongProcessor"); + LONG_PROCESSOR_CLASS = Class.forName("io.lettuce.core.protocol.RedisStateMachine$Netty41LongProcessor"); } catch (ClassNotFoundException e) { throw new RedisException("Cannot load Netty41LongProcessor class", e); } diff --git a/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java b/src/main/java/io/lettuce/core/protocol/SharedLock.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/protocol/SharedLock.java rename to src/main/java/io/lettuce/core/protocol/SharedLock.java index 10446df6cd..522806724c 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java +++ b/src/main/java/io/lettuce/core/protocol/SharedLock.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Supplier; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Shared locking facade that supports shared and exclusive locking. @@ -29,7 +29,7 @@ * Exclusive locking is reentrant. An exclusive lock owner is permitted to acquire and release shared locks. Shared/exclusive * lock requests by other threads than the thread which holds the exclusive lock, are forced to wait until the exclusive lock is * released. - * + * * @author Mark Paluch */ class SharedLock { @@ -71,7 +71,7 @@ void decrementWriters() { /** * Execute a {@link Runnable} guarded by an exclusive lock. - * + * * @param runnable the runnable, must not be {@literal null}. */ void doExclusive(Runnable runnable) { @@ -86,7 +86,7 @@ void doExclusive(Runnable runnable) { /** * Retrieve a value produced by a {@link Supplier} guarded by an exclusive lock. - * + * * @param supplier the {@link Supplier}, must not be {@literal null}. * @param the return type * @return the return value diff --git a/src/main/java/com/lambdaworks/redis/protocol/TransactionalCommand.java b/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/protocol/TransactionalCommand.java rename to src/main/java/io/lettuce/core/protocol/TransactionalCommand.java index 2a281f7ffb..5f6d741832 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/TransactionalCommand.java +++ b/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.util.concurrent.CountDownLatch; @@ -21,12 +21,12 @@ * A wrapper for commands within a {@literal MULTI} transaction. Commands triggered within a transaction will be completed * twice. Once on the submission and once during {@literal EXEC}. Only the second completion will complete the underlying * command. - * - * + * + * * @param Key type. * @param Value type. * @param Command output type. - * + * * @author Mark Paluch */ public class TransactionalCommand extends AsyncCommand implements RedisCommand { diff --git a/src/main/java/com/lambdaworks/redis/protocol/WithLatency.java b/src/main/java/io/lettuce/core/protocol/WithLatency.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/protocol/WithLatency.java rename to src/main/java/io/lettuce/core/protocol/WithLatency.java index cad57a5ce7..f3c2f086d8 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/WithLatency.java +++ b/src/main/java/io/lettuce/core/protocol/WithLatency.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; /** * Interface to items recording a latency. Unit of time depends on the actual implementation. - * + * * @author Mark Paluch */ interface WithLatency { @@ -46,13 +46,13 @@ interface WithLatency { long getSent(); /** - * + * * @return the time of the first response. */ long getFirstResponse(); /** - * + * * @return the time of completion. */ long getCompleted(); diff --git a/src/main/java/com/lambdaworks/redis/protocol/package-info.java b/src/main/java/io/lettuce/core/protocol/package-info.java similarity index 52% rename from src/main/java/com/lambdaworks/redis/protocol/package-info.java rename to src/main/java/io/lettuce/core/protocol/package-info.java index a84a938889..a28811c1f9 100644 --- a/src/main/java/com/lambdaworks/redis/protocol/package-info.java +++ b/src/main/java/io/lettuce/core/protocol/package-info.java @@ -1,4 +1,4 @@ /** * Redis protocol layer abstraction. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandArgs.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandArgs.java rename to src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java index d6ddd852d7..243cfdf931 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandArgs.java +++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.protocol.CommandArgs; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.protocol.CommandArgs; /** * * Command args for Pub/Sub connections. This implementation hides the first key as PubSub keys are not keys from the key-space. - * + * * @author Mark Paluch * @since 4.2 */ diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandBuilder.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java similarity index 78% rename from src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandBuilder.java rename to src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java index 72793d2625..3a98d5b5e0 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandBuilder.java +++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java @@ -13,29 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; -import static com.lambdaworks.redis.protocol.CommandKeyword.CHANNELS; -import static com.lambdaworks.redis.protocol.CommandKeyword.NUMSUB; -import static com.lambdaworks.redis.protocol.CommandType.*; +import static io.lettuce.core.protocol.CommandKeyword.CHANNELS; +import static io.lettuce.core.protocol.CommandKeyword.NUMSUB; +import static io.lettuce.core.protocol.CommandType.*; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.CommandOutput; -import com.lambdaworks.redis.output.IntegerOutput; -import com.lambdaworks.redis.output.KeyListOutput; -import com.lambdaworks.redis.output.MapOutput; -import com.lambdaworks.redis.protocol.BaseRedisCommandBuilder; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.CommandOutput; +import io.lettuce.core.output.IntegerOutput; +import io.lettuce.core.output.KeyListOutput; +import io.lettuce.core.output.MapOutput; +import io.lettuce.core.protocol.BaseRedisCommandBuilder; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandType; /** * Dedicated pub/sub command builder to build pub/sub commands. - * + * * @author Mark Paluch * @since 4.2 */ diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java rename to src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java index 752c7788fe..c99facf1a8 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java +++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.output.CommandOutput; -import com.lambdaworks.redis.protocol.CommandHandler; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.output.CommandOutput; +import io.lettuce.core.protocol.CommandHandler; +import io.lettuce.core.resource.ClientResources; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler; @@ -27,10 +27,10 @@ /** * A netty {@link ChannelHandler} responsible for writing redis pub/sub commands and reading the response stream from the * server. - * + * * @param Key type. * @param Value type. - * + * * @author Will Glozer */ public class PubSubCommandHandler extends CommandHandler { @@ -41,7 +41,7 @@ public class PubSubCommandHandler extends CommandHandler { /** * Initialize a new instance. - * + * * @param clientResources client resources for this connection * @param codec Codec. * @param endpoint the Pub/Sub endpoint for Pub/Sub callback. diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java rename to src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java index fe1817613d..8d884445c5 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java +++ b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; import java.util.List; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.protocol.DefaultEndpoint; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.protocol.DefaultEndpoint; import io.netty.util.internal.ConcurrentSet; diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java rename to src/main/java/io/lettuce/core/pubsub/PubSubOutput.java index 2060d771dd..5679b8c98b 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java +++ b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; import java.nio.ByteBuffer; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.output.CommandOutput; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.output.CommandOutput; /** * One element of the redis pub/sub stream. May be a message or notification of subscription details. - * + * * @param Key type. * @param Value type. * @param Result type. diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java rename to src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java index bd7e0133dc..8c5f618e93 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java +++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; /** * Convenience adapter with an empty implementation of all {@link RedisPubSubListener} callback methods. - * + * * @param Key type. * @param Value type. - * + * * @author Will Glozer */ public class RedisPubSubAdapter implements RedisPubSubListener { diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java rename to src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java index 87f8355c1a..e38e9ab601 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java +++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.RedisAsyncCommandsImpl; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands; +import io.lettuce.core.RedisAsyncCommandsImpl; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands; /** * An asynchronous and thread-safe API for a Redis pub/sub connection. diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubListener.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubListener.java rename to src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java index 32c29d4e39..fdb829ef9e 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubListener.java +++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; /** * Interface for redis pub/sub listeners. - * + * * @param Key type. * @param Value type. * @author Will Glozer @@ -25,7 +25,7 @@ public interface RedisPubSubListener { /** * Message received from a channel subscription. - * + * * @param channel Channel. * @param message Message. */ @@ -33,7 +33,7 @@ public interface RedisPubSubListener { /** * Message received from a pattern subscription. - * + * * @param pattern Pattern * @param channel Channel * @param message Message @@ -42,7 +42,7 @@ public interface RedisPubSubListener { /** * Subscribed to a channel. - * + * * @param channel Channel * @param count Subscription count. */ @@ -50,7 +50,7 @@ public interface RedisPubSubListener { /** * Subscribed to a pattern. - * + * * @param pattern Pattern. * @param count Subscription count. */ @@ -58,7 +58,7 @@ public interface RedisPubSubListener { /** * Unsubscribed from a channel. - * + * * @param channel Channel * @param count Subscription count. */ @@ -66,7 +66,7 @@ public interface RedisPubSubListener { /** * Unsubscribed from a pattern. - * + * * @param pattern Channel * @param count Subscription count. */ diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java rename to src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java index 809a67fd7f..070bb95e7f 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java +++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; import java.util.Map; @@ -21,11 +21,11 @@ import reactor.core.publisher.FluxSink; import reactor.core.publisher.Mono; -import com.lambdaworks.redis.RedisReactiveCommandsImpl; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.pubsub.api.reactive.ChannelMessage; -import com.lambdaworks.redis.pubsub.api.reactive.PatternMessage; -import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands; +import io.lettuce.core.RedisReactiveCommandsImpl; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.pubsub.api.reactive.ChannelMessage; +import io.lettuce.core.pubsub.api.reactive.PatternMessage; +import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands; /** * A reactive and thread-safe API for a Redis pub/sub connection. diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java similarity index 83% rename from src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java rename to src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java index e5d8cbd78e..b559a00a8f 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java +++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands; -import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands; -import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands; +import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands; +import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands; /** * An asynchronous thread-safe pub/sub connection to a redis server. After one or more channels are subscribed to only pub/sub * related commands or {@literal QUIT} may be called. - * + * * Incoming messages and results of the {@literal subscribe}/{@literal unsubscribe} calls will be passed to all registered * {@link RedisPubSubListener}s. - * - * A {@link com.lambdaworks.redis.protocol.ConnectionWatchdog} monitors each connection and reconnects automatically until + * + * A {@link io.lettuce.core.protocol.ConnectionWatchdog} monitors each connection and reconnects automatically until * {@link #close} is called. Channel and pattern subscriptions are renewed after reconnecting. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -39,14 +39,14 @@ public interface StatefulRedisPubSubConnection extends StatefulRedisConnec /** * Returns the {@link RedisPubSubCommands} API for the current connection. Does not create a new connection. - * + * * @return the synchronous API for the underlying connection. */ RedisPubSubCommands sync(); /** * Returns the {@link RedisPubSubAsyncCommands} API for the current connection. Does not create a new connection. - * + * * @return the asynchronous API for the underlying connection. */ RedisPubSubAsyncCommands async(); @@ -67,7 +67,7 @@ public interface StatefulRedisPubSubConnection extends StatefulRedisConnec /** * Remove an existing {@link RedisPubSubListener listener}.. - * + * * @param listener the listener, must not be {@literal null}. */ void removeListener(RedisPubSubListener listener); diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java rename to src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java index e0e4b4251b..fcec08ef5c 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java +++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; import java.lang.reflect.Array; import java.util.ArrayList; @@ -23,14 +23,14 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.StatefulRedisConnectionImpl; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.protocol.ConnectionWatchdog; -import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands; -import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands; -import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.StatefulRedisConnectionImpl; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.protocol.ConnectionWatchdog; +import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands; +import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands; +import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands; import io.netty.channel.ChannelHandler; import io.netty.util.internal.ConcurrentSet; @@ -40,7 +40,7 @@ * * A {@link ConnectionWatchdog} monitors each connection and reconnects automatically until {@link #close} is called. All * pending commands will be (re)sent after successful reconnection. - * + * * @param Key type. * @param Value type. * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java similarity index 87% rename from src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java rename to src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java index 6e98e33186..c2b9dcb32e 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java +++ b/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub.api.async; +package io.lettuce.core.pubsub.api.async; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.pubsub.RedisPubSubListener; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.pubsub.RedisPubSubListener; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; /** * Asynchronous and thread-safe Redis PubSub API. @@ -32,7 +32,7 @@ public interface RedisPubSubAsyncCommands extends RedisAsyncCommands /** * Listen for messages published to channels matching the given patterns. - * + * * @param patterns the patterns * @return RedisFuture<Void> Future to synchronize {@code psubscribe} completion */ @@ -40,7 +40,7 @@ public interface RedisPubSubAsyncCommands extends RedisAsyncCommands /** * Stop listening for messages posted to channels matching the given patterns. - * + * * @param patterns the patterns * @return RedisFuture<Void> Future to synchronize {@code punsubscribe} completion */ @@ -48,7 +48,7 @@ public interface RedisPubSubAsyncCommands extends RedisAsyncCommands /** * Listen for messages published to the given channels. - * + * * @param channels the channels * @return RedisFuture<Void> Future to synchronize {@code subscribe} completion */ @@ -56,7 +56,7 @@ public interface RedisPubSubAsyncCommands extends RedisAsyncCommands /** * Stop listening for messages posted to the given channels. - * + * * @param channels the channels * @return RedisFuture<Void> Future to synchronize {@code unsubscribe} completion. */ diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/async/package-info.java b/src/main/java/io/lettuce/core/pubsub/api/async/package-info.java similarity index 57% rename from src/main/java/com/lambdaworks/redis/pubsub/api/async/package-info.java rename to src/main/java/io/lettuce/core/pubsub/api/async/package-info.java index f82360b4bb..98a910594e 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/api/async/package-info.java +++ b/src/main/java/io/lettuce/core/pubsub/api/async/package-info.java @@ -1,4 +1,4 @@ /** * Pub/Sub Redis API for asynchronous executed commands. */ -package com.lambdaworks.redis.pubsub.api.async; +package io.lettuce.core.pubsub.api.async; diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java rename to src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java index 32a7ca75b5..6213fc3e6b 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java +++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub.api.reactive; +package io.lettuce.core.pubsub.api.reactive; /** * Message payload for a subscription to a channel. - * + * * @author Mark Paluch */ public class ChannelMessage { diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java rename to src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java index 135166ca7c..a8b21bca17 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java +++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub.api.reactive; +package io.lettuce.core.pubsub.api.reactive; /** * Message payload for a subscription to a pattern. - * + * * @author Mark Paluch */ public class PatternMessage { diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java rename to src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java index 8e2d6d00d7..88bdf60836 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java +++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub.api.reactive; +package io.lettuce.core.pubsub.api.reactive; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.api.reactive.RedisReactiveCommands; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; import reactor.core.publisher.Flux; import reactor.core.publisher.FluxSink; @@ -63,7 +63,7 @@ public interface RedisPubSubReactiveCommands extends RedisReactiveCommands * and may lead to {@link OutOfMemoryError}. Use {@link #observeChannels(FluxSink.OverflowStrategy)} to specify a different * strategy. *

    - * + * * @return hot Flux for subscriptions to {@literal message}'s. */ Flux> observeChannels(); @@ -79,7 +79,7 @@ public interface RedisPubSubReactiveCommands extends RedisReactiveCommands /** * Listen for messages published to channels matching the given patterns. - * + * * @param patterns the patterns * @return Flux<Success> Flux for {@code psubscribe} command */ @@ -87,7 +87,7 @@ public interface RedisPubSubReactiveCommands extends RedisReactiveCommands /** * Stop listening for messages posted to channels matching the given patterns. - * + * * @param patterns the patterns * @return Flux<Success> Flux for {@code punsubscribe} command */ @@ -95,7 +95,7 @@ public interface RedisPubSubReactiveCommands extends RedisReactiveCommands /** * Listen for messages published to the given channels. - * + * * @param channels the channels * @return Flux<Success> Flux for {@code subscribe} command */ @@ -103,7 +103,7 @@ public interface RedisPubSubReactiveCommands extends RedisReactiveCommands /** * Stop listening for messages posted to the given channels. - * + * * @param channels the channels * @return Flux<Success> Flux for {@code unsubscribe} command. */ diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/package-info.java similarity index 58% rename from src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java rename to src/main/java/io/lettuce/core/pubsub/api/reactive/package-info.java index 17e7b200e6..874cc9e353 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java +++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/package-info.java @@ -1,4 +1,4 @@ /** * Pub/Sub Redis API for commands executed in a reactive manner. */ -package com.lambdaworks.redis.pubsub.api.reactive; +package io.lettuce.core.pubsub.api.reactive; diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java b/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java similarity index 88% rename from src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java rename to src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java index 55ddaf7d56..bfe016db6b 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java +++ b/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub.api.sync; +package io.lettuce.core.pubsub.api.sync; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; /** * Synchronous and thread-safe Redis PubSub API. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -30,28 +30,28 @@ public interface RedisPubSubCommands extends RedisCommands { /** * Listen for messages published to channels matching the given patterns. - * + * * @param patterns the patterns */ void psubscribe(K... patterns); /** * Stop listening for messages posted to channels matching the given patterns. - * + * * @param patterns the patterns */ void punsubscribe(K... patterns); /** * Listen for messages published to the given channels. - * + * * @param channels the channels */ void subscribe(K... channels); /** * Stop listening for messages posted to the given channels. - * + * * @param channels the channels */ void unsubscribe(K... channels); diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/package-info.java b/src/main/java/io/lettuce/core/pubsub/api/sync/package-info.java similarity index 57% rename from src/main/java/com/lambdaworks/redis/pubsub/api/sync/package-info.java rename to src/main/java/io/lettuce/core/pubsub/api/sync/package-info.java index 3def5e254a..a6ecbb76ab 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/package-info.java +++ b/src/main/java/io/lettuce/core/pubsub/api/sync/package-info.java @@ -1,4 +1,4 @@ /** * Pub/Sub Redis API for synchronous executed commands. */ -package com.lambdaworks.redis.pubsub.api.sync; +package io.lettuce.core.pubsub.api.sync; diff --git a/src/main/java/com/lambdaworks/redis/pubsub/package-info.java b/src/main/java/io/lettuce/core/pubsub/package-info.java similarity index 50% rename from src/main/java/com/lambdaworks/redis/pubsub/package-info.java rename to src/main/java/io/lettuce/core/pubsub/package-info.java index b698510a89..2e0e22ad16 100644 --- a/src/main/java/com/lambdaworks/redis/pubsub/package-info.java +++ b/src/main/java/io/lettuce/core/pubsub/package-info.java @@ -1,4 +1,4 @@ /** * Pub/Sub connection classes. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; diff --git a/src/main/java/com/lambdaworks/redis/resource/ClientResources.java b/src/main/java/io/lettuce/core/resource/ClientResources.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/resource/ClientResources.java rename to src/main/java/io/lettuce/core/resource/ClientResources.java index aabc766513..cda60a8b5c 100644 --- a/src/main/java/com/lambdaworks/redis/resource/ClientResources.java +++ b/src/main/java/io/lettuce/core/resource/ClientResources.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.event.EventBus; -import com.lambdaworks.redis.event.EventPublisherOptions; -import com.lambdaworks.redis.metrics.CommandLatencyCollector; +import io.lettuce.core.event.EventBus; +import io.lettuce.core.event.EventPublisherOptions; +import io.lettuce.core.metrics.CommandLatencyCollector; import io.netty.util.Timer; import io.netty.util.concurrent.EventExecutorGroup; @@ -82,7 +82,7 @@ public interface ClientResources { /** * Returns the computation pool used for internal operations. Such tasks are periodic Redis Cluster and Redis Sentinel - * topology updates and scheduling of connection reconnection by {@link com.lambdaworks.redis.protocol.ConnectionWatchdog}. + * topology updates and scheduling of connection reconnection by {@link io.lettuce.core.protocol.ConnectionWatchdog}. * * @return the computation pool used for internal operations */ diff --git a/src/main/java/com/lambdaworks/redis/resource/ConstantDelay.java b/src/main/java/io/lettuce/core/resource/ConstantDelay.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/resource/ConstantDelay.java rename to src/main/java/io/lettuce/core/resource/ConstantDelay.java index 4776e2050a..313eb3764a 100644 --- a/src/main/java/com/lambdaworks/redis/resource/ConstantDelay.java +++ b/src/main/java/io/lettuce/core/resource/ConstantDelay.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.util.concurrent.TimeUnit; /** * {@link Delay} with a constant delay for each attempt. - * + * * @author Mark Paluch */ class ConstantDelay extends Delay { diff --git a/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java b/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java rename to src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java index 5e0b072fb0..d5d0d92756 100644 --- a/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java +++ b/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.resource.Delay.StatefulDelay; +import io.lettuce.core.resource.Delay.StatefulDelay; /** * Stateful delay that increases using decorrelated jitter strategy. @@ -29,7 +29,7 @@ * This strategy is based on Exponential Backoff and * Jitter. *

    - * + * * @author Jongyeol Choi * @since 4.2 * @see StatefulDelay diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java rename to src/main/java/io/lettuce/core/resource/DefaultClientResources.java index 382e1d4030..f5ab92c8e4 100644 --- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java +++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; -import static com.lambdaworks.redis.resource.Futures.toBooleanPromise; +import static io.lettuce.core.resource.Futures.toBooleanPromise; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import com.lambdaworks.redis.event.DefaultEventBus; -import com.lambdaworks.redis.event.DefaultEventPublisherOptions; -import com.lambdaworks.redis.event.EventBus; -import com.lambdaworks.redis.event.EventPublisherOptions; -import com.lambdaworks.redis.event.metrics.DefaultCommandLatencyEventPublisher; -import com.lambdaworks.redis.event.metrics.MetricEventPublisher; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.internal.LettuceLists; -import com.lambdaworks.redis.metrics.CommandLatencyCollector; -import com.lambdaworks.redis.metrics.CommandLatencyCollectorOptions; -import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollector; -import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollectorOptions; -import com.lambdaworks.redis.resource.Delay.StatefulDelay; +import io.lettuce.core.event.DefaultEventBus; +import io.lettuce.core.event.DefaultEventPublisherOptions; +import io.lettuce.core.event.EventBus; +import io.lettuce.core.event.EventPublisherOptions; +import io.lettuce.core.event.metrics.DefaultCommandLatencyEventPublisher; +import io.lettuce.core.event.metrics.MetricEventPublisher; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceLists; +import io.lettuce.core.metrics.CommandLatencyCollector; +import io.lettuce.core.metrics.CommandLatencyCollectorOptions; +import io.lettuce.core.metrics.DefaultCommandLatencyCollector; +import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions; +import io.lettuce.core.resource.Delay.StatefulDelay; import io.netty.util.HashedWheelTimer; import io.netty.util.Timer; @@ -57,7 +57,7 @@ * {@code computationThreadPoolSize}. *
  • an {@code eventBus} which is a provided instance of {@link EventBus}.
    • *
  • a {@code commandLatencyCollector} which is a provided instance of - * {@link com.lambdaworks.redis.metrics.CommandLatencyCollector}.
    • + * {@link io.lettuce.core.metrics.CommandLatencyCollector}. *
  • a {@code dnsResolver} which is a provided instance of {@link DnsResolver}.
    • *
  • a {@code timer} that is a provided instance of {@link io.netty.util.HashedWheelTimer}.
    • * @@ -258,7 +258,7 @@ public Builder ioThreadPoolSize(int ioThreadPoolSize) { /** * Sets a shared {@link EventLoopGroupProvider event executor provider} that can be used across different instances of - * {@link com.lambdaworks.redis.RedisClient} and {@link com.lambdaworks.redis.cluster.RedisClusterClient}. The provided + * {@link io.lettuce.core.RedisClient} and {@link io.lettuce.core.cluster.RedisClusterClient}. The provided * {@link EventLoopGroupProvider} instance will not be shut down when shutting down the client resources. You have to * take care of that. This is an advanced configuration that should only be used if you know what you are doing. * @@ -290,7 +290,7 @@ public Builder computationThreadPoolSize(int computationThreadPoolSize) { /** * Sets a shared {@link EventExecutorGroup event executor group} that can be used across different instances of - * {@link com.lambdaworks.redis.RedisClient} and {@link com.lambdaworks.redis.cluster.RedisClusterClient}. The provided + * {@link io.lettuce.core.RedisClient} and {@link io.lettuce.core.cluster.RedisClusterClient}. The provided * {@link EventExecutorGroup} instance will not be shut down when shutting down the client resources. You have to take * care of that. This is an advanced configuration that should only be used if you know what you are doing. * @@ -306,8 +306,8 @@ public Builder eventExecutorGroup(EventExecutorGroup eventExecutorGroup) { } /** - * Sets a shared {@link Timer} that can be used across different instances of {@link com.lambdaworks.redis.RedisClient} - * and {@link com.lambdaworks.redis.cluster.RedisClusterClient} The provided {@link Timer} instance will not be shut + * Sets a shared {@link Timer} that can be used across different instances of {@link io.lettuce.core.RedisClient} + * and {@link io.lettuce.core.cluster.RedisClusterClient} The provided {@link Timer} instance will not be shut * down when shutting down the client resources. You have to take care of that. This is an advanced configuration that * should only be used if you know what you are doing. * diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java rename to src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java index 5cac9a7172..abb5f38dd3 100644 --- a/src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java +++ b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; -import static com.lambdaworks.redis.resource.Futures.toBooleanPromise; +import static io.lettuce.core.resource.Futures.toBooleanPromise; import java.util.HashMap; import java.util.Map; @@ -23,7 +23,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.EpollProvider; +import io.lettuce.core.EpollProvider; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; @@ -33,7 +33,7 @@ /** * Default implementation which manages one event loop group instance per type. - * + * * @author Mark Paluch * @since 3.4 */ @@ -50,7 +50,7 @@ public class DefaultEventLoopGroupProvider implements EventLoopGroupProvider { /** * Creates a new instance of {@link DefaultEventLoopGroupProvider}. - * + * * @param numberOfThreads number of threads (pool size) */ public DefaultEventLoopGroupProvider(int numberOfThreads) { @@ -124,7 +124,7 @@ private T getOrCreate(Class type) { *
  • NioEventLoopGroup
    • *
  • EpollEventLoopGroup
    • * - * + * * @param type the type * @param numberOfThreads the number of threads to use for the {@link EventExecutorGroup} * @param type parameter diff --git a/src/main/java/com/lambdaworks/redis/resource/Delay.java b/src/main/java/io/lettuce/core/resource/Delay.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/resource/Delay.java rename to src/main/java/io/lettuce/core/resource/Delay.java index d1c8ca4773..e06fbe4cbe 100644 --- a/src/main/java/com/lambdaworks/redis/resource/Delay.java +++ b/src/main/java/io/lettuce/core/resource/Delay.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; /** * Base class for delays and factory class to create particular instances. {@link Delay} can be subclassed to create custom @@ -28,7 +28,7 @@ * Delays are usually stateless instances that can be shared amongst multiple users (such as connections). Stateful * {@link Delay} implementations must implement {@link StatefulDelay} to reset their internal state after the delay is not * required anymore. - * + * * @author Mark Paluch * @author Jongyeol Choi * @since 4.2 @@ -45,9 +45,9 @@ public abstract class Delay { * Interface to be implemented by stateful {@link Delay}s. Stateful delays can get reset once a condition (such as * successful reconnect) is met. Stateful delays should not be shared by multiple connections but each connection should use * its own instance. - * + * * @see Supplier - * @see com.lambdaworks.redis.resource.DefaultClientResources.Builder#reconnectDelay(Supplier) + * @see io.lettuce.core.resource.DefaultClientResources.Builder#reconnectDelay(Supplier) */ public interface StatefulDelay { @@ -76,7 +76,7 @@ protected Delay(TimeUnit timeUnit) { /** * Returns the {@link TimeUnit} associated with this {@link Delay}. - * + * * @return the {@link TimeUnit} associated with this {@link Delay}. */ public TimeUnit getTimeUnit() { @@ -222,7 +222,7 @@ public static Supplier decorrelatedJitter(long lower, long upper, long ba /** * Generates a random long value within {@code min} and {@code max} boundaries. - * + * * @param min * @param max * @return a random value diff --git a/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java b/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java rename to src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java index 64cf2d2bea..1a56dddc94 100644 --- a/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java +++ b/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.io.Closeable; import java.io.IOException; @@ -33,8 +33,8 @@ import javax.naming.directory.Attributes; import javax.naming.directory.InitialDirContext; -import com.lambdaworks.redis.LettuceStrings; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.LettuceStrings; +import io.lettuce.core.internal.LettuceAssert; /** * DNS Resolver based on Java's {@link com.sun.jndi.dns.DnsContextFactory}. This resolver resolves hostnames to IPv4 and IPv6 @@ -78,7 +78,7 @@ public DirContextDnsResolver() { /** * Creates a new {@link DirContextDnsResolver} using a collection of DNS servers. - * + * * @param dnsServer must not be {@literal null} and not empty. */ public DirContextDnsResolver(String dnsServer) { @@ -96,7 +96,7 @@ public DirContextDnsResolver(Iterable dnsServers) { /** * Creates a new {@link DirContextDnsResolver} for the given stack preference and {@code properties}. - * + * * @param preferIpv4 flag to prefer IPv4 over IPv6 address resolution. * @param preferIpv6 flag to prefer IPv6 over IPv4 address resolution. * @param properties custom properties for creating the context, must not be {@literal null}. @@ -150,7 +150,7 @@ public void close() throws IOException { /** * Perform hostname to address resolution. - * + * * @param host the hostname, must not be empty or {@literal null}. * @return array of one or more {@link InetAddress adresses} * @throws UnknownHostException @@ -178,7 +178,7 @@ public InetAddress[] resolve(String host) throws UnknownHostException { /** * Resolve a hostname - * + * * @param hostname * @param inetAddresses * @throws NamingException @@ -203,7 +203,7 @@ private void resolve(String hostname, List inetAddresses) throws Na /** * Resolves {@code CNAME} records to {@link InetAddress adresses}. - * + * * @param hostname * @return * @throws NamingException @@ -242,7 +242,7 @@ private List resolveCname(String hostname) throws NamingException { /** * Resolve an attribute for a hostname. - * + * * @param hostname * @param attrName * @return diff --git a/src/main/java/com/lambdaworks/redis/resource/DnsResolver.java b/src/main/java/io/lettuce/core/resource/DnsResolver.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/resource/DnsResolver.java rename to src/main/java/io/lettuce/core/resource/DnsResolver.java index 5412201d31..529d0f8b19 100644 --- a/src/main/java/com/lambdaworks/redis/resource/DnsResolver.java +++ b/src/main/java/io/lettuce/core/resource/DnsResolver.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.net.InetAddress; import java.net.UnknownHostException; /** * Users may implement this interface to override the normal DNS lookup offered by the OS. - * + * * @author Mark Paluch * @since 4.2 */ @@ -28,7 +28,7 @@ public interface DnsResolver { /** * Returns the IP address for the specified host name. - * + * * @param host the hostname, must not be empty or {@literal null}. * @return array of one or more {@link InetAddress adresses} * @throws UnknownHostException if the given host is not recognized or the associated IP address cannot be used to build an diff --git a/src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java b/src/main/java/io/lettuce/core/resource/DnsResolvers.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java rename to src/main/java/io/lettuce/core/resource/DnsResolvers.java index 8d971ef01f..4cbaa2f119 100644 --- a/src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java +++ b/src/main/java/io/lettuce/core/resource/DnsResolvers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.net.InetAddress; import java.net.UnknownHostException; @@ -21,7 +21,7 @@ /** * * Predefined DNS resolvers. - * + * * @author Mark Paluch * @since 4.2 */ diff --git a/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java b/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java rename to src/main/java/io/lettuce/core/resource/EqualJitterDelay.java index 954dbe581e..bd266f9bd8 100644 --- a/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java +++ b/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/lambdaworks/redis/resource/EventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/resource/EventLoopGroupProvider.java rename to src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java index 5f7cf33fba..14109b3d15 100644 --- a/src/main/java/com/lambdaworks/redis/resource/EventLoopGroupProvider.java +++ b/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.util.concurrent.TimeUnit; @@ -27,7 +27,7 @@ * instances open can exhaust the number of open files. *

    * Usually, the default settings are sufficient. However, customizing might be useful for some special cases where multiple - * {@link com.lambdaworks.redis.RedisClient} or {@link com.lambdaworks.redis.cluster.RedisClusterClient} instances are needed + * {@link io.lettuce.core.RedisClient} or {@link io.lettuce.core.cluster.RedisClusterClient} instances are needed * that share one or more event loop groups. *

    *

    @@ -37,7 +37,7 @@ *

    * You can implement your own {@link EventLoopGroupProvider} to share existing {@link EventLoopGroup EventLoopGroup's} with * lettuce. - * + * * @author Mark Paluch * @since 3.4 */ @@ -65,7 +65,7 @@ public interface EventLoopGroupProvider { /** * Release a {@code eventLoopGroup} instance. The method will shutdown/terminate the {@link EventExecutorGroup} if it is no longer * needed. - * + * * @param eventLoopGroup the eventLoopGroup instance, must not be {@literal null} * @param quietPeriod the quiet period * @param timeout the timeout diff --git a/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java b/src/main/java/io/lettuce/core/resource/ExponentialDelay.java similarity index 98% rename from src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java rename to src/main/java/io/lettuce/core/resource/ExponentialDelay.java index 445588ed79..787305ac99 100644 --- a/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java +++ b/src/main/java/io/lettuce/core/resource/ExponentialDelay.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.util.concurrent.TimeUnit; @@ -66,7 +66,7 @@ public long createDelay(long attempt) { /** * Apply bounds to the given {@code delay}. - * + * * @param delay the delay * @return the delay normalized to its lower and upper bounds. */ diff --git a/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java b/src/main/java/io/lettuce/core/resource/FullJitterDelay.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java rename to src/main/java/io/lettuce/core/resource/FullJitterDelay.java index 428fdcc662..937eb95301 100644 --- a/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java +++ b/src/main/java/io/lettuce/core/resource/FullJitterDelay.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/lambdaworks/redis/resource/Futures.java b/src/main/java/io/lettuce/core/resource/Futures.java similarity index 96% rename from src/main/java/com/lambdaworks/redis/resource/Futures.java rename to src/main/java/io/lettuce/core/resource/Futures.java index c9df5ab771..3a04196478 100644 --- a/src/main/java/com/lambdaworks/redis/resource/Futures.java +++ b/src/main/java/io/lettuce/core/resource/Futures.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.util.LinkedHashSet; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; import io.netty.util.concurrent.*; /** * Utility class to support netty's future handling. - * + * * @author Mark Paluch * @since 3.4 */ @@ -32,7 +32,7 @@ class Futures { /** * Create a promise that emits a {@code Boolean} value on completion of the {@code future} - * + * * @param future the future. * @return Promise emitting a {@code Boolean} value. {@literal true} if the {@code future} completed successfully, otherwise * the cause wil be transported. @@ -57,15 +57,15 @@ public void operationComplete(Future future) throws Exception { /** * Promise aggregator that aggregates multiple promises into one {@link Promise}. The aggregator workflow is: *
      - *
    1. Create a new instance of {@link com.lambdaworks.redis.resource.Futures.PromiseAggregator}
      2. + *
    2. Create a new instance of {@link io.lettuce.core.resource.Futures.PromiseAggregator}
      3. *
    3. Call {@link #expectMore(int)} until the number of expected futures is reached
      4. *
    4. Arm the aggregator using {@link #arm()}
      5. *
    5. Add the number of futures using {@link #add(Promise[])} until the expectation is met. The added futures can be either * done or in progress.
      6. *
    6. The {@code aggregatePromise} is released/finished as soon as the last future/promise completes
      7. - * + * *
    - * + * * @param Result value type * @param Future type */ @@ -89,7 +89,7 @@ public PromiseAggregator(Promise aggregatePromise) { /** * Add the number of {@code count} to the count of expected promises. - * + * * @param count number of futures/promises, that is added to the overall expectation count. * @throws IllegalStateException if the aggregator was armed */ @@ -101,7 +101,7 @@ public void expectMore(int count) { /** * Arm the aggregator to expect completion of the futures. - * + * * @throws IllegalStateException if the aggregator was armed */ public void arm() { @@ -111,7 +111,7 @@ public void arm() { /** * Add the given {@link Promise}s to the aggregator. - * + * * @param promises the promises * @throws IllegalStateException if the aggregator was not armed */ diff --git a/src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java similarity index 84% rename from src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java rename to src/main/java/io/lettuce/core/resource/SocketAddressResolver.java index 35ed36580a..99dbf684f0 100644 --- a/src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java +++ b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.net.UnknownHostException; -import com.lambdaworks.redis.RedisURI; +import io.lettuce.core.RedisURI; /** - * Resolves a {@link com.lambdaworks.redis.RedisURI} to a {@link java.net.SocketAddress}. - * + * Resolves a {@link io.lettuce.core.RedisURI} to a {@link java.net.SocketAddress}. + * * @author Mark Paluch */ public class SocketAddressResolver { /** - * Resolves a {@link com.lambdaworks.redis.RedisURI} to a {@link java.net.SocketAddress}. - * + * Resolves a {@link io.lettuce.core.RedisURI} to a {@link java.net.SocketAddress}. + * * @param redisURI must not be {@literal null} * @param dnsResolver must not be {@literal null} * @return the resolved {@link SocketAddress} diff --git a/src/main/java/com/lambdaworks/redis/resource/package-info.java b/src/main/java/io/lettuce/core/resource/package-info.java similarity index 56% rename from src/main/java/com/lambdaworks/redis/resource/package-info.java rename to src/main/java/io/lettuce/core/resource/package-info.java index 6fdd5e515f..b4c223bf4e 100644 --- a/src/main/java/com/lambdaworks/redis/resource/package-info.java +++ b/src/main/java/io/lettuce/core/resource/package-info.java @@ -1,4 +1,4 @@ /** * Client resource infrastructure providers. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java rename to src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java index 02ee4ca0bf..31b6cba72c 100644 --- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java +++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel; +package io.lettuce.core.sentinel; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -22,16 +22,16 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicReference; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.RedisCommand; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; -import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands; +import io.lettuce.core.KillArgs; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.RedisCommand; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands; /** * An asynchronous and thread-safe API for a Redis Sentinel connection. diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java similarity index 91% rename from src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java rename to src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java index a963fa70cf..9cb3277942 100644 --- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java +++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel; +package io.lettuce.core.sentinel; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -22,13 +22,13 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import com.lambdaworks.redis.AbstractRedisReactiveCommands; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; -import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands; +import io.lettuce.core.AbstractRedisReactiveCommands; +import io.lettuce.core.KillArgs; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands; /** * A reactive and thread-safe API for a Redis Sentinel connection. diff --git a/src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java b/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java rename to src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java index 7381d7b334..0fabef1042 100644 --- a/src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java +++ b/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel; +package io.lettuce.core.sentinel; -import static com.lambdaworks.redis.protocol.CommandKeyword.*; -import static com.lambdaworks.redis.protocol.CommandType.*; +import static io.lettuce.core.protocol.CommandKeyword.*; +import static io.lettuce.core.protocol.CommandType.*; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.internal.LettuceAssert; -import com.lambdaworks.redis.output.*; -import com.lambdaworks.redis.protocol.BaseRedisCommandBuilder; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandKeyword; +import io.lettuce.core.KillArgs; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.internal.LettuceAssert; +import io.lettuce.core.output.*; +import io.lettuce.core.protocol.BaseRedisCommandBuilder; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandKeyword; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java similarity index 81% rename from src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java rename to src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java index 2d29e2bd87..2177791150 100644 --- a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java +++ b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel; +package io.lettuce.core.sentinel; import java.util.Collection; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.RedisChannelHandler; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.*; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; -import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands; -import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands; -import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands; +import io.lettuce.core.RedisChannelHandler; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.*; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands; +import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands; +import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java b/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java similarity index 82% rename from src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java rename to src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java index e559f47483..e5640bb473 100644 --- a/src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java +++ b/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel.api; +package io.lettuce.core.sentinel.api; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.protocol.ConnectionWatchdog; -import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands; -import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands; -import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.protocol.ConnectionWatchdog; +import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands; +import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands; +import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands; /** * A thread-safe connection to a redis server. Multiple threads may share one {@link StatefulRedisSentinelConnection}. - * + * * A {@link ConnectionWatchdog} monitors each connection and reconnects automatically until {@link #close} is called. All * pending commands will be (re)sent after successful reconnection. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -36,14 +36,14 @@ public interface StatefulRedisSentinelConnection extends StatefulConnectio /** * Returns the {@link RedisSentinelCommands} API for the current connection. Does not create a new connection. - * + * * @return the synchronous API for the underlying connection. */ RedisSentinelCommands sync(); /** * Returns the {@link RedisSentinelAsyncCommands} API for the current connection. Does not create a new connection. - * + * * @return the asynchronous API for the underlying connection. */ RedisSentinelAsyncCommands async(); diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java rename to src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java index 6ce644bbd9..f05767df25 100644 --- a/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java +++ b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java @@ -13,29 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel.api.async; +package io.lettuce.core.sentinel.api.async; import java.net.SocketAddress; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; -import com.lambdaworks.redis.RedisFuture; +import io.lettuce.core.KillArgs; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.RedisFuture; /** * Asynchronous executed commands for Redis Sentinel. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateAsyncApi + * @generated by io.lettuce.apigenerator.CreateAsyncApi */ public interface RedisSentinelAsyncCommands { /** * Return the ip and port number of the master with that name. - * + * * @param key the key * @return SocketAddress; */ @@ -43,14 +43,14 @@ public interface RedisSentinelAsyncCommands { /** * Enumerates all the monitored masters and their states. - * + * * @return Map<K, V>> */ RedisFuture>> masters(); /** * Show the state and info of the specified master. - * + * * @param key the key * @return Map<K, V> */ @@ -58,7 +58,7 @@ public interface RedisSentinelAsyncCommands { /** * Provides a list of slaves for the master with the specified name. - * + * * @param key the key * @return List<Map<K, V>> */ @@ -66,7 +66,7 @@ public interface RedisSentinelAsyncCommands { /** * This command will reset all the masters with matching name. - * + * * @param key the key * @return Long */ @@ -74,7 +74,7 @@ public interface RedisSentinelAsyncCommands { /** * Perform a failover. - * + * * @param key the master id * @return String */ @@ -82,7 +82,7 @@ public interface RedisSentinelAsyncCommands { /** * This command tells the Sentinel to start monitoring a new master with the specified name, ip, port, and quorum. - * + * * @param key the key * @param ip the IP address * @param port the port @@ -93,18 +93,18 @@ public interface RedisSentinelAsyncCommands { /** * Multiple option / value pairs can be specified (or none at all). - * + * * @param key the key * @param option the option * @param value the value - * + * * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly. */ RedisFuture set(K key, String option, V value); /** * remove the specified master. - * + * * @param key the key * @return String */ @@ -174,7 +174,7 @@ public interface RedisSentinelAsyncCommands { /** * Ping the server. - * + * * @return String simple-string-reply */ RedisFuture ping(); diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/async/package-info.java b/src/main/java/io/lettuce/core/sentinel/api/async/package-info.java similarity index 56% rename from src/main/java/com/lambdaworks/redis/sentinel/api/async/package-info.java rename to src/main/java/io/lettuce/core/sentinel/api/async/package-info.java index b58008bef1..9e8e976232 100644 --- a/src/main/java/com/lambdaworks/redis/sentinel/api/async/package-info.java +++ b/src/main/java/io/lettuce/core/sentinel/api/async/package-info.java @@ -1,4 +1,4 @@ /** * Redis Sentinel API for asynchronous executed commands. */ -package com.lambdaworks.redis.sentinel.api.async; +package io.lettuce.core.sentinel.api.async; diff --git a/src/main/java/io/lettuce/core/sentinel/api/package-info.java b/src/main/java/io/lettuce/core/sentinel/api/package-info.java new file mode 100644 index 0000000000..9ff01b61e5 --- /dev/null +++ b/src/main/java/io/lettuce/core/sentinel/api/package-info.java @@ -0,0 +1,4 @@ +/** + * Redis Sentinel connection API. + */ +package io.lettuce.core.sentinel.api; diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java rename to src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java index d784f09935..1b0c55df10 100644 --- a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java +++ b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel.api.reactive; +package io.lettuce.core.sentinel.api.reactive; import java.net.SocketAddress; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.KillArgs; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; /** * Reactive executed commands for Redis Sentinel. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateReactiveApi + * @generated by io.lettuce.apigenerator.CreateReactiveApi */ public interface RedisSentinelReactiveCommands { /** * Return the ip and port number of the master with that name. - * + * * @param key the key * @return SocketAddress; */ @@ -44,14 +44,14 @@ public interface RedisSentinelReactiveCommands { /** * Enumerates all the monitored masters and their states. - * + * * @return Map<K, V>> */ Flux> masters(); /** * Show the state and info of the specified master. - * + * * @param key the key * @return Map<K, V> */ @@ -59,7 +59,7 @@ public interface RedisSentinelReactiveCommands { /** * Provides a list of slaves for the master with the specified name. - * + * * @param key the key * @return Map<K, V> */ @@ -67,7 +67,7 @@ public interface RedisSentinelReactiveCommands { /** * This command will reset all the masters with matching name. - * + * * @param key the key * @return Long */ @@ -75,7 +75,7 @@ public interface RedisSentinelReactiveCommands { /** * Perform a failover. - * + * * @param key the master id * @return String */ @@ -83,7 +83,7 @@ public interface RedisSentinelReactiveCommands { /** * This command tells the Sentinel to start monitoring a new master with the specified name, ip, port, and quorum. - * + * * @param key the key * @param ip the IP address * @param port the port @@ -94,18 +94,18 @@ public interface RedisSentinelReactiveCommands { /** * Multiple option / value pairs can be specified (or none at all). - * + * * @param key the key * @param option the option * @param value the value - * + * * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly. */ Mono set(K key, String option, V value); /** * remove the specified master. - * + * * @param key the key * @return String */ @@ -175,7 +175,7 @@ public interface RedisSentinelReactiveCommands { /** * Ping the server. - * + * * @return String simple-string-reply */ Mono ping(); diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java b/src/main/java/io/lettuce/core/sentinel/api/reactive/package-info.java similarity index 58% rename from src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java rename to src/main/java/io/lettuce/core/sentinel/api/reactive/package-info.java index 09c4f53bb4..b83bef6914 100644 --- a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java +++ b/src/main/java/io/lettuce/core/sentinel/api/reactive/package-info.java @@ -1,4 +1,4 @@ /** * Redis Sentinel API for commands executed in a reactive manner. */ -package com.lambdaworks.redis.sentinel.api.reactive; +package io.lettuce.core.sentinel.api.reactive; diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java rename to src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java index 52b5e76cea..5d392a7239 100644 --- a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java +++ b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java @@ -13,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel.api.sync; +package io.lettuce.core.sentinel.api.sync; import java.net.SocketAddress; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.KillArgs; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; /** * Synchronous executed commands for Redis Sentinel. - * + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi + * @generated by io.lettuce.apigenerator.CreateSyncApi */ public interface RedisSentinelCommands { /** * Return the ip and port number of the master with that name. - * + * * @param key the key * @return SocketAddress; */ @@ -42,14 +42,14 @@ public interface RedisSentinelCommands { /** * Enumerates all the monitored masters and their states. - * + * * @return Map<K, V>> */ List> masters(); /** * Show the state and info of the specified master. - * + * * @param key the key * @return Map<K, V> */ @@ -57,7 +57,7 @@ public interface RedisSentinelCommands { /** * Provides a list of slaves for the master with the specified name. - * + * * @param key the key * @return List<Map<K, V>> */ @@ -65,7 +65,7 @@ public interface RedisSentinelCommands { /** * This command will reset all the masters with matching name. - * + * * @param key the key * @return Long */ @@ -73,7 +73,7 @@ public interface RedisSentinelCommands { /** * Perform a failover. - * + * * @param key the master id * @return String */ @@ -81,7 +81,7 @@ public interface RedisSentinelCommands { /** * This command tells the Sentinel to start monitoring a new master with the specified name, ip, port, and quorum. - * + * * @param key the key * @param ip the IP address * @param port the port @@ -92,18 +92,18 @@ public interface RedisSentinelCommands { /** * Multiple option / value pairs can be specified (or none at all). - * + * * @param key the key * @param option the option * @param value the value - * + * * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly. */ String set(K key, String option, V value); /** * remove the specified master. - * + * * @param key the key * @return String */ @@ -173,7 +173,7 @@ public interface RedisSentinelCommands { /** * Ping the server. - * + * * @return String simple-string-reply */ String ping(); diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/package-info.java b/src/main/java/io/lettuce/core/sentinel/api/sync/package-info.java similarity index 57% rename from src/main/java/com/lambdaworks/redis/sentinel/api/sync/package-info.java rename to src/main/java/io/lettuce/core/sentinel/api/sync/package-info.java index cba7adbd66..f9c00bcc69 100644 --- a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/package-info.java +++ b/src/main/java/io/lettuce/core/sentinel/api/sync/package-info.java @@ -1,4 +1,4 @@ /** * Redis Sentinel API for synchronous executed commands. */ -package com.lambdaworks.redis.sentinel.api.sync; +package io.lettuce.core.sentinel.api.sync; diff --git a/src/main/java/com/lambdaworks/redis/sentinel/package-info.java b/src/main/java/io/lettuce/core/sentinel/package-info.java similarity index 53% rename from src/main/java/com/lambdaworks/redis/sentinel/package-info.java rename to src/main/java/io/lettuce/core/sentinel/package-info.java index 223b2531d3..5b5ab61d61 100644 --- a/src/main/java/com/lambdaworks/redis/sentinel/package-info.java +++ b/src/main/java/io/lettuce/core/sentinel/package-info.java @@ -1,4 +1,4 @@ /** * Redis Sentinel connection classes. */ -package com.lambdaworks.redis.sentinel; +package io.lettuce.core.sentinel; diff --git a/src/main/java/com/lambdaworks/redis/support/AbstractCdiBean.java b/src/main/java/io/lettuce/core/support/AbstractCdiBean.java similarity index 95% rename from src/main/java/com/lambdaworks/redis/support/AbstractCdiBean.java rename to src/main/java/io/lettuce/core/support/AbstractCdiBean.java index 8655992a3c..a54e406bdd 100644 --- a/src/main/java/com/lambdaworks/redis/support/AbstractCdiBean.java +++ b/src/main/java/io/lettuce/core/support/AbstractCdiBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -27,8 +27,8 @@ import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.InjectionPoint; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.RedisURI; +import io.lettuce.core.resource.ClientResources; /** * @author Mark Paluch diff --git a/src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java b/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java similarity index 94% rename from src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java rename to src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java index 9a7a9aade9..1e6d27ec1f 100644 --- a/src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java +++ b/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.config.AbstractFactoryBean; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.DefaultClientResources; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.DefaultClientResources; /** * {@link FactoryBean} that creates a {@link ClientResources} instance representing the infrastructure resources (thread pools) * for a Redis Client. - * + * * @author Mark Paluch */ public class ClientResourcesFactoryBean extends AbstractFactoryBean { diff --git a/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java similarity index 97% rename from src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java rename to src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java index 1a9b880aff..69c470d158 100644 --- a/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java +++ b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -31,11 +31,11 @@ import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.apache.commons.pool2.impl.SoftReferenceObjectPool; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.internal.AbstractInvocationHandler; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.RedisException; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.internal.AbstractInvocationHandler; +import io.lettuce.core.internal.LettuceAssert; /** * Connection pool support for {@link GenericObjectPool} and {@link SoftReferenceObjectPool}. Connection pool creation requires @@ -58,18 +58,18 @@ * the blocking command is resolved. * *

    Example usage

    - * + * * 
      * // application initialization
  * RedisClusterClient clusterClient = RedisClusterClient.create(RedisURI.create(host, port));
  * GenericObjectPool<StatefulRedisClusterConnection<String, String>> pool = ConnectionPoolSupport
  *         .createGenericObjectPool(() -> clusterClient.connect(), new GenericObjectPoolConfig());
- * 
+ *
  * // executing work
  * try (StatefulRedisClusterConnection<String, String> connection = pool.borrowObject()) {
  *     // perform some work
  * }
- * 
+ *
  * // terminating
  * pool.close();
  * clusterClient.shutdown();
diff --git a/src/main/java/com/lambdaworks/redis/support/LettuceCdiExtension.java b/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/support/LettuceCdiExtension.java
rename to src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
index 8f5fad902d..d49a0fed0f 100644
--- a/src/main/java/com/lambdaworks/redis/support/LettuceCdiExtension.java
+++ b/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
@@ -26,11 +26,11 @@
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.*;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.internal.LettuceSets;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.internal.LettuceSets;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -53,12 +53,12 @@
  *     public RedisURI redisURI() {
  *         return RedisURI.Builder.redis("localhost", 6379).build();
  *     }
- * 
+ *
  *     @Produces
  *     public ClientResources clientResources() {
  *         return DefaultClientResources.create()
  *     }
- * 
+ *
  *     public void shutdownClientResources(@Disposes ClientResources clientResources) throws Exception {
  *         clientResources.shutdown().get();
  *     }
@@ -72,13 +72,13 @@
  *   public class Consumer {
  *      @Inject
  *      private RedisClient client;
- * 
+ *
  *      @Inject
  *      private RedisClusterClient clusterClient;
  * }
  *  
  *
    - * + * * @author Mark Paluch */ public class LettuceCdiExtension implements Extension { diff --git a/src/main/java/com/lambdaworks/redis/support/LettuceFactoryBeanSupport.java b/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java similarity index 92% rename from src/main/java/com/lambdaworks/redis/support/LettuceFactoryBeanSupport.java rename to src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java index 56958af9c9..755cfd9fc6 100644 --- a/src/main/java/com/lambdaworks/redis/support/LettuceFactoryBeanSupport.java +++ b/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import java.net.URI; import org.springframework.beans.factory.config.AbstractFactoryBean; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.RedisURI; +import io.lettuce.core.resource.ClientResources; /** * Adapter for Springs {@link org.springframework.beans.factory.FactoryBean} interface to allow easy setup of - * {@link com.lambdaworks.redis.RedisClient} factories via Spring configuration. - * + * {@link io.lettuce.core.RedisClient} factories via Spring configuration. + * * @author Mark Paluch * @since 3.0 */ @@ -53,7 +53,7 @@ public URI getUri() { /** * Set the URI for connecting Redis. The URI follows the URI conventions. See {@link RedisURI} for URL schemes. Either the * URI of the RedisURI must be set in order to connect to Redis. - * + * * @param uri the URI */ public void setUri(URI uri) { @@ -67,7 +67,7 @@ public RedisURI getRedisURI() { /** * Set the RedisURI for connecting Redis. See {@link RedisURI} for URL schemes. Either the URI of the RedisURI must be set * in order to connect to Redis. - * + * * @param redisURI the RedisURI */ public void setRedisURI(RedisURI redisURI) { @@ -81,7 +81,7 @@ public String getPassword() { /** * Sets the password to use for a Redis connection. If the password is set, it has higher precedence than the password * provided within the URI meaning the password from the URI is replaced by this one. - * + * * @param password the password */ public void setPassword(String password) { @@ -100,7 +100,7 @@ public ClientResources getClientResources() { /** * Set shared client resources to reuse across different client instances. If not set, each client instance will provide * their own {@link ClientResources} instance. - * + * * @param clientResources the client resources */ public void setClientResources(ClientResources clientResources) { diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClientCdiBean.java b/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java similarity index 90% rename from src/main/java/com/lambdaworks/redis/support/RedisClientCdiBean.java rename to src/main/java/io/lettuce/core/support/RedisClientCdiBean.java index dd17c9f6dc..922e7c2def 100644 --- a/src/main/java/com/lambdaworks/redis/support/RedisClientCdiBean.java +++ b/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import java.lang.annotation.Annotation; import java.util.Set; @@ -22,13 +22,13 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.resource.ClientResources; /** * Factory Bean for {@link RedisClient} instances. Requires a {@link RedisURI} and allows to reuse - * {@link com.lambdaworks.redis.resource.ClientResources}. URI Formats: + * {@link io.lettuce.core.resource.ClientResources}. URI Formats: * {@code * redis-sentinel://host[:port][,host2[:port2]][/databaseNumber]#sentinelMasterId * } diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClientFactoryBean.java b/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java similarity index 88% rename from src/main/java/com/lambdaworks/redis/support/RedisClientFactoryBean.java rename to src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java index ba97203f6a..46cf7c7787 100644 --- a/src/main/java/com/lambdaworks/redis/support/RedisClientFactoryBean.java +++ b/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; -import static com.lambdaworks.redis.LettuceStrings.isNotEmpty; +import static io.lettuce.core.LettuceStrings.isNotEmpty; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; /** * Factory Bean for {@link RedisClient} instances. Needs either a {@link java.net.URI} or a {@link RedisURI} as input and allows - * to reuse {@link com.lambdaworks.redis.resource.ClientResources}. URI Formats: + * to reuse {@link io.lettuce.core.resource.ClientResources}. URI Formats: * {@code * redis-sentinel://host[:port][,host2[:port2]][/databaseNumber]#sentinelMasterId * } diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientCdiBean.java b/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/support/RedisClusterClientCdiBean.java rename to src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java index 56d5c5b493..3b1f53e613 100644 --- a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientCdiBean.java +++ b/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import java.lang.annotation.Annotation; import java.util.Set; @@ -22,13 +22,13 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.resource.ClientResources; /** * Factory Bean for {@link RedisClusterClient} instances. Requires a {@link RedisURI} and allows to reuse - * {@link com.lambdaworks.redis.resource.ClientResources}. URI Format: {@code + * {@link io.lettuce.core.resource.ClientResources}. URI Format: {@code * redis://[password@]host[:port] * } * diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java b/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java similarity index 89% rename from src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java rename to src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java index 66a68bd158..bbb198086d 100644 --- a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java +++ b/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; -import static com.lambdaworks.redis.LettuceStrings.isNotEmpty; +import static io.lettuce.core.LettuceStrings.isNotEmpty; import java.net.URI; import java.util.Collection; import java.util.Collections; import java.util.List; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.RedisClusterURIUtil; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.RedisClusterURIUtil; +import io.lettuce.core.internal.LettuceAssert; /** * Factory Bean for {@link RedisClusterClient} instances. Needs either a {@link URI} or a {@link RedisURI} as input and allows - * to reuse {@link com.lambdaworks.redis.resource.ClientResources}. URI Format: {@code + * to reuse {@link io.lettuce.core.resource.ClientResources}. URI Format: {@code * redis://[password@]host[:port][,host2[:port2]] * } - * + * * {@code * rediss://[password@]host[:port][,host2[:port2]] * } diff --git a/src/main/java/io/lettuce/core/support/package-info.java b/src/main/java/io/lettuce/core/support/package-info.java new file mode 100644 index 0000000000..ad8c9bdedc --- /dev/null +++ b/src/main/java/io/lettuce/core/support/package-info.java @@ -0,0 +1,5 @@ +/** + * Supportive classes such as {@link io.lettuce.core.support.RedisClientCdiBean} for CDI support, {@link io.lettuce.core.support.RedisClientFactoryBean} for Spring. + */ +package io.lettuce.core.support; + diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html index aec3a3ec1e..69c4beeaac 100644 --- a/src/main/javadoc/overview.html +++ b/src/main/javadoc/overview.html @@ -1,10 +1,10 @@ lettuce is a scalable thread-safe Java -{@link com.lambdaworks.redis.RedisClient RedisClient} providing -{@link com.lambdaworks.redis.api.sync.RedisCommands synchronous}, -{@link com.lambdaworks.redis.api.async.RedisAsyncCommands asynchronous} and -{@link com.lambdaworks.redis.api.reactive.RedisReactiveCommands reactive} APIs for Redis Standalone, PubSub, -Redis Sentinel and {@link com.lambdaworks.redis.cluster.RedisClusterClient Redis Cluster}. +{@link io.lettuce.core.RedisClient RedisClient} providing +{@link io.lettuce.core.api.sync.RedisCommands synchronous}, +{@link io.lettuce.core.api.async.RedisAsyncCommands asynchronous} and +{@link io.lettuce.core.api.reactive.RedisReactiveCommands reactive} APIs for Redis Standalone, PubSub, +Redis Sentinel and {@link io.lettuce.core.cluster.RedisClusterClient Redis Cluster}. Multiple threads may share one connection if they avoid blocking and transactional operations such as BLPOP and @@ -16,8 +16,8 @@ Each redis command is implemented by one or more methods with names identical to the lowercase redis command name. Complex commands with multiple modifiers that change the result type include the CamelCased modifier as part of the command name, e.g. - {@link com.lambdaworks.redis.api.sync.RedisCommands#zrangebyscore zrangebyscore} and - {@link com.lambdaworks.redis.api.sync.RedisCommands#zrangebyscoreWithScores zrangebyscoreWithScores}. + {@link io.lettuce.core.api.sync.RedisCommands#zrangebyscore zrangebyscore} and + {@link io.lettuce.core.api.sync.RedisCommands#zrangebyscoreWithScores zrangebyscoreWithScores}.

    @@ -27,10 +27,10 @@

    - All connections inherit a default timeout from their {@link com.lambdaworks.redis.RedisClient} - and will throw a {@link com.lambdaworks.redis.RedisException} when non-blocking commands fail + All connections inherit a default timeout from their {@link io.lettuce.core.RedisClient} + and will throw a {@link io.lettuce.core.RedisException} when non-blocking commands fail to return a result before the timeout expires. The timeout defaults to 60 seconds and - may be changed via {@link com.lambdaworks.redis.RedisClient#setDefaultTimeout} or for + may be changed via {@link io.lettuce.core.RedisClient#setDefaultTimeout} or for each individual connection.

    diff --git a/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension index d5f09da89b..b6c82fbdad 100644 --- a/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension +++ b/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension @@ -1 +1 @@ -com.lambdaworks.redis.support.LettuceCdiExtension +io.lettuce.core.support.LettuceCdiExtension diff --git a/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java b/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java similarity index 94% rename from src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java rename to src/main/templates/io/lettuce/core/api/BaseRedisCommands.java index 22671507a7..6a9930bd35 100644 --- a/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java +++ b/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.ProtocolKeyword; -import com.lambdaworks.redis.output.CommandOutput; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.ProtocolKeyword; +import io.lettuce.core.output.CommandOutput; /** - * + * * ${intent} for basic commands. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -35,7 +35,7 @@ public interface BaseRedisCommands { /** * Post a message to a channel. - * + * * @param channel the channel type: key * @param message the message type: value * @return Long integer-reply the number of clients that received the message. @@ -44,14 +44,14 @@ public interface BaseRedisCommands { /** * Lists the currently *active channels*. - * + * * @return List<K> array-reply a list of active channels, optionally matching the specified pattern. */ List pubsubChannels(); /** * Lists the currently *active channels*. - * + * * @param channel the key * @return List<K> array-reply a list of active channels, optionally matching the specified pattern. */ @@ -67,14 +67,14 @@ public interface BaseRedisCommands { /** * Returns the number of subscriptions to patterns. - * + * * @return Long integer-reply the number of patterns all the clients are subscribed to. */ Long pubsubNumpat(); /** * Echo the given string. - * + * * @param msg the message type: value * @return V bulk-string-reply */ @@ -90,7 +90,7 @@ public interface BaseRedisCommands { /** * Ping the server. - * + * * @return String simple-string-reply */ String ping(); @@ -111,14 +111,14 @@ public interface BaseRedisCommands { /** * Close the connection. - * + * * @return String simple-string-reply always OK. */ String quit(); /** * Wait for replication. - * + * * @param replicas minimum number of replicas * @param timeout timeout in milliseconds * @return number of replicas @@ -147,7 +147,7 @@ public interface BaseRedisCommands { T dispatch(ProtocolKeyword type, CommandOutput output, CommandArgs args); /** - * + * * @return true if the connection is open (connected and not closed). */ boolean isOpen(); diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java b/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java similarity index 98% rename from src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java rename to src/main/templates/io/lettuce/core/api/RedisGeoCommands.java index 04bd3ff2d7..3d19bc918e 100644 --- a/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java +++ b/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.redis.*; +import io.lettuce.core.*; import java.util.List; import java.util.Set; diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisHLLCommands.java b/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java similarity index 94% rename from src/main/templates/com/lambdaworks/redis/api/RedisHLLCommands.java rename to src/main/templates/io/lettuce/core/api/RedisHLLCommands.java index f3fdc6bd48..826075116a 100644 --- a/src/main/templates/com/lambdaworks/redis/api/RedisHLLCommands.java +++ b/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api; /** * ${intent} for HyperLogLog (PF* commands). - * + * * @param Key type. * @param Value type. * @author Mark Paluch diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java similarity index 94% rename from src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java rename to src/main/templates/io/lettuce/core/api/RedisHashCommands.java index 408df3049a..a01241eb98 100644 --- a/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java +++ b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.KeyValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * ${intent} for Hashes (Key-Value pairs). - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -35,7 +35,7 @@ public interface RedisHashCommands { /** * Delete one or more hash fields. - * + * * @param key the key * @param fields the field type: key * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing @@ -45,11 +45,11 @@ public interface RedisHashCommands { /** * Determine if a hash field exists. - * + * * @param key the key * @param field the field type: key * @return Boolean integer-reply specifically: - * + * * {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field}, * or {@code key} does not exist. */ @@ -57,7 +57,7 @@ public interface RedisHashCommands { /** * Get the value of a hash field. - * + * * @param key the key * @param field the field type: key * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present @@ -67,7 +67,7 @@ public interface RedisHashCommands { /** * Increment the integer value of a hash field by the given number. - * + * * @param key the key * @param field the field type: key * @param amount the increment type: long @@ -77,7 +77,7 @@ public interface RedisHashCommands { /** * Increment the float value of a hash field by the given amount. - * + * * @param key the key * @param field the field type: key * @param amount the increment type: double @@ -87,7 +87,7 @@ public interface RedisHashCommands { /** * Get all the fields and values in a hash. - * + * * @param key the key * @return Map<K,V> array-reply list of fields and their values stored in the hash, or an empty list when {@code key} * does not exist. @@ -96,17 +96,17 @@ public interface RedisHashCommands { /** * Stream over all the fields and values in a hash. - * + * * @param channel the channel * @param key the key - * + * * @return Long count of the keys. */ Long hgetall(KeyValueStreamingChannel channel, K key); /** * Get all the fields in a hash. - * + * * @param key the key * @return List<K> array-reply list of fields in the hash, or an empty list when {@code key} does not exist. */ @@ -114,17 +114,17 @@ public interface RedisHashCommands { /** * Stream over all the fields in a hash. - * + * * @param channel the channel * @param key the key - * + * * @return Long count of the keys. */ Long hkeys(KeyStreamingChannel channel, K key); /** * Get the number of fields in a hash. - * + * * @param key the key * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist. */ @@ -132,7 +132,7 @@ public interface RedisHashCommands { /** * Get the values of all the given hash fields. - * + * * @param key the key * @param fields the field type: key * @return List<V> array-reply list of values associated with the given fields, in the same @@ -141,18 +141,18 @@ public interface RedisHashCommands { /** * Stream over the values of all the given hash fields. - * + * * @param channel the channel * @param key the key * @param fields the fields - * + * * @return Long count of the keys */ Long hmget(KeyValueStreamingChannel channel, K key, K... fields); /** * Set multiple hash fields to multiple values. - * + * * @param key the key * @param map the null * @return String simple-string-reply @@ -161,7 +161,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @return MapScanCursor<K, V> map scan cursor. */ @@ -169,7 +169,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanArgs scan arguments * @return MapScanCursor<K, V> map scan cursor. @@ -178,7 +178,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -188,7 +188,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return MapScanCursor<K, V> map scan cursor. @@ -197,7 +197,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @return StreamScanCursor scan cursor. @@ -206,7 +206,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanArgs scan arguments @@ -216,7 +216,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} @@ -227,7 +227,7 @@ public interface RedisHashCommands { /** * Incrementally iterate hash fields and associated values. - * + * * @param channel streaming channel that receives a call for every key-value pair * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java similarity index 95% rename from src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java rename to src/main/templates/io/lettuce/core/api/RedisKeyCommands.java index 9ca45cc9a7..b7a4803d7a 100644 --- a/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java +++ b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api; import java.util.Date; import java.util.List; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * ${intent} for Keys (Key manipulation/querying). - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -50,7 +50,7 @@ public interface RedisKeyCommands { /** * Return a serialized version of the value stored at the specified key. - * + * * @param key the key * @return byte[] bulk-string-reply the serialized value. */ @@ -66,11 +66,11 @@ public interface RedisKeyCommands { /** * Set a key's time to live in seconds. - * + * * @param key the key * @param seconds the seconds type: long * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set. */ @@ -78,11 +78,11 @@ public interface RedisKeyCommands { /** * Set the expiration for a key as a UNIX timestamp. - * + * * @param key the key * @param timestamp the timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -90,11 +90,11 @@ public interface RedisKeyCommands { /** * Set the expiration for a key as a UNIX timestamp. - * + * * @param key the key * @param timestamp the timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -102,7 +102,7 @@ public interface RedisKeyCommands { /** * Find all keys matching the given pattern. - * + * * @param pattern the pattern type: patternkey (pattern) * @return List<K> array-reply list of keys matching {@code pattern}. */ @@ -110,7 +110,7 @@ public interface RedisKeyCommands { /** * Find all keys matching the given pattern. - * + * * @param channel the channel * @param pattern the pattern * @return Long array-reply list of keys matching {@code pattern}. @@ -119,7 +119,7 @@ public interface RedisKeyCommands { /** * Atomically transfer a key from a Redis instance to another one. - * + * * @param host the host * @param port the port * @param key the key @@ -143,7 +143,7 @@ public interface RedisKeyCommands { /** * Move a key to another database. - * + * * @param key the key * @param db the db type: long * @return Boolean integer-reply specifically: @@ -152,7 +152,7 @@ public interface RedisKeyCommands { /** * returns the kind of internal representation used in order to store the value associated with a key. - * + * * @param key the key * @return String */ @@ -161,7 +161,7 @@ public interface RedisKeyCommands { /** * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write * operations). - * + * * @param key the key * @return number of seconds since the object stored at the specified key is idle. */ @@ -169,7 +169,7 @@ public interface RedisKeyCommands { /** * returns the number of references of the value associated with the specified key. - * + * * @param key the key * @return Long */ @@ -177,10 +177,10 @@ public interface RedisKeyCommands { /** * Remove the expiration from a key. - * + * * @param key the key * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an * associated timeout. */ @@ -188,11 +188,11 @@ public interface RedisKeyCommands { /** * Set a key's time to live in milliseconds. - * + * * @param key the key * @param milliseconds the milliseconds type: long * @return integer-reply, specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set. */ @@ -200,11 +200,11 @@ public interface RedisKeyCommands { /** * Set the expiration for a key as a UNIX timestamp specified in milliseconds. - * + * * @param key the key * @param timestamp the milliseconds-timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -212,11 +212,11 @@ public interface RedisKeyCommands { /** * Set the expiration for a key as a UNIX timestamp specified in milliseconds. - * + * * @param key the key * @param timestamp the milliseconds-timestamp type: posix time * @return Boolean integer-reply specifically: - * + * * {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not * be set (see: {@code EXPIRE}). */ @@ -224,7 +224,7 @@ public interface RedisKeyCommands { /** * Get the time to live for a key in milliseconds. - * + * * @param key the key * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description * above). @@ -233,14 +233,14 @@ public interface RedisKeyCommands { /** * Return a random key from the keyspace. - * + * * @return V bulk-string-reply the random key, or {@literal null} when the database is empty. */ V randomkey(); /** * Rename a key. - * + * * @param key the key * @param newKey the newkey type: key * @return String simple-string-reply @@ -249,18 +249,18 @@ public interface RedisKeyCommands { /** * Rename a key, only if the new key does not exist. - * + * * @param key the key * @param newKey the newkey type: key * @return Boolean integer-reply specifically: - * + * * {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists. */ Boolean renamenx(K key, K newKey); /** * Create a key using the provided serialized value, previously obtained using DUMP. - * + * * @param key the key * @param ttl the ttl type: long * @param value the serialized-value type: string @@ -270,7 +270,7 @@ public interface RedisKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @return List<V> array-reply list of sorted elements. */ @@ -278,7 +278,7 @@ public interface RedisKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @return Long number of values. @@ -287,7 +287,7 @@ public interface RedisKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @param sortArgs sort arguments * @return List<V> array-reply list of sorted elements. @@ -296,7 +296,7 @@ public interface RedisKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param sortArgs sort arguments @@ -306,7 +306,7 @@ public interface RedisKeyCommands { /** * Sort the elements in a list, set or sorted set. - * + * * @param key the key * @param sortArgs sort arguments * @param destination the destination key to store sort results @@ -316,7 +316,7 @@ public interface RedisKeyCommands { /** * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created. - * + * * @param keys the keys * @return Long integer-reply the number of found keys. */ @@ -332,7 +332,7 @@ public interface RedisKeyCommands { /** * Determine the type stored at key. - * + * * @param key the key * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist. */ @@ -340,14 +340,14 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @return KeyScanCursor<K> scan cursor. */ KeyScanCursor scan(); /** * Incrementally iterate the keys space. - * + * * @param scanArgs scan arguments * @return KeyScanCursor<K> scan cursor. */ @@ -355,7 +355,7 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments * @return KeyScanCursor<K> scan cursor. @@ -364,7 +364,7 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return KeyScanCursor<K> scan cursor. */ @@ -372,7 +372,7 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @return StreamScanCursor scan cursor. */ @@ -380,7 +380,7 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanArgs scan arguments * @return StreamScanCursor scan cursor. @@ -389,7 +389,7 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -399,7 +399,7 @@ public interface RedisKeyCommands { /** * Incrementally iterate the keys space. - * + * * @param channel streaming channel that receives a call for every key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return StreamScanCursor scan cursor. diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java b/src/main/templates/io/lettuce/core/api/RedisListCommands.java similarity index 95% rename from src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java rename to src/main/templates/io/lettuce/core/api/RedisListCommands.java index f2d97520b9..8c0cd58d6c 100644 --- a/src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java +++ b/src/main/templates/io/lettuce/core/api/RedisListCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api; import java.util.List; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.KeyValue; +import io.lettuce.core.output.ValueStreamingChannel; /** * ${intent} for Lists. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -32,11 +32,11 @@ public interface RedisListCommands { /** * Remove and get the first element in a list, or block until one is available. - * + * * @param timeout the timeout in seconds * @param keys the keys * @return KeyValue<K,V> array-reply specifically: - * + * * A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk * with the first element being the name of the key where an element was popped and the second element being the * value of the popped element. @@ -45,11 +45,11 @@ public interface RedisListCommands { /** * Remove and get the last element in a list, or block until one is available. - * + * * @param timeout the timeout in seconds * @param keys the keys * @return KeyValue<K,V> array-reply specifically: - * + * * A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk * with the first element being the name of the key where an element was popped and the second element being the * value of the popped element. @@ -58,7 +58,7 @@ public interface RedisListCommands { /** * Pop a value from a list, push it to another list and return it; or block until one is available. - * + * * @param timeout the timeout in seconds * @param source the source key * @param destination the destination type: key @@ -69,7 +69,7 @@ public interface RedisListCommands { /** * Get an element from a list by its index. - * + * * @param key the key * @param index the index type: long * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range. @@ -78,7 +78,7 @@ public interface RedisListCommands { /** * Insert an element before or after another element in a list. - * + * * @param key the key * @param before the before * @param pivot the pivot @@ -90,7 +90,7 @@ public interface RedisListCommands { /** * Get the length of a list. - * + * * @param key the key * @return Long integer-reply the length of the list at {@code key}. */ @@ -98,7 +98,7 @@ public interface RedisListCommands { /** * Remove and get the first element in a list. - * + * * @param key the key * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist. */ @@ -106,7 +106,7 @@ public interface RedisListCommands { /** * Prepend one or multiple values to a list. - * + * * @param key the key * @param values the value * @return Long integer-reply the length of the list after the push operations. @@ -124,7 +124,7 @@ public interface RedisListCommands { /** * Get a range of elements from a list. - * + * * @param key the key * @param start the start type: long * @param stop the stop type: long @@ -134,7 +134,7 @@ public interface RedisListCommands { /** * Get a range of elements from a list. - * + * * @param channel the channel * @param key the key * @param start the start type: long @@ -145,7 +145,7 @@ public interface RedisListCommands { /** * Remove elements from a list. - * + * * @param key the key * @param count the count type: long * @param value the value @@ -155,7 +155,7 @@ public interface RedisListCommands { /** * Set the value of an element in a list by its index. - * + * * @param key the key * @param index the index type: long * @param value the value @@ -165,7 +165,7 @@ public interface RedisListCommands { /** * Trim a list to the specified range. - * + * * @param key the key * @param start the start type: long * @param stop the stop type: long @@ -175,7 +175,7 @@ public interface RedisListCommands { /** * Remove and get the last element in a list. - * + * * @param key the key * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist. */ @@ -183,7 +183,7 @@ public interface RedisListCommands { /** * Remove the last element in a list, append it to another list and return it. - * + * * @param source the source key * @param destination the destination type: key * @return V bulk-string-reply the element being popped and pushed. @@ -192,7 +192,7 @@ public interface RedisListCommands { /** * Append one or multiple values to a list. - * + * * @param key the key * @param values the value * @return Long integer-reply the length of the list after the push operation. diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisScriptingCommands.java b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java similarity index 93% rename from src/main/templates/com/lambdaworks/redis/api/RedisScriptingCommands.java rename to src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java index f5c562eafe..afd4cd9658 100644 --- a/src/main/templates/com/lambdaworks/redis/api/RedisScriptingCommands.java +++ b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api; import java.util.List; -import com.lambdaworks.redis.ScriptOutputType; +import io.lettuce.core.ScriptOutputType; /** * ${intent} for Scripting. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -30,7 +30,7 @@ public interface RedisScriptingCommands { /** * Execute a Lua script server side. - * + * * @param script Lua 5.1 script. * @param type output type * @param keys key names @@ -41,7 +41,7 @@ public interface RedisScriptingCommands { /** * Execute a Lua script server side. - * + * * @param script Lua 5.1 script. * @param type the type * @param keys the keys @@ -53,7 +53,7 @@ public interface RedisScriptingCommands { /** * Evaluates a script cached on the server side by its SHA1 digest - * + * * @param digest SHA1 of the script * @param type the type * @param keys the keys @@ -64,7 +64,7 @@ public interface RedisScriptingCommands { /** * Execute a Lua script server side. - * + * * @param digest SHA1 of the script * @param type the type * @param keys the keys @@ -76,7 +76,7 @@ public interface RedisScriptingCommands { /** * Check existence of scripts in the script cache. - * + * * @param digests script digests * @return List<Boolean> array-reply The command returns an array of integers that correspond to the specified SHA1 * digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1 @@ -86,21 +86,21 @@ public interface RedisScriptingCommands { /** * Remove all the scripts from the script cache. - * + * * @return String simple-string-reply */ String scriptFlush(); /** * Kill the script currently in execution. - * + * * @return String simple-string-reply */ String scriptKill(); /** * Load the specified Lua script into the script cache. - * + * * @param script script content * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache. */ @@ -108,7 +108,7 @@ public interface RedisScriptingCommands { /** * Create a SHA1 digest from a Lua script. - * + * * @param script script content * @return the SHA1 value */ diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java b/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java similarity index 94% rename from src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java rename to src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java index 44c9d44f11..da845eaeb1 100644 --- a/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java +++ b/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.net.SocketAddress; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.KillArgs; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; /** * ${intent} for Redis Sentinel. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -34,7 +34,7 @@ public interface RedisSentinelCommands { /** * Return the ip and port number of the master with that name. - * + * * @param key the key * @return SocketAddress; */ @@ -42,14 +42,14 @@ public interface RedisSentinelCommands { /** * Enumerates all the monitored masters and their states. - * + * * @return Map<K, V>> */ List> masters(); /** * Show the state and info of the specified master. - * + * * @param key the key * @return Map<K, V> */ @@ -57,7 +57,7 @@ public interface RedisSentinelCommands { /** * Provides a list of slaves for the master with the specified name. - * + * * @param key the key * @return List<Map<K, V>> */ @@ -65,7 +65,7 @@ public interface RedisSentinelCommands { /** * This command will reset all the masters with matching name. - * + * * @param key the key * @return Long */ @@ -73,7 +73,7 @@ public interface RedisSentinelCommands { /** * Perform a failover. - * + * * @param key the master id * @return String */ @@ -81,7 +81,7 @@ public interface RedisSentinelCommands { /** * This command tells the Sentinel to start monitoring a new master with the specified name, ip, port, and quorum. - * + * * @param key the key * @param ip the IP address * @param port the port @@ -92,18 +92,18 @@ public interface RedisSentinelCommands { /** * Multiple option / value pairs can be specified (or none at all). - * + * * @param key the key * @param option the option * @param value the value - * + * * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly. */ String set(K key, String option, V value); /** * remove the specified master. - * + * * @param key the key * @return String */ @@ -173,7 +173,7 @@ public interface RedisSentinelCommands { /** * Ping the server. - * + * * @return String simple-string-reply */ String ping(); diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java similarity index 95% rename from src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java rename to src/main/templates/io/lettuce/core/api/RedisServerCommands.java index d0e92d1d21..08aa50b04b 100644 --- a/src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java +++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api; import java.util.Date; import java.util.List; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.KillArgs; +import io.lettuce.core.protocol.CommandType; /** * ${intent} for Server Control. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -33,28 +33,28 @@ public interface RedisServerCommands { /** * Asynchronously rewrite the append-only file. - * + * * @return String simple-string-reply always {@code OK}. */ String bgrewriteaof(); /** * Asynchronously save the dataset to disk. - * + * * @return String simple-string-reply */ String bgsave(); /** * Get the current connection name. - * + * * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set. */ K clientGetname(); /** * Set the current connection name. - * + * * @param name the client name * @return simple-string-reply {@code OK} if the connection name was successfully set. */ @@ -62,7 +62,7 @@ public interface RedisServerCommands { /** * Kill the connection of a client identified by ip:port. - * + * * @param addr ip:port * @return String simple-string-reply {@code OK} if the connection exists and has been closed */ @@ -78,7 +78,7 @@ public interface RedisServerCommands { /** * Stop processing commands from clients for some time. - * + * * @param timeout the timeout value in milliseconds * @return String simple-string-reply The command returns OK or an error if the timeout is invalid. */ @@ -86,7 +86,7 @@ public interface RedisServerCommands { /** * Get the list of client connections. - * + * * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF), * each line is composed of a succession of property=value fields separated by a space character. */ @@ -94,14 +94,14 @@ public interface RedisServerCommands { /** * Returns an array reply of details about all Redis commands. - * + * * @return List<Object> array-reply */ List command(); /** * Returns an array reply of details about the requested commands. - * + * * @param commands the commands to query for * @return List<Object> array-reply */ @@ -109,7 +109,7 @@ public interface RedisServerCommands { /** * Returns an array reply of details about the requested commands. - * + * * @param commands the commands to query for * @return List<Object> array-reply */ @@ -117,14 +117,14 @@ public interface RedisServerCommands { /** * Get total number of Redis commands. - * + * * @return Long integer-reply of number of total commands in this Redis server. */ Long commandCount(); /** * Get the value of a configuration parameter. - * + * * @param parameter name of the parameter * @return List<String> bulk-string-reply */ @@ -132,14 +132,14 @@ public interface RedisServerCommands { /** * Reset the stats returned by INFO. - * + * * @return String simple-string-reply always {@code OK}. */ String configResetstat(); /** * Rewrite the configuration file with the in memory configuration. - * + * * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is * returned. */ @@ -147,7 +147,7 @@ public interface RedisServerCommands { /** * Set a configuration parameter to the given value. - * + * * @param parameter the parameter name * @param value the parameter value * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned. @@ -156,7 +156,7 @@ public interface RedisServerCommands { /** * Return the number of keys in the selected database. - * + * * @return Long integer-reply */ Long dbsize(); @@ -178,7 +178,7 @@ public interface RedisServerCommands { /** * Get debugging information about a key. - * + * * @param key the key * @return String simple-string-reply */ @@ -222,7 +222,7 @@ public interface RedisServerCommands { /** * Remove all keys from all databases. - * + * * @return String simple-string-reply */ String flushall(); @@ -236,7 +236,7 @@ public interface RedisServerCommands { /** * Remove all keys from the current database. - * + * * @return String simple-string-reply */ String flushdb(); @@ -250,14 +250,14 @@ public interface RedisServerCommands { /** * Get information and statistics about the server. - * + * * @return String bulk-string-reply as a collection of text lines. */ String info(); /** * Get information and statistics about the server. - * + * * @param section the section type: string * @return String bulk-string-reply as a collection of text lines. */ @@ -265,28 +265,28 @@ public interface RedisServerCommands { /** * Get the UNIX time stamp of the last successful save to disk. - * + * * @return Date integer-reply an UNIX time stamp. */ Date lastsave(); /** * Synchronously save the dataset to disk. - * + * * @return String simple-string-reply The commands returns OK on success. */ String save(); /** * Synchronously save the dataset to disk and then shut down the server. - * + * * @param save {@literal true} force save operation */ void shutdown(boolean save); /** * Make the server a slave of another instance, or promote it as master. - * + * * @param host the host type: string * @param port the port type: string * @return String simple-string-reply @@ -295,21 +295,21 @@ public interface RedisServerCommands { /** * Promote server as master. - * + * * @return String simple-string-reply */ String slaveofNoOne(); /** * Read the slow log. - * + * * @return List<Object> deeply nested multi bulk replies */ List slowlogGet(); /** * Read the slow log. - * + * * @param count the count * @return List<Object> deeply nested multi bulk replies */ @@ -317,25 +317,25 @@ public interface RedisServerCommands { /** * Obtaining the current length of the slow log. - * + * * @return Long length of the slow log. */ Long slowlogLen(); /** * Resetting the slow log. - * + * * @return String simple-string-reply The commands returns OK on success. */ String slowlogReset(); /** * Return the current server time. - * + * * @return List<V> array-reply specifically: - * + * * A multi bulk reply containing two elements: - * + * * unix time in seconds. microseconds. */ List time(); diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java b/src/main/templates/io/lettuce/core/api/RedisSetCommands.java similarity index 93% rename from src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java rename to src/main/templates/io/lettuce/core/api/RedisSetCommands.java index 69e8220df9..193d5f2142 100644 --- a/src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java +++ b/src/main/templates/io/lettuce/core/api/RedisSetCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,31 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api.sync; +package io.lettuce.core.api; import java.util.List; import java.util.Set; -import com.lambdaworks.redis.ScanArgs; -import com.lambdaworks.redis.ScanCursor; -import com.lambdaworks.redis.StreamScanCursor; -import com.lambdaworks.redis.ValueScanCursor; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.ScanArgs; +import io.lettuce.core.ScanCursor; +import io.lettuce.core.StreamScanCursor; +import io.lettuce.core.ValueScanCursor; +import io.lettuce.core.output.ValueStreamingChannel; /** - * Synchronous executed commands for Sets. - * + * ${intent} for Sets. + * * @param Key type. * @param Value type. * @author Mark Paluch * @since 4.0 - * @generated by com.lambdaworks.apigenerator.CreateSyncApi */ public interface RedisSetCommands { /** * Add one or more members to a set. - * + * * @param key the key * @param members the member type: value * @return Long integer-reply the number of elements that were added to the set, not including all the elements already @@ -47,7 +46,7 @@ public interface RedisSetCommands { /** * Get the number of members in a set. - * + * * @param key the key * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not * exist. @@ -56,7 +55,7 @@ public interface RedisSetCommands { /** * Subtract multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -64,7 +63,7 @@ public interface RedisSetCommands { /** * Subtract multiple sets. - * + * * @param channel the channel * @param keys the keys * @return Long count of members of the resulting set. @@ -73,7 +72,7 @@ public interface RedisSetCommands { /** * Subtract multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -82,7 +81,7 @@ public interface RedisSetCommands { /** * Intersect multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -90,7 +89,7 @@ public interface RedisSetCommands { /** * Intersect multiple sets. - * + * * @param channel the channel * @param keys the keys * @return Long count of members of the resulting set. @@ -99,7 +98,7 @@ public interface RedisSetCommands { /** * Intersect multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -108,11 +107,11 @@ public interface RedisSetCommands { /** * Determine if a given value is a member of a set. - * + * * @param key the key * @param member the member type: value * @return Boolean integer-reply specifically: - * + * * {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the * set, or if {@code key} does not exist. */ @@ -120,12 +119,12 @@ public interface RedisSetCommands { /** * Move a member from one set to another. - * + * * @param source the source key * @param destination the destination type: key * @param member the member type: value * @return Boolean integer-reply specifically: - * + * * {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no * operation was performed. */ @@ -133,7 +132,7 @@ public interface RedisSetCommands { /** * Get all the members in a set. - * + * * @param key the key * @return Set<V> array-reply all elements of the set. */ @@ -141,7 +140,7 @@ public interface RedisSetCommands { /** * Get all the members in a set. - * + * * @param channel the channel * @param key the keys * @return Long count of members of the resulting set. @@ -150,7 +149,7 @@ public interface RedisSetCommands { /** * Remove and return a random member from a set. - * + * * @param key the key * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist. */ @@ -167,9 +166,9 @@ public interface RedisSetCommands { /** * Get one random member from a set. - * + * * @param key the key - * + * * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the * randomly selected element, or {@literal null} when {@code key} does not exist. */ @@ -177,7 +176,7 @@ public interface RedisSetCommands { /** * Get one or multiple random members from a set. - * + * * @param key the key * @param count the count type: long * @return Set<V> bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply @@ -187,7 +186,7 @@ public interface RedisSetCommands { /** * Get one or multiple random members from a set. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param count the count @@ -197,7 +196,7 @@ public interface RedisSetCommands { /** * Remove one or more members from a set. - * + * * @param key the key * @param members the member type: value * @return Long integer-reply the number of members that were removed from the set, not including non existing members. @@ -206,7 +205,7 @@ public interface RedisSetCommands { /** * Add multiple sets. - * + * * @param keys the key * @return Set<V> array-reply list with members of the resulting set. */ @@ -214,7 +213,7 @@ public interface RedisSetCommands { /** * Add multiple sets. - * + * * @param channel streaming channel that receives a call for every value * @param keys the keys * @return Long count of members of the resulting set. @@ -223,7 +222,7 @@ public interface RedisSetCommands { /** * Add multiple sets and store the resulting set in a key. - * + * * @param destination the destination type: key * @param keys the key * @return Long integer-reply the number of elements in the resulting set. @@ -232,7 +231,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @return ValueScanCursor<V> scan cursor. */ @@ -240,7 +239,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanArgs scan arguments * @return ValueScanCursor<V> scan cursor. @@ -249,7 +248,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @param scanArgs scan arguments @@ -259,7 +258,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} * @return ValueScanCursor<V> scan cursor. @@ -268,7 +267,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @return StreamScanCursor scan cursor. @@ -277,7 +276,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanArgs scan arguments @@ -287,7 +286,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} @@ -298,7 +297,7 @@ public interface RedisSetCommands { /** * Incrementally iterate Set elements. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param scanCursor cursor to resume from a previous scan, must not be {@literal null} diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java similarity index 99% rename from src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java rename to src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java index d6a4eda2e1..0256d83d48 100644 --- a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java +++ b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api; import java.util.List; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.output.ScoredValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.*; +import io.lettuce.core.output.ScoredValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * ${intent} for Sorted Sets. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -33,13 +33,13 @@ public interface RedisSortedSetCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param score the score * @param member the member - * + * * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -47,11 +47,11 @@ public interface RedisSortedSetCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...) * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -59,11 +59,11 @@ public interface RedisSortedSetCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the key * @param scoredValues the scored values * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -99,12 +99,12 @@ public interface RedisSortedSetCommands { /** * Add one or more members to a sorted set, or update its score if it already exists. - * + * * @param key the ke * @param zAddArgs arguments for zadd * @param scoredValues the scored values * @return Long integer-reply specifically: - * + * * The number of elements added to the sorted sets, not including elements already existing for which the score was * updated. */ @@ -136,7 +136,7 @@ public interface RedisSortedSetCommands { /** * Get the number of members in a sorted set. - * + * * @param key the key * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key} * does not exist. @@ -145,7 +145,7 @@ public interface RedisSortedSetCommands { /** * Count the members in a sorted set with scores within the given values. - * + * * @param key the key * @param min min score * @param max max score @@ -157,7 +157,7 @@ public interface RedisSortedSetCommands { /** * Count the members in a sorted set with scores within the given values. - * + * * @param key the key * @param min min score * @param max max score @@ -179,7 +179,7 @@ public interface RedisSortedSetCommands { /** * Increment the score of a member in a sorted set. - * + * * @param key the key * @param amount the increment type: long * @param member the member type: key @@ -190,7 +190,7 @@ public interface RedisSortedSetCommands { /** * Intersect multiple sorted sets and store the resulting sorted set in a new key. - * + * * @param destination the destination * @param keys the keys * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}. @@ -199,7 +199,7 @@ public interface RedisSortedSetCommands { /** * Intersect multiple sorted sets and store the resulting sorted set in a new key. - * + * * @param destination the destination * @param storeArgs the storeArgs * @param keys the keys @@ -393,7 +393,7 @@ public interface RedisSortedSetCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -406,7 +406,7 @@ public interface RedisSortedSetCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -430,7 +430,7 @@ public interface RedisSortedSetCommands { /** * Stream over range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score @@ -445,7 +445,7 @@ public interface RedisSortedSetCommands { /** * Stream over a range of members in a sorted set, by score. - * + * * @param channel streaming channel that receives a call for every value * @param key the key * @param min min score diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java b/src/main/templates/io/lettuce/core/api/RedisStringCommands.java similarity index 96% rename from src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java rename to src/main/templates/io/lettuce/core/api/RedisStringCommands.java index e01479587a..5baf4752f7 100644 --- a/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java +++ b/src/main/templates/io/lettuce/core/api/RedisStringCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; -import com.lambdaworks.redis.BitFieldArgs; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.SetArgs; -import com.lambdaworks.redis.Value; +import io.lettuce.core.output.KeyValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; +import io.lettuce.core.BitFieldArgs; +import io.lettuce.core.KeyValue; +import io.lettuce.core.SetArgs; +import io.lettuce.core.Value; /** * ${intent} for Strings. diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java b/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java similarity index 92% rename from src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java rename to src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java index 54f499100a..c7fc8acf59 100644 --- a/src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java +++ b/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.api; +package io.lettuce.core.api; import java.util.List; -import com.lambdaworks.redis.TransactionResult; +import io.lettuce.core.TransactionResult; /** * ${intent} for Transactions. - * + * * @param Key type. * @param Value type. * @author Mark Paluch @@ -30,7 +30,7 @@ public interface RedisTransactionalCommands { /** * Discard all commands issued after MULTI. - * + * * @return String simple-string-reply always {@code OK}. */ String discard(); diff --git a/src/site/markdown/download.md.vm b/src/site/markdown/download.md.vm deleted file mode 100644 index eeee9ca6a8..0000000000 --- a/src/site/markdown/download.md.vm +++ /dev/null @@ -1,74 +0,0 @@ -Download lettuce -====================== - - lettuce is distributed under the - [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt). - - The checksum and signature are links to the originals on the main distribution server. - - -lettuce 3.x ------------ - -| | Download | Checksum | Signature | -| ----------------- |:-------------|:-------------|:-------------| -| lettuce (jar) | [lettuce-${lettuce3-release-version}.jar](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}.jar)|[lettuce-${lettuce3-release-version}.jar.md5](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}.jar.md5)|[lettuce-${lettuce3-release-version}.jar.asc](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}.jar.asc)| -| lettuce shaded (jar) | [lettuce-${lettuce3-release-version}-shaded.jar](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-shaded.jar)|[lettuce-${lettuce3-release-version}-shaded.jar.md5](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-shaded.jar.md5)|[lettuce-${lettuce3-release-version}-shaded.jar.asc](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-shaded.jar.asc)| -| lettuce binary (zip) | [lettuce-${lettuce3-release-version}-bin.zip](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.zip)|[lettuce-${lettuce3-release-version}-bin.zip.md5](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.zip.md5)|[lettuce-${lettuce3-release-version}-bin.zip.asc](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.zip.asc)| -| lettuce binary (tar.gz) | [lettuce-${lettuce3-release-version}-bin.tar.gz](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.tar.gz)|[lettuce-${lettuce3-release-version}-bin.tar.gz.md5](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.tar.gz.md5)|[lettuce-${lettuce3-release-version}-bin.tar.gz.asc](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.tar.gz.asc)| - - -lettuce 4.x ------------ - -| | Download | Checksum | Signature | -| ----------------- |:-------------|:-------------|:-------------| -| lettuce (jar) | [lettuce-${lettuce-release-version}.jar](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce-release-version}/lettuce-${lettuce-release-version}.jar)|[lettuce-${lettuce-release-version}.jar.md5](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce-release-version}/lettuce-${lettuce-release-version}.jar.md5)|[lettuce-${lettuce-release-version}.jar.asc](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce-release-version}/lettuce-${lettuce-release-version}.jar.asc)| -| lettuce shaded (jar) | [lettuce-${lettuce-release-version}-shaded.jar](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce-release-version}/lettuce-${lettuce-release-version}-shaded.jar)|[lettuce-${lettuce-release-version}-shaded.jar.md5](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce-release-version}/lettuce-${lettuce-release-version}-shaded.jar.md5)|[lettuce-${lettuce-release-version}-shaded.jar.asc](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce-release-version}/lettuce-${lettuce-release-version}-shaded.jar.asc)| -| lettuce binary (zip) | [lettuce-${lettuce-release-version}-bin.zip](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.zip)|[lettuce-${lettuce-release-version}-bin.zip.md5](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.zip.md5)|[lettuce-${lettuce-release-version}-bin.zip.asc](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.zip.asc)| -| lettuce binary (tar.gz) | [lettuce-${lettuce-release-version}-bin.tar.gz](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.tar.gz)|[lettuce-${lettuce-release-version}-bin.tar.gz.md5](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.tar.gz.md5)|[lettuce-${lettuce-release-version}-bin.tar.gz.asc](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.tar.gz.asc)| - - - -It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. - -The PGP signatures can be verified using PGP or GPG. First download the -[KEYS](http://redis.paluch.biz/KEYS) as well as the asc signature file for the relevant distribution. -Make sure you get these files from Maven Central rather -than from a mirror. Then verify the signatures using - - - % gpg --import KEYS - % gpg --verify lettuce-${lettuce-release-version}.jar.asc - - -Alternatively, you can verify the MD5 signature on the files. A unix program called md5 or md5sum is included -in many unix distributions. - - -Previous Releases ------------------ - - All previous releases of lettuce can be found in - [Maven Central](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22biz.paluch.redis%22%20AND%20a%3A%22lettuce%22). - - -Using lettuce on your classpath ------------------ - - To use lettuce in your application make sure that the jars are in the application's classpath. Add - the dependencies listed below to your classpath. - - lettuce-${lettuce-release-version}.jar - netty-buffer-${netty-version}.jar - netty-codec-${netty-version}.Final.jar - netty-common-${netty-version}.Final.jar - netty-transport-${netty-version}.jar - netty-transport-native-epoll-${netty-version}.jar - netty-handler-${netty-version}.jar - reactor-3.0.0.RELEASE.jar - LatencyUtils-2.0.3.jar - HdrHistogram-2.1.8.jar - commons-pool2-2.4.2.jar - -You can do this from the command line or a manifest file. diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm deleted file mode 100644 index 8ec6b81d05..0000000000 --- a/src/site/markdown/index.md.vm +++ /dev/null @@ -1,113 +0,0 @@ -Introduction -============= - -Lettuce is a scalable thread-safe Redis client for synchronous, -asynchronous and reactive usage. Multiple threads may share one connection if they avoid blocking and transactional -operations such as `BLPOP` and `MULTI`/`EXEC`. -lettuce is built with [netty](https://github.com/netty/netty). -Supports advanced Redis features such as Sentinel, Cluster, Pipelining, Auto-Reconnect and Redis data models. - - -This version of lettuce has been tested against Redis and 3.0. - -* lettuce 3.x works with Java 6, 7 and 8, lettuce 4.x requires Java 8 -* [synchronous](https://github.com/mp911de/lettuce/wiki/Basic-usage), [asynchronous](https://github.com/mp911de/lettuce/wiki/Asynchronous-API-%284.0%29) and [reactive](https://github.com/mp911de/lettuce/wiki/Reactive-API-%284.0%29) usage -* [Redis Sentinel](https://github.com/mp911de/lettuce/wiki/Redis-Sentinel) -* [Redis Cluster](https://github.com/mp911de/lettuce/wiki/Redis-Cluster) -* [SSL](https://github.com/mp911de/lettuce/wiki/SSL-Connections) and [Unix Domain Socket](https://github.com/mp911de/lettuce/wiki/Unix-Domain-Sockets) connections -* [Streaming API](https://github.com/mp911de/lettuce/wiki/Streaming-API) -* [CDI](https://github.com/mp911de/lettuce/wiki/CDI-Support) and [Spring](https://github.com/mp911de/lettuce/wiki/Spring-Support) integration -* [Codecs](https://github.com/mp911de/lettuce/wiki/Codecs) (for UTF8/bit/JSON etc. representation of your data) -* multiple [Command Interfaces](https://github.com/mp911de/lettuce/wiki/Command-Interfaces-%284.0%29) - -See the [Wiki](https://github.com/mp911de/lettuce/wiki) for more docs. - -I'm developing and maintaining actively the fork of https://github.com/wg/lettuce - -[![Join the chat at https://gitter.im/mp911de/lettuce](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mp911de/lettuce) [![Build Status](https://travis-ci.org/mp911de/lettuce.svg)](https://travis-ci.org/mp911de/lettuce) [![Coverage Status](https://img.shields.io/coveralls/mp911de/lettuce.svg)](https://coveralls.io/r/mp911de/lettuce) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/biz.paluch.redis/lettuce/badge.svg)](https://maven-badges.herokuapp.com/maven-central/biz.paluch.redis/lettuce) - -- - - - -3.x and 4.x ------------- -lettuce is available in two major versions. The 3.x stream and the 4.x stream. Both streams are maintained. - -After this release, the 4.x branch will be promoted to the default branch. -Following rules should give a guidance for the stream in which a particular change is done: - -**Changes affecting both streams** - -* New Redis commands (such as HSTRLEN) -* Bugfixes - -**Changes for the 4.x stream only** - -* New Redis paradigms -* Enriching the API (such as multi-key command execution in the Cluster API) -* Technical improvements to the client (such as the Reactive API) - -The 3.x stream will be maintained at least until end of 2016. - -- - - - -How to get -------------- - -``` - - biz.paluch.redis - lettuce - ${lettuce-release-version} - -``` - -Shaded JAR-File (packaged dependencies and relocated to the `com.lambdaworks` package to prevent version conflicts) - -``` - - biz.paluch.redis - lettuce - ${lettuce-release-version} - shaded - - - - io.projectreactor - reactor-core - - - org.latencyutils - LatencyUtils - - - io.netty - netty-common - - - io.netty - netty-transport - - - io.netty - netty-handler - - - io.netty - netty-codec - - - io.netty - netty-transport-native-epoll - - - org.apache.commons - commons-pool2 - - - -``` - -All versions: [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22biz.paluch.redis%22%20AND%20a%3A%22lettuce%22) - -Snapshots: [Sonatype OSS Repository](https://oss.sonatype.org/#nexus-search;gav~biz.paluch.redis~lettuce~~~) - diff --git a/src/site/site.xml b/src/site/site.xml deleted file mode 100644 index ad9fce6483..0000000000 --- a/src/site/site.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - lettuce - Advanced Java Redis client - http://redis.paluch.biz/ - - - - - - - - - - - - - - - - - - - - - - - - true - - mp911de/lettuce - right - black - - - mp911de - true - true - - - piwik.paluch.biz - 6 - - - - - - org.apache.maven.skins - maven-fluido-skin - 1.3.1 - - diff --git a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java index ec0308e6b6..cc2ed18b63 100644 --- a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java +++ b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java @@ -18,8 +18,8 @@ import java.util.List; import java.util.Set; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.sync.RedisCommands; +import io.lettuce.core.*; +import io.lettuce.core.api.sync.RedisCommands; public class LettuceGeoDemo { diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java index 32735c92fc..6575812545 100644 --- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java +++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java @@ -19,17 +19,17 @@ import javax.enterprise.inject.Alternative; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.pubsub.PubSubEndpoint; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.pubsub.PubSubEndpoint; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl; +import io.lettuce.core.resource.ClientResources; /** * Demo code for extending a RedisClient. - * + * * @author Mark Paluch */ @Alternative diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java index 71b2e1b528..1207a049cc 100644 --- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java +++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java @@ -21,13 +21,13 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.pubsub.RedisPubSubAsyncCommandsImpl; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; -import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.pubsub.RedisPubSubAsyncCommandsImpl; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands; /** * Test for override/extensability of RedisClient diff --git a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java index a66ff7df98..87ea76691b 100644 --- a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java +++ b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java @@ -18,12 +18,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.protocol.CommandType; -import com.lambdaworks.redis.protocol.RedisCommand; -import com.lambdaworks.redis.pubsub.PubSubEndpoint; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.protocol.CommandType; +import io.lettuce.core.protocol.RedisCommand; +import io.lettuce.core.pubsub.PubSubEndpoint; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl; /** * Demo code for extending a RedisPubSubConnectionImpl. diff --git a/src/test/java/com/lambdaworks/CanConnect.java b/src/test/java/io/lettuce/CanConnect.java similarity index 95% rename from src/test/java/com/lambdaworks/CanConnect.java rename to src/test/java/io/lettuce/CanConnect.java index 8788791377..cbc2d8addd 100644 --- a/src/test/java/com/lambdaworks/CanConnect.java +++ b/src/test/java/io/lettuce/CanConnect.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks; +package io.lettuce; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/src/test/java/com/lambdaworks/ConnectionTestUtil.java b/src/test/java/io/lettuce/ConnectionTestUtil.java similarity index 88% rename from src/test/java/com/lambdaworks/ConnectionTestUtil.java rename to src/test/java/io/lettuce/ConnectionTestUtil.java index a2c4c36c12..35b4537b97 100644 --- a/src/test/java/com/lambdaworks/ConnectionTestUtil.java +++ b/src/test/java/io/lettuce/ConnectionTestUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks; +package io.lettuce; import java.util.Queue; import org.springframework.test.util.ReflectionTestUtils; -import com.lambdaworks.redis.RedisChannelHandler; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.internal.LettuceFactories; -import com.lambdaworks.redis.protocol.CommandHandler; -import com.lambdaworks.redis.protocol.ConnectionWatchdog; -import com.lambdaworks.redis.protocol.DefaultEndpoint; - +import io.lettuce.core.RedisChannelHandler; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.internal.LettuceFactories; +import io.lettuce.core.protocol.CommandHandler; +import io.lettuce.core.protocol.ConnectionWatchdog; +import io.lettuce.core.protocol.DefaultEndpoint; import io.netty.channel.Channel; /** @@ -37,7 +36,7 @@ public class ConnectionTestUtil { /** * Extract the {@link Channel} from a {@link StatefulConnection}. - * + * * @param connection the connection * @return the {@link Channel} */ @@ -49,7 +48,7 @@ public static Channel getChannel(StatefulConnection connection) { /** * Extract the {@link ConnectionWatchdog} from a {@link StatefulConnection}. - * + * * @param connection the connection * @return the {@link ConnectionWatchdog} */ @@ -65,7 +64,7 @@ public static ConnectionWatchdog getConnectionWatchdog(StatefulConnection /** * Extract the {@link RedisChannelWriter} from a {@link StatefulConnection}. - * + * * @param connection the connection * @return the {@link RedisChannelWriter} */ @@ -93,7 +92,7 @@ public static Queue getQueue(StatefulConnection connection) { /** * Extract the command buffer from a from a {@link StatefulConnection}. - * + * * @param connection the connection * @return the queue */ @@ -109,7 +108,7 @@ public static Queue getCommandBuffer(StatefulConnection connection /** * Extract the connection state from a from a {@link StatefulConnection}. - * + * * @param connection the connection * @return the connection state as {@link String} */ diff --git a/src/test/java/com/lambdaworks/Delay.java b/src/test/java/io/lettuce/Delay.java similarity index 91% rename from src/test/java/com/lambdaworks/Delay.java rename to src/test/java/io/lettuce/Delay.java index 4935f3646e..e03006baae 100644 --- a/src/test/java/com/lambdaworks/Delay.java +++ b/src/test/java/io/lettuce/Delay.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks; +package io.lettuce; import com.google.code.tempusfugit.temporal.Duration; diff --git a/src/test/java/com/lambdaworks/Futures.java b/src/test/java/io/lettuce/Futures.java similarity index 92% rename from src/test/java/com/lambdaworks/Futures.java rename to src/test/java/io/lettuce/Futures.java index ae34ff2605..f60a9aa329 100644 --- a/src/test/java/com/lambdaworks/Futures.java +++ b/src/test/java/io/lettuce/Futures.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks; +package io.lettuce; import java.lang.reflect.Constructor; import java.net.SocketAddress; @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; -import com.lambdaworks.redis.ConnectionFuture; +import io.lettuce.core.ConnectionFuture; /** * Utility methods to synchronize and create futures. @@ -58,7 +58,7 @@ public static boolean areAllCompleted(Collection> futures) { public static ConnectionFuture createConnectionFuture(SocketAddress socketAddress, CompletableFuture decorated) { try { - Class futureClass = (Class) Class.forName("com.lambdaworks.redis.DefaultConnectionFuture"); + Class futureClass = (Class) Class.forName("io.lettuce.core.DefaultConnectionFuture"); Constructor constructor = futureClass.getDeclaredConstructor(SocketAddress.class, CompletableFuture.class); constructor.setAccessible(true); diff --git a/src/test/java/com/lambdaworks/KeysAndValues.java b/src/test/java/io/lettuce/KeysAndValues.java similarity index 95% rename from src/test/java/com/lambdaworks/KeysAndValues.java rename to src/test/java/io/lettuce/KeysAndValues.java index 381969f309..4dadc9598b 100644 --- a/src/test/java/com/lambdaworks/KeysAndValues.java +++ b/src/test/java/io/lettuce/KeysAndValues.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks; +package io.lettuce; import java.util.*; /** * Keys for testing slot-hashes. - * + * * @author Mark Paluch */ public class KeysAndValues { diff --git a/src/test/java/com/lambdaworks/LoggingTestRule.java b/src/test/java/io/lettuce/LoggingTestRule.java similarity index 98% rename from src/test/java/com/lambdaworks/LoggingTestRule.java rename to src/test/java/io/lettuce/LoggingTestRule.java index a1c054c78a..389ffedb9f 100644 --- a/src/test/java/com/lambdaworks/LoggingTestRule.java +++ b/src/test/java/io/lettuce/LoggingTestRule.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks; +package io.lettuce; import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/src/test/java/com/lambdaworks/Sockets.java b/src/test/java/io/lettuce/Sockets.java similarity index 93% rename from src/test/java/com/lambdaworks/Sockets.java rename to src/test/java/io/lettuce/Sockets.java index 63f0f73987..5d538f7606 100644 --- a/src/test/java/com/lambdaworks/Sockets.java +++ b/src/test/java/io/lettuce/Sockets.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks; +package io.lettuce; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/src/test/java/com/lambdaworks/SslTest.java b/src/test/java/io/lettuce/SslTest.java similarity index 94% rename from src/test/java/com/lambdaworks/SslTest.java rename to src/test/java/io/lettuce/SslTest.java index a92a36d2f0..90e08c2697 100644 --- a/src/test/java/com/lambdaworks/SslTest.java +++ b/src/test/java/io/lettuce/SslTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks; +package io.lettuce; -import static com.lambdaworks.redis.TestSettings.host; -import static com.lambdaworks.redis.TestSettings.sslPort; +import static io.lettuce.core.TestSettings.host; +import static io.lettuce.core.TestSettings.sslPort; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.junit.Assume.assumeTrue; @@ -29,12 +29,11 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands; -import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands; - +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands; +import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands; import io.netty.handler.codec.DecoderException; import io.netty.handler.ssl.OpenSsl; diff --git a/src/test/java/com/lambdaworks/TestClientResources.java b/src/test/java/io/lettuce/TestClientResources.java similarity index 79% rename from src/test/java/com/lambdaworks/TestClientResources.java rename to src/test/java/io/lettuce/TestClientResources.java index 58b102d60a..ca37871fe7 100644 --- a/src/test/java/com/lambdaworks/TestClientResources.java +++ b/src/test/java/io/lettuce/TestClientResources.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks; +package io.lettuce; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.TestEventLoopGroupProvider; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.DefaultClientResources; +import io.lettuce.core.TestEventLoopGroupProvider; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.DefaultClientResources; /** - * Client-Resources suitable for testing. Uses {@link com.lambdaworks.redis.TestEventLoopGroupProvider} to preserve the event - * loop groups between tests. Every time a new {@link TestClientResources} instance is created, shutdown hook is added + * Client-Resources suitable for testing. Uses {@link io.lettuce.core.TestEventLoopGroupProvider} to preserve the event loop + * groups between tests. Every time a new {@link TestClientResources} instance is created, shutdown hook is added * {@link Runtime#addShutdownHook(Thread)}. - * + * * @author Mark Paluch */ public class TestClientResources { @@ -36,7 +36,7 @@ public class TestClientResources { /** * Creates a new {@link ClientResources} instance and registers a shutdown hook to de-allocate the instance upon JVM * shutdown. - * + * * @return a new {@link ClientResources} instance. */ public static ClientResources create() { diff --git a/src/test/java/com/lambdaworks/Wait.java b/src/test/java/io/lettuce/Wait.java similarity index 91% rename from src/test/java/com/lambdaworks/Wait.java rename to src/test/java/io/lettuce/Wait.java index 1769839df9..6120b17dc8 100644 --- a/src/test/java/com/lambdaworks/Wait.java +++ b/src/test/java/io/lettuce/Wait.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks; +package io.lettuce; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; @@ -27,14 +27,14 @@ /** * Wait-Until helper. - * + * * @author Mark Paluch */ public class Wait { /** - * Initialize a {@link com.lambdaworks.Wait.WaitBuilder} to wait until the {@code supplier} supplies {@literal true} - * + * Initialize a {@link Wait.WaitBuilder} to wait until the {@code supplier} supplies {@literal true} + * * @param supplier * @return */ @@ -48,8 +48,8 @@ public static WaitBuilder untilTrue(Supplier supplier) { } /** - * Initialize a {@link com.lambdaworks.Wait.WaitBuilder} to wait until the {@code condition} does not throw exceptions - * + * Initialize a {@link Wait.WaitBuilder} to wait until the {@code condition} does not throw exceptions + * * @param condition * @return */ @@ -73,9 +73,9 @@ public static WaitBuilder untilNoException(VoidWaitCondition condition) { } /** - * Initialize a {@link com.lambdaworks.Wait.WaitBuilder} to wait until the {@code actualSupplier} provides an object that is - * not equal to {@code expectation} - * + * Initialize a {@link Wait.WaitBuilder} to wait until the {@code actualSupplier} provides an object that is not equal to + * {@code expectation} + * * @param expectation * @param actualSupplier * @param @@ -115,8 +115,8 @@ public static WaitBuilder untilNotEquals(T expectation, Supplier actua } /** - * Initialize a {@link com.lambdaworks.Wait.WaitBuilder} to wait until the {@code actualSupplier} provides an object that is - * not equal to {@code expectation} + * Initialize a {@link Wait.WaitBuilder} to wait until the {@code actualSupplier} provides an object that is not equal to + * {@code expectation} * * @param expectation * @param actualSupplier diff --git a/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java similarity index 99% rename from src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java rename to src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java index 1954e5d566..8c7460bcc5 100644 --- a/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java +++ b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.apigenerator; +package io.lettuce.apigenerator; import java.io.File; import java.io.FileOutputStream; diff --git a/src/test/java/com/lambdaworks/apigenerator/Constants.java b/src/test/java/io/lettuce/apigenerator/Constants.java similarity index 96% rename from src/test/java/com/lambdaworks/apigenerator/Constants.java rename to src/test/java/io/lettuce/apigenerator/Constants.java index 26535efaf5..9c01e624ad 100644 --- a/src/test/java/com/lambdaworks/apigenerator/Constants.java +++ b/src/test/java/io/lettuce/apigenerator/Constants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.apigenerator; +package io.lettuce.apigenerator; import java.io.File; diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java similarity index 92% rename from src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java rename to src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java index a0cb4c791e..5edc38a276 100644 --- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java +++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.apigenerator; +package io.lettuce.apigenerator; import java.io.File; import java.util.ArrayList; @@ -32,7 +32,8 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.github.javaparser.ast.type.ReferenceType; import com.github.javaparser.ast.type.Type; -import com.lambdaworks.redis.internal.LettuceSets; + +import io.lettuce.core.internal.LettuceSets; /** * Create async API based on the templates. @@ -69,9 +70,9 @@ public CreateAsyncApi(String templateName) { String targetPackage; if (templateName.contains("RedisSentinel")) { - targetPackage = "com.lambdaworks.redis.sentinel.api.async"; + targetPackage = "io.lettuce.core.sentinel.api.async"; } else { - targetPackage = "com.lambdaworks.redis.api.async"; + targetPackage = "io.lettuce.core.api.async"; } factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(), @@ -116,7 +117,7 @@ protected Function methodTypeMutator() { * @return */ protected Supplier> importSupplier() { - return () -> Collections.singletonList("com.lambdaworks.redis.RedisFuture"); + return () -> Collections.singletonList("io.lettuce.core.RedisFuture"); } @Test diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java similarity index 94% rename from src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java rename to src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java index 571d6f0aa2..c2177c4c6c 100644 --- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java +++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.apigenerator; +package io.lettuce.apigenerator; import java.io.File; import java.util.ArrayList; @@ -33,7 +33,8 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.github.javaparser.ast.type.ReferenceType; import com.github.javaparser.ast.type.Type; -import com.lambdaworks.redis.internal.LettuceSets; + +import io.lettuce.core.internal.LettuceSets; /** * Create async API based on the templates. @@ -69,7 +70,7 @@ public CreateAsyncNodeSelectionClusterApi(String templateName) { String targetName = templateName.replace("Commands", "AsyncCommands").replace("Redis", "NodeSelection"); File templateFile = new File(Constants.TEMPLATES, "com/lambdaworks/redis/api/" + templateName + ".java"); - String targetPackage = "com.lambdaworks.redis.cluster.api.async"; + String targetPackage = "io.lettuce.core.cluster.api.async"; factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(), methodTypeMutator(), methodFilter(), importSupplier(), null, null); @@ -130,7 +131,7 @@ protected Function methodTypeMutator() { * @return */ protected Supplier> importSupplier() { - return () -> Collections.singletonList("com.lambdaworks.redis.RedisFuture"); + return () -> Collections.singletonList("io.lettuce.core.RedisFuture"); } @Test diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java similarity index 95% rename from src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java rename to src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java index dae8a7b7ef..2eecf76a80 100644 --- a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java +++ b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.apigenerator; +package io.lettuce.apigenerator; import java.io.File; import java.util.*; import java.util.function.Function; -import java.util.function.Predicate; import java.util.function.Supplier; import org.junit.Test; @@ -31,11 +30,12 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.github.javaparser.ast.type.ReferenceType; import com.github.javaparser.ast.type.Type; -import com.lambdaworks.redis.internal.LettuceSets; + +import io.lettuce.core.internal.LettuceSets; /** * Create reactive API based on the templates. - * + * * @author Mark Paluch */ @RunWith(Parameterized.class) @@ -80,9 +80,9 @@ public CreateReactiveApi(String templateName) { String targetPackage; if (templateName.contains("RedisSentinel")) { - targetPackage = "com.lambdaworks.redis.sentinel.api.reactive"; + targetPackage = "io.lettuce.core.sentinel.api.reactive"; } else { - targetPackage = "com.lambdaworks.redis.api.reactive"; + targetPackage = "io.lettuce.core.api.reactive"; } factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(), @@ -91,7 +91,7 @@ public CreateReactiveApi(String templateName) { /** * Mutate type comment. - * + * * @return */ protected Function commentMutator() { @@ -111,7 +111,7 @@ protected Function methodCommentMutator() { /** * Mutate type to async result. - * + * * @return */ protected Function methodTypeMutator() { @@ -170,7 +170,7 @@ private String getResultType(MethodDeclaration method, /** * Supply additional imports. - * + * * @return */ protected Supplier> importSupplier() { diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java similarity index 93% rename from src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java rename to src/test/java/io/lettuce/apigenerator/CreateSyncApi.java index 843dff8191..06d19c6fd5 100644 --- a/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java +++ b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.apigenerator; +package io.lettuce.apigenerator; import java.io.File; import java.util.ArrayList; @@ -24,18 +24,19 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; -import com.lambdaworks.redis.internal.LettuceSets; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.type.Type; +import io.lettuce.core.internal.LettuceSets; + /** * Create sync API based on the templates. - * + * * @author Mark Paluch */ @RunWith(Parameterized.class) @@ -67,9 +68,9 @@ public CreateSyncApi(String templateName) { String targetPackage; if (templateName.contains("RedisSentinel")) { - targetPackage = "com.lambdaworks.redis.sentinel.api.sync"; + targetPackage = "io.lettuce.core.sentinel.api.sync"; } else { - targetPackage = "com.lambdaworks.redis.api.sync"; + targetPackage = "io.lettuce.core.api.sync"; } factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(), @@ -78,7 +79,7 @@ public CreateSyncApi(String templateName) { /** * Mutate type comment. - * + * * @return */ protected Function commentMutator() { @@ -105,7 +106,7 @@ protected Predicate methodFilter() { /** * Mutate type to async result. - * + * * @return */ protected Function methodTypeMutator() { @@ -114,7 +115,7 @@ protected Function methodTypeMutator() { /** * Supply additional imports. - * + * * @return */ protected Supplier> importSupplier() { diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java similarity index 96% rename from src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java rename to src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java index 990c6025c1..19cc29ecb8 100644 --- a/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java +++ b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.apigenerator; +package io.lettuce.apigenerator; import java.io.File; import java.util.ArrayList; @@ -33,7 +33,8 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.github.javaparser.ast.type.ReferenceType; import com.github.javaparser.ast.type.Type; -import com.lambdaworks.redis.internal.LettuceSets; + +import io.lettuce.core.internal.LettuceSets; /** * Create sync API based on the templates. @@ -69,7 +70,7 @@ public CreateSyncNodeSelectionClusterApi(String templateName) { String targetName = templateName.replace("Redis", "NodeSelection"); File templateFile = new File(Constants.TEMPLATES, "com/lambdaworks/redis/api/" + templateName + ".java"); - String targetPackage = "com.lambdaworks.redis.cluster.api.sync"; + String targetPackage = "io.lettuce.core.cluster.api.sync"; // todo: remove AutoCloseable from BaseNodeSelectionAsyncCommands factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(), diff --git a/src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java b/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java similarity index 96% rename from src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java rename to src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java index e3e25f79b2..158bd79ba1 100644 --- a/src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java +++ b/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.apigenerator; +package io.lettuce.apigenerator; import org.junit.runner.RunWith; import org.junit.runners.Suite; /** * Entrypoint to generate all Redis command interfaces from {@code src/main/templates}. - * + * * @author Mark Paluch */ @RunWith(Suite.class) diff --git a/src/test/java/com/lambdaworks/category/SlowTests.java b/src/test/java/io/lettuce/category/SlowTests.java similarity index 95% rename from src/test/java/com/lambdaworks/category/SlowTests.java rename to src/test/java/io/lettuce/category/SlowTests.java index 77d4836f2c..7b173ad8f5 100644 --- a/src/test/java/com/lambdaworks/category/SlowTests.java +++ b/src/test/java/io/lettuce/category/SlowTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.category; +package io.lettuce.category; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/codec/CRC16Test.java b/src/test/java/io/lettuce/codec/CRC16Test.java similarity index 97% rename from src/test/java/com/lambdaworks/codec/CRC16Test.java rename to src/test/java/io/lettuce/codec/CRC16Test.java index 94399b7df0..e0338dec1b 100644 --- a/src/test/java/com/lambdaworks/codec/CRC16Test.java +++ b/src/test/java/io/lettuce/codec/CRC16Test.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.codec; +package io.lettuce.codec; import static org.assertj.core.api.Assertions.assertThat; @@ -24,6 +24,8 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import io.lettuce.core.codec.CRC16; + @RunWith(Parameterized.class) public class CRC16Test { diff --git a/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java rename to src/test/java/io/lettuce/core/AbstractRedisClientTest.java index 23a4b3d9c7..3343eb58e5 100644 --- a/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java +++ b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java @@ -13,15 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.api.StatefulConnection; +import io.lettuce.TestClientResources; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; -import com.lambdaworks.redis.api.sync.RedisCommands; +import io.lettuce.core.api.sync.RedisCommands; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/AbstractTest.java b/src/test/java/io/lettuce/core/AbstractTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/AbstractTest.java rename to src/test/java/io/lettuce/core/AbstractTest.java index df3e32a3c7..5cafe4fc3e 100644 --- a/src/test/java/com/lambdaworks/redis/AbstractTest.java +++ b/src/test/java/io/lettuce/core/AbstractTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.Arrays; import java.util.List; @@ -23,8 +23,8 @@ import org.apache.logging.log4j.Logger; import org.junit.Rule; -import com.lambdaworks.LoggingTestRule; -import com.lambdaworks.redis.internal.LettuceSets; +import io.lettuce.LoggingTestRule; +import io.lettuce.core.internal.LettuceSets; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java b/src/test/java/io/lettuce/core/AllTheAPIsTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java rename to src/test/java/io/lettuce/core/AllTheAPIsTest.java index 313807ae8b..1c103c7431 100644 --- a/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java +++ b/src/test/java/io/lettuce/core/AllTheAPIsTest.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.TestClientResources; +import io.lettuce.TestClientResources; import org.junit.BeforeClass; import org.junit.Test; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.async.AsyncNodeSelection; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.async.AsyncNodeSelection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java b/src/test/java/io/lettuce/core/AsyncConnectionTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java rename to src/test/java/io/lettuce/core/AsyncConnectionTest.java index 3805e1a61a..3ce0bdbfc1 100644 --- a/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java +++ b/src/test/java/io/lettuce/core/AsyncConnectionTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; @@ -28,7 +28,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; +import io.lettuce.core.api.async.RedisAsyncCommands; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java b/src/test/java/io/lettuce/core/ClientMetricsTest.java similarity index 88% rename from src/test/java/com/lambdaworks/redis/ClientMetricsTest.java rename to src/test/java/io/lettuce/core/ClientMetricsTest.java index 08eb79f874..fe2529c680 100644 --- a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java +++ b/src/test/java/io/lettuce/core/ClientMetricsTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.AbstractRedisClientTest.client; +import static io.lettuce.core.AbstractRedisClientTest.client; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; @@ -33,14 +33,14 @@ import reactor.core.publisher.Flux; import reactor.test.StepVerifier; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.event.EventBus; -import com.lambdaworks.redis.event.metrics.CommandLatencyEvent; -import com.lambdaworks.redis.event.metrics.MetricEventPublisher; -import com.lambdaworks.redis.metrics.CommandLatencyId; -import com.lambdaworks.redis.metrics.CommandMetrics; +import io.lettuce.TestClientResources; +import io.lettuce.Wait; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.event.EventBus; +import io.lettuce.core.event.metrics.CommandLatencyEvent; +import io.lettuce.core.event.metrics.MetricEventPublisher; +import io.lettuce.core.metrics.CommandLatencyId; +import io.lettuce.core.metrics.CommandMetrics; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java b/src/test/java/io/lettuce/core/ClientOptionsTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/ClientOptionsTest.java rename to src/test/java/io/lettuce/core/ClientOptionsTest.java index cca2db8f1f..fadd50f8e7 100644 --- a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java +++ b/src/test/java/io/lettuce/core/ClientOptionsTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.ConnectionTestUtil.getChannel; -import static com.lambdaworks.ConnectionTestUtil.getConnectionWatchdog; +import static io.lettuce.ConnectionTestUtil.getChannel; +import static io.lettuce.ConnectionTestUtil.getConnectionWatchdog; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -25,13 +25,13 @@ import org.junit.Test; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.*; +import io.lettuce.Wait; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.*; import io.netty.channel.Channel; diff --git a/src/test/java/com/lambdaworks/redis/ClientTest.java b/src/test/java/io/lettuce/core/ClientTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/ClientTest.java rename to src/test/java/io/lettuce/core/ClientTest.java index 0480b83854..898f70bf79 100644 --- a/src/test/java/com/lambdaworks/redis/ClientTest.java +++ b/src/test/java/io/lettuce/core/ClientTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; @@ -25,13 +25,13 @@ import org.junit.rules.ExpectedException; import org.junit.runners.MethodSorters; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandWrapper; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.TestClientResources; +import io.lettuce.Wait; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandWrapper; +import io.lettuce.core.protocol.RedisCommand; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java b/src/test/java/io/lettuce/core/ConnectionCommandTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java rename to src/test/java/io/lettuce/core/ConnectionCommandTest.java index 342a450f9b..6825bcd175 100644 --- a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java +++ b/src/test/java/io/lettuce/core/ConnectionCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -25,9 +25,9 @@ import org.junit.runners.MethodSorters; import org.springframework.test.util.ReflectionTestUtils; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.sync.RedisCommands; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java b/src/test/java/io/lettuce/core/CustomCodecTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/CustomCodecTest.java rename to src/test/java/io/lettuce/core/CustomCodecTest.java index ff60315e10..674b9a9626 100644 --- a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java +++ b/src/test/java/io/lettuce/core/CustomCodecTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; @@ -26,11 +26,11 @@ import reactor.test.StepVerifier; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.codec.CompressionCodec; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.codec.CompressionCodec; +import io.lettuce.core.codec.RedisCodec; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/DefaultRedisClient.java b/src/test/java/io/lettuce/core/DefaultRedisClient.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/DefaultRedisClient.java rename to src/test/java/io/lettuce/core/DefaultRedisClient.java index c539c20314..e2ad0a3b0e 100644 --- a/src/test/java/com/lambdaworks/redis/DefaultRedisClient.java +++ b/src/test/java/io/lettuce/core/DefaultRedisClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.concurrent.TimeUnit; @@ -38,7 +38,7 @@ public void run() { /** * Do not close the client. - * + * * @return the default redis client for the tests. */ public static RedisClient get() { diff --git a/src/test/java/com/lambdaworks/redis/FastShutdown.java b/src/test/java/io/lettuce/core/FastShutdown.java similarity index 92% rename from src/test/java/com/lambdaworks/redis/FastShutdown.java rename to src/test/java/io/lettuce/core/FastShutdown.java index 8f8a67b57d..d6f8192661 100644 --- a/src/test/java/com/lambdaworks/redis/FastShutdown.java +++ b/src/test/java/io/lettuce/core/FastShutdown.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.resource.ClientResources; /** * @author Mark Paluch @@ -26,7 +26,7 @@ public class FastShutdown { /** * Shut down a {@link AbstractRedisClient} with a timeout of 10ms. - * + * * @param redisClient */ public static void shutdown(AbstractRedisClient redisClient) { diff --git a/src/test/java/com/lambdaworks/redis/GeoModelTest.java b/src/test/java/io/lettuce/core/GeoModelTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/GeoModelTest.java rename to src/test/java/io/lettuce/core/GeoModelTest.java index be531c99bd..89e3d0a11c 100644 --- a/src/test/java/com/lambdaworks/redis/GeoModelTest.java +++ b/src/test/java/io/lettuce/core/GeoModelTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/com/lambdaworks/redis/JavaRuntimeTest.java b/src/test/java/io/lettuce/core/JavaRuntimeTest.java similarity index 90% rename from src/test/java/com/lambdaworks/redis/JavaRuntimeTest.java rename to src/test/java/io/lettuce/core/JavaRuntimeTest.java index 76d6b69888..8a6bed4596 100644 --- a/src/test/java/com/lambdaworks/redis/JavaRuntimeTest.java +++ b/src/test/java/io/lettuce/core/JavaRuntimeTest.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.startsWith; import static org.junit.Assume.assumeThat; -import com.lambdaworks.redis.internal.LettuceClassUtils; +import io.lettuce.core.internal.LettuceClassUtils; import org.junit.Test; -import com.lambdaworks.redis.internal.LettuceAssert; +import io.lettuce.core.internal.LettuceAssert; public class JavaRuntimeTest { diff --git a/src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java b/src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java similarity index 88% rename from src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java rename to src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java index 038cb6a7c1..d9ae72d1f3 100644 --- a/src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java +++ b/src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.LinkedHashMap; import java.util.Map; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.KeyValueStreamingChannel; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.KeyValueStreamingChannel; /** * Adapter for a {@link KeyStreamingChannel}. Stores the output in a map. - * + * * @param Key type. * @param Value type. * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/KeyValueTest.java b/src/test/java/io/lettuce/core/KeyValueTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/KeyValueTest.java rename to src/test/java/io/lettuce/core/KeyValueTest.java index 99e53789ee..4e4a3bb978 100644 --- a/src/test/java/com/lambdaworks/redis/KeyValueTest.java +++ b/src/test/java/io/lettuce/core/KeyValueTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java b/src/test/java/io/lettuce/core/LettuceFuturesTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java rename to src/test/java/io/lettuce/core/LettuceFuturesTest.java index aa605c13d9..cb7bd91051 100644 --- a/src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java +++ b/src/test/java/io/lettuce/core/LettuceFuturesTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/com/lambdaworks/redis/LimitTest.java b/src/test/java/io/lettuce/core/LimitTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/LimitTest.java rename to src/test/java/io/lettuce/core/LimitTest.java index e6f3e75f80..cbcbf1fc16 100644 --- a/src/test/java/com/lambdaworks/redis/LimitTest.java +++ b/src/test/java/io/lettuce/core/LimitTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java b/src/test/java/io/lettuce/core/ListStreamingAdapter.java similarity index 86% rename from src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java rename to src/test/java/io/lettuce/core/ListStreamingAdapter.java index 9129f0c6fc..271dade297 100644 --- a/src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java +++ b/src/test/java/io/lettuce/core/ListStreamingAdapter.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.ArrayList; import java.util.List; import java.util.Vector; -import com.lambdaworks.redis.output.KeyStreamingChannel; -import com.lambdaworks.redis.output.ScoredValueStreamingChannel; -import com.lambdaworks.redis.output.ValueStreamingChannel; +import io.lettuce.core.output.KeyStreamingChannel; +import io.lettuce.core.output.ScoredValueStreamingChannel; +import io.lettuce.core.output.ValueStreamingChannel; /** * Streaming adapter which stores every key or/and value in a list. This adapter can be used in KeyStreamingChannels and * ValueStreamingChannels. - * + * * @author Mark Paluch * @param Value-Type. * @since 3.0 diff --git a/src/test/java/com/lambdaworks/redis/PipeliningTest.java b/src/test/java/io/lettuce/core/PipeliningTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/PipeliningTest.java rename to src/test/java/io/lettuce/core/PipeliningTest.java index 36fb41036f..2353ea4139 100644 --- a/src/test/java/com/lambdaworks/redis/PipeliningTest.java +++ b/src/test/java/io/lettuce/core/PipeliningTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; @@ -23,8 +23,8 @@ import org.junit.Test; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/PrivateAccessorTest.java b/src/test/java/io/lettuce/core/PrivateAccessorTest.java similarity index 81% rename from src/test/java/com/lambdaworks/redis/PrivateAccessorTest.java rename to src/test/java/io/lettuce/core/PrivateAccessorTest.java index 95908f1b16..c4ae7f168e 100644 --- a/src/test/java/com/lambdaworks/redis/PrivateAccessorTest.java +++ b/src/test/java/io/lettuce/core/PrivateAccessorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; @@ -26,15 +26,15 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import com.lambdaworks.codec.Base16; -import com.lambdaworks.codec.CRC16; -import com.lambdaworks.redis.cluster.SlotHash; -import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser; -import com.lambdaworks.redis.cluster.models.slots.ClusterSlotsParser; -import com.lambdaworks.redis.internal.LettuceLists; -import com.lambdaworks.redis.models.command.CommandDetailParser; -import com.lambdaworks.redis.models.role.RoleParser; -import com.lambdaworks.redis.protocol.LettuceCharsets; +import io.lettuce.core.codec.Base16; +import io.lettuce.core.codec.CRC16; +import io.lettuce.core.cluster.SlotHash; +import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser; +import io.lettuce.core.cluster.models.slots.ClusterSlotsParser; +import io.lettuce.core.internal.LettuceLists; +import io.lettuce.core.models.command.CommandDetailParser; +import io.lettuce.core.models.role.RoleParser; +import io.lettuce.core.protocol.LettuceCharsets; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/RangeTest.java b/src/test/java/io/lettuce/core/RangeTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/RangeTest.java rename to src/test/java/io/lettuce/core/RangeTest.java index 44d5726b1d..6b5a2b04e6 100644 --- a/src/test/java/com/lambdaworks/redis/RangeTest.java +++ b/src/test/java/io/lettuce/core/RangeTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.Range.Boundary.excluding; -import static com.lambdaworks.redis.Range.Boundary.including; +import static io.lettuce.core.Range.Boundary.excluding; +import static io.lettuce.core.Range.Boundary.including; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; diff --git a/src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java rename to src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java index 8d9f3284b8..eb53b6ad23 100644 --- a/src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java +++ b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; @@ -32,12 +32,12 @@ import reactor.core.publisher.Flux; import reactor.core.scheduler.Schedulers; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.metrics.CommandLatencyCollector; -import com.lambdaworks.redis.output.ValueListOutput; -import com.lambdaworks.redis.protocol.*; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.metrics.CommandLatencyCollector; +import io.lettuce.core.output.ValueListOutput; +import io.lettuce.core.protocol.*; +import io.lettuce.core.resource.ClientResources; import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java b/src/test/java/io/lettuce/core/ReactiveConnectionTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java rename to src/test/java/io/lettuce/core/ReactiveConnectionTest.java index 2587d3d824..6addd2b657 100644 --- a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java +++ b/src/test/java/io/lettuce/core/ReactiveConnectionTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static com.google.code.tempusfugit.temporal.Duration.millis; -import static com.lambdaworks.redis.ClientOptions.DisconnectedBehavior.REJECT_COMMANDS; +import static io.lettuce.core.ClientOptions.DisconnectedBehavior.REJECT_COMMANDS; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; @@ -36,10 +36,10 @@ import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import com.lambdaworks.Delay; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; +import io.lettuce.Delay; +import io.lettuce.Wait; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.reactive.RedisReactiveCommands; public class ReactiveConnectionTest extends AbstractRedisClientTest { diff --git a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java b/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java rename to src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java index 14714f2e74..b6f9009de6 100644 --- a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java +++ b/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; @@ -28,10 +28,10 @@ import reactor.test.StepVerifier; -import com.lambdaworks.KeysAndValues; -import com.lambdaworks.redis.GeoArgs.Unit; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; +import io.lettuce.KeysAndValues; +import io.lettuce.core.GeoArgs.Unit; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.reactive.RedisReactiveCommands; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java b/src/test/java/io/lettuce/core/RedisClientConnectionTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java rename to src/test/java/io/lettuce/core/RedisClientConnectionTest.java index 90e8fdf9d8..310e71bd48 100644 --- a/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java +++ b/src/test/java/io/lettuce/core/RedisClientConnectionTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import static com.lambdaworks.redis.RedisURI.Builder.redis; +import static io.lettuce.core.RedisURI.Builder.redis; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import java.util.concurrent.CompletableFuture; @@ -27,11 +27,11 @@ import org.junit.Test; import org.springframework.test.util.ReflectionTestUtils; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/RedisClientFactoryBeanTest.java b/src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/RedisClientFactoryBeanTest.java rename to src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java index 876b9daf08..9798137eda 100644 --- a/src/test/java/com/lambdaworks/redis/RedisClientFactoryBeanTest.java +++ b/src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.redis.support.RedisClientFactoryBean; +import io.lettuce.core.support.RedisClientFactoryBean; public class RedisClientFactoryBeanTest { private RedisClientFactoryBean sut = new RedisClientFactoryBean(); diff --git a/src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java b/src/test/java/io/lettuce/core/RedisClientFactoryTest.java similarity index 92% rename from src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java rename to src/test/java/io/lettuce/core/RedisClientFactoryTest.java index 372bd09c7c..cfe975988d 100644 --- a/src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java +++ b/src/test/java/io/lettuce/core/RedisClientFactoryTest.java @@ -13,15 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; -import com.lambdaworks.TestClientResources; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import io.lettuce.TestClientResources; import org.junit.Test; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.DefaultClientResources; +import io.lettuce.core.resource.ClientResources; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java b/src/test/java/io/lettuce/core/RedisClientListenerTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java rename to src/test/java/io/lettuce/core/RedisClientListenerTest.java index 786e1d76c1..6b76246cfe 100644 --- a/src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java +++ b/src/test/java/io/lettuce/core/RedisClientListenerTest.java @@ -13,27 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static com.google.code.tempusfugit.temporal.Duration.seconds; import static com.google.code.tempusfugit.temporal.WaitFor.waitOrTimeout; import static org.assertj.core.api.Assertions.assertThat; import java.net.SocketAddress; -import java.util.concurrent.TimeUnit; -import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import com.google.code.tempusfugit.temporal.Timeout; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.TestClientResources; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.resource.ClientResources; /** * Integration tests for {@link RedisConnectionStateListener} via {@link RedisClient}. - * + * * @author Mark Paluch */ public class RedisClientListenerTest extends AbstractTest { diff --git a/src/test/java/com/lambdaworks/redis/RedisClientTest.java b/src/test/java/io/lettuce/core/RedisClientTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/RedisClientTest.java rename to src/test/java/io/lettuce/core/RedisClientTest.java index a488f3677a..87b6bc5777 100644 --- a/src/test/java/com/lambdaworks/redis/RedisClientTest.java +++ b/src/test/java/io/lettuce/core/RedisClientTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; @@ -23,9 +23,9 @@ import org.junit.Test; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.DefaultClientResources; -import com.lambdaworks.redis.resource.DefaultEventLoopGroupProvider; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.DefaultClientResources; +import io.lettuce.core.resource.DefaultEventLoopGroupProvider; import io.netty.util.concurrent.EventExecutorGroup; /** diff --git a/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java b/src/test/java/io/lettuce/core/RedisURIBuilderTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java rename to src/test/java/io/lettuce/core/RedisURIBuilderTest.java index 8737991561..1f4ce6d262 100644 --- a/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java +++ b/src/test/java/io/lettuce/core/RedisURIBuilderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/RedisURITest.java b/src/test/java/io/lettuce/core/RedisURITest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/RedisURITest.java rename to src/test/java/io/lettuce/core/RedisURITest.java index f0898ea236..6c4641079f 100644 --- a/src/test/java/com/lambdaworks/redis/RedisURITest.java +++ b/src/test/java/io/lettuce/core/RedisURITest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; @@ -22,7 +22,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.internal.LettuceSets; +import io.lettuce.core.internal.LettuceSets; import org.junit.Test; /** diff --git a/src/test/java/com/lambdaworks/redis/ScanCursorTest.java b/src/test/java/io/lettuce/core/ScanCursorTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/ScanCursorTest.java rename to src/test/java/io/lettuce/core/ScanCursorTest.java index e47fbd5ceb..9d26918c95 100644 --- a/src/test/java/com/lambdaworks/redis/ScanCursorTest.java +++ b/src/test/java/io/lettuce/core/ScanCursorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/ScanIteratorTest.java b/src/test/java/io/lettuce/core/ScanIteratorTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/ScanIteratorTest.java rename to src/test/java/io/lettuce/core/ScanIteratorTest.java index 911bc8462b..7e72610360 100644 --- a/src/test/java/com/lambdaworks/redis/ScanIteratorTest.java +++ b/src/test/java/io/lettuce/core/ScanIteratorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.AssertionsForClassTypes.fail; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; @@ -25,7 +25,7 @@ import org.junit.Test; -import com.lambdaworks.KeysAndValues; +import io.lettuce.KeysAndValues; /** * @author Mark Paluch @@ -232,4 +232,4 @@ public void zsetMultiPass() throws Exception { assertThat(values).containsAll(values); } -} \ No newline at end of file +} diff --git a/src/test/java/com/lambdaworks/redis/ScoredValueStreamingAdapter.java b/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/ScoredValueStreamingAdapter.java rename to src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java index 1b03ac06ee..9a5ec567e8 100644 --- a/src/test/java/com/lambdaworks/redis/ScoredValueStreamingAdapter.java +++ b/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.output.ScoredValueStreamingChannel; +import io.lettuce.core.output.ScoredValueStreamingChannel; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/ScoredValueTest.java b/src/test/java/io/lettuce/core/ScoredValueTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/ScoredValueTest.java rename to src/test/java/io/lettuce/core/ScoredValueTest.java index aec53eed3a..f2d8e5d580 100644 --- a/src/test/java/com/lambdaworks/redis/ScoredValueTest.java +++ b/src/test/java/io/lettuce/core/ScoredValueTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.offset; @@ -41,7 +41,7 @@ public void shouldCreateEmptyScoredValueFromOptional() { public void shouldCreateEmptyValue() { ScoredValue value = ScoredValue.empty(); - + assertThat(value.hasValue()).isFalse(); } diff --git a/src/test/java/com/lambdaworks/redis/SocketOptionsTest.java b/src/test/java/io/lettuce/core/SocketOptionsTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/SocketOptionsTest.java rename to src/test/java/io/lettuce/core/SocketOptionsTest.java index 85051e8740..f7afdde0e4 100644 --- a/src/test/java/com/lambdaworks/redis/SocketOptionsTest.java +++ b/src/test/java/io/lettuce/core/SocketOptionsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/src/test/java/com/lambdaworks/redis/SyncAsyncApiConvergenceTest.java b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/SyncAsyncApiConvergenceTest.java rename to src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java index 905d46c805..4817a257bf 100644 --- a/src/test/java/com/lambdaworks/redis/SyncAsyncApiConvergenceTest.java +++ b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; @@ -25,8 +25,8 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.sync.RedisCommands; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/TestEventLoopGroupProvider.java b/src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java similarity index 88% rename from src/test/java/com/lambdaworks/redis/TestEventLoopGroupProvider.java rename to src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java index 0c5b218ec4..07d1e7becf 100644 --- a/src/test/java/com/lambdaworks/redis/TestEventLoopGroupProvider.java +++ b/src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.resource.DefaultEventLoopGroupProvider; +import io.lettuce.core.resource.DefaultEventLoopGroupProvider; import io.netty.util.concurrent.DefaultPromise; import io.netty.util.concurrent.EventExecutorGroup; @@ -25,10 +25,10 @@ import io.netty.util.concurrent.Promise; /** - * A {@link com.lambdaworks.redis.resource.EventLoopGroupProvider} suitable for testing. Preserves the event loop groups between + * A {@link io.lettuce.core.resource.EventLoopGroupProvider} suitable for testing. Preserves the event loop groups between * tests. Every time a new {@link TestEventLoopGroupProvider} instance is created, shutdown hook is added * {@link Runtime#addShutdownHook(Thread)}. - * + * * @author Mark Paluch */ public class TestEventLoopGroupProvider extends DefaultEventLoopGroupProvider { diff --git a/src/test/java/com/lambdaworks/redis/TestRedisPublisher.java b/src/test/java/io/lettuce/core/TestRedisPublisher.java similarity index 89% rename from src/test/java/com/lambdaworks/redis/TestRedisPublisher.java rename to src/test/java/io/lettuce/core/TestRedisPublisher.java index ff14a1321a..fc7cd67caa 100644 --- a/src/test/java/com/lambdaworks/redis/TestRedisPublisher.java +++ b/src/test/java/io/lettuce/core/TestRedisPublisher.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.function.Supplier; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.protocol.RedisCommand; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/TestSettings.java b/src/test/java/io/lettuce/core/TestSettings.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/TestSettings.java rename to src/test/java/io/lettuce/core/TestSettings.java index a8942940af..15359418c7 100644 --- a/src/test/java/com/lambdaworks/redis/TestSettings.java +++ b/src/test/java/io/lettuce/core/TestSettings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.net.Inet4Address; import java.net.InetAddress; @@ -21,7 +21,7 @@ /** * This class provides settings used while testing. You can override these using system properties. - * + * * @author Mark Paluch */ public class TestSettings { @@ -30,7 +30,7 @@ private TestSettings() { } /** - * + * * @return hostname of your redis instance. Defaults to {@literal localhost}. Can be overriden with * {@code -Dhost=YourHostName} */ diff --git a/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java b/src/test/java/io/lettuce/core/UnixDomainSocketTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java rename to src/test/java/io/lettuce/core/UnixDomainSocketTest.java index b3444fd554..18ddd362b0 100644 --- a/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java +++ b/src/test/java/io/lettuce/core/UnixDomainSocketTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -23,7 +23,7 @@ import java.io.IOException; import java.util.Locale; -import com.lambdaworks.TestClientResources; +import io.lettuce.TestClientResources; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.AfterClass; @@ -31,10 +31,10 @@ import org.junit.Rule; import org.junit.Test; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.sentinel.SentinelRule; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.sentinel.SentinelRule; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; import io.netty.util.internal.SystemPropertyUtil; diff --git a/src/test/java/com/lambdaworks/redis/Utf8StringCodecTest.java b/src/test/java/io/lettuce/core/Utf8StringCodecTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/Utf8StringCodecTest.java rename to src/test/java/io/lettuce/core/Utf8StringCodecTest.java index 908240ae33..896d4d85f3 100644 --- a/src/test/java/com/lambdaworks/redis/Utf8StringCodecTest.java +++ b/src/test/java/io/lettuce/core/Utf8StringCodecTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/ValueTest.java b/src/test/java/io/lettuce/core/ValueTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/ValueTest.java rename to src/test/java/io/lettuce/core/ValueTest.java index 19fd545e11..3a3de5c5a4 100644 --- a/src/test/java/com/lambdaworks/redis/ValueTest.java +++ b/src/test/java/io/lettuce/core/ValueTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java b/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java similarity index 88% rename from src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java rename to src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java index dfb94151f7..6bc200e5df 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java +++ b/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import com.lambdaworks.TestClientResources; +import io.lettuce.TestClientResources; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; -import com.lambdaworks.redis.AbstractTest; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.internal.LettuceLists; +import io.lettuce.core.AbstractTest; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.internal.LettuceLists; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java rename to src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java index 6631c6f848..6c10fadc5b 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java +++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; @@ -26,18 +26,18 @@ import org.junit.Ignore; import org.junit.Test; -import com.lambdaworks.KeysAndValues; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; -import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.KeysAndValues; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands; +import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; +import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; +import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.cluster.api.sync.RedisClusterCommands; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * @author Mark Paluch @@ -171,7 +171,7 @@ public void msetnxCrossSlot() throws Exception { String key = mset.keySet().iterator().next(); Map submap = Collections.singletonMap(key, mset.get(key)); - + assertThat(commands.msetnx(submap).get()).isTrue(); assertThat(commands.msetnx(mset).get()).isFalse(); @@ -594,7 +594,7 @@ private void writeKeysToTwoNodes() { syncCommands.set(KEY_ON_NODE_1, value); syncCommands.set(KEY_ON_NODE_2, value); } - + protected Map prepareMset() { Map mset = new HashMap<>(); for (char c = 'a'; c < 'z'; c++) { diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java rename to src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java index 1fe21cb9da..6f0c8616bc 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java +++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; @@ -29,16 +29,16 @@ import reactor.core.publisher.Flux; import reactor.test.StepVerifier; -import com.lambdaworks.KeysAndValues; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; -import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.KeysAndValues; +import io.lettuce.core.*; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; +import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.cluster.api.sync.RedisClusterCommands; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.util.ReactiveSyncInvocationHandler; import io.netty.util.internal.ConcurrentSet; diff --git a/src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java similarity index 87% rename from src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java rename to src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java index 0180a1875a..8ec8c53cc9 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java +++ b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.codec.ByteArrayCodec; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.codec.ByteArrayCodec; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java rename to src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java index c196599c42..4f7cfc7c4e 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java similarity index 90% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java rename to src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java index 2992b5db2d..c7251cdbb6 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; @@ -28,12 +28,12 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandType; @RunWith(MockitoJUnitRunner.class) public class ClusterCommandInternalsTest { diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java similarity index 90% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java rename to src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java index 67dc03b200..fc60af2542 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java @@ -13,34 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static com.google.code.tempusfugit.temporal.Duration.seconds; import static com.google.code.tempusfugit.temporal.Timeout.timeout; -import static com.lambdaworks.redis.cluster.ClusterTestUtil.getNodeId; +import static io.lettuce.core.cluster.ClusterTestUtil.getNodeId; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; -import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import com.lambdaworks.TestClientResources; +import io.lettuce.TestClientResources; import org.junit.*; import org.junit.runners.MethodSorters; import com.google.code.tempusfugit.temporal.WaitFor; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands; -import com.lambdaworks.redis.cluster.models.slots.ClusterSlotRange; -import com.lambdaworks.redis.cluster.models.slots.ClusterSlotsParser; -import com.lambdaworks.redis.internal.LettuceLists; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; +import io.lettuce.core.cluster.api.sync.RedisClusterCommands; +import io.lettuce.core.cluster.models.slots.ClusterSlotRange; +import io.lettuce.core.cluster.models.slots.ClusterSlotsParser; +import io.lettuce.core.internal.LettuceLists; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ClusterCommandTest extends AbstractClusterTest { diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java similarity index 92% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java rename to src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java index d3a2bef3a7..9456b012ce 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; @@ -22,11 +22,11 @@ import org.junit.Test; -import com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent; -import com.lambdaworks.redis.internal.HostAndPort; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandType; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.cluster.ClusterConnectionProvider.Intent; +import io.lettuce.core.internal.HostAndPort; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandType; +import io.lettuce.core.protocol.RedisCommand; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java similarity index 89% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java rename to src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java index 57f27a1b16..5296dea0fe 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.fail; @@ -31,16 +31,16 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandType; -import com.lambdaworks.redis.protocol.RedisCommand; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.RedisException; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandType; +import io.lettuce.core.protocol.RedisCommand; +import io.lettuce.core.resource.ClientResources; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java rename to src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java index 24cb6666c3..bf98c73a55 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; @@ -28,13 +28,13 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.internal.LettuceLists; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.TestClientResources; +import io.lettuce.core.*; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.internal.LettuceLists; +import io.lettuce.core.resource.ClientResources; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartitionParserTest.java b/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterPartitionParserTest.java rename to src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java index 924e159c98..70a58c9f44 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartitionParserTest.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.hasItem; @@ -25,11 +25,11 @@ import org.junit.Test; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.internal.LettuceLists; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.internal.LettuceLists; public class ClusterPartitionParserTest { diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java similarity index 87% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java rename to src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java index aa0aa94b45..1753f5d94a 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.cluster.ClusterTestUtil.getNodeId; +import static io.lettuce.core.cluster.ClusterTestUtil.getNodeId; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; @@ -25,15 +25,15 @@ import reactor.test.StepVerifier; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands; -import com.lambdaworks.redis.cluster.models.slots.ClusterSlotRange; -import com.lambdaworks.redis.cluster.models.slots.ClusterSlotsParser; -import com.lambdaworks.redis.internal.LettuceLists; +import io.lettuce.TestClientResources; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands; +import io.lettuce.core.cluster.models.slots.ClusterSlotRange; +import io.lettuce.core.cluster.models.slots.ClusterSlotsParser; +import io.lettuce.core.internal.LettuceLists; @FixMethodOrder(MethodSorters.NAME_ASCENDING) @SuppressWarnings("unchecked") diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java b/src/test/java/io/lettuce/core/cluster/ClusterRule.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java rename to src/test/java/io/lettuce/core/cluster/ClusterRule.java index 0719a75051..31be102c4c 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterRule.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.net.InetSocketAddress; import java.util.ArrayList; @@ -30,13 +30,13 @@ import org.junit.runner.Description; import org.junit.runners.model.Statement; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.async.RedisServerAsyncCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; -import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.async.RedisServerAsyncCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; +import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java rename to src/test/java/io/lettuce/core/cluster/ClusterSetup.java index 9afc44cf56..0ec9c549fb 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import java.util.stream.Stream; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.Wait; +import io.lettuce.core.TestSettings; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands; +import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; +import io.lettuce.core.cluster.api.sync.RedisClusterCommands; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java b/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java similarity index 84% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java rename to src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java index 32874e98f2..b0066b294c 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.util.RoutingInvocationHandler; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.sync.RedisClusterCommands; +import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.util.RoutingInvocationHandler; /** * @author Mark Paluch @@ -34,7 +34,7 @@ public class ClusterTestUtil { /** * Retrieve the cluster node Id from the {@code connection}. - * + * * @param connection * @return */ @@ -49,7 +49,7 @@ public static String getNodeId(RedisClusterCommands connection) { /** * Retrieve the {@link RedisClusterNode} from the {@code connection}. - * + * * @param connection * @return */ @@ -66,7 +66,7 @@ public static RedisClusterNode getOwnPartition(RedisClusterCommands connec /** * Flush databases of all cluster nodes. - * + * * @param connection the cluster connection */ public static void flushDatabaseOfAllNodes(StatefulRedisClusterConnection connection) { @@ -82,7 +82,7 @@ public static void flushDatabaseOfAllNodes(StatefulRedisClusterConnection /** * Create an API wrapper which exposes the {@link RedisCommands} API by using internally a cluster connection. - * + * * @param connection * @return */ diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptionsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptionsTest.java rename to src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java index 6e967cbb85..c5e506ffa5 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptionsTest.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; @@ -21,7 +21,7 @@ import org.junit.Test; -import com.lambdaworks.redis.cluster.ClusterTopologyRefreshOptions.RefreshTrigger; +import io.lettuce.core.cluster.ClusterTopologyRefreshOptions.RefreshTrigger; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java rename to src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java index 79c2fc45a0..1729852909 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java +++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; @@ -29,7 +29,7 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.resource.ClientResources; import io.netty.util.concurrent.EventExecutorGroup; diff --git a/src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java similarity index 89% rename from src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java rename to src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java index a4eed8edad..a4619fdfdb 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java +++ b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createMap; -import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createNode; -import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createPartitions; +import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createMap; +import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createNode; +import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createPartitions; import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; @@ -26,9 +26,9 @@ import org.junit.Test; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java rename to src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java index 1449cc017b..626683421c 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java +++ b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createMap; -import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createNode; -import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createPartitions; +import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createMap; +import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createNode; +import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createPartitions; import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; @@ -25,9 +25,9 @@ import org.junit.Test; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java rename to src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java index abdf8b76f2..a45b7a761d 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java +++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.ScriptOutputType.STATUS; +import static io.lettuce.core.ScriptOutputType.STATUS; import static org.assertj.core.api.Assertions.assertThat; import java.util.*; @@ -26,17 +26,17 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.async.AsyncExecutions; -import com.lambdaworks.redis.cluster.api.async.AsyncNodeSelection; -import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.internal.LettuceSets; +import io.lettuce.Wait; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.async.AsyncExecutions; +import io.lettuce.core.cluster.api.async.AsyncNodeSelection; +import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands; +import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.internal.LettuceSets; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java rename to src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java index 30c9a59205..a8c5118796 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java +++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.ScriptOutputType.STATUS; +import static io.lettuce.core.ScriptOutputType.STATUS; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; import java.util.*; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.internal.LettuceSets; +import io.lettuce.core.internal.LettuceSets; import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.RedisCommandExecutionException; -import com.lambdaworks.redis.RedisCommandTimeoutException; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.sync.Executions; -import com.lambdaworks.redis.cluster.api.sync.NodeSelection; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.Wait; +import io.lettuce.core.RedisCommandExecutionException; +import io.lettuce.core.RedisCommandTimeoutException; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.sync.Executions; +import io.lettuce.core.cluster.api.sync.NodeSelection; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java b/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java similarity index 87% rename from src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java rename to src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java index 3e65683f76..73455e622d 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java +++ b/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.*; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/PipelinedRedisFutureTest.java b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/cluster/PipelinedRedisFutureTest.java rename to src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java index dd41522887..5e662ded02 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/PipelinedRedisFutureTest.java +++ b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java similarity index 88% rename from src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java rename to src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java index 0c53a6c2a7..cd03233cf1 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java +++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; @@ -37,22 +37,22 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import com.lambdaworks.Futures; -import com.lambdaworks.redis.ReadFrom; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandType; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.Futures; +import io.lettuce.core.ReadFrom; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.RedisException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.ClusterConnectionProvider.Intent; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandType; +import io.lettuce.core.resource.ClientResources; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java b/src/test/java/io/lettuce/core/cluster/ReadFromTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java rename to src/test/java/io/lettuce/core/cluster/ReadFromTest.java index 42e92e4da3..2d3f64f041 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java +++ b/src/test/java/io/lettuce/core/cluster/ReadFromTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; @@ -24,10 +24,10 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.redis.ReadFrom; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.ReadFrom; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.models.role.RedisNodeDescription; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java similarity index 89% rename from src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java rename to src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java index 7aa4b7206b..839da9754d 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java +++ b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; -import com.lambdaworks.redis.protocol.CommandType; -import com.lambdaworks.redis.protocol.ProtocolKeyword; +import io.lettuce.core.protocol.CommandType; +import io.lettuce.core.protocol.ProtocolKeyword; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java rename to src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java index 900841164d..f604fb693b 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.util.Arrays; import java.util.List; import org.junit.Test; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.internal.LettuceLists; +import io.lettuce.TestClientResources; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.internal.LettuceLists; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java rename to src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java index 9926601184..8f38f3712a 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.RedisClientConnectionTest.CODEC; -import static com.lambdaworks.redis.cluster.ClusterTestUtil.getOwnPartition; +import static io.lettuce.core.RedisClientConnectionTest.CODEC; +import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -30,20 +30,20 @@ import org.junit.runners.MethodSorters; import org.springframework.test.util.ReflectionTestUtils; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.TestClientResources; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.cluster.api.sync.RedisClusterCommands; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; @FixMethodOrder(MethodSorters.NAME_ASCENDING) @SuppressWarnings("unchecked") diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java similarity index 89% rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java rename to src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java index a7558b2bab..5c53842f94 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.TestSettings.*; +import static io.lettuce.core.TestSettings.*; import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; @@ -23,21 +23,21 @@ import java.util.List; import java.util.stream.Collectors; -import com.lambdaworks.TestClientResources; +import io.lettuce.TestClientResources; import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; -import com.lambdaworks.Sockets; -import com.lambdaworks.redis.AbstractTest; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisCommandExecutionException; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.sync.Executions; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.Sockets; +import io.lettuce.core.AbstractTest; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisCommandExecutionException; +import io.lettuce.core.RedisException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.sync.Executions; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java similarity index 89% rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java rename to src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java index 9d1d82ee85..2bfa8a6f31 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; @@ -21,12 +21,12 @@ import org.junit.*; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.ReadFrom; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.TestClientResources; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.ReadFrom; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; @SuppressWarnings("unchecked") public class RedisClusterReadFromTest extends AbstractClusterTest { diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java rename to src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java index 46a2750c0c..45994d1077 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static com.google.code.tempusfugit.temporal.Duration.seconds; import static com.google.code.tempusfugit.temporal.Timeout.timeout; -import static com.lambdaworks.redis.cluster.AbstractClusterTest.createSlots; -import static com.lambdaworks.redis.cluster.ClusterTestUtil.getNodeId; -import static com.lambdaworks.redis.cluster.ClusterTestUtil.getOwnPartition; +import static io.lettuce.core.cluster.AbstractClusterTest.createSlots; +import static io.lettuce.core.cluster.ClusterTestUtil.getNodeId; +import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; @@ -35,22 +35,22 @@ import com.google.code.tempusfugit.temporal.Condition; import com.google.code.tempusfugit.temporal.WaitFor; -import com.lambdaworks.ConnectionTestUtil; -import com.lambdaworks.Futures; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.Wait; -import com.lambdaworks.category.SlowTests; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.ConnectionTestUtil; +import io.lettuce.Futures; +import io.lettuce.TestClientResources; +import io.lettuce.Wait; +import io.lettuce.category.SlowTests; +import io.lettuce.core.*; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands; +import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.cluster.api.sync.RedisClusterCommands; +import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; /** * Test for mutable cluster setup scenarios. diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java similarity index 87% rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java rename to src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java index 8dc5931f8e..41ed471fbf 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java @@ -13,37 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static com.google.code.tempusfugit.temporal.Duration.seconds; import static com.google.code.tempusfugit.temporal.Timeout.timeout; -import static com.lambdaworks.redis.cluster.ClusterTestUtil.getOwnPartition; +import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition; import static org.assertj.core.api.Assertions.assertThat; -import java.util.ArrayList; import java.util.Collections; -import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.lambdaworks.TestClientResources; +import io.lettuce.TestClientResources; import org.junit.*; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.api.sync.RedisCommands; import org.junit.runners.MethodSorters; import com.google.code.tempusfugit.temporal.Duration; import com.google.code.tempusfugit.temporal.ThreadSleep; import com.google.code.tempusfugit.temporal.WaitFor; -import com.lambdaworks.Wait; -import com.lambdaworks.category.SlowTests; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.Wait; +import io.lettuce.category.SlowTests; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; @FixMethodOrder(MethodSorters.NAME_ASCENDING) @SuppressWarnings("unchecked") diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterURIUtilTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterURIUtilTest.java rename to src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java index 334c67e4b1..ed500ace79 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterURIUtilTest.java +++ b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; @@ -22,7 +22,7 @@ import org.junit.Test; -import com.lambdaworks.redis.RedisURI; +import io.lettuce.core.RedisURI; /** * @author Mark Paluch @@ -109,4 +109,4 @@ public void testSslWithPasswordMultipleHosts() { assertThat(host2.getHost()).isEqualTo("host2"); assertThat(host2.getPort()).isEqualTo(6380); } -} \ No newline at end of file +} diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java similarity index 88% rename from src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java rename to src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java index d0cce6d98e..87f6bf9881 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java +++ b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; -import static com.lambdaworks.redis.cluster.ClusterTestUtil.getOwnPartition; +import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition; import static org.assertj.core.api.Assertions.assertThat; import java.util.Collections; @@ -25,14 +25,14 @@ import reactor.test.StepVerifier; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.TestClientResources; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; @FixMethodOrder(MethodSorters.NAME_ASCENDING) @SuppressWarnings("unchecked") diff --git a/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java rename to src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java index 1fba569461..3bfcf81ef6 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java +++ b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; @@ -29,11 +29,11 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.DnsResolvers; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.DnsResolvers; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/ScanIteratorTest.java b/src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/cluster/ScanIteratorTest.java rename to src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java index 964a3963ff..b49c806a19 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/ScanIteratorTest.java +++ b/src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.AssertionsForClassTypes.fail; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; @@ -27,13 +27,13 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.KeysAndValues; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.ScanArgs; -import com.lambdaworks.redis.ScanIterator; -import com.lambdaworks.redis.ScoredValue; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.KeysAndValues; +import io.lettuce.core.KeyValue; +import io.lettuce.core.ScanArgs; +import io.lettuce.core.ScanIterator; +import io.lettuce.core.ScoredValue; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; /** * @author Mark Paluch @@ -250,4 +250,4 @@ public void zsetMultiPass() throws Exception { assertThat(values).containsAll(values); } -} \ No newline at end of file +} diff --git a/src/test/java/com/lambdaworks/redis/cluster/SlotHashTest.java b/src/test/java/io/lettuce/core/cluster/SlotHashTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/cluster/SlotHashTest.java rename to src/test/java/io/lettuce/core/cluster/SlotHashTest.java index a27f40347b..bbd835a14a 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/SlotHashTest.java +++ b/src/test/java/io/lettuce/core/cluster/SlotHashTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java rename to src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java index 2848006669..99fc014b4d 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java +++ b/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -31,11 +31,11 @@ import org.springframework.util.SocketUtils; import org.springframework.util.StopWatch; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.ClusterNodeConnectionFactory.ConnectionKey; -import com.lambdaworks.redis.codec.StringCodec; +import io.lettuce.TestClientResources; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey; +import io.lettuce.core.codec.StringCodec; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java similarity index 87% rename from src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java rename to src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java index 62ee954444..44300baaa9 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java +++ b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.commands; +package io.lettuce.core.cluster.commands; import static org.assertj.core.api.Assertions.assertThat; @@ -24,20 +24,20 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisCommandExecutionException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.cluster.AbstractClusterTest; -import com.lambdaworks.redis.cluster.ClusterTestUtil; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.commands.CustomCommandTest; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.*; +import io.lettuce.TestClientResources; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisCommandExecutionException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.cluster.AbstractClusterTest; +import io.lettuce.core.cluster.ClusterTestUtil; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.commands.CustomCommandTest; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.*; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java similarity index 82% rename from src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java rename to src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java index c9b055a9e7..466f088d8b 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java +++ b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.commands; +package io.lettuce.core.cluster.commands; -import static com.lambdaworks.redis.cluster.ClusterTestUtil.flushDatabaseOfAllNodes; +import static io.lettuce.core.cluster.ClusterTestUtil.flushDatabaseOfAllNodes; -import com.lambdaworks.TestClientResources; +import io.lettuce.TestClientResources; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.ClusterTestUtil; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.commands.GeoCommandTest; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.ClusterTestUtil; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.commands.GeoCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java similarity index 77% rename from src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java rename to src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java index 31b560c282..da7a22cf28 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java +++ b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.commands; +package io.lettuce.core.cluster.commands; -import com.lambdaworks.TestClientResources; +import io.lettuce.TestClientResources; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.ClusterTestUtil; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.commands.HashCommandTest; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.ClusterTestUtil; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.commands.HashCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java similarity index 86% rename from src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java rename to src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java index 564cdf8874..3feba895f0 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java +++ b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.commands; +package io.lettuce.core.cluster.commands; import static org.assertj.core.api.Assertions.assertThat; @@ -22,14 +22,14 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.ClusterTestUtil; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.ClusterTestUtil; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java similarity index 85% rename from src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java rename to src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java index ecf7cd0b57..090569ad20 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java +++ b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java @@ -13,23 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.commands; +package io.lettuce.core.cluster.commands; -import com.lambdaworks.TestClientResources; -import org.assertj.core.api.Assertions; +import io.lettuce.TestClientResources; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.ClusterTestUtil; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.commands.ListCommandTest; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.ClusterTestUtil; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.commands.ListCommandTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java similarity index 85% rename from src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java rename to src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java index 43e7068059..59976dfe6b 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java +++ b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java @@ -13,26 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.commands; +package io.lettuce.core.cluster.commands; import static org.assertj.core.api.Assertions.assertThat; import java.util.LinkedHashMap; import java.util.Map; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.*; +import io.lettuce.TestClientResources; +import io.lettuce.core.*; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.ClusterTestUtil; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.commands.StringCommandTest; -import com.lambdaworks.redis.internal.LettuceSets; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.ClusterTestUtil; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.commands.StringCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java similarity index 75% rename from src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java rename to src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java index 7f2a7c10db..cf22f3ce9d 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.commands.reactive; +package io.lettuce.core.cluster.commands.reactive; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.ClusterTestUtil; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.commands.HashCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.ClusterTestUtil; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.commands.HashCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java similarity index 73% rename from src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java rename to src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java index 4849012feb..9d30831e01 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java +++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.commands.reactive; +package io.lettuce.core.cluster.commands.reactive; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.TestClientResources; +import io.lettuce.util.ReactiveSyncInvocationHandler; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.ClusterTestUtil; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.commands.KeyClusterCommandTest; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.ClusterTestUtil; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.commands.KeyClusterCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java similarity index 85% rename from src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java rename to src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java index 13748e51d9..a506bc44b2 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.commands.reactive; +package io.lettuce.core.cluster.commands.reactive; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.ClusterTestUtil; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.commands.ListCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.ClusterTestUtil; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.commands.ListCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java similarity index 80% rename from src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java rename to src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java index 1e64223e86..b4e1890fb6 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.commands.reactive; +package io.lettuce.core.cluster.commands.reactive; import static org.assertj.core.api.Assertions.assertThat; @@ -28,17 +28,17 @@ import reactor.core.publisher.Flux; import reactor.test.StepVerifier; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.ClusterTestUtil; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; -import com.lambdaworks.redis.commands.StringCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.KeyValue; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.ClusterTestUtil; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; +import io.lettuce.core.commands.StringCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/models/partitions/PartitionsTest.java b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/cluster/models/partitions/PartitionsTest.java rename to src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java index a2aef43e2a..74e6ddc204 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/models/partitions/PartitionsTest.java +++ b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.models.partitions; +package io.lettuce.core.cluster.models.partitions; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; @@ -23,7 +23,7 @@ import org.junit.Test; -import com.lambdaworks.redis.RedisURI; +import io.lettuce.core.RedisURI; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNodeTest.java b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNodeTest.java rename to src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java index ec02b1c15f..1483f8d20c 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNodeTest.java +++ b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.models.partitions; +package io.lettuce.core.cluster.models.partitions; import static org.assertj.core.api.Assertions.*; import org.junit.Test; -import com.lambdaworks.redis.RedisURI; +import io.lettuce.core.RedisURI; public class RedisClusterNodeTest { @Test diff --git a/src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java rename to src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java index 6e7281b931..b9c682b768 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java +++ b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.models.slots; +package io.lettuce.core.cluster.models.slots; import static org.assertj.core.api.Assertions.assertThat; @@ -23,8 +23,8 @@ import org.junit.Test; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.internal.LettuceLists; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.internal.LettuceLists; @SuppressWarnings("unchecked") public class ClusterSlotsParserTest { diff --git a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java similarity index 89% rename from src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java rename to src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java index b52cf8aedb..f62e0bbc8a 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java +++ b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub; +package io.lettuce.core.cluster.pubsub; import static org.assertj.core.api.Assertions.assertThat; @@ -25,17 +25,17 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.AbstractClusterTest; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.cluster.pubsub.api.async.NodeSelectionPubSubAsyncCommands; -import com.lambdaworks.redis.cluster.pubsub.api.async.PubSubAsyncNodeSelection; -import com.lambdaworks.redis.cluster.pubsub.api.reactive.NodeSelectionPubSubReactiveCommands; -import com.lambdaworks.redis.cluster.pubsub.api.reactive.PubSubReactiveNodeSelection; -import com.lambdaworks.redis.cluster.pubsub.api.sync.NodeSelectionPubSubCommands; -import com.lambdaworks.redis.cluster.pubsub.api.sync.PubSubNodeSelection; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; -import com.lambdaworks.redis.support.PubSubTestListener; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.AbstractClusterTest; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.cluster.pubsub.api.async.NodeSelectionPubSubAsyncCommands; +import io.lettuce.core.cluster.pubsub.api.async.PubSubAsyncNodeSelection; +import io.lettuce.core.cluster.pubsub.api.reactive.NodeSelectionPubSubReactiveCommands; +import io.lettuce.core.cluster.pubsub.api.reactive.PubSubReactiveNodeSelection; +import io.lettuce.core.cluster.pubsub.api.sync.NodeSelectionPubSubCommands; +import io.lettuce.core.cluster.pubsub.api.sync.PubSubNodeSelection; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.support.PubSubTestListener; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubConnectionTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubConnectionTest.java rename to src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java index d3ef4ebcdf..d5012241ef 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubConnectionTest.java +++ b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.pubsub; +package io.lettuce.core.cluster.pubsub; import static org.assertj.core.api.Assertions.assertThat; @@ -23,12 +23,12 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.AbstractClusterTest; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; -import com.lambdaworks.redis.support.PubSubTestListener; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.AbstractClusterTest; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.support.PubSubTestListener; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java rename to src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java index 9aa8a35752..e6c2b7fb3b 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java +++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -35,21 +35,21 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import com.lambdaworks.Futures; -import com.lambdaworks.redis.ConnectionFuture; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.protocol.CommandType; -import com.lambdaworks.redis.protocol.RedisCommand; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.DnsResolvers; +import io.lettuce.Futures; +import io.lettuce.core.ConnectionFuture; +import io.lettuce.core.RedisException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.protocol.CommandType; +import io.lettuce.core.protocol.RedisCommand; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.DnsResolvers; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViewsTest.java b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViewsTest.java rename to src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java index c2e1e34416..daf6843093 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViewsTest.java +++ b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; import static org.assertj.core.api.Assertions.assertThat; @@ -22,7 +22,7 @@ import org.junit.Test; -import com.lambdaworks.redis.RedisURI; +import io.lettuce.core.RedisURI; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/RequestsTest.java b/src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/cluster/topology/RequestsTest.java rename to src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java index 89e62d564b..d31bd32f37 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/topology/RequestsTest.java +++ b/src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; import static org.assertj.core.api.Assertions.assertThat; @@ -22,11 +22,11 @@ import org.junit.Test; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.RedisURI; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandType; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyComparatorsTest.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/cluster/topology/TopologyComparatorsTest.java rename to src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java index 4512f5c5cf..4366baafdf 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyComparatorsTest.java +++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; -import static com.lambdaworks.redis.cluster.topology.TopologyComparators.isChanged; +import static io.lettuce.core.cluster.topology.TopologyComparators.isChanged; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.util.Lists.newArrayList; import java.util.*; -import com.lambdaworks.redis.RedisURI; +import io.lettuce.core.RedisURI; import org.junit.Test; -import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.internal.LettuceLists; +import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.internal.LettuceLists; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java rename to src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java index 6c7ce2f9f1..c1669d7e0e 100644 --- a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java +++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster.topology; +package io.lettuce.core.cluster.topology; import static org.assertj.core.api.Assertions.assertThat; @@ -27,21 +27,21 @@ import org.junit.Test; import org.springframework.test.util.ReflectionTestUtils; -import com.lambdaworks.Wait; -import com.lambdaworks.category.SlowTests; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.async.BaseRedisAsyncCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.AbstractClusterTest; -import com.lambdaworks.redis.cluster.ClusterClientOptions; -import com.lambdaworks.redis.cluster.ClusterTopologyRefreshOptions; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; +import io.lettuce.Wait; +import io.lettuce.category.SlowTests; +import io.lettuce.core.*; +import io.lettuce.core.api.async.BaseRedisAsyncCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.AbstractClusterTest; +import io.lettuce.core.cluster.ClusterClientOptions; +import io.lettuce.core.cluster.ClusterTopologyRefreshOptions; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands; +import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; import io.netty.util.concurrent.ScheduledFuture; diff --git a/src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java b/src/test/java/io/lettuce/core/codec/CompressionCodecTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java rename to src/test/java/io/lettuce/core/codec/CompressionCodecTest.java index 82201b36b2..5671ffb9fd 100644 --- a/src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java +++ b/src/test/java/io/lettuce/core/codec/CompressionCodecTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/codec/StringCodecTest.java b/src/test/java/io/lettuce/core/codec/StringCodecTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/codec/StringCodecTest.java rename to src/test/java/io/lettuce/core/codec/StringCodecTest.java index 81c38dddc5..2eafa1180a 100644 --- a/src/test/java/com/lambdaworks/redis/codec/StringCodecTest.java +++ b/src/test/java/io/lettuce/core/codec/StringCodecTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; import static org.assertj.core.api.Assertions.assertThat; @@ -22,7 +22,7 @@ import org.junit.Test; -import com.lambdaworks.redis.protocol.LettuceCharsets; +import io.lettuce.core.protocol.LettuceCharsets; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java b/src/test/java/io/lettuce/core/commands/BitCommandTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java rename to src/test/java/io/lettuce/core/commands/BitCommandTest.java index 96c432a495..75214b6101 100644 --- a/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/BitCommandTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; -import static com.lambdaworks.redis.BitFieldArgs.offset; -import static com.lambdaworks.redis.BitFieldArgs.signed; -import static com.lambdaworks.redis.BitFieldArgs.typeWidthBasedOffset; -import static com.lambdaworks.redis.BitFieldArgs.unsigned; -import static com.lambdaworks.redis.BitFieldArgs.OverflowType.WRAP; +import static io.lettuce.core.BitFieldArgs.offset; +import static io.lettuce.core.BitFieldArgs.signed; +import static io.lettuce.core.BitFieldArgs.typeWidthBasedOffset; +import static io.lettuce.core.BitFieldArgs.unsigned; +import static io.lettuce.core.BitFieldArgs.OverflowType.WRAP; import static org.assertj.core.api.Assertions.assertThat; import java.nio.ByteBuffer; @@ -27,10 +27,10 @@ import org.junit.Test; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.BitFieldArgs; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.codec.Utf8StringCodec; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.BitFieldArgs; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.codec.Utf8StringCodec; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java b/src/test/java/io/lettuce/core/commands/CustomCommandTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java rename to src/test/java/io/lettuce/core/commands/CustomCommandTest.java index eb7dedee8c..e80a852d48 100644 --- a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/CustomCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; @@ -22,13 +22,13 @@ import org.junit.Test; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.RedisCommandExecutionException; -import com.lambdaworks.redis.TransactionResult; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.*; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.RedisCommandExecutionException; +import io.lettuce.core.TransactionResult; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.*; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java rename to src/test/java/io/lettuce/core/commands/GeoCommandTest.java index 5e3ceec851..0e2db3051f 100644 --- a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.offset; @@ -25,7 +25,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import com.lambdaworks.redis.*; +import io.lettuce.core.*; public class GeoCommandTest extends AbstractRedisClientTest { diff --git a/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java b/src/test/java/io/lettuce/core/commands/HLLCommandTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java rename to src/test/java/io/lettuce/core/commands/HLLCommandTest.java index 28075f4a06..e2dd07792c 100644 --- a/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/HLLCommandTest.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; -import com.lambdaworks.redis.cluster.SlotHash; +import io.lettuce.core.cluster.SlotHash; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.api.sync.RedisHLLCommands; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.api.sync.RedisHLLCommands; public class HLLCommandTest extends AbstractRedisClientTest { @Rule diff --git a/src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java b/src/test/java/io/lettuce/core/commands/HashCommandTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java rename to src/test/java/io/lettuce/core/commands/HashCommandTest.java index afc3dc969e..f09e8858aa 100644 --- a/src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/HashCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.offset; @@ -26,7 +26,7 @@ import org.junit.Test; -import com.lambdaworks.redis.*; +import io.lettuce.core.*; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java rename to src/test/java/io/lettuce/core/commands/KeyCommandTest.java index bafb01aa18..a82f6bcb60 100644 --- a/src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotEquals; @@ -24,7 +24,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import com.lambdaworks.redis.*; +import io.lettuce.core.*; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/commands/ListCommandTest.java b/src/test/java/io/lettuce/core/commands/ListCommandTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/commands/ListCommandTest.java rename to src/test/java/io/lettuce/core/commands/ListCommandTest.java index ae18b23c2c..2a98569785 100644 --- a/src/test/java/com/lambdaworks/redis/commands/ListCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/ListCommandTest.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.ListStreamingAdapter; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.ListStreamingAdapter; import org.assertj.core.api.Assertions; import org.junit.Test; diff --git a/src/test/java/com/lambdaworks/redis/commands/NumericCommandTest.java b/src/test/java/io/lettuce/core/commands/NumericCommandTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/commands/NumericCommandTest.java rename to src/test/java/io/lettuce/core/commands/NumericCommandTest.java index 93306c6079..edf32da9ea 100644 --- a/src/test/java/com/lambdaworks/redis/commands/NumericCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/NumericCommandTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.offset; -import com.lambdaworks.redis.AbstractRedisClientTest; +import io.lettuce.core.AbstractRedisClientTest; import org.assertj.core.api.Assertions; import org.junit.Test; diff --git a/src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java similarity index 90% rename from src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java rename to src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java index fedf43693c..9c71dc5f5a 100644 --- a/src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; import static com.google.code.tempusfugit.temporal.Duration.seconds; import static com.google.code.tempusfugit.temporal.Timeout.timeout; -import static com.lambdaworks.redis.TestSettings.host; -import static com.lambdaworks.redis.TestSettings.port; +import static io.lettuce.core.TestSettings.host; +import static io.lettuce.core.TestSettings.port; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; @@ -29,12 +29,12 @@ import org.junit.runners.MethodSorters; import com.google.code.tempusfugit.temporal.WaitFor; -import com.lambdaworks.CanConnect; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.MigrateArgs; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; +import io.lettuce.CanConnect; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.MigrateArgs; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.async.RedisAsyncCommands; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java rename to src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java index d41050c1f5..6006959f39 100644 --- a/src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; -import static com.lambdaworks.redis.ScriptOutputType.*; +import static io.lettuce.core.ScriptOutputType.*; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; @@ -27,10 +27,10 @@ import org.junit.rules.ExpectedException; import org.junit.runners.MethodSorters; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.api.StatefulRedisConnection; +import io.lettuce.Wait; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.RedisException; +import io.lettuce.core.api.StatefulRedisConnection; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java rename to src/test/java/io/lettuce/core/commands/ServerCommandTest.java index c6cc1cd9f5..69a97f906d 100644 --- a/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.containsString; @@ -29,15 +29,15 @@ import org.junit.Test; import org.junit.runners.MethodSorters; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.models.command.CommandDetail; -import com.lambdaworks.redis.models.command.CommandDetailParser; -import com.lambdaworks.redis.models.role.RedisInstance; -import com.lambdaworks.redis.models.role.RoleParser; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.KillArgs; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.models.command.CommandDetail; +import io.lettuce.core.models.command.CommandDetailParser; +import io.lettuce.core.models.role.RedisInstance; +import io.lettuce.core.models.role.RoleParser; +import io.lettuce.core.protocol.CommandType; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/commands/SetCommandTest.java b/src/test/java/io/lettuce/core/commands/SetCommandTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/commands/SetCommandTest.java rename to src/test/java/io/lettuce/core/commands/SetCommandTest.java index 032b292c0e..e220426262 100644 --- a/src/test/java/com/lambdaworks/redis/commands/SetCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/SetCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; import static org.assertj.core.api.Assertions.assertThat; @@ -24,7 +24,7 @@ import org.junit.Test; -import com.lambdaworks.redis.*; +import io.lettuce.core.*; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/commands/SortCommandTest.java b/src/test/java/io/lettuce/core/commands/SortCommandTest.java similarity index 86% rename from src/test/java/com/lambdaworks/redis/commands/SortCommandTest.java rename to src/test/java/io/lettuce/core/commands/SortCommandTest.java index bc267bb2ea..61f9c06481 100644 --- a/src/test/java/com/lambdaworks/redis/commands/SortCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/SortCommandTest.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; -import static com.lambdaworks.redis.SortArgs.Builder.alpha; -import static com.lambdaworks.redis.SortArgs.Builder.asc; -import static com.lambdaworks.redis.SortArgs.Builder.by; -import static com.lambdaworks.redis.SortArgs.Builder.desc; -import static com.lambdaworks.redis.SortArgs.Builder.get; -import static com.lambdaworks.redis.SortArgs.Builder.limit; +import static io.lettuce.core.SortArgs.Builder.alpha; +import static io.lettuce.core.SortArgs.Builder.asc; +import static io.lettuce.core.SortArgs.Builder.by; +import static io.lettuce.core.SortArgs.Builder.desc; +import static io.lettuce.core.SortArgs.Builder.get; +import static io.lettuce.core.SortArgs.Builder.limit; import static org.assertj.core.api.Assertions.assertThat; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.ListStreamingAdapter; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.ListStreamingAdapter; import org.assertj.core.api.Assertions; import org.junit.Test; diff --git a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java rename to src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java index 74d88c4b3d..55eeef5949 100644 --- a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; -import static com.lambdaworks.redis.ZStoreArgs.Builder.max; -import static com.lambdaworks.redis.ZStoreArgs.Builder.min; -import static com.lambdaworks.redis.ZStoreArgs.Builder.sum; -import static com.lambdaworks.redis.ZStoreArgs.Builder.weights; +import static io.lettuce.core.ZStoreArgs.Builder.max; +import static io.lettuce.core.ZStoreArgs.Builder.min; +import static io.lettuce.core.ZStoreArgs.Builder.sum; +import static io.lettuce.core.ZStoreArgs.Builder.weights; import static java.lang.Double.NEGATIVE_INFINITY; import static java.lang.Double.POSITIVE_INFINITY; import static org.assertj.core.api.Assertions.assertThat; @@ -29,8 +29,8 @@ import org.junit.Test; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.Range.Boundary; +import io.lettuce.core.*; +import io.lettuce.core.Range.Boundary; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java b/src/test/java/io/lettuce/core/commands/StringCommandTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java rename to src/test/java/io/lettuce/core/commands/StringCommandTest.java index c49b726eb0..b14a6e350c 100644 --- a/src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/StringCommandTest.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; -import static com.lambdaworks.redis.SetArgs.Builder.ex; -import static com.lambdaworks.redis.SetArgs.Builder.nx; -import static com.lambdaworks.redis.SetArgs.Builder.px; -import static com.lambdaworks.redis.SetArgs.Builder.xx; +import static io.lettuce.core.SetArgs.Builder.ex; +import static io.lettuce.core.SetArgs.Builder.nx; +import static io.lettuce.core.SetArgs.Builder.px; +import static io.lettuce.core.SetArgs.Builder.xx; import static org.assertj.core.api.Assertions.assertThat; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.codec.ByteArrayCodec; +import io.lettuce.core.*; +import io.lettuce.core.codec.ByteArrayCodec; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java b/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java similarity index 92% rename from src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java rename to src/test/java/io/lettuce/core/commands/TransactionCommandTest.java index e777f41d26..f5eafd085c 100644 --- a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands; +package io.lettuce.core.commands; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; -import com.lambdaworks.redis.TransactionResult; +import io.lettuce.core.TransactionResult; import org.assertj.core.api.Assertions; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.RedisCommandExecutionException; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.api.sync.RedisCommands; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.RedisCommandExecutionException; +import io.lettuce.core.RedisException; +import io.lettuce.core.api.sync.RedisCommands; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java similarity index 84% rename from src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java index fa5b5a51dc..80e3dd4f2f 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; -import static com.lambdaworks.redis.BitFieldArgs.offset; -import static com.lambdaworks.redis.BitFieldArgs.signed; -import static com.lambdaworks.redis.BitFieldArgs.typeWidthBasedOffset; -import static com.lambdaworks.redis.BitFieldArgs.OverflowType.FAIL; +import static io.lettuce.core.BitFieldArgs.offset; +import static io.lettuce.core.BitFieldArgs.signed; +import static io.lettuce.core.BitFieldArgs.typeWidthBasedOffset; +import static io.lettuce.core.BitFieldArgs.OverflowType.FAIL; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import reactor.test.StepVerifier; -import com.lambdaworks.redis.BitFieldArgs; -import com.lambdaworks.redis.Value; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.reactive.RedisStringReactiveCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.BitCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.BitFieldArgs; +import io.lettuce.core.Value; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.reactive.RedisStringReactiveCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.BitCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java similarity index 79% rename from src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java index 846251c4ec..1fd61026ca 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; import org.junit.Test; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.CustomCommandTest; -import com.lambdaworks.redis.output.ValueListOutput; -import com.lambdaworks.redis.output.ValueOutput; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandType; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.api.reactive.RedisReactiveCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.CustomCommandTest; +import io.lettuce.core.output.ValueListOutput; +import io.lettuce.core.output.ValueOutput; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandType; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java similarity index 86% rename from src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java index 40ccee4367..397b6baddd 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.offset; @@ -23,10 +23,10 @@ import reactor.test.StepVerifier; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.GeoCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.api.reactive.RedisReactiveCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.GeoCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java similarity index 80% rename from src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java index bf2a83b507..582ba6cd5c 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.HLLCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.HLLCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java similarity index 80% rename from src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java index 58ce441207..a9cc514648 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.HashCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.HashCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java similarity index 80% rename from src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java index 7e6afc1e83..7d420062d9 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.KeyCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.KeyCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java similarity index 80% rename from src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java index f8cce9ed1d..3e342b6d72 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.ListCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.ListCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java similarity index 79% rename from src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java index 8a830a0028..363a19bfcc 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.NumericCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.NumericCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java similarity index 79% rename from src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java index 112012bb2b..2e253144f4 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.ScriptingCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.ScriptingCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java similarity index 88% rename from src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java index 891bb89e60..7ba61f8d2a 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.ServerCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.api.reactive.RedisReactiveCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.ServerCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java similarity index 80% rename from src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java index 4e18646bb1..5097e4051f 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.SetCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.SetCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java similarity index 80% rename from src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java index 28d02b8177..15e2b66b28 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.SortCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.SortCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java similarity index 79% rename from src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java index 5b82a25fca..cb391868e6 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.SortedSetCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.SortedSetCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java similarity index 85% rename from src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java index 2d323f4c2e..f72ac03849 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; import org.junit.Test; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.StringCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.KeyValue; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.StringCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java rename to src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java index 0dbe835e73..76393876fe 100644 --- a/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.reactive; +package io.lettuce.core.commands.reactive; import static org.assertj.core.api.Assertions.assertThat; @@ -23,14 +23,14 @@ import reactor.test.StepVerifier; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.TransactionCommandTest; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.KeyValue; +import io.lettuce.core.RedisException; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.reactive.RedisReactiveCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.TransactionCommandTest; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java similarity index 85% rename from src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java rename to src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java index 1c72912cc3..cae3ca7598 100644 --- a/src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.transactional; +package io.lettuce.core.commands.transactional; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.BitCommandTest; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.BitCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java rename to src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java index f513054081..039862a3f3 100644 --- a/src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.transactional; +package io.lettuce.core.commands.transactional; import org.junit.Ignore; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.GeoCommandTest; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.GeoCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java similarity index 84% rename from src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java rename to src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java index 31c9feb2e4..5294963d7c 100644 --- a/src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.transactional; +package io.lettuce.core.commands.transactional; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.HLLCommandTest; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.HLLCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java similarity index 84% rename from src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java rename to src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java index 1c641e71b0..77acc48899 100644 --- a/src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.transactional; +package io.lettuce.core.commands.transactional; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.HashCommandTest; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.HashCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java similarity index 85% rename from src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java rename to src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java index d93386a252..891fa91c0b 100644 --- a/src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.transactional; +package io.lettuce.core.commands.transactional; import org.junit.Ignore; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.KeyCommandTest; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.KeyCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java similarity index 84% rename from src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java rename to src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java index b803506e83..42280ac5dd 100644 --- a/src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.transactional; +package io.lettuce.core.commands.transactional; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.ListCommandTest; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.ListCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java similarity index 84% rename from src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java rename to src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java index 50f9849276..4ee98ecabe 100644 --- a/src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.transactional; +package io.lettuce.core.commands.transactional; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.SetCommandTest; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.SetCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java similarity index 84% rename from src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java rename to src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java index 837ecb0dd1..e491f21282 100644 --- a/src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.transactional; +package io.lettuce.core.commands.transactional; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.SortCommandTest; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.SortCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java similarity index 83% rename from src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java rename to src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java index 61ccebb74a..e7b596bc62 100644 --- a/src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.transactional; +package io.lettuce.core.commands.transactional; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.SortedSetCommandTest; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.SortedSetCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java similarity index 83% rename from src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java rename to src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java index da6f4a6746..fc1c037497 100644 --- a/src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java +++ b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.transactional; +package io.lettuce.core.commands.transactional; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.commands.StringCommandTest; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.commands.StringCommandTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java b/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java similarity index 92% rename from src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java rename to src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java index b1fe12c5dd..e055d7cdd0 100644 --- a/src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java +++ b/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.commands.transactional; +package io.lettuce.core.commands.transactional; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.List; -import com.lambdaworks.redis.TransactionResult; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.internal.AbstractInvocationHandler; +import io.lettuce.core.TransactionResult; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.internal.AbstractInvocationHandler; /** * Invocation handler for testing purposes that wraps each call into a transaction. - * + * * @param * @param */ @@ -101,7 +101,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th /** * Create a transactional wrapper proxy for {@link RedisCommands}. - * + * * @param connection the connection * @return the wrapper proxy. */ diff --git a/src/test/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategyTest.java b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java similarity index 90% rename from src/test/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategyTest.java rename to src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java index d89ad82ab1..771628e4c2 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategyTest.java +++ b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; @@ -28,11 +28,11 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.dynamic.domain.Timeout; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactory; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.dynamic.domain.Timeout; +import io.lettuce.core.dynamic.output.CommandOutputFactory; +import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver; /** * @author Mark Paluch @@ -101,4 +101,4 @@ static interface BatchingCommands { void justVoid(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java similarity index 85% rename from src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java rename to src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java index aef5c95b68..08d953fcdb 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java +++ b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; @@ -22,22 +22,22 @@ import org.junit.Test; -import com.lambdaworks.redis.ScanArgs; -import com.lambdaworks.redis.SetArgs; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.dynamic.annotation.Command; -import com.lambdaworks.redis.dynamic.annotation.Param; -import com.lambdaworks.redis.dynamic.annotation.Value; -import com.lambdaworks.redis.dynamic.domain.Timeout; -import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver; -import com.lambdaworks.redis.dynamic.output.OutputRegistry; -import com.lambdaworks.redis.dynamic.output.OutputRegistryCommandOutputFactoryResolver; -import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory; -import com.lambdaworks.redis.dynamic.segment.CommandSegmentFactory; -import com.lambdaworks.redis.dynamic.support.ReflectionUtils; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.ScanArgs; +import io.lettuce.core.SetArgs; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.dynamic.annotation.Command; +import io.lettuce.core.dynamic.annotation.Param; +import io.lettuce.core.dynamic.annotation.Value; +import io.lettuce.core.dynamic.domain.Timeout; +import io.lettuce.core.dynamic.output.CodecAwareOutputFactoryResolver; +import io.lettuce.core.dynamic.output.OutputRegistry; +import io.lettuce.core.dynamic.output.OutputRegistryCommandOutputFactoryResolver; +import io.lettuce.core.dynamic.segment.AnnotationCommandSegmentFactory; +import io.lettuce.core.dynamic.segment.CommandSegmentFactory; +import io.lettuce.core.dynamic.support.ReflectionUtils; +import io.lettuce.core.protocol.RedisCommand; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java b/src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java rename to src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java index b4ae2fbfab..ecae52ad96 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java +++ b/src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/src/test/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethodTest.java b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethodTest.java rename to src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java index 33f3de88ff..6d639de56c 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethodTest.java +++ b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java similarity index 90% rename from src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java rename to src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java index a103deedd7..fc40e07077 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java +++ b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; @@ -24,13 +24,13 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.redis.GeoCoordinates; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.dynamic.segment.CommandSegment; -import com.lambdaworks.redis.dynamic.segment.CommandSegments; -import com.lambdaworks.redis.dynamic.support.ReflectionUtils; -import com.lambdaworks.redis.internal.LettuceLists; -import com.lambdaworks.redis.models.command.CommandDetail; +import io.lettuce.core.GeoCoordinates; +import io.lettuce.core.KeyValue; +import io.lettuce.core.dynamic.segment.CommandSegment; +import io.lettuce.core.dynamic.segment.CommandSegments; +import io.lettuce.core.dynamic.support.ReflectionUtils; +import io.lettuce.core.internal.LettuceLists; +import io.lettuce.core.models.command.CommandDetail; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java b/src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java rename to src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java index 94907b10c9..bd972776fb 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java +++ b/src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; @@ -25,12 +25,12 @@ import org.springframework.util.Base64Utils; import org.springframework.util.ReflectionUtils; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.dynamic.segment.CommandSegment; -import com.lambdaworks.redis.dynamic.segment.CommandSegments; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.*; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.dynamic.segment.CommandSegment; +import io.lettuce.core.dynamic.segment.CommandSegments; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandType; /** * @author Mark Paluch @@ -207,6 +207,6 @@ private interface MyCommands { void justObject(Object object); - void valueRange(@com.lambdaworks.redis.dynamic.annotation.Value Range value); + void valueRange(@io.lettuce.core.dynamic.annotation.Value Range value); } } diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java similarity index 83% rename from src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java rename to src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java index e2616fe812..e6303fdf5b 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java +++ b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -29,14 +29,14 @@ import org.mockito.runners.MockitoJUnitRunner; import org.reactivestreams.Publisher; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.dynamic.domain.Timeout; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactory; -import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver; -import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory; -import com.lambdaworks.redis.dynamic.segment.CommandSegments; -import com.lambdaworks.redis.dynamic.support.ReflectionUtils; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.dynamic.domain.Timeout; +import io.lettuce.core.dynamic.output.CommandOutputFactory; +import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver; +import io.lettuce.core.dynamic.segment.AnnotationCommandSegmentFactory; +import io.lettuce.core.dynamic.segment.CommandSegments; +import io.lettuce.core.dynamic.support.ReflectionUtils; +import io.lettuce.core.protocol.RedisCommand; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java rename to src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java index 3c99cd8a44..c37447113e 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java +++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; @@ -157,4 +157,4 @@ public void toWrapperShouldConvertMonoToFlux() { Mono foo = Mono.just("foo"); assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class); } -} \ No newline at end of file +} diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java rename to src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java index b9f3d9ea3d..2958a43199 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java +++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; @@ -23,8 +23,8 @@ import rx.Observable; import rx.Single; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.dynamic.annotation.Command; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.dynamic.annotation.Command; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsAsyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsAsyncTest.java rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java index b35021bdb5..6bf30ecbf5 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsAsyncTest.java +++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; @@ -22,7 +22,7 @@ import org.junit.Test; -import com.lambdaworks.redis.AbstractRedisClientTest; +import io.lettuce.core.AbstractRedisClientTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsBatchingTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsBatchingTest.java rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java index 2639162fbf..92403093c3 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsBatchingTest.java +++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; @@ -22,15 +22,15 @@ import org.junit.Test; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.LettuceFutures; -import com.lambdaworks.redis.RedisCommandExecutionException; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.dynamic.annotation.Command; -import com.lambdaworks.redis.dynamic.batch.BatchException; -import com.lambdaworks.redis.dynamic.batch.BatchExecutor; -import com.lambdaworks.redis.dynamic.batch.BatchSize; -import com.lambdaworks.redis.dynamic.batch.CommandBatching; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.LettuceFutures; +import io.lettuce.core.RedisCommandExecutionException; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.dynamic.annotation.Command; +import io.lettuce.core.dynamic.batch.BatchException; +import io.lettuce.core.dynamic.batch.BatchExecutor; +import io.lettuce.core.dynamic.batch.BatchSize; +import io.lettuce.core.dynamic.batch.CommandBatching; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsClusterSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java similarity index 83% rename from src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsClusterSyncTest.java rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java index 8b72d28099..2618f8f99e 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsClusterSyncTest.java +++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; @@ -22,17 +22,17 @@ import org.junit.*; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.AbstractTest; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.Value; -import com.lambdaworks.redis.cluster.ClusterRule; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.dynamic.annotation.Command; -import com.lambdaworks.redis.dynamic.domain.Timeout; -import com.lambdaworks.redis.internal.LettuceLists; +import io.lettuce.TestClientResources; +import io.lettuce.core.AbstractTest; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisURI; +import io.lettuce.core.Value; +import io.lettuce.core.cluster.ClusterRule; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.dynamic.annotation.Command; +import io.lettuce.core.dynamic.domain.Timeout; +import io.lettuce.core.internal.LettuceLists; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java similarity index 89% rename from src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java index 9754abb3e0..e245ba9296 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java +++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import org.junit.Test; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.dynamic.annotation.Command; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.dynamic.annotation.Command; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java similarity index 86% rename from src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java index c7afbde633..e8f4fbef0c 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java +++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; @@ -22,12 +22,12 @@ import org.junit.Test; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.Value; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.dynamic.annotation.Command; -import com.lambdaworks.redis.dynamic.domain.Timeout; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.Value; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.dynamic.annotation.Command; +import io.lettuce.core.dynamic.domain.Timeout; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java index 9d30c2831d..976aec1693 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java +++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import org.junit.Test; -import com.lambdaworks.redis.AbstractRedisClientTest; +import io.lettuce.core.AbstractRedisClientTest; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/SimpleBatcherTest.java b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java similarity index 92% rename from src/test/java/com/lambdaworks/redis/dynamic/SimpleBatcherTest.java rename to src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java index 9830d30338..4456773fe8 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/SimpleBatcherTest.java +++ b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; @@ -26,12 +26,12 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.dynamic.batch.CommandBatching; -import com.lambdaworks.redis.protocol.AsyncCommand; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandType; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.dynamic.batch.CommandBatching; +import io.lettuce.core.protocol.AsyncCommand; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandType; +import io.lettuce.core.protocol.RedisCommand; /** * @author Mark Paluch @@ -143,4 +143,4 @@ public void shouldBatchWithBatchControlFlush() { private static RedisCommand createCommand() { return new AsyncCommand<>(new Command<>(CommandType.COMMAND, null, null)); } -} \ No newline at end of file +} diff --git a/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java similarity index 85% rename from src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java rename to src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java index 7f43d0314d..f744093f39 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java +++ b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.codec; +package io.lettuce.core.dynamic.codec; import static org.assertj.core.api.Assertions.assertThat; @@ -25,15 +25,15 @@ import org.junit.Test; -import com.lambdaworks.redis.Range; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.dynamic.CommandMethod; -import com.lambdaworks.redis.dynamic.DeclaredCommandMethod; -import com.lambdaworks.redis.dynamic.annotation.Key; -import com.lambdaworks.redis.dynamic.annotation.Value; -import com.lambdaworks.redis.dynamic.support.ReflectionUtils; +import io.lettuce.core.Range; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.dynamic.CommandMethod; +import io.lettuce.core.dynamic.DeclaredCommandMethod; +import io.lettuce.core.dynamic.annotation.Key; +import io.lettuce.core.dynamic.annotation.Value; +import io.lettuce.core.dynamic.support.ReflectionUtils; /** * @author Mark Paluch @@ -98,7 +98,7 @@ public void resolutionShouldFail() { public void shouldDiscoverCodecTypesFromWrappers() { Method method = ReflectionUtils.findMethod(CommandMethods.class, "withWrappers", Range.class, - com.lambdaworks.redis.Value.class); + io.lettuce.core.Value.class); Set> types = new AnnotationRedisCodecResolver(codecs).findTypes(DeclaredCommandMethod.create(method), Value.class); @@ -128,7 +128,7 @@ private static interface CommandMethods { String mixedTypes(@Key String key, @Value byte[] value); - String withWrappers(@Value Range range, @Value com.lambdaworks.redis.Value value); + String withWrappers(@Value Range range, @Value io.lettuce.core.Value value); String withMap(Map map); } diff --git a/src/test/java/com/lambdaworks/redis/dynamic/codec/ParameterWrappersTest.java b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java similarity index 89% rename from src/test/java/com/lambdaworks/redis/dynamic/codec/ParameterWrappersTest.java rename to src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java index 4747cd283b..d743c7d0a4 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/codec/ParameterWrappersTest.java +++ b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.codec; +package io.lettuce.core.dynamic.codec; import static org.assertj.core.api.Assertions.assertThat; @@ -23,13 +23,13 @@ import org.junit.Test; -import com.lambdaworks.redis.KeyValue; -import com.lambdaworks.redis.Range; -import com.lambdaworks.redis.Value; -import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver.ParameterWrappers; -import com.lambdaworks.redis.dynamic.parameter.Parameter; -import com.lambdaworks.redis.dynamic.support.ReflectionUtils; -import com.lambdaworks.redis.dynamic.support.TypeInformation; +import io.lettuce.core.KeyValue; +import io.lettuce.core.Range; +import io.lettuce.core.Value; +import io.lettuce.core.dynamic.codec.AnnotationRedisCodecResolver.ParameterWrappers; +import io.lettuce.core.dynamic.parameter.Parameter; +import io.lettuce.core.dynamic.support.ReflectionUtils; +import io.lettuce.core.dynamic.support.TypeInformation; /** * @author Mark Paluch @@ -136,12 +136,12 @@ private static interface CommandMethods { String byteArray(byte[] values); - String withWrappers(Range range, com.lambdaworks.redis.Value value, - com.lambdaworks.redis.KeyValue keyValue); + String withWrappers(Range range, io.lettuce.core.Value value, + io.lettuce.core.KeyValue keyValue); String withList(List map); String withMap(Map map); } -} \ No newline at end of file +} diff --git a/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java rename to src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java index 296a9232a9..b3a3dd249e 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java +++ b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.intercept; +package io.lettuce.core.dynamic.intercept; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java similarity index 92% rename from src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java rename to src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java index e6eea7cb66..59628695d3 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java +++ b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.output; +package io.lettuce.core.dynamic.output; import static org.assertj.core.api.Assertions.assertThat; @@ -24,11 +24,11 @@ import org.junit.Test; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.dynamic.CommandMethod; -import com.lambdaworks.redis.dynamic.DeclaredCommandMethod; -import com.lambdaworks.redis.dynamic.support.ReflectionUtils; -import com.lambdaworks.redis.output.*; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.dynamic.CommandMethod; +import io.lettuce.core.dynamic.DeclaredCommandMethod; +import io.lettuce.core.dynamic.support.ReflectionUtils; +import io.lettuce.core.output.*; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java rename to src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java index 1e51436aa4..5e166ba531 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java +++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.output; +package io.lettuce.core.dynamic.output; import static org.assertj.core.api.Assertions.assertThat; @@ -23,13 +23,13 @@ import org.junit.Test; -import com.lambdaworks.redis.GeoCoordinates; -import com.lambdaworks.redis.ScoredValue; -import com.lambdaworks.redis.Value; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.dynamic.DeclaredCommandMethod; -import com.lambdaworks.redis.dynamic.support.ReflectionUtils; -import com.lambdaworks.redis.output.*; +import io.lettuce.core.GeoCoordinates; +import io.lettuce.core.ScoredValue; +import io.lettuce.core.Value; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.dynamic.DeclaredCommandMethod; +import io.lettuce.core.dynamic.support.ReflectionUtils; +import io.lettuce.core.output.*; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java similarity index 90% rename from src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java rename to src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java index e3d13e5a21..142e8598f1 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java +++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.output; +package io.lettuce.core.dynamic.output; import static org.assertj.core.api.Assertions.assertThat; @@ -22,13 +22,13 @@ import org.junit.Test; -import com.lambdaworks.redis.ScoredValue; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.dynamic.support.ClassTypeInformation; -import com.lambdaworks.redis.dynamic.support.ResolvableType; -import com.lambdaworks.redis.output.*; +import io.lettuce.core.ScoredValue; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.dynamic.support.ClassTypeInformation; +import io.lettuce.core.dynamic.support.ResolvableType; +import io.lettuce.core.output.*; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java similarity index 89% rename from src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java rename to src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java index 695084ad97..52a86b0f4a 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java +++ b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.segment; +package io.lettuce.core.dynamic.segment; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; -import com.lambdaworks.redis.dynamic.CommandMethod; -import com.lambdaworks.redis.dynamic.DeclaredCommandMethod; -import com.lambdaworks.redis.dynamic.annotation.Command; -import com.lambdaworks.redis.dynamic.annotation.CommandNaming; -import com.lambdaworks.redis.dynamic.annotation.CommandNaming.LetterCase; -import com.lambdaworks.redis.dynamic.annotation.CommandNaming.Strategy; -import com.lambdaworks.redis.dynamic.support.ReflectionUtils; +import io.lettuce.core.dynamic.CommandMethod; +import io.lettuce.core.dynamic.DeclaredCommandMethod; +import io.lettuce.core.dynamic.annotation.Command; +import io.lettuce.core.dynamic.annotation.CommandNaming; +import io.lettuce.core.dynamic.annotation.CommandNaming.LetterCase; +import io.lettuce.core.dynamic.annotation.CommandNaming.Strategy; +import io.lettuce.core.dynamic.support.ReflectionUtils; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java rename to src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java index 6522b120f6..bc921daae8 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java +++ b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; import static org.assertj.core.api.Assertions.assertThat; @@ -137,4 +137,4 @@ static interface ListOfString extends List { static interface ListOfInteger extends List { } -} \ No newline at end of file +} diff --git a/src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java rename to src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java index 29d4874c56..e9eba26346 100644 --- a/src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java +++ b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.support; +package io.lettuce.core.dynamic.support; -import static com.lambdaworks.redis.dynamic.support.ClassTypeInformation.from; +import static io.lettuce.core.dynamic.support.ClassTypeInformation.from; import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; @@ -111,4 +111,4 @@ static interface GenericReturnTypes { List atLeastNumber(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java similarity index 86% rename from src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java rename to src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java index 502481d1e7..333fbe7295 100644 --- a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java +++ b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event; +package io.lettuce.core.event; import static org.assertj.core.api.Assertions.assertThat; @@ -25,11 +25,11 @@ import reactor.core.publisher.Flux; import reactor.test.StepVerifier; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.AbstractTest; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.event.connection.ConnectionEvent; +import io.lettuce.TestClientResources; +import io.lettuce.core.AbstractTest; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.event.connection.ConnectionEvent; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java b/src/test/java/io/lettuce/core/event/DefaultEventBusTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java rename to src/test/java/io/lettuce/core/event/DefaultEventBusTest.java index 51f0f8863a..b6e1c133ca 100644 --- a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java +++ b/src/test/java/io/lettuce/core/event/DefaultEventBusTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event; +package io.lettuce.core.event; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java rename to src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java index ecc9e22ad6..a0a66d4af2 100644 --- a/src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java +++ b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.event; +package io.lettuce.core.event; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/internal/AbstractInvocationHandlerTest.java b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/internal/AbstractInvocationHandlerTest.java rename to src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java index 10c62102a7..1a9336f51b 100644 --- a/src/test/java/com/lambdaworks/redis/internal/AbstractInvocationHandlerTest.java +++ b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.internal; +package io.lettuce.core.internal; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/internal/HostAndPortTest.java b/src/test/java/io/lettuce/core/internal/HostAndPortTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/internal/HostAndPortTest.java rename to src/test/java/io/lettuce/core/internal/HostAndPortTest.java index 61ffeff438..fa1feb78e3 100644 --- a/src/test/java/com/lambdaworks/redis/internal/HostAndPortTest.java +++ b/src/test/java/io/lettuce/core/internal/HostAndPortTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.internal; +package io.lettuce.core.internal; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/src/test/java/com/lambdaworks/redis/masterslave/CustomCommandTest.java b/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/masterslave/CustomCommandTest.java rename to src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java index d862321105..eefb893a52 100644 --- a/src/test/java/com/lambdaworks/redis/masterslave/CustomCommandTest.java +++ b/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; @@ -22,13 +22,13 @@ import org.junit.*; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.*; +import io.lettuce.TestClientResources; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.*; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriterTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriterTest.java rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java index 231e41dfc1..0c463d1db4 100644 --- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriterTest.java +++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import static org.assertj.core.api.Assertions.assertThat; @@ -22,9 +22,9 @@ import org.junit.Test; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandType; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandType; +import io.lettuce.core.protocol.RedisCommand; /** * @author Mark Paluch @@ -77,4 +77,4 @@ public void shouldReturnIntentForMixedCommands() { MasterSlaveConnectionProvider.Intent.WRITE); } -} \ No newline at end of file +} diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java similarity index 86% rename from src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java index 9b7b11237c..4e47dbd5cf 100644 --- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java +++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; @@ -30,12 +30,12 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.models.role.RedisInstance; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.models.role.RedisInstance; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java index 5ab7ff8ac3..46b9e42661 100644 --- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java +++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; -import static com.lambdaworks.redis.TestSettings.port; -import static com.lambdaworks.redis.masterslave.MasterSlaveTest.slaveCall; +import static io.lettuce.core.TestSettings.port; +import static io.lettuce.core.masterslave.MasterSlaveTest.slaveCall; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; @@ -29,11 +29,11 @@ import org.junit.Test; import org.springframework.test.util.ReflectionTestUtils; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.sentinel.AbstractSentinelTest; -import com.lambdaworks.redis.sentinel.SentinelRule; +import io.lettuce.TestClientResources; +import io.lettuce.core.*; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.sentinel.AbstractSentinelTest; +import io.lettuce.core.sentinel.SentinelRule; import io.netty.channel.group.ChannelGroup; diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java index 5f05b36354..88a6836a49 100644 --- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java +++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; @@ -28,13 +28,13 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.models.role.RedisInstance; -import com.lambdaworks.redis.models.role.RedisNodeDescription; -import com.lambdaworks.redis.models.role.RoleParser; +import io.lettuce.core.*; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.models.role.RedisInstance; +import io.lettuce.core.models.role.RedisNodeDescription; +import io.lettuce.core.models.role.RoleParser; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java index 59c93c9783..239dbf91ed 100644 --- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java +++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -22,11 +22,11 @@ import org.junit.Test; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.models.role.RedisInstance; -import com.lambdaworks.redis.models.role.RedisNodeDescription; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.models.role.RedisInstance; +import io.lettuce.core.models.role.RedisNodeDescription; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveUtilsTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveUtilsTest.java rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java index d7b11a00bf..446174f7eb 100644 --- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveUtilsTest.java +++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; @@ -21,8 +21,8 @@ import org.junit.Test; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.models.role.RedisInstance; +import io.lettuce.core.RedisURI; +import io.lettuce.core.models.role.RedisInstance; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java rename to src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java index 2b49d9ead8..af8471bd8b 100644 --- a/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java +++ b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; @@ -34,14 +34,14 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.test.util.ReflectionTestUtils; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisConnectionException; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.pubsub.RedisPubSubAdapter; -import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection; -import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisConnectionException; +import io.lettuce.core.RedisURI; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.pubsub.RedisPubSubAdapter; +import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; +import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands; +import io.lettuce.core.resource.ClientResources; import io.netty.util.concurrent.EventExecutorGroup; diff --git a/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java rename to src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java index 9c6f09fd44..0e12554654 100644 --- a/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java +++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.masterslave; +package io.lettuce.core.masterslave; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; @@ -28,12 +28,12 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.models.role.RedisInstance; -import com.lambdaworks.redis.models.role.RoleParser; +import io.lettuce.core.*; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.models.role.RedisInstance; +import io.lettuce.core.models.role.RoleParser; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/metrics/CommandLatencyIdTest.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/metrics/CommandLatencyIdTest.java rename to src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java index 5d1cae1fb5..1864df21ed 100644 --- a/src/test/java/com/lambdaworks/redis/metrics/CommandLatencyIdTest.java +++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.metrics; +package io.lettuce.core.metrics; import static org.assertj.core.api.Assertions.assertThat; -import com.lambdaworks.redis.protocol.CommandKeyword; +import io.lettuce.core.protocol.CommandKeyword; import io.netty.channel.local.LocalAddress; import org.junit.Test; diff --git a/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java rename to src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java index 133cf8e89f..0a28b23369 100644 --- a/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java +++ b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.metrics; +package io.lettuce.core.metrics; import static java.util.concurrent.TimeUnit.MICROSECONDS; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -25,7 +25,7 @@ import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.protocol.CommandType; import io.netty.channel.local.LocalAddress; diff --git a/src/test/java/com/lambdaworks/redis/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java b/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java rename to src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java index 4b9cc2b05c..1f8675316d 100644 --- a/src/test/java/com/lambdaworks/redis/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java +++ b/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.metrics; +package io.lettuce.core.metrics; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/models/command/CommandDetailParserTest.java b/src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/models/command/CommandDetailParserTest.java rename to src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java index cb52aad822..3fab834a02 100644 --- a/src/test/java/com/lambdaworks/redis/models/command/CommandDetailParserTest.java +++ b/src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.models.command; +package io.lettuce.core.models.command; import static org.assertj.core.api.Assertions.assertThat; @@ -23,7 +23,7 @@ import org.junit.Test; -import com.lambdaworks.redis.internal.LettuceLists; +import io.lettuce.core.internal.LettuceLists; public class CommandDetailParserTest { diff --git a/src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java b/src/test/java/io/lettuce/core/models/role/RoleParserTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java rename to src/test/java/io/lettuce/core/models/role/RoleParserTest.java index b4cdc3ce32..9e829430b5 100644 --- a/src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java +++ b/src/test/java/io/lettuce/core/models/role/RoleParserTest.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.models.role; +package io.lettuce.core.models.role; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import java.util.List; -import com.lambdaworks.redis.internal.HostAndPort; +import io.lettuce.core.internal.HostAndPort; import org.junit.Test; -import com.lambdaworks.redis.internal.LettuceLists; +import io.lettuce.core.internal.LettuceLists; public class RoleParserTest { public static final long REPLICATION_OFFSET_1 = 3167038L; diff --git a/src/test/java/com/lambdaworks/redis/output/BooleanListOutputTest.java b/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/output/BooleanListOutputTest.java rename to src/test/java/io/lettuce/core/output/BooleanListOutputTest.java index 09f7d85106..6c72631020 100644 --- a/src/test/java/com/lambdaworks/redis/output/BooleanListOutputTest.java +++ b/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import static org.assertj.core.api.Assertions.*; @@ -21,7 +21,7 @@ import org.junit.Test; -import com.lambdaworks.redis.codec.Utf8StringCodec; +import io.lettuce.core.codec.Utf8StringCodec; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java similarity index 90% rename from src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java rename to src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java index a93d3d7b12..f38c3935f3 100644 --- a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java +++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import static org.assertj.core.api.Assertions.assertThat; @@ -21,8 +21,8 @@ import org.junit.Test; -import com.lambdaworks.redis.GeoCoordinates; -import com.lambdaworks.redis.codec.Utf8StringCodec; +import io.lettuce.core.GeoCoordinates; +import io.lettuce.core.codec.Utf8StringCodec; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java similarity index 89% rename from src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java rename to src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java index d46f158ac2..ff83960180 100644 --- a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java +++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import static org.assertj.core.api.Assertions.assertThat; @@ -21,9 +21,9 @@ import org.junit.Test; -import com.lambdaworks.redis.GeoCoordinates; -import com.lambdaworks.redis.Value; -import com.lambdaworks.redis.codec.Utf8StringCodec; +import io.lettuce.core.GeoCoordinates; +import io.lettuce.core.Value; +import io.lettuce.core.codec.Utf8StringCodec; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/output/GeoWithinListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/output/GeoWithinListOutputTest.java rename to src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java index e5e45617ca..140adb922f 100644 --- a/src/test/java/com/lambdaworks/redis/output/GeoWithinListOutputTest.java +++ b/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import static org.assertj.core.api.Assertions.*; @@ -21,10 +21,10 @@ import org.junit.Test; -import com.lambdaworks.redis.GeoCoordinates; -import com.lambdaworks.redis.GeoWithin; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.Utf8StringCodec; +import io.lettuce.core.GeoCoordinates; +import io.lettuce.core.GeoWithin; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.Utf8StringCodec; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/output/ListOutputTest.java b/src/test/java/io/lettuce/core/output/ListOutputTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/output/ListOutputTest.java rename to src/test/java/io/lettuce/core/output/ListOutputTest.java index 0c76577c8d..a1fe45155f 100644 --- a/src/test/java/com/lambdaworks/redis/output/ListOutputTest.java +++ b/src/test/java/io/lettuce/core/output/ListOutputTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import static org.assertj.core.api.Assertions.assertThat; @@ -28,7 +28,7 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import com.lambdaworks.redis.codec.Utf8StringCodec; +import io.lettuce.core.codec.Utf8StringCodec; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/output/NestedMultiOutputTest.java b/src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java similarity index 84% rename from src/test/java/com/lambdaworks/redis/output/NestedMultiOutputTest.java rename to src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java index 9c2f915d67..6d8e3a7e53 100644 --- a/src/test/java/com/lambdaworks/redis/output/NestedMultiOutputTest.java +++ b/src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; -import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer; +import static io.lettuce.core.protocol.LettuceCharsets.buffer; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.Utf8StringCodec; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.Utf8StringCodec; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java b/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java rename to src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java index 71dfe783ce..dc2eef51a9 100644 --- a/src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java +++ b/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.output; +package io.lettuce.core.output; import static org.assertj.core.api.Assertions.*; @@ -21,8 +21,8 @@ import org.junit.Test; -import com.lambdaworks.redis.ScoredValue; -import com.lambdaworks.redis.codec.Utf8StringCodec; +import io.lettuce.core.ScoredValue; +import io.lettuce.core.codec.Utf8StringCodec; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/protocol/AsyncCommandInternalsTest.java b/src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/protocol/AsyncCommandInternalsTest.java rename to src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java index ec9ef31d75..f2716222e7 100644 --- a/src/test/java/com/lambdaworks/redis/protocol/AsyncCommandInternalsTest.java +++ b/src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; -import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer; +import static io.lettuce.core.protocol.LettuceCharsets.buffer; import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.CancellationException; @@ -26,11 +26,11 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.CommandOutput; -import com.lambdaworks.redis.output.StatusOutput; +import io.lettuce.core.*; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.CommandOutput; +import io.lettuce.core.output.StatusOutput; public class AsyncCommandInternalsTest { protected RedisCodec codec = new Utf8StringCodec(); diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java rename to src/test/java/io/lettuce/core/protocol/CommandArgsTest.java index e6107131ea..a668e3cbdf 100644 --- a/src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java +++ b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import static org.assertj.core.api.Assertions.assertThat; @@ -22,8 +22,8 @@ import org.junit.Test; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.codec.Utf8StringCodec; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.codec.Utf8StringCodec; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java rename to src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java index 6a32bbc079..f8e61d1944 100644 --- a/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java +++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; @@ -41,12 +41,12 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.test.util.ReflectionTestUtils; -import com.lambdaworks.redis.ConnectionEvents; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollector; -import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollectorOptions; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.ConnectionEvents; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.metrics.DefaultCommandLatencyCollector; +import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.resource.ClientResources; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandInternalsTest.java b/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/protocol/CommandInternalsTest.java rename to src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java index fdb612e4b1..b163f0e160 100644 --- a/src/test/java/com/lambdaworks/redis/protocol/CommandInternalsTest.java +++ b/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; -import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer; +import static io.lettuce.core.protocol.LettuceCharsets.buffer; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.CommandOutput; -import com.lambdaworks.redis.output.NestedMultiOutput; -import com.lambdaworks.redis.output.StatusOutput; +import io.lettuce.core.RedisException; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.CommandOutput; +import io.lettuce.core.output.NestedMultiOutput; +import io.lettuce.core.output.StatusOutput; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java rename to src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java index 41e6a6a7f7..a733b73ecf 100644 --- a/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java +++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import static org.assertj.core.api.Assertions.assertThat; @@ -22,12 +22,12 @@ import org.junit.Test; import org.springframework.test.util.ReflectionTestUtils; -import com.lambdaworks.ConnectionTestUtil; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.server.RandomResponseServer; +import io.lettuce.ConnectionTestUtil; +import io.lettuce.Wait; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.server.RandomResponseServer; /** * @author Mark Paluch @@ -113,7 +113,7 @@ public void pingBeforeConnectFailOnReconnect() throws Exception { /** * Simulates a failure on reconnect by changing the port to a invalid server and triggering a reconnect. * - * Expectation: {@link com.lambdaworks.redis.ConnectionEvents.Reconnect} events are sent. + * Expectation: {@link io.lettuce.core.ConnectionEvents.Reconnect} events are sent. * * @throws Exception */ diff --git a/src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java rename to src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java index f83f585ab1..4bb410e858 100644 --- a/src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java +++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; @@ -44,12 +44,12 @@ import org.mockito.runners.MockitoJUnitRunner; import org.springframework.test.util.ReflectionTestUtils; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.internal.LettuceFactories; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.resource.ClientResources; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.RedisException; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.internal.LettuceFactories; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.resource.ClientResources; import edu.umd.cs.mtc.MultithreadedTestCase; import edu.umd.cs.mtc.TestFramework; diff --git a/src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java b/src/test/java/io/lettuce/core/protocol/StateMachineTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java rename to src/test/java/io/lettuce/core/protocol/StateMachineTest.java index c6033962e7..5317601253 100644 --- a/src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java +++ b/src/test/java/io/lettuce/core/protocol/StateMachineTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; -import static com.lambdaworks.redis.protocol.RedisStateMachine.State; +import static io.lettuce.core.protocol.RedisStateMachine.State; import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.Charset; @@ -32,10 +32,10 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.lambdaworks.redis.RedisException; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.*; +import io.lettuce.core.RedisException; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.*; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java rename to src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java index e38cc32021..809df3b36d 100644 --- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java +++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; @@ -30,12 +30,12 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.internal.LettuceFactories; -import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands; +import io.lettuce.TestClientResources; +import io.lettuce.Wait; +import io.lettuce.core.*; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.internal.LettuceFactories; +import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands; /** * @author Will Glozer diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java rename to src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java index 10fe65337b..0fd6306222 100644 --- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java +++ b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.pubsub; +package io.lettuce.core.pubsub; import static com.google.code.tempusfugit.temporal.Duration.millis; import static org.assertj.core.api.Assertions.assertThat; @@ -34,18 +34,18 @@ import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import com.lambdaworks.Delay; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.internal.LettuceFactories; -import com.lambdaworks.redis.pubsub.api.reactive.ChannelMessage; -import com.lambdaworks.redis.pubsub.api.reactive.PatternMessage; -import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands; -import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands; +import io.lettuce.Delay; +import io.lettuce.TestClientResources; +import io.lettuce.Wait; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.internal.LettuceFactories; +import io.lettuce.core.pubsub.api.reactive.ChannelMessage; +import io.lettuce.core.pubsub.api.reactive.PatternMessage; +import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands; +import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java similarity index 84% rename from src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java rename to src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java index 1d6ebaa84a..8c2052adb5 100644 --- a/src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java +++ b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.reactive; +package io.lettuce.core.reactive; -import static com.lambdaworks.redis.protocol.CommandType.LRANGE; +import static io.lettuce.core.protocol.CommandType.LRANGE; import java.util.List; import java.util.UUID; @@ -27,14 +27,14 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.ValueListOutput; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandArgs; +import io.lettuce.TestClientResources; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.ValueListOutput; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandArgs; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java similarity index 96% rename from src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java rename to src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java index fa6e156a34..622196410d 100644 --- a/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java +++ b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.reliability; +package io.lettuce.core.reliability; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; @@ -25,15 +25,15 @@ import org.junit.Before; import org.junit.Test; -import com.lambdaworks.ConnectionTestUtil; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.IntegerOutput; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.*; +import io.lettuce.ConnectionTestUtil; +import io.lettuce.Wait; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.IntegerOutput; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.*; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; diff --git a/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java rename to src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java index fadf76ad05..b151783ba4 100644 --- a/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java +++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.reliability; +package io.lettuce.core.reliability; import static com.google.code.tempusfugit.temporal.Duration.millis; -import static com.lambdaworks.ConnectionTestUtil.getCommandBuffer; -import static com.lambdaworks.ConnectionTestUtil.getQueue; +import static io.lettuce.ConnectionTestUtil.getCommandBuffer; +import static io.lettuce.ConnectionTestUtil.getQueue; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; @@ -25,19 +25,19 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import com.lambdaworks.Delay; -import com.lambdaworks.redis.api.StatefulRedisConnection; +import io.lettuce.Delay; +import io.lettuce.core.api.StatefulRedisConnection; import org.junit.Before; import org.junit.Test; -import com.lambdaworks.ConnectionTestUtil; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.IntegerOutput; -import com.lambdaworks.redis.output.StatusOutput; -import com.lambdaworks.redis.protocol.*; +import io.lettuce.ConnectionTestUtil; +import io.lettuce.Wait; +import io.lettuce.core.*; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.IntegerOutput; +import io.lettuce.core.output.StatusOutput; +import io.lettuce.core.protocol.*; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; diff --git a/src/test/java/com/lambdaworks/redis/resource/ConstantDelayTest.java b/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/resource/ConstantDelayTest.java rename to src/test/java/io/lettuce/core/resource/ConstantDelayTest.java index ce8e96dfd1..3e495caef6 100644 --- a/src/test/java/com/lambdaworks/redis/resource/ConstantDelayTest.java +++ b/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java rename to src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java index 9750c98f15..f211fa5fde 100644 --- a/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java +++ b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java rename to src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java index b0a239dd4c..6d9da18eff 100644 --- a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java +++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -27,11 +27,11 @@ import reactor.test.StepVerifier; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.event.Event; -import com.lambdaworks.redis.event.EventBus; -import com.lambdaworks.redis.metrics.CommandLatencyCollector; -import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollectorOptions; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.event.Event; +import io.lettuce.core.event.EventBus; +import io.lettuce.core.metrics.CommandLatencyCollector; +import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.util.Timer; diff --git a/src/test/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProviderTest.java b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProviderTest.java rename to src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java index 4010a44c9e..3174119d0c 100644 --- a/src/test/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProviderTest.java +++ b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/com/lambdaworks/redis/resource/DirContextDnsResolverTest.java b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java similarity index 99% rename from src/test/java/com/lambdaworks/redis/resource/DirContextDnsResolverTest.java rename to src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java index 4fa79e5715..e79dea6275 100644 --- a/src/test/java/com/lambdaworks/redis/resource/DirContextDnsResolverTest.java +++ b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java rename to src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java index 42cd096f7d..6172815427 100644 --- a/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java +++ b/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/resource/ExponentialDelayTest.java b/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/resource/ExponentialDelayTest.java rename to src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java index 8ff5da7aba..f465378cf3 100644 --- a/src/test/java/com/lambdaworks/redis/resource/ExponentialDelayTest.java +++ b/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java rename to src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java index c5c1106378..0cd453df40 100644 --- a/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java +++ b/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/lambdaworks/redis/resource/FuturesTest.java b/src/test/java/io/lettuce/core/resource/FuturesTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/resource/FuturesTest.java rename to src/test/java/io/lettuce/core/resource/FuturesTest.java index 4a9310fd52..c761e1dc19 100644 --- a/src/test/java/com/lambdaworks/redis/resource/FuturesTest.java +++ b/src/test/java/io/lettuce/core/resource/FuturesTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.resource; +package io.lettuce.core.resource; import static com.google.code.tempusfugit.temporal.Duration.seconds; import static com.google.code.tempusfugit.temporal.Timeout.timeout; diff --git a/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java b/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java similarity index 85% rename from src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java rename to src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java index 855d451328..8ed0cc0acd 100644 --- a/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java +++ b/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel; +package io.lettuce.core.sentinel; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; -import com.lambdaworks.redis.AbstractTest; -import com.lambdaworks.redis.FastShutdown; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands; +import io.lettuce.core.AbstractTest; +import io.lettuce.core.FastShutdown; +import io.lettuce.core.RedisClient; +import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java similarity index 94% rename from src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java rename to src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java index b2e4b19351..3f53995a9e 100644 --- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java +++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel; +package io.lettuce.core.sentinel; -import static com.lambdaworks.redis.TestSettings.hostAddr; +import static io.lettuce.core.TestSettings.hostAddr; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -24,17 +24,17 @@ import java.util.List; import java.util.Map; -import com.lambdaworks.TestClientResources; +import io.lettuce.TestClientResources; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands; +import io.lettuce.Wait; +import io.lettuce.core.*; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java rename to src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java index c388f65010..6b2b1dcefd 100644 --- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java +++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel; +package io.lettuce.core.sentinel; import static org.assertj.core.api.Assertions.assertThat; @@ -26,14 +26,14 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; -import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands; -import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands; +import io.lettuce.TestClientResources; +import io.lettuce.Wait; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands; +import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java b/src/test/java/io/lettuce/core/sentinel/SentinelRule.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java rename to src/test/java/io/lettuce/core/sentinel/SentinelRule.java index a5f8864fdf..1bc56a4a0a 100644 --- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java +++ b/src/test/java/io/lettuce/core/sentinel/SentinelRule.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel; +package io.lettuce.core.sentinel; import static com.google.code.tempusfugit.temporal.Duration.seconds; @@ -28,15 +28,15 @@ import org.junit.runner.Description; import org.junit.runners.model.Statement; -import com.lambdaworks.Wait; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.models.role.RedisInstance; -import com.lambdaworks.redis.models.role.RoleParser; -import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands; -import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands; +import io.lettuce.Wait; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.models.role.RedisInstance; +import io.lettuce.core.models.role.RoleParser; +import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands; +import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands; /** * Rule to simplify Redis Sentinel handling. @@ -60,7 +60,7 @@ public class SentinelRule implements TestRule { protected Logger log = LogManager.getLogger(getClass()); /** - * + * * @param redisClient * @param flushBeforeTest * @param sentinelPorts @@ -125,7 +125,7 @@ public void flush() { /** * Requires a master with a slave. If no master or slave is present, the rule flushes known masters and sets up a master * with a slave. - * + * * @param masterId * @param redisPorts */ @@ -142,7 +142,7 @@ public void needMasterWithSlave(String masterId, int... redisPorts) { /** * Wait until the master has a connected slave. - * + * * @param masterId */ public void waitForConnectedSlaves(String masterId) { @@ -153,7 +153,7 @@ public void waitForConnectedSlaves(String masterId) { /** * Wait until sentinel can provide an address for the master. - * + * * @param masterId */ public void waitForMaster(String masterId) { @@ -204,7 +204,7 @@ public void monitor(final String key, String ip, int port, int quorum, boolean s /** * Check if the master has slaves at all (no check for connection/alive). - * + * * @param masterId * @return */ @@ -225,7 +225,7 @@ public boolean hasSlaves(String masterId) { /** * Check if a master runs on any of the given ports. - * + * * @param redisPorts * @return */ @@ -253,7 +253,7 @@ public boolean hasMaster(int... redisPorts) { /** * Check if the master has connected slaves. - * + * * @param masterId * @return */ @@ -293,7 +293,7 @@ public boolean hasConnectedSlaves(String masterId) { /** * Setup a master with one or more slaves (depending on port count). - * + * * @param redisPorts * @return */ @@ -335,7 +335,7 @@ public int setupMasterSlave(int... redisPorts) { /** * Retrieve the port of the first found master. - * + * * @param connections * @return */ diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java similarity index 91% rename from src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java rename to src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java index 283041f5d6..3d7712b94e 100644 --- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java +++ b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel; +package io.lettuce.core.sentinel; -import static com.lambdaworks.redis.TestSettings.hostAddr; +import static io.lettuce.core.TestSettings.hostAddr; import static org.assertj.core.api.Assertions.assertThat; import java.util.regex.Matcher; @@ -26,11 +26,11 @@ import org.junit.Rule; import org.junit.Test; -import com.lambdaworks.redis.KillArgs; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands; +import io.lettuce.core.KillArgs; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java similarity index 77% rename from src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java rename to src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java index 4f8e1319ea..0bfe7d12f1 100644 --- a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel.reactive; +package io.lettuce.core.sentinel.reactive; -import static com.lambdaworks.redis.TestSettings.hostAddr; +import static io.lettuce.core.TestSettings.hostAddr; import static org.assertj.core.api.Assertions.assertThat; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; -import com.lambdaworks.redis.sentinel.SentinelCommandTest; -import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands; -import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands; +import io.lettuce.core.TestSettings; +import io.lettuce.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.sentinel.SentinelCommandTest; +import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands; +import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java similarity index 77% rename from src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelServerReactiveCommandTest.java rename to src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java index 6eaea17ac8..f875d7fdca 100644 --- a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelServerReactiveCommandTest.java +++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.sentinel.reactive; +package io.lettuce.core.sentinel.reactive; -import static com.lambdaworks.redis.TestSettings.hostAddr; +import static io.lettuce.core.TestSettings.hostAddr; import static org.assertj.core.api.Assertions.assertThat; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.sentinel.SentinelServerCommandTest; -import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands; -import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands; -import com.lambdaworks.util.ReactiveSyncInvocationHandler; +import io.lettuce.core.TestSettings; +import io.lettuce.core.sentinel.SentinelServerCommandTest; +import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands; +import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands; +import io.lettuce.util.ReactiveSyncInvocationHandler; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/server/RandomResponseServer.java b/src/test/java/io/lettuce/core/server/RandomResponseServer.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/server/RandomResponseServer.java rename to src/test/java/io/lettuce/core/server/RandomResponseServer.java index ee181acc18..07bc99d186 100644 --- a/src/test/java/com/lambdaworks/redis/server/RandomResponseServer.java +++ b/src/test/java/io/lettuce/core/server/RandomResponseServer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.server; +package io.lettuce.core.server; import java.util.concurrent.TimeUnit; @@ -25,7 +25,7 @@ /** * Tiny netty server to generate random base64 data on message reception. - * + * * @author Mark Paluch */ public class RandomResponseServer { diff --git a/src/test/java/com/lambdaworks/redis/server/RandomServerHandler.java b/src/test/java/io/lettuce/core/server/RandomServerHandler.java similarity index 97% rename from src/test/java/com/lambdaworks/redis/server/RandomServerHandler.java rename to src/test/java/io/lettuce/core/server/RandomServerHandler.java index 4743e7dd2c..d238b4565a 100644 --- a/src/test/java/com/lambdaworks/redis/server/RandomServerHandler.java +++ b/src/test/java/io/lettuce/core/server/RandomServerHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.server; +package io.lettuce.core.server; import java.security.SecureRandom; import java.util.Arrays; diff --git a/src/test/java/com/lambdaworks/redis/support/CdiTest.java b/src/test/java/io/lettuce/core/support/CdiTest.java similarity index 89% rename from src/test/java/com/lambdaworks/redis/support/CdiTest.java rename to src/test/java/io/lettuce/core/support/CdiTest.java index dc28b3d18c..5ac548f669 100644 --- a/src/test/java/com/lambdaworks/redis/support/CdiTest.java +++ b/src/test/java/io/lettuce/core/support/CdiTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -21,18 +21,18 @@ import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; -import com.lambdaworks.redis.AbstractRedisClientTest; -import com.lambdaworks.redis.FastShutdown; +import io.lettuce.core.AbstractRedisClientTest; +import io.lettuce.core.FastShutdown; import org.apache.webbeans.cditest.CdiTestContainer; import org.apache.webbeans.cditest.CdiTestContainerLoader; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.lambdaworks.redis.RedisConnectionStateListener; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.DefaultClientResources; +import io.lettuce.core.RedisConnectionStateListener; +import io.lettuce.core.RedisURI; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.DefaultClientResources; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java similarity index 92% rename from src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java rename to src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java index cb39a76ee1..51b69807b0 100644 --- a/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java +++ b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -26,23 +26,23 @@ import org.apache.commons.pool2.impl.SoftReferenceObjectPool; import org.junit.Test; -import com.lambdaworks.TestClientResources; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.RedisAdvancedClusterAsyncCommandsImpl; -import com.lambdaworks.redis.cluster.RedisAdvancedClusterReactiveCommandsImpl; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.StatefulRedisClusterConnectionImpl; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands; -import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; -import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.masterslave.MasterSlave; -import com.lambdaworks.redis.masterslave.StatefulRedisMasterSlaveConnection; +import io.lettuce.TestClientResources; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.reactive.RedisReactiveCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.RedisAdvancedClusterAsyncCommandsImpl; +import io.lettuce.core.cluster.RedisAdvancedClusterReactiveCommandsImpl; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.StatefulRedisClusterConnectionImpl; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands; +import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands; +import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.masterslave.MasterSlave; +import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/support/InjectedClient.java b/src/test/java/io/lettuce/core/support/InjectedClient.java similarity index 88% rename from src/test/java/com/lambdaworks/redis/support/InjectedClient.java rename to src/test/java/io/lettuce/core/support/InjectedClient.java index 25c86e3572..82102f03e1 100644 --- a/src/test/java/com/lambdaworks/redis/support/InjectedClient.java +++ b/src/test/java/io/lettuce/core/support/InjectedClient.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Inject; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.RedisClusterClient; +import io.lettuce.core.RedisClient; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.RedisClusterClient; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/support/PersonDB.java b/src/test/java/io/lettuce/core/support/PersonDB.java similarity index 95% rename from src/test/java/com/lambdaworks/redis/support/PersonDB.java rename to src/test/java/io/lettuce/core/support/PersonDB.java index 5963a96928..8b9eb167c8 100644 --- a/src/test/java/com/lambdaworks/redis/support/PersonDB.java +++ b/src/test/java/io/lettuce/core/support/PersonDB.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/test/java/com/lambdaworks/redis/support/PubSubTestListener.java b/src/test/java/io/lettuce/core/support/PubSubTestListener.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/support/PubSubTestListener.java rename to src/test/java/io/lettuce/core/support/PubSubTestListener.java index c4c2ac753c..4fdf75f4e0 100644 --- a/src/test/java/com/lambdaworks/redis/support/PubSubTestListener.java +++ b/src/test/java/io/lettuce/core/support/PubSubTestListener.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import java.util.concurrent.BlockingQueue; -import com.lambdaworks.redis.internal.LettuceFactories; -import com.lambdaworks.redis.pubsub.RedisPubSubListener; +import io.lettuce.core.internal.LettuceFactories; +import io.lettuce.core.pubsub.RedisPubSubListener; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java similarity index 98% rename from src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java rename to src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java index 9399a92b45..1e85559174 100644 --- a/src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java +++ b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import static org.assertj.core.api.Assertions.assertThat; @@ -23,7 +23,7 @@ import org.junit.Test; -import com.lambdaworks.redis.RedisURI; +import io.lettuce.core.RedisURI; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/redis/support/SpringTest.java b/src/test/java/io/lettuce/core/support/SpringTest.java similarity index 93% rename from src/test/java/com/lambdaworks/redis/support/SpringTest.java rename to src/test/java/io/lettuce/core/support/SpringTest.java index b5629463c9..379ddd7373 100644 --- a/src/test/java/com/lambdaworks/redis/support/SpringTest.java +++ b/src/test/java/io/lettuce/core/support/SpringTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.support; +package io.lettuce.core.support; import static org.assertj.core.api.Assertions.*; @@ -24,8 +24,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.cluster.RedisClusterClient; +import io.lettuce.core.RedisClient; +import io.lettuce.core.cluster.RedisClusterClient; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/examples/ConnectToElastiCacheMaster.java b/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java similarity index 83% rename from src/test/java/com/lambdaworks/examples/ConnectToElastiCacheMaster.java rename to src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java index fd78c38de3..ba7d3936fc 100644 --- a/src/test/java/com/lambdaworks/examples/ConnectToElastiCacheMaster.java +++ b/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.examples; +package io.lettuce.examples; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.resource.DefaultClientResources; -import com.lambdaworks.redis.resource.DirContextDnsResolver; +import io.lettuce.core.RedisClient; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.resource.DefaultClientResources; +import io.lettuce.core.resource.DirContextDnsResolver; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java similarity index 78% rename from src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java rename to src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java index 145db6ab12..645dd5d9f8 100644 --- a/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java +++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.examples; +package io.lettuce.examples; import java.util.Arrays; import java.util.List; -import com.lambdaworks.redis.ReadFrom; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.masterslave.MasterSlave; -import com.lambdaworks.redis.masterslave.StatefulRedisMasterSlaveConnection; +import io.lettuce.core.ReadFrom; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.masterslave.MasterSlave; +import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingRedisSentinel.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java similarity index 79% rename from src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingRedisSentinel.java rename to src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java index caeca3c0aa..cb78276380 100644 --- a/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingRedisSentinel.java +++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.examples; +package io.lettuce.examples; -import com.lambdaworks.redis.ReadFrom; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.masterslave.MasterSlave; -import com.lambdaworks.redis.masterslave.StatefulRedisMasterSlaveConnection; +import io.lettuce.core.ReadFrom; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.masterslave.MasterSlave; +import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedis.java b/src/test/java/io/lettuce/examples/ConnectToRedis.java similarity index 89% rename from src/test/java/com/lambdaworks/examples/ConnectToRedis.java rename to src/test/java/io/lettuce/examples/ConnectToRedis.java index 2592209929..8549f58795 100644 --- a/src/test/java/com/lambdaworks/examples/ConnectToRedis.java +++ b/src/test/java/io/lettuce/examples/ConnectToRedis.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.examples; +package io.lettuce.examples; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.api.StatefulRedisConnection; +import io.lettuce.core.RedisClient; +import io.lettuce.core.api.StatefulRedisConnection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java similarity index 87% rename from src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java rename to src/test/java/io/lettuce/examples/ConnectToRedisCluster.java index d9a9e568e4..733c75f5c4 100644 --- a/src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java +++ b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.examples; +package io.lettuce.examples; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterSSL.java b/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java similarity index 86% rename from src/test/java/com/lambdaworks/examples/ConnectToRedisClusterSSL.java rename to src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java index 1ea69e6087..84fa931ae7 100644 --- a/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterSSL.java +++ b/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.examples; +package io.lettuce.examples; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterWithTopologyRefreshing.java b/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java similarity index 85% rename from src/test/java/com/lambdaworks/examples/ConnectToRedisClusterWithTopologyRefreshing.java rename to src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java index cb0d5179e1..46cee0c6e0 100644 --- a/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterWithTopologyRefreshing.java +++ b/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.examples; +package io.lettuce.examples; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.cluster.ClusterClientOptions; -import com.lambdaworks.redis.cluster.ClusterTopologyRefreshOptions; -import com.lambdaworks.redis.cluster.RedisClusterClient; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.ClusterClientOptions; +import io.lettuce.core.cluster.ClusterTopologyRefreshOptions; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisSSL.java b/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java similarity index 89% rename from src/test/java/com/lambdaworks/examples/ConnectToRedisSSL.java rename to src/test/java/io/lettuce/examples/ConnectToRedisSSL.java index 2fa7390a53..650cd11168 100644 --- a/src/test/java/com/lambdaworks/examples/ConnectToRedisSSL.java +++ b/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.examples; +package io.lettuce.examples; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.api.StatefulRedisConnection; +import io.lettuce.core.RedisClient; +import io.lettuce.core.api.StatefulRedisConnection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisUsingRedisSentinel.java b/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java similarity index 89% rename from src/test/java/com/lambdaworks/examples/ConnectToRedisUsingRedisSentinel.java rename to src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java index 9e6f6455c4..daf6ce6e6c 100644 --- a/src/test/java/com/lambdaworks/examples/ConnectToRedisUsingRedisSentinel.java +++ b/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.examples; +package io.lettuce.examples; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.api.StatefulRedisConnection; +import io.lettuce.core.RedisClient; +import io.lettuce.core.api.StatefulRedisConnection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/examples/MySpringBean.java b/src/test/java/io/lettuce/examples/MySpringBean.java similarity index 86% rename from src/test/java/com/lambdaworks/examples/MySpringBean.java rename to src/test/java/io/lettuce/examples/MySpringBean.java index abced3b3d3..b034c9029e 100644 --- a/src/test/java/com/lambdaworks/examples/MySpringBean.java +++ b/src/test/java/io/lettuce/examples/MySpringBean.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.examples; +package io.lettuce.examples; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; import org.springframework.beans.factory.annotation.Autowired; +import io.lettuce.core.RedisClient; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; + /** * @author Mark Paluch */ diff --git a/src/test/java/com/lambdaworks/examples/ReadWriteExample.java b/src/test/java/io/lettuce/examples/ReadWriteExample.java similarity index 85% rename from src/test/java/com/lambdaworks/examples/ReadWriteExample.java rename to src/test/java/io/lettuce/examples/ReadWriteExample.java index 49449ee206..6d6b9235b2 100644 --- a/src/test/java/com/lambdaworks/examples/ReadWriteExample.java +++ b/src/test/java/io/lettuce/examples/ReadWriteExample.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.examples; +package io.lettuce.examples; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/examples/SpringExample.java b/src/test/java/io/lettuce/examples/SpringExample.java similarity index 88% rename from src/test/java/com/lambdaworks/examples/SpringExample.java rename to src/test/java/io/lettuce/examples/SpringExample.java index 4e32dacb3c..283ab59060 100644 --- a/src/test/java/com/lambdaworks/examples/SpringExample.java +++ b/src/test/java/io/lettuce/examples/SpringExample.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.examples; +package io.lettuce.examples; import org.springframework.context.support.ClassPathXmlApplicationContext; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; +import io.lettuce.core.RedisClient; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java b/src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java similarity index 84% rename from src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java rename to src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java index d908754fd8..d9b9dc636a 100644 --- a/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java +++ b/src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.util; +package io.lettuce.util; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.internal.AbstractInvocationHandler; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.internal.AbstractInvocationHandler; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; /** * @author Mark Paluch diff --git a/src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java b/src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java similarity index 89% rename from src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java rename to src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java index 36c854bd2c..604958706b 100644 --- a/src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java +++ b/src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.util; +package io.lettuce.util; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -21,16 +21,15 @@ import java.util.List; import java.util.Set; -import com.lambdaworks.redis.api.StatefulConnection; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.internal.LettuceSets; -import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection; -import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.internal.LettuceSets; +import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection; +import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands; /** * Invocation handler for testing purposes. diff --git a/src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java b/src/test/java/io/lettuce/util/RoutingInvocationHandler.java similarity index 93% rename from src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java rename to src/test/java/io/lettuce/util/RoutingInvocationHandler.java index 00088fea55..b0b5a9bd93 100644 --- a/src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java +++ b/src/test/java/io/lettuce/util/RoutingInvocationHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.util; +package io.lettuce.util; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; diff --git a/src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java similarity index 91% rename from src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java rename to src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java index 7379217bee..b8095d51c4 100644 --- a/src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java +++ b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.Collection; -import com.lambdaworks.redis.protocol.ConnectionFacade; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.protocol.ConnectionFacade; +import io.lettuce.core.protocol.RedisCommand; /** * @author Mark Paluch diff --git a/src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java similarity index 86% rename from src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java rename to src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java index 202ed9f047..9f1d5f8b8b 100644 --- a/src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java +++ b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import java.util.Collection; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.api.async.RedisAsyncCommands; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.protocol.ConnectionFacade; -import com.lambdaworks.redis.protocol.RedisCommand; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.api.async.RedisAsyncCommands; +import io.lettuce.core.api.reactive.RedisReactiveCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.protocol.ConnectionFacade; +import io.lettuce.core.protocol.RedisCommand; /** * @author Mark Paluch diff --git a/src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java similarity index 96% rename from src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java rename to src/test/jmh/io/lettuce/core/RedisClientBenchmark.java index 2d6c63705e..5329e1c9dc 100644 --- a/src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java +++ b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis; +package io.lettuce.core; import org.openjdk.jmh.annotations.*; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.ByteArrayCodec; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.ByteArrayCodec; /** * Benchmark for {@link RedisClient}. diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java similarity index 88% rename from src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java rename to src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java index 111d86b801..27451e1abd 100644 --- a/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java +++ b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.net.SocketAddress; import java.util.Arrays; @@ -28,16 +28,16 @@ import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.cluster.models.partitions.Partitions; -import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.output.ValueOutput; -import com.lambdaworks.redis.protocol.Command; -import com.lambdaworks.redis.protocol.CommandArgs; -import com.lambdaworks.redis.protocol.CommandType; +import io.lettuce.core.*; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.cluster.models.partitions.Partitions; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.output.ValueOutput; +import io.lettuce.core.protocol.Command; +import io.lettuce.core.protocol.CommandArgs; +import io.lettuce.core.protocol.CommandType; /** * Benchmark for {@link ClusterDistributionChannelWriter}. diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java b/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java similarity index 80% rename from src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java rename to src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java index b2be6479ad..f29935888d 100644 --- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java +++ b/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import java.net.SocketAddress; import java.util.Collections; import java.util.function.Supplier; -import com.lambdaworks.redis.EmptyStatefulRedisConnection; -import com.lambdaworks.redis.RedisChannelWriter; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.RedisCodec; +import io.lettuce.core.EmptyStatefulRedisConnection; +import io.lettuce.core.RedisChannelWriter; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.RedisCodec; /** * @author Mark Paluch diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java similarity index 92% rename from src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java rename to src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java index 7bf8eaa623..5553d103fa 100644 --- a/src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java +++ b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.cluster; +package io.lettuce.core.cluster; import org.openjdk.jmh.annotations.*; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection; -import com.lambdaworks.redis.codec.ByteArrayCodec; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.codec.ByteArrayCodec; /** * Benchmark for {@link RedisClusterClient}. @@ -37,7 +37,7 @@ *
  • reactive command execution with batching
    • *
  • reactive command execution with delayed flushing
    • * - * + * * @author Mark Paluch */ @State(Scope.Benchmark) diff --git a/src/test/jmh/com/lambdaworks/redis/codec/JmhMain.java b/src/test/jmh/io/lettuce/core/codec/JmhMain.java similarity index 97% rename from src/test/jmh/com/lambdaworks/redis/codec/JmhMain.java rename to src/test/jmh/io/lettuce/core/codec/JmhMain.java index 15e902a6bf..9abc0dec8e 100644 --- a/src/test/jmh/com/lambdaworks/redis/codec/JmhMain.java +++ b/src/test/jmh/io/lettuce/core/codec/JmhMain.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; import java.io.IOException; import java.util.concurrent.TimeUnit; @@ -27,7 +27,7 @@ /** * Manual JMH Test Launcher. - * + * * @author Mark Paluch */ public class JmhMain { diff --git a/src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java b/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java similarity index 96% rename from src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java rename to src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java index cd3541bdcb..a4510700bc 100644 --- a/src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java +++ b/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -24,14 +24,14 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.infra.Blackhole; -import com.lambdaworks.redis.protocol.LettuceCharsets; +import io.lettuce.core.protocol.LettuceCharsets; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; /** * Benchmark for {@link StringCodec}. - * + * * @author Mark Paluch */ public class StringCodecBenchmark { diff --git a/src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java b/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java similarity index 94% rename from src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java rename to src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java index facdefcaaf..6f98a5b82d 100644 --- a/src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java +++ b/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.codec; +package io.lettuce.core.codec; import java.nio.ByteBuffer; @@ -23,7 +23,7 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.infra.Blackhole; -import com.lambdaworks.redis.protocol.LettuceCharsets; +import io.lettuce.core.protocol.LettuceCharsets; /** * Benchmark for {@link Utf8StringCodec}. diff --git a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java similarity index 90% rename from src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java rename to src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java index 222a0ff20b..94feb9fcc6 100644 --- a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java +++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import org.mockito.Mockito; import org.openjdk.jmh.annotations.Benchmark; @@ -21,11 +21,11 @@ import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; -import com.lambdaworks.redis.*; -import com.lambdaworks.redis.api.reactive.RedisReactiveCommands; -import com.lambdaworks.redis.api.sync.RedisCommands; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.dynamic.batch.BatchSize; +import io.lettuce.core.*; +import io.lettuce.core.api.reactive.RedisReactiveCommands; +import io.lettuce.core.api.sync.RedisCommands; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.dynamic.batch.BatchSize; /** * Benchmark for commands executed through {@link RedisCommandFactory}. diff --git a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java similarity index 87% rename from src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java rename to src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java index 19c84aa61b..0aaedbcbd1 100644 --- a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java +++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic; +package io.lettuce.core.dynamic; import java.util.concurrent.CompletableFuture; import org.openjdk.jmh.annotations.*; -import com.lambdaworks.redis.RedisClient; -import com.lambdaworks.redis.RedisFuture; -import com.lambdaworks.redis.RedisURI; -import com.lambdaworks.redis.TestSettings; -import com.lambdaworks.redis.api.StatefulRedisConnection; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.dynamic.batch.BatchSize; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.RedisURI; +import io.lettuce.core.TestSettings; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.dynamic.batch.BatchSize; /** * Benchmark for commands executed through {@link StatefulRedisConnection}. diff --git a/src/test/jmh/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java similarity index 97% rename from src/test/jmh/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryBenchmark.java rename to src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java index 0ab7baa3f8..b6db4a5231 100644 --- a/src/test/jmh/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryBenchmark.java +++ b/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.dynamic.intercept; +package io.lettuce.core.dynamic.intercept; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Scope; diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java similarity index 89% rename from src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java rename to src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java index 594e27bff4..ff02e2455b 100644 --- a/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java +++ b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.nio.charset.StandardCharsets; @@ -21,11 +21,11 @@ import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.codec.RedisCodec; -import com.lambdaworks.redis.codec.StringCodec; -import com.lambdaworks.redis.codec.Utf8StringCodec; -import com.lambdaworks.redis.output.ValueOutput; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.codec.Utf8StringCodec; +import io.lettuce.core.output.ValueOutput; /** * Benchmark for {@link Command}. Test cases: diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java similarity index 91% rename from src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java rename to src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java index e2e7451439..20c56a3b60 100644 --- a/src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java +++ b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.output.ValueOutput; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.output.ValueOutput; /** * Benchmark for {@link CommandHandler}. Test cases: *
      *
    • netty (in-eventloop) writes
      • *
    - * + * * @author Mark Paluch */ @State(Scope.Benchmark) diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java similarity index 99% rename from src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java rename to src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java index 874abed595..c3b7194012 100644 --- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java +++ b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.io.IOException; import java.io.InputStream; diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java similarity index 84% rename from src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java rename to src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java index 9a50f1b90c..67acdb193f 100644 --- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java +++ b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.net.SocketAddress; import java.util.Map; import java.util.concurrent.TimeUnit; -import com.lambdaworks.redis.event.DefaultEventPublisherOptions; -import com.lambdaworks.redis.event.EventBus; -import com.lambdaworks.redis.event.EventPublisherOptions; -import com.lambdaworks.redis.metrics.CommandLatencyCollector; -import com.lambdaworks.redis.metrics.CommandLatencyId; -import com.lambdaworks.redis.metrics.CommandMetrics; -import com.lambdaworks.redis.resource.ClientResources; -import com.lambdaworks.redis.resource.Delay; -import com.lambdaworks.redis.resource.DnsResolver; -import com.lambdaworks.redis.resource.EventLoopGroupProvider; +import io.lettuce.core.event.DefaultEventPublisherOptions; +import io.lettuce.core.event.EventBus; +import io.lettuce.core.event.EventPublisherOptions; +import io.lettuce.core.metrics.CommandLatencyCollector; +import io.lettuce.core.metrics.CommandLatencyId; +import io.lettuce.core.metrics.CommandMetrics; +import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.Delay; +import io.lettuce.core.resource.DnsResolver; +import io.lettuce.core.resource.EventLoopGroupProvider; import io.netty.util.Timer; import io.netty.util.concurrent.*; diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyContext.java b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java similarity index 99% rename from src/test/jmh/com/lambdaworks/redis/protocol/EmptyContext.java rename to src/test/jmh/io/lettuce/core/protocol/EmptyContext.java index 89cf7a089c..4cf66c7ddb 100644 --- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyContext.java +++ b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyFuture.java b/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java similarity index 98% rename from src/test/jmh/com/lambdaworks/redis/protocol/EmptyFuture.java rename to src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java index 39943f0eec..7ff2cf1ea3 100644 --- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyFuture.java +++ b/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; @@ -28,7 +28,7 @@ * @author Mark Paluch */ class EmptyFuture implements ChannelFuture { - + @Override public Channel channel() { return null; diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyPromise.java b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java similarity index 99% rename from src/test/jmh/com/lambdaworks/redis/protocol/EmptyPromise.java rename to src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java index 372eed8a42..ed68201683 100644 --- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyPromise.java +++ b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java similarity index 98% rename from src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java rename to src/test/jmh/io/lettuce/core/protocol/JmhMain.java index 7f15361ad5..2b8af8aa97 100644 --- a/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java +++ b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java similarity index 91% rename from src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java rename to src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java index 0e0126eefb..00e8170ebf 100644 --- a/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java +++ b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import org.openjdk.jmh.annotations.*; -import com.lambdaworks.redis.ClientOptions; -import com.lambdaworks.redis.EmptyStatefulRedisConnection; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.output.ValueOutput; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.EmptyStatefulRedisConnection; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.output.ValueOutput; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelPromise; diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java similarity index 94% rename from src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java rename to src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java index e67019df36..b25351b889 100644 --- a/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java +++ b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lambdaworks.redis.protocol; +package io.lettuce.core.protocol; import java.nio.ByteBuffer; import java.util.List; import org.openjdk.jmh.annotations.*; -import com.lambdaworks.redis.codec.ByteArrayCodec; -import com.lambdaworks.redis.output.ArrayOutput; +import io.lettuce.core.codec.ByteArrayCodec; +import io.lettuce.core.output.ArrayOutput; import io.netty.buffer.ByteBuf; import io.netty.buffer.PooledByteBufAllocator; diff --git a/src/test/resources/com/lambdaworks/redis/support/SpringTest-context.xml b/src/test/resources/io/lettuce/core/support/SpringTest-context.xml similarity index 61% rename from src/test/resources/com/lambdaworks/redis/support/SpringTest-context.xml rename to src/test/resources/io/lettuce/core/support/SpringTest-context.xml index f5e6fa68c4..058bccac2d 100644 --- a/src/test/resources/com/lambdaworks/redis/support/SpringTest-context.xml +++ b/src/test/resources/io/lettuce/core/support/SpringTest-context.xml @@ -3,35 +3,35 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + + class="io.lettuce.core.support.ClientResourcesFactoryBean"> - + - + - + - + - + - + diff --git a/src/test/resources/com/lambdaworks/examples/SpringTest-context.xml b/src/test/resources/io/lettuce/examples/SpringTest-context.xml similarity index 69% rename from src/test/resources/com/lambdaworks/examples/SpringTest-context.xml rename to src/test/resources/io/lettuce/examples/SpringTest-context.xml index 24e5b3f1ea..eab55942bf 100644 --- a/src/test/resources/com/lambdaworks/examples/SpringTest-context.xml +++ b/src/test/resources/io/lettuce/examples/SpringTest-context.xml @@ -3,10 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + - + diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml index 672acaaa90..1b10de22c6 100644 --- a/src/test/resources/log4j2-test.xml +++ b/src/test/resources/log4j2-test.xml @@ -13,9 +13,9 @@ - - - + + + diff --git a/src/test/resources/spring-test.xml b/src/test/resources/spring-test.xml index 4804d43392..9e2f82bf67 100644 --- a/src/test/resources/spring-test.xml +++ b/src/test/resources/spring-test.xml @@ -2,7 +2,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> - + @@ -12,4 +12,4 @@ - \ No newline at end of file +