From 2b3f70ea92ca7566fc8f667efc15449e382ebe8c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 23 May 2017 15:21:49 +0200 Subject: [PATCH] DATACASS-448 - Relocate CQL, mapping and convert packages. We relocated packages of the former Spring CQL module and mapping/convert packages of the Spring Data Cassandra module: org.springframework.cassandra -> org.springframework.data.cql org.springframework.cassandra.core.cql.generator -> org.springframework.data.cql.core.generator org.springframework.cassandra.core.cql -> org.springframework.data.cql.core org.springframework.data.cassandra.convert -> org.springframework.data.cassandra.core.convert org.springframework.data.cassandra.mapping -> org.springframework.data.cassandra.core.mapping --- .../core/converter/package-info.java | 4 - .../core/cql/generator/package-info.java | 4 - .../cassandra/core/cql/package-info.java | 4 - .../cassandra/core/package-info.java | 4 - .../core/session/lookup/package-info.java | 6 -- .../cassandra/core/support/package-info.java | 4 - .../config/CassandraClusterFactoryBean.java | 8 +- .../config/CassandraEntityClassScanner.java | 4 +- ...sandraMappingBeanFactoryPostProcessor.java | 14 +-- .../config/CassandraSessionFactoryBean.java | 6 +- .../config/CassandraTemplateFactoryBean.java | 10 +-- .../cassandra/config/DefaultBeanNames.java | 2 +- .../java/AbstractCassandraConfiguration.java | 20 ++--- ...bstractReactiveCassandraConfiguration.java | 12 +-- .../config/xml/CassandraClusterParser.java | 10 +-- .../xml/CassandraMappingContextParser.java | 12 +-- .../xml/CassandraMappingConverterParser.java | 10 +-- .../config/xml/CassandraSessionParser.java | 12 +-- .../config/xml/CassandraTemplateParser.java | 10 +-- .../core/AsyncCassandraOperations.java | 8 +- .../core/AsyncCassandraTemplate.java | 54 ++++++------ .../core/CassandraAdminOperations.java | 2 +- .../core/CassandraAdminTemplate.java | 22 ++--- .../core/CassandraBatchOperations.java | 2 +- .../core/CassandraBatchTemplate.java | 2 +- .../cassandra/core/CassandraOperations.java | 10 +-- ...assandraPersistentEntitySchemaCreator.java | 20 ++--- ...assandraPersistentEntitySchemaDropper.java | 14 +-- .../cassandra/core/CassandraTemplate.java | 71 ++++++++------- .../data/cassandra/core/QueryUtils.java | 6 +- .../core/ReactiveCassandraOperations.java | 8 +- .../core/ReactiveCassandraTemplate.java | 83 +++++++++--------- .../data/cassandra/core/StatementFactory.java | 31 ++++--- .../convert/AbstractCassandraConverter.java | 4 +- .../BasicCassandraRowValueProvider.java | 4 +- .../convert/CassandraConverter.java | 16 ++-- .../convert/CassandraConverters.java | 6 +- .../convert/CassandraCustomConversions.java | 4 +- .../convert/CassandraJodaTimeConverters.java | 2 +- .../convert/CassandraJsr310Converters.java | 2 +- .../convert/CassandraRowValueProvider.java | 8 +- .../CassandraThreeTenBackPortConverters.java | 2 +- .../convert/CassandraUDTValueProvider.java | 4 +- .../convert/CassandraValueProvider.java | 6 +- .../{ => core}/convert/ColumnReader.java | 4 +- .../{ => core}/convert/CustomConversions.java | 3 +- .../convert/MappingCassandraConverter.java | 68 ++++++-------- .../{ => core}/convert/QueryMapper.java | 61 ++++++------- .../convert/RowReaderPropertyAccessor.java | 2 +- .../{ => core}/convert/UpdateMapper.java | 22 +++-- .../{ => core}/convert/package-info.java | 2 +- .../mapping/BasicCassandraMappingContext.java | 18 ++-- .../BasicCassandraPersistentEntity.java | 8 +- ...andraPersistentEntityMetadataVerifier.java | 2 +- .../BasicCassandraPersistentProperty.java | 10 +-- .../CassandraColumnAnnotationComparator.java | 10 +-- .../mapping/CassandraMappingContext.java | 6 +- .../mapping/CassandraPersistentEntity.java | 16 ++-- ...andraPersistentEntityMetadataVerifier.java | 12 +-- .../mapping/CassandraPersistentProperty.java | 6 +- ...CassandraPersistentPropertyComparator.java | 15 ++-- ...aPrimaryKeyColumnAnnotationComparator.java | 16 ++-- .../mapping/CassandraSimpleTypeHolder.java | 13 ++- .../{ => core}/mapping/CassandraType.java | 12 +-- .../CassandraUserTypePersistentEntity.java | 4 +- .../cassandra/{ => core}/mapping/Column.java | 2 +- ...andraPersistentEntityMetadataVerifier.java | 2 +- .../{ => core}/mapping/EntityMapping.java | 2 +- .../cassandra/{ => core}/mapping/Indexed.java | 10 +-- .../cassandra/{ => core}/mapping/Mapping.java | 2 +- .../{ => core}/mapping/PrimaryKey.java | 2 +- .../{ => core}/mapping/PrimaryKeyClass.java | 10 +-- ...PrimaryKeyClassEntityMetadataVerifier.java | 2 +- .../{ => core}/mapping/PrimaryKeyColumn.java | 6 +- .../{ => core}/mapping/PropertyMapping.java | 2 +- .../mapping/SimpleUserTypeResolver.java | 4 +- .../cassandra/{ => core}/mapping/Table.java | 10 +-- .../{ => core}/mapping/UserDefinedType.java | 2 +- .../{ => core}/mapping/UserTypeResolver.java | 8 +- .../{ => core}/mapping/UserTypeUtil.java | 6 +- .../mapping/VerifierMappingExceptions.java | 2 +- .../{ => core}/mapping/package-info.java | 2 +- .../data/cassandra/core/query/ColumnName.java | 2 +- .../data/cassandra/core/query/Columns.java | 6 +- .../data/cassandra/core/query/Criteria.java | 2 +- .../core/query/CriteriaDefinition.java | 11 +-- .../data/cassandra/core/query/Query.java | 29 +++--- .../core/query/SerializationUtils.java | 6 +- .../data/cassandra/core/query/Update.java | 10 +-- .../data/cassandra/package-info.java | 2 +- .../repository/CassandraRepository.java | 2 +- .../TypedIdCassandraRepository.java | 8 +- ...andraRepositoryConfigurationExtension.java | 2 +- .../query/AbstractCassandraQuery.java | 20 ++--- .../query/AbstractReactiveCassandraQuery.java | 16 ++-- .../query/CassandraEntityMetadata.java | 12 +-- .../query/CassandraParameterAccessor.java | 16 ++-- .../repository/query/CassandraParameters.java | 4 +- .../CassandraParametersParameterAccessor.java | 4 +- .../query/CassandraQueryCreator.java | 17 ++-- .../query/CassandraQueryExecution.java | 2 +- .../query/CassandraQueryMethod.java | 4 +- .../query/ConvertingParameterAccessor.java | 18 ++-- .../query/DtoInstantiatingConverter.java | 4 +- .../query/PartTreeCassandraQuery.java | 17 ++-- .../ReactiveCassandraQueryExecution.java | 2 +- .../query/ReactiveCassandraQueryMethod.java | 2 +- .../query/ReactivePartTreeCassandraQuery.java | 17 ++-- .../ReactiveStringBasedCassandraQuery.java | 5 +- .../query/SimpleCassandraEntityMetadata.java | 4 +- .../query/StringBasedCassandraQuery.java | 5 +- .../repository/support/BasicMapId.java | 4 +- .../support/CassandraRepositoryFactory.java | 4 +- .../MappingCassandraEntityInformation.java | 8 +- .../ReactiveCassandraRepositoryFactory.java | 4 +- .../CassandraCqlClusterFactoryBean.java | 18 ++-- .../CassandraCqlSessionFactoryBean.java | 12 +-- .../CassandraCqlTemplateFactoryBean.java | 4 +- .../cql}/config/ClusterBuilderConfigurer.java | 2 +- .../cql}/config/CompressionType.java | 10 +-- .../cql}/config/DataCenterReplication.java | 10 +-- .../cql}/config/KeyspaceAction.java | 2 +- ...eyspaceActionSpecificationFactoryBean.java | 16 ++-- .../cql}/config/KeyspaceAttributes.java | 12 +-- .../MultiLevelSetFlattenerFactoryBean.java | 2 +- .../config/PoolingOptionsFactoryBean.java | 10 +-- .../cql}/config/SocketOptionsFactoryBean.java | 10 +-- .../java/AbstractClusterConfiguration.java | 12 +-- .../AbstractCqlTemplateConfiguration.java | 8 +- .../java/AbstractSessionConfiguration.java | 18 ++-- .../cql}/config/java/package-info.java | 2 +- .../cql}/config/package-info.java | 2 +- .../config/xml/CassandraCqlClusterParser.java | 18 ++-- .../config/xml/CassandraCqlSessionParser.java | 14 +-- .../xml/CassandraCqlTemplateParser.java | 14 +-- .../config/xml/CassandraNamespaceHandler.java | 10 +-- .../cql}/config/xml/DefaultCqlBeanNames.java | 2 +- .../cql}/config/xml/ParsingUtils.java | 2 +- .../cql}/config/xml/package-info.java | 2 +- .../core/ArgumentPreparedStatementBinder.java | 6 +- .../cql}/core/AsyncCqlOperations.java | 2 +- .../cql}/core/AsyncCqlTemplate.java | 6 +- .../core/AsyncPreparedStatementCreator.java | 2 +- .../cql}/core/AsyncSessionCallback.java | 2 +- .../cql}/core/AsynchronousQueryListener.java | 2 +- .../core/CachedPreparedStatementCreator.java | 2 +- ...andraUncategorizedDataAccessException.java | 2 +- .../cql}/core/ColumnMapRowMapper.java | 2 +- .../cql/core}/CqlConstantType.java | 4 +- .../cql => data/cql/core}/CqlIdentifier.java | 5 +- .../cql}/core/CqlOperations.java | 2 +- .../cql}/core/CqlProvider.java | 6 +- .../cql => data/cql/core}/CqlStringUtils.java | 6 +- .../cql}/core/CqlTemplate.java | 6 +- ...ionTranslatingListenableFutureAdapter.java | 2 +- .../core/GuavaListenableFutureAdapter.java | 2 +- .../cql}/core/HostMapper.java | 2 +- .../cql/core}/KeyspaceIdentifier.java | 3 +- .../cql}/core/Ordering.java | 2 +- .../cql}/core/PreparedStatementBinder.java | 2 +- .../cql}/core/PreparedStatementCallback.java | 2 +- .../cql}/core/PreparedStatementCreator.java | 2 +- .../cql}/core/PrimaryKeyType.java | 10 +-- .../cql}/core/QueryOptions.java | 2 +- .../cql}/core/QueryOptionsUtil.java | 2 +- .../cql}/core/ReactiveCqlOperations.java | 4 +- .../cql}/core/ReactiveCqlTemplate.java | 12 +-- .../ReactivePreparedStatementCallback.java | 4 +- .../ReactivePreparedStatementCreator.java | 6 +- .../cql}/core/ReactiveResultSetExtractor.java | 4 +- .../ReactiveRowMapperResultSetExtractor.java | 4 +- .../cql}/core/ReactiveSessionCallback.java | 4 +- .../cql}/core/ReactiveStatementCallback.java | 4 +- .../cql}/core/ReservedKeyword.java | 2 +- .../cql}/core/ResultSetExtractor.java | 2 +- .../cql}/core/RingMember.java | 12 +-- .../cql}/core/RingMemberHostMapper.java | 2 +- .../cql}/core/RowCallbackHandler.java | 2 +- .../cql}/core/RowMapper.java | 2 +- .../core/RowMapperResultSetExtractor.java | 2 +- .../cql}/core/SessionCallback.java | 2 +- .../core/SimplePreparedStatementCreator.java | 2 +- .../cql}/core/SingleColumnRowMapper.java | 6 +- .../cql}/core/WriteOptions.java | 2 +- .../converter/AbstractResultSetConverter.java | 2 +- ...actResultSetToBasicFixedTypeConverter.java | 2 +- .../converter/ResultSetToArrayConverter.java | 2 +- .../ResultSetToBigDecimalConverter.java | 2 +- .../ResultSetToBigIntegerConverter.java | 2 +- .../ResultSetToBooleanConverter.java | 2 +- .../ResultSetToByteBufferConverter.java | 2 +- .../converter/ResultSetToDateConverter.java | 2 +- .../converter/ResultSetToDoubleConverter.java | 2 +- .../converter/ResultSetToFloatConverter.java | 2 +- .../ResultSetToInetAddressConverter.java | 2 +- .../ResultSetToIntegerConverter.java | 2 +- .../converter/ResultSetToListConverter.java | 2 +- .../ResultSetToListOfStringConverter.java | 2 +- .../converter/ResultSetToLongConverter.java | 2 +- .../converter/ResultSetToStringConverter.java | 2 +- .../converter/ResultSetToUuidConverter.java | 2 +- .../core/converter/RowToArrayConverter.java | 2 +- .../core/converter/RowToListConverter.java | 2 +- .../core/converter/RowToMapConverter.java | 2 +- .../data/cql/core/converter/package-info.java | 4 + .../generator/AddColumnCqlGenerator.java | 8 +- .../generator/AlterColumnCqlGenerator.java | 6 +- .../generator/AlterKeyspaceCqlGenerator.java | 8 +- .../generator/AlterTableCqlGenerator.java | 20 ++--- .../generator/AlterUserTypeCqlGenerator.java | 14 +-- .../generator/ColumnChangeCqlGenerator.java | 4 +- .../generator/CreateIndexCqlGenerator.java | 6 +- .../generator/CreateKeyspaceCqlGenerator.java | 12 +-- .../generator/CreateTableCqlGenerator.java | 12 +-- .../generator/CreateUserTypeCqlGenerator.java | 8 +- .../generator/DropColumnCqlGenerator.java | 8 +- .../generator/DropIndexCqlGenerator.java | 6 +- .../generator/DropKeyspaceCqlGenerator.java | 6 +- .../generator/DropTableCqlGenerator.java | 6 +- .../generator/DropUserTypeCqlGenerator.java | 6 +- .../generator/IndexNameCqlGenerator.java | 4 +- .../core}/generator/KeyspaceCqlGenerator.java | 4 +- .../generator/KeyspaceNameCqlGenerator.java | 4 +- .../KeyspaceOptionsCqlGenerator.java | 8 +- .../generator/RenameColumnCqlGenerator.java | 10 +-- .../core}/generator/TableCqlGenerator.java | 4 +- .../generator/TableNameCqlGenerator.java | 4 +- .../generator/TableOptionsCqlGenerator.java | 8 +- .../generator/UserTypeNameCqlGenerator.java | 4 +- .../data/cql/core/generator/package-info.java | 4 + .../core/keyspace/AddColumnSpecification.java | 4 +- .../keyspace/AlterColumnSpecification.java | 12 +-- .../keyspace/AlterKeyspaceSpecification.java | 4 +- .../keyspace/AlterTableSpecification.java | 6 +- .../keyspace/AlterUserTypeSpecification.java | 4 +- .../keyspace/ColumnChangeSpecification.java | 6 +- .../core/keyspace/ColumnSpecification.java | 16 ++-- .../ColumnTypeChangeSpecification.java | 6 +- .../keyspace/CreateIndexSpecification.java | 6 +- .../keyspace/CreateKeyspaceSpecification.java | 10 +-- .../keyspace/CreateTableSpecification.java | 4 +- .../keyspace/CreateUserTypeSpecification.java | 4 +- .../cql}/core/keyspace/DefaultOption.java | 4 +- .../core/keyspace/DefaultTableDescriptor.java | 10 +-- .../keyspace/DropColumnSpecification.java | 12 +-- .../core/keyspace/DropIndexSpecification.java | 2 +- .../keyspace/DropKeyspaceSpecification.java | 10 +-- .../core/keyspace/DropTableSpecification.java | 4 +- .../keyspace/DropUserTypeSpecification.java | 4 +- .../core/keyspace/FieldSpecification.java | 8 +- .../cql}/core/keyspace/IndexDescriptor.java | 12 +-- .../core/keyspace/IndexNameSpecification.java | 6 +- .../keyspace/KeyspaceActionSpecification.java | 6 +- .../core/keyspace/KeyspaceDescriptor.java | 12 +-- .../cql}/core/keyspace/KeyspaceOption.java | 2 +- .../KeyspaceOptionsSpecification.java | 6 +- .../core/keyspace/KeyspaceSpecification.java | 2 +- .../cql}/core/keyspace/Option.java | 2 +- .../keyspace/RenameColumnSpecification.java | 6 +- .../cql}/core/keyspace/TableDescriptor.java | 4 +- .../core/keyspace/TableNameSpecification.java | 6 +- .../cql}/core/keyspace/TableOption.java | 2 +- .../keyspace/TableOptionsSpecification.java | 8 +- .../core/keyspace/TableSpecification.java | 12 +-- .../keyspace/UserTypeNameSpecification.java | 4 +- .../core/keyspace/UserTypeSpecification.java | 6 +- .../cql}/core/keyspace/package-info.java | 2 +- .../data/cql/core/package-info.java | 4 + .../DefaultBridgedReactiveSession.java | 2 +- .../DefaultReactiveSessionFactory.java | 4 +- .../core/session/DefaultSessionFactory.java | 4 +- .../cql}/core/session/ReactiveResultSet.java | 2 +- .../cql}/core/session/ReactiveSession.java | 2 +- .../core/session/ReactiveSessionFactory.java | 6 +- .../cql}/core/session/SessionFactory.java | 4 +- .../lookup/AbstractRoutingSessionFactory.java | 6 +- .../BeanFactorySessionFactoryLookup.java | 8 +- .../lookup/MapSessionFactoryLookup.java | 4 +- .../session/lookup/SessionFactoryLookup.java | 6 +- .../SessionFactoryLookupFailureException.java | 4 +- .../lookup/SingleSessionFactoryLookup.java | 4 +- .../cql/core/session/lookup/package-info.java | 6 ++ .../cql}/core/session/package-info.java | 4 +- .../core/support/CQLExceptionTranslator.java | 4 +- .../data/cql/core/support/package-info.java | 4 + .../cql}/core/util/MapBuilder.java | 2 +- .../data/cql/package-info.java | 4 + .../cql}/support/CassandraAccessor.java | 44 +++++----- .../support/CassandraExceptionTranslator.java | 6 +- .../support/ReactiveCassandraAccessor.java | 16 ++-- .../cql}/support/RowUtils.java | 6 +- .../CassandraAuthenticationException.java | 10 +-- .../CassandraConnectionFailureException.java | 2 +- ...nsufficientReplicasAvailableException.java | 10 +-- .../exception/CassandraInternalException.java | 10 +-- ...aInvalidConfigurationInQueryException.java | 10 +-- .../CassandraInvalidQueryException.java | 10 +-- .../CassandraKeyspaceExistsException.java | 10 +-- .../CassandraQuerySyntaxException.java | 10 +-- .../CassandraReadTimeoutException.java | 2 +- ...CassandraSchemaElementExistsException.java | 2 +- .../CassandraTableExistsException.java | 10 +-- .../CassandraTraceRetrievalException.java | 10 +-- .../exception/CassandraTruncateException.java | 10 +-- .../CassandraTypeMismatchException.java | 10 +-- .../CassandraUnauthorizedException.java | 10 +-- .../CassandraUncategorizedException.java | 10 +-- .../CassandraWriteTimeoutException.java | 10 +-- ...ncorrectResultSetColumnCountException.java | 2 +- ...nsupportedCassandraOperationException.java | 8 +- .../cql}/support/exception/package-info.java | 2 +- .../cql}/support/package-info.java | 2 +- .../main/resources/META-INF/spring.handlers | 2 +- .../main/resources/META-INF/spring.schemas | 8 +- .../main/resources/META-INF/spring.tooling | 4 +- .../cassandra/config/spring-cassandra-2.0.xsd | 18 ++-- .../cql}/config/spring-cql-1.0.xsd | 0 .../cql}/config/spring-cql-1.5.xsd | 0 .../cql}/config/spring-cql-2.0.xsd | 12 +-- .../cql}/config/spring-cql.gif | Bin ...pingBeanFactoryPostProcessorUnitTests.java | 4 +- .../CassandraSessionFactoryBeanUnitTests.java | 4 +- .../config/SchemaActionIntegrationTests.java | 8 +- .../CassandraNamespaceIntegrationTests.java | 6 +- ...syncCassandraTemplateIntegrationTests.java | 6 +- .../core/AsyncCassandraTemplateUnitTests.java | 2 +- ...assandraAdminTemplateIntegrationTests.java | 10 +-- ...assandraBatchTemplateIntegrationTests.java | 4 +- ...ersistentEntitySchemaCreatorUnitTests.java | 6 +- ...ersistentEntitySchemaDropperUnitTests.java | 8 +- .../CassandraTemplateIntegrationTests.java | 8 +- .../core/CassandraTemplateUnitTests.java | 2 +- ...tiveCassandraTemplateIntegrationTests.java | 8 +- .../ReactiveCassandraTemplateUnitTests.java | 4 +- .../core/StatementFactoryUnitTests.java | 10 +-- .../CassandraTypeMappingIntegrationTest.java | 6 +- .../convert/ColumnReaderUnitTests.java | 4 +- .../{ => core}/convert/CounterEntity.java | 8 +- .../{ => core}/convert/CurrencyConverter.java | 2 +- .../CustomConversionIntegrationTests.java | 8 +- ...CassandraConverterUDTIntegrationTests.java | 14 +-- .../MappingCassandraConverterUnitTests.java | 18 ++-- .../convert/QueryMapperUnitTests.java | 19 ++-- .../{ => core}/convert/TimeEntity.java | 8 +- .../convert/UpdateMapperUnitTests.java | 14 +-- ...BasicCassandraMappingContextUnitTests.java | 14 +-- ...istentEntityMetadataVerifierUnitTests.java | 8 +- ...sistentEntityOrderPropertiesUnitTests.java | 4 +- ...sicCassandraPersistentEntityUnitTests.java | 4 +- ...cCassandraPersistentPropertyUnitTests.java | 4 +- ...CassandraCompositePrimaryKeyUnitTests.java | 12 +-- ...PersistentPropertyComparatorUnitTests.java | 6 +- ...eyColumnAnnotationComparatorUnitTests.java | 8 +- ...ndraUserTypePersistentEntityUnitTests.java | 4 +- ...istentEntityMetadataVerifierUnitTests.java | 8 +- .../mapping/CompoundPrimaryKeyUnitTests.java | 4 +- ...BasicCassandraMappingContextUnitTests.java | 10 +-- .../CreateUserTypeIntegrationTests.java | 2 +- .../ForceQuotedEntitiesSimpleUnitTests.java | 2 +- .../ForceQuotedPropertiesSimpleUnitTests.java | 8 +- ...yClassEntityMetadataVerifierUnitTests.java | 6 +- .../MultipackageScanningUnitTests.java | 12 +-- .../mapping/multipackagescanning/Top.java | 6 +- .../multipackagescanning/first/First.java | 6 +- .../multipackagescanning/second/Second.java | 6 +- .../multipackagescanning/third/Third.java | 6 +- .../core/query/ColumnNameUnitTests.java | 2 +- .../core/query/ColumnsUnitTests.java | 2 +- .../data/cassandra/domain/AddressType.java | 2 +- .../cassandra/domain/AllPossibleTypes.java | 8 +- .../data/cassandra/domain/BookReference.java | 4 +- .../data/cassandra/domain/CompositeKey.java | 6 +- .../data/cassandra/domain/FlatGroup.java | 6 +- .../data/cassandra/domain/Group.java | 4 +- .../data/cassandra/domain/GroupKey.java | 6 +- .../data/cassandra/domain/Person.java | 6 +- .../domain/TypeWithCompositeKey.java | 6 +- .../cassandra/domain/TypeWithKeyClass.java | 4 +- .../data/cassandra/domain/TypeWithMapId.java | 6 +- .../data/cassandra/domain/User.java | 2 +- .../data/cassandra/domain/UserToken.java | 10 +-- .../BigIntParamIntegrationTests.java | 6 +- ...rtingReactiveCassandraRepositoryTests.java | 2 +- .../repository/DateKeyIntegrationTests.java | 6 +- .../repository/IntParamIntegrationTests.java | 6 +- .../QueryDerivationIntegrationTests.java | 2 +- ...veCassandraRepositoryIntegrationTests.java | 2 +- .../cdi/CassandraOperationsProducer.java | 20 ++--- .../repository/cdi/CdiRepositoryTests.java | 2 +- ...sitoryConfigurationExtensionUnitTests.java | 2 +- ...ssandraRepositoriesRegistrarUnitTests.java | 8 +- ...sitoryConfigurationExtensionUnitTests.java | 2 +- .../repository/conversion/Contact.java | 4 +- .../ParameterConversionTestSupport.java | 8 +- ...yMethodParameterTypesIntegrationTests.java | 10 +-- ...aParametersParameterAccessorUnitTests.java | 6 +- .../query/CassandraParametersUnitTests.java | 2 +- .../query/CassandraQueryCreatorUnitTests.java | 24 ++--- .../query/CassandraQueryMethodUnitTests.java | 4 +- .../ConvertingParameterAccessorUnitTests.java | 8 +- .../PartTreeCassandraQueryUnitTests.java | 10 +-- ...veCassandraParameterAccessorUnitTests.java | 8 +- ...ReactiveCassandraQueryMethodUnitTests.java | 4 +- ...activePartTreeCassandraQueryUnitTests.java | 6 +- ...iveStringBasedCassandraQueryUnitTests.java | 8 +- .../StringBasedCassandraQueryUnitTests.java | 7 +- .../query/StubParameterAccessor.java | 4 +- ...gDataEmbeddedCassandraIntegrationTest.java | 4 +- .../CassandraRepositoryFactoryUnitTests.java | 6 +- .../support/IntegrationTestConfig.java | 12 +-- ...ngCassandraEntityInformationUnitTests.java | 8 +- ...veCassandraRepositoryFactoryUnitTests.java | 6 +- .../repository/support/SchemaTestUtils.java | 10 +-- ...leCassandraRepositoryIntegrationTests.java | 2 +- .../SimpleCassandraRepositoryUnitTests.java | 8 +- ...veCassandraRepositoryIntegrationTests.java | 2 +- .../cassandra/support/UserTypeBuilder.java | 2 +- .../CompositeKeyCrudIntegrationTests.java | 4 +- .../compositeprimarykey/Explicit.java | 6 +- .../compositeprimarykey/ExplicitKey.java | 6 +- .../compositeprimarykey/Implicit.java | 4 +- .../compositeprimarykey/ImplicitKey.java | 6 +- .../entity/CorrelationEntity.java | 12 +-- .../forcequote/config/Explicit.java | 4 +- .../forcequote/config/ExplicitProperties.java | 6 +- .../forcequote/config/Implicit.java | 4 +- .../forcequote/config/ImplicitProperties.java | 6 +- ...ateMapIdProxyDelegateIntegrationTests.java | 10 +-- .../mapid/repo/MultiPrimaryKeyColumns.java | 8 +- .../mapid/repo/SinglePrimaryKeyColumn.java | 8 +- ...CassandraTemplateMapIdIntegrationTest.java | 10 +-- ...tractEmbeddedCassandraIntegrationTest.java | 4 +- ...stractKeyspaceCreatingIntegrationTest.java | 2 +- .../cql}/CassandraRule.java | 12 +-- .../cql}/EmbeddedCassandraServerHelper.java | 2 +- .../{cassandra => data/cql}/KeyspaceRule.java | 4 +- ...ssandraCqlClusterFactoryBeanUnitTests.java | 4 +- ...ssandraCqlSessionFactoryBeanUnitTests.java | 6 +- .../PoolingOptionsFactoryBeanUnitTests.java | 2 +- ...AbstractClusterConfigurationUnitTests.java | 23 +++-- .../config/java/ConfigIntegrationTests.java | 6 +- .../CqlTemplateConfigIntegrationTests.java | 8 +- ...aceCreatingJavaConfigIntegrationTests.java | 14 +-- .../CassandraCqlClusterParserUnitTests.java | 10 +-- ...paceCreatingXmlConfigIntegrationTests.java | 6 +- ...paceCreatingXmlConfigIntegrationTests.java | 6 +- .../xml/MinimalXmlConfigIntegrationTests.java | 12 +-- .../config/xml/ParsingUtilsUnitTests.java | 4 +- ...paceCreatingXmlConfigIntegrationTests.java | 8 +- .../config/xml/TestHostStateListener.java | 2 +- .../cql}/config/xml/TestLatencyTracker.java | 2 +- .../config/xml/XmlConfigIntegrationTests.java | 10 +-- .../AsyncCqlTemplateIntegrationTests.java | 4 +- .../cql}/core/AsyncCqlTemplateUnitTests.java | 16 +++- ...chedPreparedStatementCreatorUnitTests.java | 2 +- .../cql/core}/CqlIdentifierUnitTests.java | 7 +- .../core/CqlTemplateIntegrationTests.java | 4 +- .../cql}/core/CqlTemplateUnitTests.java | 6 +- ...ridgedReactiveSessionIntegrationTests.java | 8 +- ...efaultBridgedReactiveSessionUnitTests.java | 4 +- .../cql}/core/QueryOptionsUnitTests.java | 2 +- .../cql}/core/QueryOptionsUtilUnitTests.java | 2 +- .../ReactiveCqlTemplateIntegrationTests.java | 10 +-- .../core/ReactiveCqlTemplateUnitTests.java | 14 +-- .../core/SingleColumnRowMapperUnitTests.java | 4 +- .../cql}/core/WriteOptionsUnitTests.java | 2 +- ...bstractIndexOperationCqlGeneratorTest.java | 4 +- ...ractKeyspaceOperationCqlGeneratorTest.java | 6 +- ...bstractTableOperationCqlGeneratorTest.java | 4 +- .../AlterKeyspaceCqlGeneratorUnitTests.java | 12 +-- ...lterTableCqlGeneratorIntegrationTests.java | 14 +-- .../AlterTableCqlGeneratorUnitTests.java | 10 +-- ...rUserTypeCqlGeneratorIntegrationTests.java | 10 +-- .../AlterUserTypeCqlGeneratorUnitTests.java | 8 +- .../CqlIndexSpecificationAssertions.java | 4 +- .../CqlKeyspaceSpecificationAssertions.java | 6 +- .../CqlTableSpecificationAssertions.java | 12 +-- ...eateIndexCqlGeneratorIntegrationTests.java | 10 +-- .../CreateIndexCqlGeneratorUnitTests.java | 4 +- ...eKeyspaceCqlGeneratorIntegrationTests.java | 10 +-- .../CreateKeyspaceCqlGeneratorUnitTests.java | 14 +-- ...eateTableCqlGeneratorIntegrationTests.java | 10 +-- .../CreateTableCqlGeneratorUnitTests.java | 22 ++--- ...eUserTypeCqlGeneratorIntegrationTests.java | 8 +- .../CreateUserTypeCqlGeneratorUnitTests.java | 8 +- .../DropIndexCqlGeneratorUnitTests.java | 4 +- .../DropKeyspaceCqlGeneratorUnitTests.java | 6 +- .../DropTableCqlGeneratorUnitTests.java | 4 +- .../DropUserTypeCqlGeneratorUnitTests.java | 8 +- ...LifecycleCqlGeneratorIntegrationTests.java | 4 +- .../TableLifecycleIntegrationTests.java | 6 +- .../TableOptionsIntegrationTests.java | 4 +- .../cql}/core/keyspace/OptionUnitTests.java | 2 +- ...bstractRoutingSessionFactoryUnitTests.java | 4 +- ...nFactorySessionFactoryLookupUnitTests.java | 4 +- .../MapSessionFactoryLookupUnitTests.java | 4 +- .../SingleSessionFactoryLookupUnitTests.java | 4 +- .../cql}/support/AbstractTestJavaConfig.java | 4 +- .../cql}/support/BeanDefinitionTestUtils.java | 2 +- .../support/CassandraAccessorUnitTests.java | 2 +- .../CassandraConnectionProperties.java | 2 +- ...CassandraExceptionTranslatorUnitTests.java | 6 +- .../cql}/support/CassandraVersion.java | 2 +- .../cql}/support/CqlDataSet.java | 2 +- .../support/IntegrationTestNettyOptions.java | 2 +- .../cql}/support/KeyspaceTestUtils.java | 2 +- .../cql}/support/RandomKeySpaceName.java | 2 +- .../config/spring-data-cassandra-basic.xml | 4 +- .../src/test/resources/logback.xml | 4 +- .../cassandra/config/multiple-converters.xml | 2 +- .../config/multiple-mapping-contexts.xml | 2 +- ...andraNamespaceIntegrationTests-context.xml | 2 +- ...itoryXmlConfigIntegrationTests-context.xml | 2 +- ...atingXmlConfigIntegrationTests-context.xml | 4 +- ...eatingXmlConfigIntegrationTests.properties | 0 ...atingXmlConfigIntegrationTests-context.xml | 0 ...nimalXmlConfigIntegrationTests-context.xml | 0 ...atingXmlConfigIntegrationTests-context.xml | 10 +-- .../xml/XmlConfigIntegrationTests-context.xml | 7 +- .../cql}/config/xml/ppncxct.properties | 0 src/main/asciidoc/reference/cassandra.adoc | 4 +- 521 files changed, 1812 insertions(+), 1845 deletions(-) delete mode 100644 spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/package-info.java delete mode 100644 spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/package-info.java delete mode 100644 spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/package-info.java delete mode 100644 spring-data-cassandra/src/main/java/org/springframework/cassandra/core/package-info.java delete mode 100644 spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/package-info.java delete mode 100644 spring-data-cassandra/src/main/java/org/springframework/cassandra/core/support/package-info.java rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/AbstractCassandraConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/BasicCassandraRowValueProvider.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/CassandraConverter.java (83%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/CassandraConverters.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/CassandraCustomConversions.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/CassandraJodaTimeConverters.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/CassandraJsr310Converters.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/CassandraRowValueProvider.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/CassandraThreeTenBackPortConverters.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/CassandraUDTValueProvider.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/CassandraValueProvider.java (90%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/ColumnReader.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/CustomConversions.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/MappingCassandraConverter.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/QueryMapper.java (91%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/RowReaderPropertyAccessor.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/UpdateMapper.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/convert/package-info.java (54%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/BasicCassandraMappingContext.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/BasicCassandraPersistentEntity.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/BasicCassandraPersistentEntityMetadataVerifier.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/BasicCassandraPersistentProperty.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraColumnAnnotationComparator.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraMappingContext.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraPersistentEntity.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraPersistentEntityMetadataVerifier.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraPersistentProperty.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraPersistentPropertyComparator.java (90%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraPrimaryKeyColumnAnnotationComparator.java (88%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraSimpleTypeHolder.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraType.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraUserTypePersistentEntity.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/Column.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/EntityMapping.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/Indexed.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/Mapping.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/PrimaryKey.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/PrimaryKeyClass.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/PrimaryKeyClassEntityMetadataVerifier.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/PrimaryKeyColumn.java (92%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/PropertyMapping.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/SimpleUserTypeResolver.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/Table.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/UserDefinedType.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/UserTypeResolver.java (89%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/UserTypeUtil.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/VerifierMappingExceptions.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/data/cassandra/{ => core}/mapping/package-info.java (59%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/CassandraCqlClusterFactoryBean.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/CassandraCqlSessionFactoryBean.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/CassandraCqlTemplateFactoryBean.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/ClusterBuilderConfigurer.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/CompressionType.java (92%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/DataCenterReplication.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/KeyspaceAction.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/KeyspaceActionSpecificationFactoryBean.java (92%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/KeyspaceAttributes.java (90%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/MultiLevelSetFlattenerFactoryBean.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/PoolingOptionsFactoryBean.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/SocketOptionsFactoryBean.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/java/AbstractClusterConfiguration.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/java/AbstractCqlTemplateConfiguration.java (84%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/java/AbstractSessionConfiguration.java (84%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/java/package-info.java (50%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/package-info.java (70%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/xml/CassandraCqlClusterParser.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/xml/CassandraCqlSessionParser.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/xml/CassandraCqlTemplateParser.java (92%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/xml/CassandraNamespaceHandler.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/xml/DefaultCqlBeanNames.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/xml/ParsingUtils.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/config/xml/package-info.java (55%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ArgumentPreparedStatementBinder.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/AsyncCqlOperations.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/AsyncCqlTemplate.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/AsyncPreparedStatementCreator.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/AsyncSessionCallback.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/AsynchronousQueryListener.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/CachedPreparedStatementCreator.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/CassandraUncategorizedDataAccessException.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ColumnMapRowMapper.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/CqlConstantType.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/CqlIdentifier.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/CqlOperations.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/CqlProvider.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/CqlStringUtils.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/CqlTemplate.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ExceptionTranslatingListenableFutureAdapter.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/GuavaListenableFutureAdapter.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/HostMapper.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/KeyspaceIdentifier.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/Ordering.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/PreparedStatementBinder.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/PreparedStatementCallback.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/PreparedStatementCreator.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/PrimaryKeyType.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/QueryOptions.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/QueryOptionsUtil.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ReactiveCqlOperations.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ReactiveCqlTemplate.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ReactivePreparedStatementCallback.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ReactivePreparedStatementCreator.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ReactiveResultSetExtractor.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ReactiveRowMapperResultSetExtractor.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ReactiveSessionCallback.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ReactiveStatementCallback.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ReservedKeyword.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/ResultSetExtractor.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/RingMember.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/RingMemberHostMapper.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/RowCallbackHandler.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/RowMapper.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/RowMapperResultSetExtractor.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/SessionCallback.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/SimplePreparedStatementCreator.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/SingleColumnRowMapper.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/WriteOptions.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/AbstractResultSetConverter.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/AbstractResultSetToBasicFixedTypeConverter.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToArrayConverter.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToBigDecimalConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToBigIntegerConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToBooleanConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToByteBufferConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToDateConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToDoubleConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToFloatConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToInetAddressConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToIntegerConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToListConverter.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToListOfStringConverter.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToLongConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToStringConverter.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/ResultSetToUuidConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/RowToArrayConverter.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/RowToListConverter.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/converter/RowToMapConverter.java (96%) create mode 100644 spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/package-info.java rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AddColumnCqlGenerator.java (82%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AlterColumnCqlGenerator.java (85%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AlterKeyspaceCqlGenerator.java (90%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AlterTableCqlGenerator.java (85%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AlterUserTypeCqlGenerator.java (86%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/ColumnChangeCqlGenerator.java (91%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CreateIndexCqlGenerator.java (88%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CreateKeyspaceCqlGenerator.java (88%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CreateTableCqlGenerator.java (91%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CreateUserTypeCqlGenerator.java (89%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/DropColumnCqlGenerator.java (80%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/DropIndexCqlGenerator.java (86%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/DropKeyspaceCqlGenerator.java (85%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/DropTableCqlGenerator.java (85%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/DropUserTypeCqlGenerator.java (88%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/IndexNameCqlGenerator.java (92%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/KeyspaceCqlGenerator.java (89%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/KeyspaceNameCqlGenerator.java (92%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/KeyspaceOptionsCqlGenerator.java (88%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/RenameColumnCqlGenerator.java (82%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/TableCqlGenerator.java (89%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/TableNameCqlGenerator.java (92%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/TableOptionsCqlGenerator.java (88%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/UserTypeNameCqlGenerator.java (93%) create mode 100644 spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/package-info.java rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/AddColumnSpecification.java (92%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/AlterColumnSpecification.java (88%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/AlterKeyspaceSpecification.java (92%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/AlterTableSpecification.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/AlterUserTypeSpecification.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/ColumnChangeSpecification.java (89%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/ColumnSpecification.java (91%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/ColumnTypeChangeSpecification.java (90%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/CreateIndexSpecification.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/CreateKeyspaceSpecification.java (92%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/CreateTableSpecification.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/CreateUserTypeSpecification.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/DefaultOption.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/DefaultTableDescriptor.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/DropColumnSpecification.java (89%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/DropIndexSpecification.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/DropKeyspaceSpecification.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/DropTableSpecification.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/DropUserTypeSpecification.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/FieldSpecification.java (89%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/IndexDescriptor.java (88%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/IndexNameSpecification.java (88%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/KeyspaceActionSpecification.java (92%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/KeyspaceDescriptor.java (87%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/KeyspaceOption.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/KeyspaceOptionsSpecification.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/KeyspaceSpecification.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/Option.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/RenameColumnSpecification.java (89%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/TableDescriptor.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/TableNameSpecification.java (87%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/TableOption.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/TableOptionsSpecification.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/TableSpecification.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/UserTypeNameSpecification.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/UserTypeSpecification.java (91%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/keyspace/package-info.java (65%) create mode 100644 spring-data-cassandra/src/main/java/org/springframework/data/cql/core/package-info.java rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/DefaultBridgedReactiveSession.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/DefaultReactiveSessionFactory.java (90%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/DefaultSessionFactory.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/ReactiveResultSet.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/ReactiveSession.java (99%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/ReactiveSessionFactory.java (91%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/SessionFactory.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/lookup/AbstractRoutingSessionFactory.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/lookup/BeanFactorySessionFactoryLookup.java (91%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/lookup/MapSessionFactoryLookup.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/lookup/SessionFactoryLookup.java (89%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/lookup/SessionFactoryLookupFailureException.java (90%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/lookup/SingleSessionFactoryLookup.java (93%) create mode 100644 spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/package-info.java rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/session/package-info.java (73%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/support/CQLExceptionTranslator.java (97%) create mode 100644 spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/package-info.java rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/core/util/MapBuilder.java (98%) create mode 100644 spring-data-cassandra/src/main/java/org/springframework/data/cql/package-info.java rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/CassandraAccessor.java (91%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/CassandraExceptionTranslator.java (97%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/ReactiveCassandraAccessor.java (92%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/RowUtils.java (98%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraAuthenticationException.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraConnectionFailureException.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraInsufficientReplicasAvailableException.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraInternalException.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraInvalidConfigurationInQueryException.java (94%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraInvalidQueryException.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraKeyspaceExistsException.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraQuerySyntaxException.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraReadTimeoutException.java (95%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraSchemaElementExistsException.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraTableExistsException.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraTraceRetrievalException.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraTruncateException.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraTypeMismatchException.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraUnauthorizedException.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraUncategorizedException.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/CassandraWriteTimeoutException.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/IncorrectResultSetColumnCountException.java (96%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/UnsupportedCassandraOperationException.java (93%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/exception/package-info.java (54%) rename spring-data-cassandra/src/main/java/org/springframework/{cassandra => data/cql}/support/package-info.java (55%) rename spring-data-cassandra/src/main/resources/org/springframework/{cassandra => data/cql}/config/spring-cql-1.0.xsd (100%) rename spring-data-cassandra/src/main/resources/org/springframework/{cassandra => data/cql}/config/spring-cql-1.5.xsd (100%) rename spring-data-cassandra/src/main/resources/org/springframework/{cassandra => data/cql}/config/spring-cql-2.0.xsd (98%) rename spring-data-cassandra/src/main/resources/org/springframework/{cassandra => data/cql}/config/spring-cql.gif (100%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/convert/CassandraTypeMappingIntegrationTest.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/convert/ColumnReaderUnitTests.java (96%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/convert/CounterEntity.java (79%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/convert/CurrencyConverter.java (94%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/convert/CustomConversionIntegrationTests.java (96%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/convert/MappingCassandraConverterUDTIntegrationTests.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/convert/MappingCassandraConverterUnitTests.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/convert/QueryMapperUnitTests.java (94%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/convert/TimeEntity.java (79%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/convert/UpdateMapperUnitTests.java (91%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/BasicCassandraMappingContextUnitTests.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/BasicCassandraPersistentEntityMetadataVerifierUnitTests.java (94%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/BasicCassandraPersistentEntityOrderPropertiesUnitTests.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/BasicCassandraPersistentEntityUnitTests.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/BasicCassandraPersistentPropertyUnitTests.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraCompositePrimaryKeyUnitTests.java (92%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraPersistentPropertyComparatorUnitTests.java (96%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraPrimaryKeyColumnAnnotationComparatorUnitTests.java (93%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/CassandraUserTypePersistentEntityUnitTests.java (96%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/CompositeCassandraPersistentEntityMetadataVerifierUnitTests.java (94%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/CompoundPrimaryKeyUnitTests.java (95%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/CreateUserTypeIntegrationTests.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/ForceQuotedEntitiesSimpleUnitTests.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/ForceQuotedPropertiesSimpleUnitTests.java (96%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/PrimaryKeyClassEntityMetadataVerifierUnitTests.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/multipackagescanning/MultipackageScanningUnitTests.java (77%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/multipackagescanning/Top.java (76%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/multipackagescanning/first/First.java (76%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/multipackagescanning/second/Second.java (75%) rename spring-data-cassandra/src/test/java/org/springframework/data/cassandra/{ => core}/mapping/multipackagescanning/third/Third.java (76%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/AbstractEmbeddedCassandraIntegrationTest.java (95%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/AbstractKeyspaceCreatingIntegrationTest.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/CassandraRule.java (96%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/EmbeddedCassandraServerHelper.java (99%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/KeyspaceRule.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/CassandraCqlClusterFactoryBeanUnitTests.java (99%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/CassandraCqlSessionFactoryBeanUnitTests.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/PoolingOptionsFactoryBeanUnitTests.java (99%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/java/AbstractClusterConfigurationUnitTests.java (93%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/java/ConfigIntegrationTests.java (89%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/java/CqlTemplateConfigIntegrationTests.java (88%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/java/KeyspaceCreatingJavaConfigIntegrationTests.java (83%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/xml/CassandraCqlClusterParserUnitTests.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java (88%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java (86%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/xml/MinimalXmlConfigIntegrationTests.java (83%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/xml/ParsingUtilsUnitTests.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java (93%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/xml/TestHostStateListener.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/xml/TestLatencyTracker.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/config/xml/XmlConfigIntegrationTests.java (95%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/AsyncCqlTemplateIntegrationTests.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/AsyncCqlTemplateUnitTests.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/CachedPreparedStatementCreatorUnitTests.java (99%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/CqlIdentifierUnitTests.java (90%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/CqlTemplateIntegrationTests.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/CqlTemplateUnitTests.java (99%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/DefaultBridgedReactiveSessionIntegrationTests.java (92%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/DefaultBridgedReactiveSessionUnitTests.java (96%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/QueryOptionsUnitTests.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/QueryOptionsUtilUnitTests.java (99%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/ReactiveCqlTemplateIntegrationTests.java (92%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/ReactiveCqlTemplateUnitTests.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/SingleColumnRowMapperUnitTests.java (96%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/WriteOptionsUnitTests.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AbstractIndexOperationCqlGeneratorTest.java (92%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AbstractKeyspaceOperationCqlGeneratorTest.java (89%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AbstractTableOperationCqlGeneratorTest.java (92%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AlterKeyspaceCqlGeneratorUnitTests.java (91%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AlterTableCqlGeneratorIntegrationTests.java (91%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AlterTableCqlGeneratorUnitTests.java (92%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AlterUserTypeCqlGeneratorIntegrationTests.java (87%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/AlterUserTypeCqlGeneratorUnitTests.java (90%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CqlIndexSpecificationAssertions.java (94%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CqlKeyspaceSpecificationAssertions.java (90%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CqlTableSpecificationAssertions.java (93%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CreateIndexCqlGeneratorIntegrationTests.java (81%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CreateIndexCqlGeneratorUnitTests.java (94%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java (79%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CreateKeyspaceCqlGeneratorUnitTests.java (90%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CreateTableCqlGeneratorIntegrationTests.java (79%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CreateTableCqlGeneratorUnitTests.java (93%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CreateUserTypeCqlGeneratorIntegrationTests.java (90%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/CreateUserTypeCqlGeneratorUnitTests.java (90%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/DropIndexCqlGeneratorUnitTests.java (94%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/DropKeyspaceCqlGeneratorUnitTests.java (90%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/DropTableCqlGeneratorUnitTests.java (93%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/DropUserTypeCqlGeneratorUnitTests.java (84%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/IndexLifecycleCqlGeneratorIntegrationTests.java (93%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/TableLifecycleIntegrationTests.java (91%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra/core/cql => data/cql/core}/generator/TableOptionsIntegrationTests.java (90%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/keyspace/OptionUnitTests.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/session/lookup/AbstractRoutingSessionFactoryUnitTests.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/session/lookup/BeanFactorySessionFactoryLookupUnitTests.java (95%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/session/lookup/MapSessionFactoryLookupUnitTests.java (95%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/core/session/lookup/SingleSessionFactoryLookupUnitTests.java (91%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/support/AbstractTestJavaConfig.java (93%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/support/BeanDefinitionTestUtils.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/support/CassandraAccessorUnitTests.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/support/CassandraConnectionProperties.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/support/CassandraExceptionTranslatorUnitTests.java (98%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/support/CassandraVersion.java (96%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/support/CqlDataSet.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/support/IntegrationTestNettyOptions.java (97%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/support/KeyspaceTestUtils.java (95%) rename spring-data-cassandra/src/test/java/org/springframework/{cassandra => data/cql}/support/RandomKeySpaceName.java (95%) rename spring-data-cassandra/src/test/resources/org/springframework/{cassandra => data/cql}/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml (86%) rename spring-data-cassandra/src/test/resources/org/springframework/{cassandra => data/cql}/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.properties (100%) rename spring-data-cassandra/src/test/resources/org/springframework/{cassandra => data/cql}/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests-context.xml (100%) rename spring-data-cassandra/src/test/resources/org/springframework/{cassandra => data/cql}/config/xml/MinimalXmlConfigIntegrationTests-context.xml (100%) rename spring-data-cassandra/src/test/resources/org/springframework/{cassandra => data/cql}/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests-context.xml (89%) rename spring-data-cassandra/src/test/resources/org/springframework/{cassandra => data/cql}/config/xml/XmlConfigIntegrationTests-context.xml (88%) rename spring-data-cassandra/src/test/resources/org/springframework/{cassandra => data/cql}/config/xml/ppncxct.properties (100%) diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/package-info.java deleted file mode 100644 index 4a2fbd88a..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * CQL specific converters. - */ -package org.springframework.cassandra.core.converter; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/package-info.java deleted file mode 100644 index 1e23c9a23..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * CQL generators for Keyspace object actions. - */ -package org.springframework.cassandra.core.cql.generator; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/package-info.java deleted file mode 100644 index ce49ca3da..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * CQL support. - */ -package org.springframework.cassandra.core.cql; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/package-info.java deleted file mode 100644 index dacce1362..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * CQL core support. - */ -package org.springframework.cassandra.core; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/package-info.java deleted file mode 100644 index 44062518b..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Provides a strategy for looking up {@link org.springframework.cassandra.core.session.SessionFactory}. - * - * @author Mark Paluch - */ -package org.springframework.cassandra.core.session.lookup; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/support/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/support/package-info.java deleted file mode 100644 index 32c40efc0..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/support/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * CQL support classes. - */ -package org.springframework.cassandra.core.support; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBean.java index 309f749cd..9ac394b4b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBean.java @@ -1,12 +1,12 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,7 +16,7 @@ package org.springframework.data.cassandra.config; -import org.springframework.cassandra.config.CassandraCqlClusterFactoryBean; +import org.springframework.data.cql.config.CassandraCqlClusterFactoryBean; /** * Spring Data Cassandra extension of CassandraCqlClusterFactoryBean. This class exists only in the name of symmetry, diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraEntityClassScanner.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraEntityClassScanner.java index 71497fe66..1e9d6af2d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraEntityClassScanner.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraEntityClassScanner.java @@ -26,8 +26,8 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.data.annotation.Persistent; -import org.springframework.data.cassandra.mapping.PrimaryKeyClass; -import org.springframework.data.cassandra.mapping.Table; +import org.springframework.data.cassandra.core.mapping.PrimaryKeyClass; +import org.springframework.data.cassandra.core.mapping.Table; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingBeanFactoryPostProcessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingBeanFactoryPostProcessor.java index 563074dde..c7b05841f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingBeanFactoryPostProcessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingBeanFactoryPostProcessor.java @@ -1,12 +1,12 @@ /* * Copyright 2013-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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,12 +29,12 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.data.cassandra.convert.CassandraConverter; -import org.springframework.data.cassandra.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.convert.CassandraConverter; +import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.CassandraTemplate; -import org.springframework.data.cassandra.mapping.BasicCassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.BasicCassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.util.StringUtils; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBean.java index ca3c3a5b8..35c718ff9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBean.java @@ -15,13 +15,13 @@ */ package org.springframework.data.cassandra.config; -import org.springframework.cassandra.config.CassandraCqlSessionFactoryBean; -import org.springframework.data.cassandra.convert.CassandraConverter; +import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.CassandraAdminOperations; import org.springframework.data.cassandra.core.CassandraAdminTemplate; import org.springframework.data.cassandra.core.CassandraPersistentEntitySchemaCreator; import org.springframework.data.cassandra.core.CassandraPersistentEntitySchemaDropper; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cql.config.CassandraCqlSessionFactoryBean; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java index 311381d8c..8a683e447 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java @@ -17,11 +17,11 @@ package org.springframework.data.cassandra.config; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.cassandra.core.CqlOperations; -import org.springframework.cassandra.core.session.DefaultSessionFactory; -import org.springframework.cassandra.core.session.SessionFactory; -import org.springframework.data.cassandra.convert.CassandraConverter; +import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.CassandraTemplate; +import org.springframework.data.cql.core.CqlOperations; +import org.springframework.data.cql.core.session.DefaultSessionFactory; +import org.springframework.data.cql.core.session.SessionFactory; import org.springframework.util.Assert; import com.datastax.driver.core.Session; @@ -89,7 +89,7 @@ public class CassandraTemplateFactoryBean implements FactoryBean(getAsyncCqlOperations().execute(truncate), aBoolean -> null); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminOperations.java index 728cd4aaa..146b373cf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminOperations.java @@ -18,7 +18,7 @@ package org.springframework.data.cassandra.core; import java.util.Map; import java.util.Optional; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import com.datastax.driver.core.KeyspaceMetadata; import com.datastax.driver.core.TableMetadata; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java index 91378a0b3..95a30bea1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java @@ -18,17 +18,17 @@ package org.springframework.data.cassandra.core; import java.util.Map; import java.util.Optional; -import org.springframework.cassandra.core.SessionCallback; -import org.springframework.cassandra.core.cql.CqlIdentifier; -import org.springframework.cassandra.core.cql.generator.CreateTableCqlGenerator; -import org.springframework.cassandra.core.cql.generator.DropTableCqlGenerator; -import org.springframework.cassandra.core.cql.generator.DropUserTypeCqlGenerator; -import org.springframework.cassandra.core.keyspace.CreateTableSpecification; -import org.springframework.cassandra.core.keyspace.DropTableSpecification; -import org.springframework.cassandra.core.keyspace.DropUserTypeSpecification; -import org.springframework.cassandra.core.session.SessionFactory; -import org.springframework.data.cassandra.convert.CassandraConverter; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.convert.CassandraConverter; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.core.SessionCallback; +import org.springframework.data.cql.core.generator.CreateTableCqlGenerator; +import org.springframework.data.cql.core.generator.DropTableCqlGenerator; +import org.springframework.data.cql.core.generator.DropUserTypeCqlGenerator; +import org.springframework.data.cql.core.keyspace.CreateTableSpecification; +import org.springframework.data.cql.core.keyspace.DropTableSpecification; +import org.springframework.data.cql.core.keyspace.DropUserTypeSpecification; +import org.springframework.data.cql.core.session.SessionFactory; import org.springframework.util.Assert; import com.datastax.driver.core.KeyspaceMetadata; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchOperations.java index 294cfb280..ea1d8d071 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchOperations.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.core; -import org.springframework.cassandra.core.WriteOptions; +import org.springframework.data.cql.core.WriteOptions; /** * Batch operations for insert/update/delete actions on a table. {@link CassandraBatchOperations} use logged Cassandra diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java index 1adeae4ff..079413f0a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java @@ -18,7 +18,7 @@ package org.springframework.data.cassandra.core; import java.util.Arrays; import java.util.concurrent.atomic.AtomicBoolean; -import org.springframework.cassandra.core.WriteOptions; +import org.springframework.data.cql.core.WriteOptions; import org.springframework.util.Assert; import com.datastax.driver.core.querybuilder.Batch; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java index 720bf34e9..9c25cf4fb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java @@ -19,14 +19,14 @@ import java.util.Iterator; import java.util.List; import java.util.stream.Stream; -import org.springframework.cassandra.core.CqlOperations; -import org.springframework.cassandra.core.QueryOptions; -import org.springframework.cassandra.core.WriteOptions; -import org.springframework.cassandra.core.cql.CqlIdentifier; import org.springframework.dao.DataAccessException; -import org.springframework.data.cassandra.convert.CassandraConverter; +import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.query.Query; import org.springframework.data.cassandra.core.query.Update; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.core.CqlOperations; +import org.springframework.data.cql.core.QueryOptions; +import org.springframework.data.cql.core.WriteOptions; import com.datastax.driver.core.Statement; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java index 6766c3b68..15cf334ec 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java @@ -25,13 +25,13 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.cassandra.core.cql.CqlIdentifier; -import org.springframework.cassandra.core.cql.generator.CreateTableCqlGenerator; -import org.springframework.cassandra.core.cql.generator.CreateUserTypeCqlGenerator; -import org.springframework.cassandra.core.keyspace.CreateTableSpecification; -import org.springframework.cassandra.core.keyspace.CreateUserTypeSpecification; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.core.generator.CreateTableCqlGenerator; +import org.springframework.data.cql.core.generator.CreateUserTypeCqlGenerator; +import org.springframework.data.cql.core.keyspace.CreateTableSpecification; +import org.springframework.data.cql.core.keyspace.CreateUserTypeSpecification; import org.springframework.data.util.Optionals; import org.springframework.util.Assert; @@ -42,9 +42,9 @@ import org.springframework.util.Assert; * @author Mark Paluch * @author Jens Schauder * @since 1.5 - * @see org.springframework.data.cassandra.mapping.Table - * @see org.springframework.data.cassandra.mapping.UserDefinedType - * @see org.springframework.data.cassandra.mapping.CassandraType + * @see org.springframework.data.cassandra.core.mapping.Table + * @see org.springframework.data.cassandra.core.mapping.UserDefinedType + * @see org.springframework.data.cassandra.core.mapping.CassandraType */ public class CassandraPersistentEntitySchemaCreator { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropper.java index 451c839cc..fa0f69b2c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropper.java @@ -18,9 +18,9 @@ package org.springframework.data.cassandra.core; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.cassandra.core.cql.CqlIdentifier; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; /** @@ -29,9 +29,9 @@ import org.springframework.util.Assert; * * @author Mark Paluch * @since 1.5 - * @see org.springframework.data.cassandra.mapping.Table - * @see org.springframework.data.cassandra.mapping.UserDefinedType - * @see org.springframework.data.cassandra.mapping.CassandraType + * @see org.springframework.data.cassandra.core.mapping.Table + * @see org.springframework.data.cassandra.core.mapping.UserDefinedType + * @see org.springframework.data.cassandra.core.mapping.CassandraType */ public class CassandraPersistentEntitySchemaDropper { @@ -72,7 +72,7 @@ public class CassandraPersistentEntitySchemaDropper { * Drop user types that exist in the keyspace. * * @param dropUnused {@literal true} to drop unused types before creation. Type usage is determined from existing - * mapped {@link org.springframework.data.cassandra.mapping.UserDefinedType}s and UDT names on field + * mapped {@link org.springframework.data.cassandra.core.mapping.UserDefinedType}s and UDT names on field * specifications. */ public void dropUserTypes(boolean dropUnused) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java index c6bfb6e5d..0dae7bbed 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java @@ -22,24 +22,24 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import org.springframework.cassandra.core.CqlOperations; -import org.springframework.cassandra.core.CqlProvider; -import org.springframework.cassandra.core.CqlTemplate; -import org.springframework.cassandra.core.QueryOptions; -import org.springframework.cassandra.core.SessionCallback; -import org.springframework.cassandra.core.WriteOptions; -import org.springframework.cassandra.core.cql.CqlIdentifier; -import org.springframework.cassandra.core.session.DefaultSessionFactory; -import org.springframework.cassandra.core.session.SessionFactory; import org.springframework.dao.DataAccessException; -import org.springframework.data.cassandra.convert.CassandraConverter; -import org.springframework.data.cassandra.convert.MappingCassandraConverter; -import org.springframework.data.cassandra.convert.QueryMapper; -import org.springframework.data.cassandra.convert.UpdateMapper; +import org.springframework.data.cassandra.core.convert.CassandraConverter; +import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.convert.QueryMapper; +import org.springframework.data.cassandra.core.convert.UpdateMapper; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.cassandra.core.query.Query; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; -import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.core.CqlOperations; +import org.springframework.data.cql.core.CqlProvider; +import org.springframework.data.cql.core.CqlTemplate; +import org.springframework.data.cql.core.QueryOptions; +import org.springframework.data.cql.core.SessionCallback; +import org.springframework.data.cql.core.WriteOptions; +import org.springframework.data.cql.core.session.DefaultSessionFactory; +import org.springframework.data.cql.core.session.SessionFactory; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; @@ -142,9 +142,9 @@ public class CassandraTemplate implements CassandraOperations { this.statementFactory = new StatementFactory(new QueryMapper(converter), new UpdateMapper(converter)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#getConverter() - */ + /* (non-Javadoc) + * @see org.springframework.data.cassandra.core.CassandraOperations#getConverter() + */ @Override public CassandraConverter getConverter() { return this.converter; @@ -170,8 +170,8 @@ public class CassandraTemplate implements CassandraOperations { } /** - * Returns the {@link CassandraMappingContext} used by this template to access mapping meta-data used to - * store (map) object to Cassandra tables. + * Returns the {@link CassandraMappingContext} used by this template to access mapping meta-data used to store (map) + * object to Cassandra tables. * * @return the {@link CassandraMappingContext} used by this template. * @see org.springframework.data.cassandra.mapping.CassandraMappingContext @@ -283,8 +283,8 @@ public class CassandraTemplate implements CassandraOperations { Assert.notNull(query, "Query must not be null"); Assert.notNull(entityClass, "Entity type must not be null"); - return select(getStatementFactory().select(query, - getMappingContext().getRequiredPersistentEntity(entityClass)), entityClass); + return select(getStatementFactory().select(query, getMappingContext().getRequiredPersistentEntity(entityClass)), + entityClass); } /* (non-Javadoc) @@ -296,8 +296,8 @@ public class CassandraTemplate implements CassandraOperations { Assert.notNull(query, "Query must not be null"); Assert.notNull(entityClass, "Entity type must not be null"); - return stream(getStatementFactory().select(query, - getMappingContext().getRequiredPersistentEntity(entityClass)), entityClass); + return stream(getStatementFactory().select(query, getMappingContext().getRequiredPersistentEntity(entityClass)), + entityClass); } /* (non-Javadoc) @@ -322,8 +322,8 @@ public class CassandraTemplate implements CassandraOperations { Assert.notNull(update, "Update must not be null"); Assert.notNull(entityClass, "Entity type must not be null"); - return getCqlOperations().execute(getStatementFactory().update(query, update, - getMappingContext().getRequiredPersistentEntity(entityClass))); + return getCqlOperations().execute( + getStatementFactory().update(query, update, getMappingContext().getRequiredPersistentEntity(entityClass))); } /* (non-Javadoc) @@ -335,8 +335,8 @@ public class CassandraTemplate implements CassandraOperations { Assert.notNull(query, "Query must not be null"); Assert.notNull(entityClass, "Entity type must not be null"); - return getCqlOperations().execute(getStatementFactory().delete(query, - getMappingContext().getRequiredPersistentEntity(entityClass))); + return getCqlOperations() + .execute(getStatementFactory().delete(query, getMappingContext().getRequiredPersistentEntity(entityClass))); } // ------------------------------------------------------------------------- @@ -404,15 +404,14 @@ public class CassandraTemplate implements CassandraOperations { CassandraPersistentEntity entity = getMappingContext().getRequiredPersistentEntity(entityClass); - CassandraPersistentProperty idProperty = entity.getIdProperty().orElseThrow(() -> - new IllegalArgumentException(String.format("Entity class [%s] has no primary key", - entityClass.getName()))); + CassandraPersistentProperty idProperty = entity.getIdProperty().orElseThrow(() -> new IllegalArgumentException( + String.format("Entity class [%s] has no primary key", entityClass.getName()))); if (idProperty.isCompositePrimaryKey()) { String typeName = idProperty.getCompositePrimaryKeyEntity().getType().getName(); - throw new IllegalArgumentException(String.format( - "Entity class [%s] uses a composite primary key class [%s] which this method can't support", + throw new IllegalArgumentException( + String.format("Entity class [%s] uses a composite primary key class [%s] which this method can't support", entityClass.getName(), typeName)); } @@ -520,8 +519,8 @@ public class CassandraTemplate implements CassandraOperations { Assert.notNull(entityClass, "Entity type must not be null"); - Truncate truncate = - QueryBuilder.truncate(getMappingContext().getRequiredPersistentEntity(entityClass).getTableName().toCql()); + Truncate truncate = QueryBuilder + .truncate(getMappingContext().getRequiredPersistentEntity(entityClass).getTableName().toCql()); getCqlOperations().execute(truncate); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/QueryUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/QueryUtils.java index 013857986..685a57b56 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/QueryUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/QueryUtils.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core; -import org.springframework.cassandra.core.QueryOptions; -import org.springframework.cassandra.core.QueryOptionsUtil; -import org.springframework.cassandra.core.WriteOptions; import org.springframework.data.convert.EntityWriter; +import org.springframework.data.cql.core.QueryOptions; +import org.springframework.data.cql.core.QueryOptionsUtil; +import org.springframework.data.cql.core.WriteOptions; import org.springframework.util.Assert; import com.datastax.driver.core.querybuilder.Delete; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraOperations.java index 30a4da53a..df1e20004 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraOperations.java @@ -19,13 +19,13 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import org.reactivestreams.Publisher; -import org.springframework.cassandra.core.QueryOptions; -import org.springframework.cassandra.core.ReactiveCqlOperations; -import org.springframework.cassandra.core.WriteOptions; import org.springframework.dao.DataAccessException; -import org.springframework.data.cassandra.convert.CassandraConverter; +import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.query.Query; import org.springframework.data.cassandra.core.query.Update; +import org.springframework.data.cql.core.QueryOptions; +import org.springframework.data.cql.core.ReactiveCqlOperations; +import org.springframework.data.cql.core.WriteOptions; import com.datastax.driver.core.Statement; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java index a4a75cb8c..de15b87c3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java @@ -18,30 +18,29 @@ package org.springframework.data.cassandra.core; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import org.springframework.cassandra.core.CqlProvider; -import org.springframework.cassandra.core.QueryOptions; -import org.springframework.cassandra.core.ReactiveCqlOperations; -import org.springframework.cassandra.core.ReactiveCqlTemplate; -import org.springframework.cassandra.core.ReactiveSessionCallback; -import org.springframework.cassandra.core.WriteOptions; -import org.springframework.cassandra.core.cql.CqlIdentifier; -import org.springframework.cassandra.core.session.DefaultReactiveSessionFactory; -import org.springframework.cassandra.core.session.ReactiveResultSet; -import org.springframework.cassandra.core.session.ReactiveSession; -import org.springframework.cassandra.core.session.ReactiveSessionFactory; +import org.reactivestreams.Publisher; import org.springframework.dao.DataAccessException; -import org.springframework.data.cassandra.convert.CassandraConverter; -import org.springframework.data.cassandra.convert.MappingCassandraConverter; -import org.springframework.data.cassandra.convert.QueryMapper; -import org.springframework.data.cassandra.convert.UpdateMapper; +import org.springframework.data.cassandra.core.convert.CassandraConverter; +import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.convert.QueryMapper; +import org.springframework.data.cassandra.core.convert.UpdateMapper; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.query.Query; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.core.CqlProvider; +import org.springframework.data.cql.core.QueryOptions; +import org.springframework.data.cql.core.ReactiveCqlOperations; +import org.springframework.data.cql.core.ReactiveCqlTemplate; +import org.springframework.data.cql.core.ReactiveSessionCallback; +import org.springframework.data.cql.core.WriteOptions; +import org.springframework.data.cql.core.session.DefaultReactiveSessionFactory; +import org.springframework.data.cql.core.session.ReactiveResultSet; +import org.springframework.data.cql.core.session.ReactiveSession; +import org.springframework.data.cql.core.session.ReactiveSessionFactory; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; -import org.reactivestreams.Publisher; - import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; @@ -67,10 +66,10 @@ import com.datastax.driver.core.querybuilder.Update; * * @author Mark Paluch * @author John Blum - * @see org.springframework.cassandra.core.ReactiveCqlOperations - * @see org.springframework.data.cassandra.convert.CassandraConverter - * @see org.springframework.data.cassandra.convert.QueryMapper - * @see org.springframework.data.cassandra.convert.UpdateMapper + * @see org.springframework.data.cql.core.ReactiveCqlOperations + * @see org.springframework.data.cassandra.core.convert.CassandraConverter + * @see org.springframework.data.cassandra.core.convert.QueryMapper + * @see org.springframework.data.cassandra.core.convert.UpdateMapper * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations * @see com.datastax.driver.core.querybuilder.Delete * @see com.datastax.driver.core.querybuilder.Insert @@ -109,7 +108,7 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { * @param session {@link ReactiveSession} used to interact with Cassandra; must not be {@literal null}. * @param converter {@link CassandraConverter} used to convert between Java and Cassandra types; must not be * {@literal null}. - * @see org.springframework.data.cassandra.convert.CassandraConverter + * @see org.springframework.data.cassandra.core.convert.CassandraConverter * @see com.datastax.driver.core.Session */ public ReactiveCassandraTemplate(ReactiveSession session, CassandraConverter converter) { @@ -123,7 +122,7 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { * @param sessionFactory {@link ReactiveSessionFactory} used to interact with Cassandra; must not be {@literal null}. * @param converter {@link CassandraConverter} used to convert between Java and Cassandra types; must not be * {@literal null}. - * @see org.springframework.data.cassandra.convert.CassandraConverter + * @see org.springframework.data.cassandra.core.convert.CassandraConverter * @see com.datastax.driver.core.Session */ public ReactiveCassandraTemplate(ReactiveSessionFactory sessionFactory, CassandraConverter converter) { @@ -145,7 +144,7 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { * {@literal null}. * @param converter {@link CassandraConverter} used to convert between Java and Cassandra types; must not be * {@literal null}. - * @see org.springframework.data.cassandra.convert.CassandraConverter + * @see org.springframework.data.cassandra.core.convert.CassandraConverter * @see com.datastax.driver.core.Session */ public ReactiveCassandraTemplate(ReactiveCqlOperations reactiveCqlOperations, CassandraConverter converter) { @@ -179,8 +178,8 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { } /** - * Returns the {@link CassandraMappingContext} used by this template to access mapping meta-data used to - * store (map) objects to Cassandra tables. + * Returns the {@link CassandraMappingContext} used by this template to access mapping meta-data used to store (map) + * objects to Cassandra tables. * * @return the {@link CassandraMappingContext} used by this template. * @see org.springframework.data.cassandra.mapping.CassandraMappingContext @@ -277,8 +276,8 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { Assert.notNull(query, "Query must not be null"); Assert.notNull(entityClass, "Entity type must not be null"); - return select(getStatementFactory().select(query, - getMappingContext().getRequiredPersistentEntity(entityClass)), entityClass); + return select(getStatementFactory().select(query, getMappingContext().getRequiredPersistentEntity(entityClass)), + entityClass); } /* (non-Javadoc) @@ -290,8 +289,8 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { Assert.notNull(query, "Query must not be null"); Assert.notNull(entityClass, "Entity type must not be null"); - return selectOne(getStatementFactory().select(query, - getMappingContext().getRequiredPersistentEntity(entityClass)), entityClass); + return selectOne(getStatementFactory().select(query, getMappingContext().getRequiredPersistentEntity(entityClass)), + entityClass); } /* (non-Javadoc) @@ -305,8 +304,8 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { Assert.notNull(update, "Update must not be null"); Assert.notNull(entityClass, "Entity type must not be null"); - return getReactiveCqlOperations().execute(getStatementFactory().update(query, update, - getMappingContext().getRequiredPersistentEntity(entityClass))); + return getReactiveCqlOperations().execute( + getStatementFactory().update(query, update, getMappingContext().getRequiredPersistentEntity(entityClass))); } /* (non-Javadoc) @@ -318,8 +317,8 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { Assert.notNull(query, "Query must not be null"); Assert.notNull(entityClass, "Entity type must not be null"); - return getReactiveCqlOperations().execute(getStatementFactory().delete(query, - getMappingContext().getRequiredPersistentEntity(entityClass))); + return getReactiveCqlOperations() + .execute(getStatementFactory().delete(query, getMappingContext().getRequiredPersistentEntity(entityClass))); } // ------------------------------------------------------------------------- @@ -403,8 +402,8 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { @Override public Publisher doInSession(ReactiveSession session) throws DriverException, DataAccessException { - return session.execute(insert).flatMap( - reactiveResultSet -> reactiveResultSet.wasApplied() ? Mono.just(entity) : Mono.empty()); + return session.execute(insert) + .flatMap(reactiveResultSet -> reactiveResultSet.wasApplied() ? Mono.just(entity) : Mono.empty()); } @Override @@ -538,8 +537,8 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { @Override public Publisher doInSession(ReactiveSession session) throws DriverException, DataAccessException { - return session.execute(delete).flatMap( - reactiveResultSet -> reactiveResultSet.wasApplied() ? Mono.just(entity) : Mono.empty()); + return session.execute(delete) + .flatMap(reactiveResultSet -> reactiveResultSet.wasApplied() ? Mono.just(entity) : Mono.empty()); } @Override @@ -581,8 +580,8 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { Assert.notNull(entityClass, "Entity type must not be null"); - Truncate truncate = QueryBuilder.truncate( - getMappingContext().getRequiredPersistentEntity(entityClass).getTableName().toCql()); + Truncate truncate = QueryBuilder + .truncate(getMappingContext().getRequiredPersistentEntity(entityClass).getTableName().toCql()); return getReactiveCqlOperations().execute(truncate).then(); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java index e9679715d..ba475b2a2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java @@ -20,11 +20,9 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import org.springframework.cassandra.core.QueryOptionsUtil; -import org.springframework.cassandra.core.WriteOptions; -import org.springframework.cassandra.core.cql.CqlIdentifier; -import org.springframework.data.cassandra.convert.QueryMapper; -import org.springframework.data.cassandra.convert.UpdateMapper; +import org.springframework.data.cassandra.core.convert.QueryMapper; +import org.springframework.data.cassandra.core.convert.UpdateMapper; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.query.Columns.ColumnSelector; import org.springframework.data.cassandra.core.query.Columns.FunctionCall; import org.springframework.data.cassandra.core.query.Columns.Selector; @@ -42,7 +40,9 @@ import org.springframework.data.cassandra.core.query.Update.RemoveOp; import org.springframework.data.cassandra.core.query.Update.SetAtIndexOp; import org.springframework.data.cassandra.core.query.Update.SetAtKeyOp; import org.springframework.data.cassandra.core.query.Update.SetOp; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.core.QueryOptionsUtil; +import org.springframework.data.cql.core.WriteOptions; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Order; import org.springframework.util.Assert; @@ -108,7 +108,7 @@ public class StatementFactory { * Returns the {@link QueryMapper} used to map {@link Query} to CQL-specific data types. * * @return the {@link QueryMapper} used to map {@link Query} to CQL-specific data types. - * @see org.springframework.data.cassandra.convert.QueryMapper + * @see QueryMapper */ protected QueryMapper getQueryMapper() { return this.queryMapper; @@ -118,7 +118,7 @@ public class StatementFactory { * Returns the {@link UpdateMapper} used to map {@link Update} to CQL-specific data types. * * @return the {@link UpdateMapper} used to map {@link Update} to CQL-specific data types. - * @see org.springframework.data.cassandra.convert.UpdateMapper + * @see UpdateMapper */ protected UpdateMapper getUpdateMapper() { return this.updateMapper; @@ -140,8 +140,7 @@ public class StatementFactory { List selectors = getQueryMapper().getMappedSelectors(query.getColumns(), entity); - Sort sort = Optional.ofNullable(query.getSort()) - .map(querySort -> getQueryMapper().getMappedSort(querySort, entity)) + Sort sort = Optional.ofNullable(query.getSort()).map(querySort -> getQueryMapper().getMappedSort(querySort, entity)) .orElse(null); Select select = select(selectors, entity.getTableName(), filter, sort); @@ -293,8 +292,8 @@ public class StatementFactory { private static Assignment getAssignment(IncrOp incrOp) { return incrOp.getValue().intValue() > 0 - ? QueryBuilder.incr(incrOp.getColumnName().toCql(), Math.abs(incrOp.getValue().intValue())) - : QueryBuilder.decr(incrOp.getColumnName().toCql(), Math.abs(incrOp.getValue().intValue())); + ? QueryBuilder.incr(incrOp.getColumnName().toCql(), Math.abs(incrOp.getValue().intValue())) + : QueryBuilder.decr(incrOp.getColumnName().toCql(), Math.abs(incrOp.getValue().intValue())); } private static Assignment getAssignment(SetOp updateOp) { @@ -333,8 +332,8 @@ public class StatementFactory { } return Mode.PREPEND.equals(updateOp.getMode()) - ? QueryBuilder.prependAll(updateOp.getColumnName().toCql(), (List) updateOp.getValue()) - : QueryBuilder.appendAll(updateOp.getColumnName().toCql(), (List) updateOp.getValue()); + ? QueryBuilder.prependAll(updateOp.getColumnName().toCql(), (List) updateOp.getValue()) + : QueryBuilder.appendAll(updateOp.getColumnName().toCql(), (List) updateOp.getValue()); } private static Assignment getAssignment(AddToMapOp updateOp) { @@ -429,7 +428,7 @@ public class StatementFactory { return QueryBuilder.containsKey(columnName, predicate.getValue()); } - throw new IllegalArgumentException(String.format("Criteria %s %s %s not supported", - columnName, predicate.getOperator(), predicate.getValue())); + throw new IllegalArgumentException( + String.format("Criteria %s %s %s not supported", columnName, predicate.getOperator(), predicate.getValue())); } } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/AbstractCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AbstractCassandraConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/AbstractCassandraConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AbstractCassandraConverter.java index 5c7c95d2a..b1bd2231b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/AbstractCassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AbstractCassandraConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import java.util.Collections; @@ -32,7 +32,7 @@ import org.springframework.data.convert.EntityInstantiators; * @author Matthew T. Adams * @author Mark Paluch * @see org.springframework.beans.factory.InitializingBean - * @see org.springframework.data.cassandra.convert.CassandraConverter + * @see org.springframework.data.cassandra.core.convert.CassandraConverter */ public abstract class AbstractCassandraConverter implements CassandraConverter, InitializingBean { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/BasicCassandraRowValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/BasicCassandraRowValueProvider.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/BasicCassandraRowValueProvider.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/BasicCassandraRowValueProvider.java index 8cd2cc26d..c8df00035 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/BasicCassandraRowValueProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/BasicCassandraRowValueProvider.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import java.util.Optional; -import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator; import org.springframework.data.mapping.model.SpELExpressionEvaluator; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverter.java similarity index 83% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverter.java index 0dd6fb92d..9a6c8969f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverter.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import java.util.Optional; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; -import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.convert.CustomConversions; import org.springframework.data.convert.EntityConverter; import org.springframework.data.util.TypeInformation; @@ -51,11 +51,11 @@ public interface CassandraConverter * Returns the Id for an entity. It can return: *
    *
  • A singular value if for a simple {@link org.springframework.data.annotation.Id} or - * {@link org.springframework.data.cassandra.mapping.PrimaryKey} Id
    • + * {@link org.springframework.data.cassandra.core.mapping.PrimaryKey} Id *
  • A {@link org.springframework.data.cassandra.repository.MapId} for composite - * {@link org.springframework.data.cassandra.mapping.PrimaryKeyColumn} Id's
    • - *
  • A the composite primary key for {@link org.springframework.data.cassandra.mapping.PrimaryKey} using a - * {@link org.springframework.data.cassandra.mapping.PrimaryKeyClass}
    • + * {@link org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn} Id's + *
  • A the composite primary key for {@link org.springframework.data.cassandra.core.mapping.PrimaryKey} using a + * {@link org.springframework.data.cassandra.core.mapping.PrimaryKeyClass}
    • *
* * @param object must not be {@literal null}. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraConverters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverters.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraConverters.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverters.java index c3678fe99..c0259c279 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraConverters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverters.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import java.net.InetAddress; import java.util.ArrayList; @@ -23,11 +23,11 @@ import java.util.Date; import java.util.List; import java.util.UUID; -import org.springframework.cassandra.core.converter.RowToListConverter; -import org.springframework.cassandra.core.converter.RowToMapConverter; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.ConverterFactory; import org.springframework.data.convert.ReadingConverter; +import org.springframework.data.cql.core.converter.RowToListConverter; +import org.springframework.data.cql.core.converter.RowToMapConverter; import org.springframework.util.Assert; import org.springframework.util.NumberUtils; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraCustomConversions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraCustomConversions.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraCustomConversions.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraCustomConversions.java index 0548d362c..87596cc3f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraCustomConversions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraCustomConversions.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.data.cassandra.mapping.CassandraSimpleTypeHolder; +import org.springframework.data.cassandra.core.mapping.CassandraSimpleTypeHolder; import org.springframework.data.mapping.model.SimpleTypeHolder; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraJodaTimeConverters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraJodaTimeConverters.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java index b9d1d1516..f69a1ef3a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraJodaTimeConverters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraJsr310Converters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJsr310Converters.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraJsr310Converters.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJsr310Converters.java index a1dc6fe37..7e8d0ad09 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraJsr310Converters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJsr310Converters.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import java.time.LocalDate; import java.util.ArrayList; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraRowValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraRowValueProvider.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraRowValueProvider.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraRowValueProvider.java index edeb65352..68b6d5036 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraRowValueProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraRowValueProvider.java @@ -1,19 +1,19 @@ /* * Copyright 2013-2016 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import com.datastax.driver.core.Row; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraThreeTenBackPortConverters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraThreeTenBackPortConverters.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java index 22de117ea..96a81ea4a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraThreeTenBackPortConverters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraUDTValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraUDTValueProvider.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraUDTValueProvider.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraUDTValueProvider.java index 299c26923..07e0a86eb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraUDTValueProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraUDTValueProvider.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import java.util.Optional; -import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator; import org.springframework.data.mapping.model.SpELExpressionEvaluator; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraValueProvider.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraValueProvider.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraValueProvider.java index 3bd200901..47330ff14 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraValueProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraValueProvider.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; -import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.mapping.model.PropertyValueProvider; /** @@ -29,7 +29,7 @@ public interface CassandraValueProvider extends PropertyValueProvider converters) { super(converters); - } } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java index 2b91b92f6..fa69cf6b7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; -import static org.springframework.data.cassandra.repository.support.BasicMapId.Entry; -import static org.springframework.data.cassandra.repository.support.BasicMapId.id; +import static org.springframework.data.cassandra.repository.support.BasicMapId.*; + +import lombok.AllArgsConstructor; import java.util.ArrayList; import java.util.Collection; @@ -24,8 +25,8 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import lombok.AllArgsConstructor; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.context.ApplicationContext; @@ -33,11 +34,11 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.core.CollectionFactory; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.cassandra.mapping.BasicCassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; -import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; -import org.springframework.data.cassandra.mapping.CassandraType; +import org.springframework.data.cassandra.core.mapping.BasicCassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; +import org.springframework.data.cassandra.core.mapping.CassandraType; import org.springframework.data.cassandra.repository.MapId; import org.springframework.data.cassandra.repository.MapIdentifiable; import org.springframework.data.convert.EntityInstantiator; @@ -55,9 +56,6 @@ import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.ObjectUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.datastax.driver.core.CodecRegistry; import com.datastax.driver.core.DataType; import com.datastax.driver.core.Row; @@ -150,8 +148,8 @@ public class MappingCassandraConverter extends AbstractCassandraConverter return getConversionService().convert(row, type); } - CassandraPersistentEntity persistentEntity = - (CassandraPersistentEntity) getMappingContext().getRequiredPersistentEntity(typeInfo); + CassandraPersistentEntity persistentEntity = (CassandraPersistentEntity) getMappingContext() + .getRequiredPersistentEntity(typeInfo); return readEntityFromRow(persistentEntity, row); } @@ -162,9 +160,8 @@ public class MappingCassandraConverter extends AbstractCassandraConverter BasicCassandraRowValueProvider rowValueProvider = new BasicCassandraRowValueProvider(row, expressionEvaluator); - PersistentEntityParameterValueProvider parameterValueProvider = - new PersistentEntityParameterValueProvider<>(entity, - new MappingAndConvertingValueProvider(rowValueProvider), Optional.empty()); + PersistentEntityParameterValueProvider parameterValueProvider = new PersistentEntityParameterValueProvider<>( + entity, new MappingAndConvertingValueProvider(rowValueProvider), Optional.empty()); EntityInstantiator instantiator = instantiators.getInstantiatorFor(entity); S instance = instantiator.createInstance(entity, parameterValueProvider); @@ -178,12 +175,11 @@ public class MappingCassandraConverter extends AbstractCassandraConverter DefaultSpELExpressionEvaluator expressionEvaluator = new DefaultSpELExpressionEvaluator(udtValue, spELContext); - CassandraUDTValueProvider valueProvider = - new CassandraUDTValueProvider(udtValue, CodecRegistry.DEFAULT_INSTANCE, expressionEvaluator); + CassandraUDTValueProvider valueProvider = new CassandraUDTValueProvider(udtValue, CodecRegistry.DEFAULT_INSTANCE, + expressionEvaluator); - PersistentEntityParameterValueProvider parameterValueProvider = - new PersistentEntityParameterValueProvider<>(entity, - new MappingAndConvertingValueProvider(valueProvider), Optional.empty()); + PersistentEntityParameterValueProvider parameterValueProvider = new PersistentEntityParameterValueProvider<>( + entity, new MappingAndConvertingValueProvider(valueProvider), Optional.empty()); EntityInstantiator instantiator = instantiators.getInstantiatorFor(entity); S instance = instantiator.createInstance(entity, parameterValueProvider); @@ -202,8 +198,8 @@ public class MappingCassandraConverter extends AbstractCassandraConverter protected void readProperties(CassandraPersistentEntity entity, CassandraValueProvider valueProvider, PersistentPropertyAccessor propertyAccessor) { - entity.getPersistentProperties().forEach(property -> - MappingCassandraConverter.this.readProperty(entity, property, valueProvider, propertyAccessor)); + entity.getPersistentProperties().forEach( + property -> MappingCassandraConverter.this.readProperty(entity, property, valueProvider, propertyAccessor)); } protected void readProperty(CassandraPersistentEntity entity, CassandraPersistentProperty property, @@ -269,10 +265,8 @@ public class MappingCassandraConverter extends AbstractCassandraConverter @SuppressWarnings("unchecked") public Optional convertToColumnType(Optional obj) { - return convertToColumnType(obj, - obj.map(Object::getClass) - .map(ClassTypeInformation::from) - .orElse((ClassTypeInformation) ClassTypeInformation.OBJECT)); + return convertToColumnType(obj, obj.map(Object::getClass).map(ClassTypeInformation::from) + .orElse((ClassTypeInformation) ClassTypeInformation.OBJECT)); } /* (non-Javadoc) @@ -671,19 +665,17 @@ public class MappingCassandraConverter extends AbstractCassandraConverter I value = optional.get(); - Class requestedTargetType = Optional.ofNullable(typeInformation) - .map(typeInfo -> (Class) typeInfo.getType()) + Class requestedTargetType = Optional.ofNullable(typeInformation).map(typeInfo -> (Class) typeInfo.getType()) .orElse(null); if (getCustomConversions().hasCustomWriteTarget(value.getClass(), requestedTargetType)) { - return Optional.ofNullable((O) getConversionService().convert(value, - getCustomConversions().getCustomWriteTarget(value.getClass(), requestedTargetType) - .orElse(requestedTargetType))); + return Optional.ofNullable((O) getConversionService().convert(value, getCustomConversions() + .getCustomWriteTarget(value.getClass(), requestedTargetType).orElse(requestedTargetType))); } if (getCustomConversions().hasCustomWriteTarget(value.getClass())) { return Optional.ofNullable((O) getConversionService().convert(value, - getCustomConversions().getCustomWriteTarget(value.getClass()).get())); + getCustomConversions().getCustomWriteTarget(value.getClass()).get())); } if (getCustomConversions().isSimpleType(value.getClass())) { @@ -700,15 +692,13 @@ public class MappingCassandraConverter extends AbstractCassandraConverter Collection original = (Collection) value; Collection converted = CollectionFactory.createCollection(getCollectionType(type), original.size()); - original.stream() - .map(element -> convertToColumnType(Optional.ofNullable(element), actualType).orElse(null)) + original.stream().map(element -> convertToColumnType(Optional.ofNullable(element), actualType).orElse(null)) .forEach(converted::add); return Optional.of((O) converted); } - Optional> optionalUdt = getMappingContext() - .getPersistentEntity(actualType.getType()) + Optional> optionalUdt = getMappingContext().getPersistentEntity(actualType.getType()) .filter(CassandraPersistentEntity::isUserDefinedType); if (optionalUdt.isPresent()) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/QueryMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/QueryMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java index 3648e0524..484736a89 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/QueryMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import java.util.ArrayList; import java.util.Collections; @@ -23,7 +23,9 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.cassandra.core.query.ColumnName; import org.springframework.data.cassandra.core.query.Columns; import org.springframework.data.cassandra.core.query.Columns.ColumnSelector; @@ -33,9 +35,7 @@ import org.springframework.data.cassandra.core.query.Criteria; import org.springframework.data.cassandra.core.query.CriteriaDefinition; import org.springframework.data.cassandra.core.query.CriteriaDefinition.Predicate; import org.springframework.data.cassandra.core.query.Filter; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; -import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Order; import org.springframework.data.mapping.PersistentProperty; @@ -87,8 +87,7 @@ public class QueryMapper { } /** - * Returns the configured {@link CassandraConverter} used to convert object values into - * Cassandra column typed values. + * Returns the configured {@link CassandraConverter} used to convert object values into Cassandra column typed values. * * @return the configured {@link CassandraConverter}. * @see org.springframework.data.cassandra.convert.CassandraConverter @@ -98,8 +97,8 @@ public class QueryMapper { } /** - * Returns the configured {@link CassandraMappingContext} containing mapping meta-data (persistent entities - * and properties) used to store (map) objects to Cassandra tables (rows/columns). + * Returns the configured {@link CassandraMappingContext} containing mapping meta-data (persistent entities and + * properties) used to store (map) objects to Cassandra tables (rows/columns). * * @return the configured {@link CassandraMappingContext}. * @see org.springframework.data.cassandra.mapping.CassandraMappingContext @@ -117,8 +116,8 @@ public class QueryMapper { public List getColumns(CassandraPersistentEntity entity) { return entity.getPersistentProperties() // - .flatMap(p -> p.getColumnNames().stream()).map(ColumnSelector::from) // - .collect(Collectors.toList()); + .flatMap(p -> p.getColumnNames().stream()).map(ColumnSelector::from) // + .collect(Collectors.toList()); } /** @@ -208,28 +207,23 @@ public class QueryMapper { ColumnSelector mappedColumnSelector = ColumnSelector.from(cqlIdentifier); - return columnSelector.getAlias() - .map(mappedColumnSelector::as) - .orElse(mappedColumnSelector); + return columnSelector.getAlias().map(mappedColumnSelector::as).orElse(mappedColumnSelector); } if (selector instanceof FunctionCall) { FunctionCall functionCall = (FunctionCall) selector; - List mappedParameters = functionCall.getParameters() - .stream() - .map(obj -> { - if (obj instanceof Selector) { - return getMappedSelector((Selector) obj, cqlIdentifier); - } + List mappedParameters = functionCall.getParameters().stream().map(obj -> { + if (obj instanceof Selector) { + return getMappedSelector((Selector) obj, cqlIdentifier); + } - return obj; - }) // + return obj; + }) // .collect(Collectors.toList()); - FunctionCall mappedFunctionCall = - FunctionCall.from(functionCall.getExpression(), mappedParameters.toArray()); + FunctionCall mappedFunctionCall = FunctionCall.from(functionCall.getExpression(), mappedParameters.toArray()); return functionCall.getAlias() // .map(mappedFunctionCall::as) // @@ -341,19 +335,16 @@ public class QueryMapper { * @return */ protected Field createPropertyField(CassandraPersistentEntity entity, ColumnName key) { - return Optional.ofNullable(entity).map(e -> new MetadataBackedField(key, e, getMappingContext())) - .orElseGet(() -> new Field(key)); + return Optional.ofNullable(entity). map(e -> new MetadataBackedField(key, e, getMappingContext())) + .orElseGet(() -> new Field(key)); } @SuppressWarnings("unchecked") TypeInformation getTypeInformation(Field field, Optional value) { return field.getProperty().map(CassandraPersistentProperty::getTypeInformation) - .orElseGet(() -> - value.map(Object::getClass) - .map(ClassTypeInformation::from) - .orElse((ClassTypeInformation) ClassTypeInformation.OBJECT) - ); + .orElseGet(() -> value.map(Object::getClass).map(ClassTypeInformation::from) + .orElse((ClassTypeInformation) ClassTypeInformation.OBJECT)); } /** @@ -420,8 +411,8 @@ public class QueryMapper { private final Optional optionalProperty; /** - * Creates a new {@link MetadataBackedField} with the given name, {@link CassandraPersistentEntity} - * and {@link MappingContext}. + * Creates a new {@link MetadataBackedField} with the given name, {@link CassandraPersistentEntity} and + * {@link MappingContext}. * * @param name must not be {@literal null} or empty. * @param entity must not be {@literal null}. @@ -469,8 +460,8 @@ public class QueryMapper { PropertyPath propertyPath = PropertyPath.from(pathExpression.replaceAll("\\.\\d", ""), entity.getTypeInformation()); - PersistentPropertyPath persistentPropertyPath = - mappingContext.getPersistentPropertyPath(propertyPath); + PersistentPropertyPath persistentPropertyPath = mappingContext + .getPersistentPropertyPath(propertyPath); return Optional.of(persistentPropertyPath); } catch (PropertyReferenceException e) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/RowReaderPropertyAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowReaderPropertyAccessor.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/RowReaderPropertyAccessor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowReaderPropertyAccessor.java index a7ed6d626..8f30f5d39 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/RowReaderPropertyAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowReaderPropertyAccessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import org.springframework.expression.EvaluationContext; import org.springframework.expression.PropertyAccessor; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/UpdateMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UpdateMapper.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/UpdateMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UpdateMapper.java index fc798568c..b66e13140 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/UpdateMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UpdateMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; import java.util.ArrayList; import java.util.Collection; @@ -25,6 +25,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.query.Filter; import org.springframework.data.cassandra.core.query.Update; import org.springframework.data.cassandra.core.query.Update.AddToMapOp; @@ -35,7 +36,6 @@ import org.springframework.data.cassandra.core.query.Update.RemoveOp; import org.springframework.data.cassandra.core.query.Update.SetAtIndexOp; import org.springframework.data.cassandra.core.query.Update.SetAtKeyOp; import org.springframework.data.cassandra.core.query.Update.SetOp; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; import org.springframework.data.mapping.PersistentProperty; import org.springframework.data.util.TypeInformation; import org.springframework.util.Assert; @@ -126,8 +126,8 @@ public class UpdateMapper extends QueryMapper { SetAtKeyOp op = (SetAtKeyOp) updateOp; - Optional> typeInformation = - field.getProperty().map(PersistentProperty::getTypeInformation); + Optional> typeInformation = field.getProperty() + .map(PersistentProperty::getTypeInformation); Optional> keyType = typeInformation.map(TypeInformation::getActualType); Optional> valueType = typeInformation.flatMap(TypeInformation::getMapValueType); @@ -150,8 +150,8 @@ public class UpdateMapper extends QueryMapper { SetAtIndexOp op = (SetAtIndexOp) updateOp; - Optional mappedValue = getConverter().convertToColumnType( - Optional.ofNullable(op.getValue()), typeInformation); + Optional mappedValue = getConverter().convertToColumnType(Optional.ofNullable(op.getValue()), + typeInformation); return new SetAtIndexOp(field.getMappedKey(), op.getIndex(), mappedValue.orElse(null)); } @@ -162,10 +162,8 @@ public class UpdateMapper extends QueryMapper { if (collection.isEmpty()) { - DataType.Name dataType = field.getProperty() - .map(property -> getMappingContext().getDataType(property)) - .map(DataType::getName) - .orElse(Name.LIST); + DataType.Name dataType = field.getProperty().map(property -> getMappingContext().getDataType(property)) + .map(DataType::getName).orElse(Name.LIST); if (dataType == Name.SET) { return new SetOp(field.getMappedKey(), Collections.emptySet()); @@ -219,8 +217,8 @@ public class UpdateMapper extends QueryMapper { private AssignmentOp getMappedUpdateOperation(Field field, AddToMapOp updateOp) { - Optional> typeInformation = - field.getProperty().map(PersistentProperty::getTypeInformation); + Optional> typeInformation = field.getProperty() + .map(PersistentProperty::getTypeInformation); Optional> keyType = typeInformation.map(TypeInformation::getActualType); Optional> valueType = typeInformation.flatMap(TypeInformation::getMapValueType); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/package-info.java similarity index 54% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/package-info.java index a6b09b0b9..44c551c3f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/package-info.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/package-info.java @@ -1,4 +1,4 @@ /** * Spring Data Cassandra specific converter infrastructure. */ -package org.springframework.data.cassandra.convert; +package org.springframework.data.cassandra.core.convert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraMappingContext.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraMappingContext.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraMappingContext.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraMappingContext.java index 7dcc18f8a..8d7f85a61 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraMappingContext.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraMappingContext.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; -import static org.springframework.cassandra.core.cql.CqlIdentifier.cqlId; -import static org.springframework.cassandra.core.keyspace.CreateTableSpecification.createTable; -import static org.springframework.data.cassandra.mapping.CassandraSimpleTypeHolder.getDataTypeFor; +import static org.springframework.data.cassandra.core.mapping.CassandraSimpleTypeHolder.*; +import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cql.core.keyspace.CreateTableSpecification.*; import java.util.Collection; import java.util.Collections; @@ -29,15 +29,15 @@ import java.util.Optional; import java.util.Set; import org.springframework.beans.BeansException; -import org.springframework.cassandra.core.cql.CqlIdentifier; -import org.springframework.cassandra.core.keyspace.CreateTableSpecification; -import org.springframework.cassandra.core.keyspace.CreateUserTypeSpecification; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.annotation.AnnotatedElementUtils; -import org.springframework.data.cassandra.convert.CassandraCustomConversions; -import org.springframework.data.cassandra.mapping.UserTypeUtil.FrozenLiteralDataType; +import org.springframework.data.cassandra.core.convert.CassandraCustomConversions; +import org.springframework.data.cassandra.core.mapping.UserTypeUtil.FrozenLiteralDataType; import org.springframework.data.convert.CustomConversions; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.core.keyspace.CreateTableSpecification; +import org.springframework.data.cql.core.keyspace.CreateUserTypeSpecification; import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.PropertyHandler; import org.springframework.data.mapping.context.AbstractMappingContext; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntity.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntity.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java index 82e6c8ebb..f77170d4e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntity.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; -import static org.springframework.cassandra.core.cql.CqlIdentifier.cqlId; +import static org.springframework.data.cql.core.CqlIdentifier.*; import java.util.ArrayList; import java.util.Comparator; @@ -23,13 +23,13 @@ import java.util.List; import java.util.Optional; import org.springframework.beans.BeansException; -import org.springframework.cassandra.core.cql.CqlIdentifier; -import org.springframework.cassandra.support.exception.UnsupportedCassandraOperationException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.expression.BeanFactoryAccessor; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.data.cassandra.util.SpelUtils; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.support.exception.UnsupportedCassandraOperationException; import org.springframework.data.mapping.Association; import org.springframework.data.mapping.AssociationHandler; import org.springframework.data.mapping.model.BasicPersistentEntity; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityMetadataVerifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityMetadataVerifier.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityMetadataVerifier.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityMetadataVerifier.java index 7460da566..14bd31894 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntityMetadataVerifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityMetadataVerifier.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.ArrayList; import java.util.List; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentProperty.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java index 32dcb2333..cc4a5532a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentProperty.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; -import static org.springframework.cassandra.core.cql.CqlIdentifier.cqlId; +import static org.springframework.data.cql.core.CqlIdentifier.*; import java.util.ArrayList; import java.util.Collections; @@ -25,9 +25,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.cassandra.core.Ordering; -import org.springframework.cassandra.core.PrimaryKeyType; -import org.springframework.cassandra.core.cql.CqlIdentifier; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.expression.BeanFactoryAccessor; @@ -35,6 +32,9 @@ import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.cassandra.util.SpelUtils; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.core.Ordering; +import org.springframework.data.cql.core.PrimaryKeyType; import org.springframework.data.mapping.Association; import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty; import org.springframework.data.mapping.model.MappingException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraColumnAnnotationComparator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraColumnAnnotationComparator.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraColumnAnnotationComparator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraColumnAnnotationComparator.java index 08b29dd32..9058d0e10 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraColumnAnnotationComparator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraColumnAnnotationComparator.java @@ -1,25 +1,25 @@ /* * Copyright 2013-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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.Comparator; /** * {@link Comparator} implementation that uses {@link Column#value()}. - * + * * @author Matthew T. Adams * @author Mark Paluch */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraMappingContext.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraMappingContext.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java index af47ae9ff..5b681912b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraMappingContext.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.Collection; -import org.springframework.cassandra.core.keyspace.CreateTableSpecification; -import org.springframework.cassandra.core.keyspace.CreateUserTypeSpecification; +import org.springframework.data.cql.core.keyspace.CreateTableSpecification; +import org.springframework.data.cql.core.keyspace.CreateUserTypeSpecification; import org.springframework.data.mapping.context.MappingContext; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPersistentEntity.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentEntity.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPersistentEntity.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentEntity.java index 0cf83ce8c..c7deed292 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPersistentEntity.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentEntity.java @@ -1,25 +1,25 @@ /* * Copyright 2013-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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.List; -import org.springframework.cassandra.core.cql.CqlIdentifier; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.model.MutablePersistentEntity; @@ -27,7 +27,7 @@ import com.datastax.driver.core.UserType; /** * Cassandra specific {@link PersistentEntity} abstraction. - * + * * @author Alex Shvid * @author Matthew T. Adams * @author Mark Paluch @@ -51,14 +51,14 @@ public interface CassandraPersistentEntity /** * Sets the CQL table name. - * + * * @param tableName must not be {@literal null}. */ void setTableName(CqlIdentifier tableName); /** * Sets whether to enforce quoting when using the {@link #getTableName()} in CQL. - * + * * @param forceQuote {@literal true} to enforce quoting; {@literal false} to disable enforced quoting usage. */ void setForceQuote(boolean forceQuote); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPersistentEntityMetadataVerifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentEntityMetadataVerifier.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPersistentEntityMetadataVerifier.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentEntityMetadataVerifier.java index 782fee45b..0f77a68c2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPersistentEntityMetadataVerifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentEntityMetadataVerifier.java @@ -1,32 +1,32 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import org.springframework.data.mapping.model.MappingException; /** * Interface for Cassandra Persistent Entity Mapping Verification. - * + * * @author David Webb */ public interface CassandraPersistentEntityMetadataVerifier { /** * Performs verification on the Persistent Entity to ensure all markers and marker combinations are valid. - * + * * @param entity */ void verify(CassandraPersistentEntity entity) throws MappingException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPersistentProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentProperty.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPersistentProperty.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentProperty.java index dc96a4d7a..343f57796 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPersistentProperty.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentProperty.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.List; import java.util.Optional; -import org.springframework.cassandra.core.Ordering; -import org.springframework.cassandra.core.cql.CqlIdentifier; import org.springframework.context.ApplicationContextAware; import org.springframework.core.convert.converter.Converter; import org.springframework.dao.InvalidDataAccessApiUsageException; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.core.Ordering; import org.springframework.data.mapping.PersistentProperty; import org.springframework.data.util.TypeInformation; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPersistentPropertyComparator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPersistentPropertyComparator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java index 49974e48e..1b16acf72 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPersistentPropertyComparator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java @@ -1,24 +1,24 @@ /* * Copyright 2013-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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.Comparator; import java.util.Optional; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; /** * {@link Comparator} implementation that orders {@link CassandraPersistentProperty} instances. @@ -28,8 +28,7 @@ import org.springframework.cassandra.core.cql.CqlIdentifier; *
  • Composite primary keys first (equal if both {@link CassandraPersistentProperty} are a composite primary key)
    • *
  • Primary key columns (see {@link CassandraPrimaryKeyColumnAnnotationComparator}, compare by ordinal/name/ordering) *
    • - *
  • Regular columns, compared by column name (see - * {@link org.springframework.cassandra.core.cql.CqlIdentifier#compareTo(CqlIdentifier)})
    • + *
  • Regular columns, compared by column name (see {@link CqlIdentifier#compareTo(CqlIdentifier)})
    • * * * @author Alex Shvid @@ -37,7 +36,7 @@ import org.springframework.cassandra.core.cql.CqlIdentifier; * @author Mark Paluch * @author John Blum * @see java.util.Comparator - * @see org.springframework.data.cassandra.mapping.CassandraPersistentProperty + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty */ public enum CassandraPersistentPropertyComparator implements Comparator { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPrimaryKeyColumnAnnotationComparator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPrimaryKeyColumnAnnotationComparator.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPrimaryKeyColumnAnnotationComparator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPrimaryKeyColumnAnnotationComparator.java index 8301705d4..9811eff82 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraPrimaryKeyColumnAnnotationComparator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPrimaryKeyColumnAnnotationComparator.java @@ -1,24 +1,24 @@ /* * Copyright 2013-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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.Comparator; -import org.springframework.cassandra.core.Ordering; -import org.springframework.cassandra.core.PrimaryKeyType; +import org.springframework.data.cql.core.Ordering; +import org.springframework.data.cql.core.PrimaryKeyType; /** * {@link Comparator} implementation that uses, in order, the... @@ -28,14 +28,14 @@ import org.springframework.cassandra.core.PrimaryKeyType; *
  • {@link PrimaryKeyColumn#name()}, then, if ordered the same,
    • *
  • {@link PrimaryKeyColumn#ordering()}.
    • * - * + * * @author Matthew T. Adams * @author John Blum * @author Mark Paluch * @see PrimaryKeyType#compare(PrimaryKeyType, PrimaryKeyType) * @see Ordering#compare(Ordering, Ordering) * @see java.util.Comparator - * @see org.springframework.data.cassandra.mapping.PrimaryKeyColumn + * @see org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn */ public enum CassandraPrimaryKeyColumnAnnotationComparator implements Comparator { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraSimpleTypeHolder.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraSimpleTypeHolder.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraSimpleTypeHolder.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraSimpleTypeHolder.java index 982e80932..f1b0a0030 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraSimpleTypeHolder.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraSimpleTypeHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.Collections; import java.util.HashMap; @@ -107,7 +107,7 @@ public class CassandraSimpleTypeHolder extends SimpleTypeHolder { classToDataType.put(javaType, dataType); Optional.ofNullable(primitiveWrappers.get(javaType)) - .ifPresent(primitiveType -> classToDataType.put(primitiveType, dataType)); + .ifPresent(primitiveType -> classToDataType.put(primitiveType, dataType)); }); // override String to text datatype as String is used multiple times @@ -129,11 +129,8 @@ public class CassandraSimpleTypeHolder extends SimpleTypeHolder { */ private static Set> getCassandraPrimitiveTypes(CodecRegistry codecRegistry) { - return DataType.allPrimitiveTypes().stream() - .map(codecRegistry::codecFor) - .map(TypeCodec::getJavaType) - .map(TypeToken::getRawType) - .collect(Collectors.toSet()); + return DataType.allPrimitiveTypes().stream().map(codecRegistry::codecFor).map(TypeCodec::getJavaType) + .map(TypeToken::getRawType).collect(Collectors.toSet()); } /** @@ -171,7 +168,7 @@ public class CassandraSimpleTypeHolder extends SimpleTypeHolder { if (dataType == null) { throw new InvalidDataAccessApiUsageException( - String.format("Did not find appropriate primitive DataType for type '%s'", typeInfo.getType())); + String.format("Did not find appropriate primitive DataType for type '%s'", typeInfo.getType())); } array[i] = dataType.getName(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraType.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraType.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraType.java index 338ef40f9..f7b9e790f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraType.java @@ -1,19 +1,19 @@ /* * Copyright 2013-2016 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.lang.annotation.Documented; import java.lang.annotation.Retention; @@ -23,7 +23,7 @@ import com.datastax.driver.core.DataType; /** * Specifies the Cassandra type of the annotated property or parameter if used in query methods. - * + * * @author Alex Shvid * @author Matthew T. Adams * @author Mark Paluch @@ -52,7 +52,7 @@ public @interface CassandraType { * If the property maps to a user-defined type then this attribute holds the user type name. For collection-like * properties the user type name applies to the component type. The user type name is only required if the UDT does * not map to a class annotated with {@link UserDefinedType}. - * + * * @return name of the user type * @since 1.5 */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraUserTypePersistentEntity.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntity.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraUserTypePersistentEntity.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntity.java index 9b76442e7..49eb5ee14 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CassandraUserTypePersistentEntity.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntity.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.Optional; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.data.mapping.model.MappingException; import org.springframework.data.util.TypeInformation; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/Column.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Column.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/Column.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Column.java index 8d1f7d18b..35aecea93 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/Column.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Column.java @@ -28,7 +28,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java index 38b079ec8..2d37e5193 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.Arrays; import java.util.Collection; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/EntityMapping.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/EntityMapping.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/EntityMapping.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/EntityMapping.java index b6cf4405b..3b071b860 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/EntityMapping.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/EntityMapping.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.Collections; import java.util.HashMap; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/Indexed.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Indexed.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/Indexed.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Indexed.java index 390bea54a..8fb36dfde 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/Indexed.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Indexed.java @@ -1,19 +1,19 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -22,7 +22,7 @@ import java.lang.annotation.Target; /** * Identifies a secondary index in the table on a single, non-key column. - * + * * @author Alex Shvid * @author Matthew T. Adams */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/Mapping.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Mapping.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/Mapping.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Mapping.java index 9eab0b751..abd7c8f39 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/Mapping.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Mapping.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.Collections; import java.util.HashSet; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKey.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKey.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKey.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKey.java index 425cd05f6..0ebab7e67 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKey.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKey.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKeyClass.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClass.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKeyClass.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClass.java index 326a28961..f75fb4a15 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKeyClass.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClass.java @@ -1,19 +1,19 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -28,7 +28,7 @@ import org.springframework.data.annotation.Persistent; *

    * If your Cassandra table has multiple primary key columns, then you must define a primary key class, annotate it with * this annotation, and use that class as the {@link PrimaryKey} of your entity class! - * + * * @author Alex Shvid * @author Matthew T. Adams */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKeyClassEntityMetadataVerifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifier.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKeyClassEntityMetadataVerifier.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifier.java index f87e7efbe..b54709711 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKeyClassEntityMetadataVerifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifier.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.ArrayList; import java.util.List; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKeyColumn.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyColumn.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKeyColumn.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyColumn.java index 718b20f0c..d7d0743c9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PrimaryKeyColumn.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyColumn.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.cassandra.core.Ordering; -import org.springframework.cassandra.core.PrimaryKeyType; import org.springframework.core.annotation.AliasFor; +import org.springframework.data.cql.core.Ordering; +import org.springframework.data.cql.core.PrimaryKeyType; /** * Identifies the annotated field of a composite primary key class as a primary key field that is either a partition or diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PropertyMapping.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PropertyMapping.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PropertyMapping.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PropertyMapping.java index d4693216d..6128e9064 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/PropertyMapping.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PropertyMapping.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/SimpleUserTypeResolver.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleUserTypeResolver.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/SimpleUserTypeResolver.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleUserTypeResolver.java index a5558e241..6ba9a104c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/SimpleUserTypeResolver.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleUserTypeResolver.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; import com.datastax.driver.core.Cluster; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/Table.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Table.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/Table.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Table.java index db9ff4dc3..ea410db20 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/Table.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Table.java @@ -1,19 +1,19 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -25,7 +25,7 @@ import org.springframework.data.annotation.Persistent; /** * Identifies a domain object to be persisted to Cassandra as a table. - * + * * @author Alex Shvid * @author Matthew T. Adams */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/UserDefinedType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/UserDefinedType.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/UserDefinedType.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/UserDefinedType.java index aedead209..4d9dab880 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/UserDefinedType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/UserDefinedType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/UserTypeResolver.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/UserTypeResolver.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/UserTypeResolver.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/UserTypeResolver.java index 7891185bf..f1a36970e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/UserTypeResolver.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/UserTypeResolver.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import com.datastax.driver.core.UserType; /** * Strategy interface to resolve {@link UserType} by its name. - * + * * @author Mark Paluch * @since 1.5 */ @@ -29,7 +29,7 @@ public interface UserTypeResolver { /** * Resolve a {@link UserType} by its name. - * + * * @param typeName must not be {@literal null}. * @return the type or {@literal null}, if not found. */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/UserTypeUtil.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/UserTypeUtil.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/UserTypeUtil.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/UserTypeUtil.java index 3417bfe9b..fed69df04 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/UserTypeUtil.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/UserTypeUtil.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; -import static org.springframework.cassandra.core.cql.CqlIdentifier.*; +import static org.springframework.data.cql.core.CqlIdentifier.*; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/VerifierMappingExceptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/VerifierMappingExceptions.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/VerifierMappingExceptions.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/VerifierMappingExceptions.java index da58eb0c6..e88d7ef57 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/VerifierMappingExceptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/VerifierMappingExceptions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; import java.util.Collection; import java.util.Collections; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/package-info.java similarity index 59% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/package-info.java index 24c83315f..e4495da63 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/package-info.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/package-info.java @@ -1,4 +1,4 @@ /** * Infrastructure for the Apache Cassandra row-to-object mapping subsystem. */ -package org.springframework.data.cassandra.mapping; +package org.springframework.data.cassandra.core.mapping; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/ColumnName.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/ColumnName.java index 5169e1c2c..6ba74236e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/ColumnName.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/ColumnName.java @@ -17,7 +17,7 @@ package org.springframework.data.cassandra.core.query; import java.util.Optional; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java index e1da1ad12..86daf6757 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java @@ -15,6 +15,8 @@ */ package org.springframework.data.cassandra.core.query; +import lombok.EqualsAndHashCode; + import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -25,9 +27,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Optional; -import lombok.EqualsAndHashCode; - -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Criteria.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Criteria.java index a9927e9d0..897851ecf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Criteria.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Criteria.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.core.query; -import static org.springframework.util.ObjectUtils.nullSafeHashCode; +import static org.springframework.util.ObjectUtils.*; import java.util.Arrays; import java.util.Collection; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/CriteriaDefinition.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/CriteriaDefinition.java index b8469271a..6a4902c48 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/CriteriaDefinition.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/CriteriaDefinition.java @@ -98,15 +98,8 @@ public interface CriteriaDefinition { */ enum Operators implements Operator { - EQ("="), - GT(">"), - GTE(">="), - LT("<"), - LTE("<="), - CONTAINS("CONTAINS"), - CONTAINS_KEY("CONTAINS KEY"), - IN("IN"), - LIKE("LIKE"); + EQ("="), GT(">"), GTE(">="), LT("<"), LTE("<="), CONTAINS("CONTAINS"), CONTAINS_KEY("CONTAINS KEY"), IN("IN"), LIKE( + "LIKE"); private final String operator; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Query.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Query.java index 974b05c8c..55e4e6581 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Query.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Query.java @@ -15,8 +15,7 @@ */ package org.springframework.data.cassandra.core.query; -import static org.springframework.util.ObjectUtils.nullSafeEquals; -import static org.springframework.util.ObjectUtils.nullSafeHashCode; +import static org.springframework.util.ObjectUtils.*; import java.util.ArrayList; import java.util.Arrays; @@ -26,7 +25,7 @@ import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import org.springframework.cassandra.core.QueryOptions; +import org.springframework.data.cql.core.QueryOptions; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Order; import org.springframework.util.Assert; @@ -129,8 +128,8 @@ public class Query implements Filter { criteriaDefinitions.add(criteriaDefinition); } - return new Query(criteriaDefinitions, this.columns, this.sort, this.pagingState, - this.queryOptions, this.limit, this.allowFiltering); + return new Query(criteriaDefinitions, this.columns, this.sort, this.pagingState, this.queryOptions, this.limit, + this.allowFiltering); } /* (non-Javadoc) @@ -180,8 +179,8 @@ public class Query implements Filter { } } - return new Query(this.criteriaDefinitions, this.columns, this.sort.and(sort), this.pagingState, - this.queryOptions, this.limit, this.allowFiltering); + return new Query(this.criteriaDefinitions, this.columns, this.sort.and(sort), this.pagingState, this.queryOptions, + this.limit, this.allowFiltering); } /** @@ -201,8 +200,8 @@ public class Query implements Filter { Assert.notNull(pagingState, "PagingState must not be null"); - return new Query(this.criteriaDefinitions, this.columns, this.sort, Optional.of(pagingState), - this.queryOptions, this.limit, this.allowFiltering); + return new Query(this.criteriaDefinitions, this.columns, this.sort, Optional.of(pagingState), this.queryOptions, + this.limit, this.allowFiltering); } /** @@ -222,8 +221,8 @@ public class Query implements Filter { Assert.notNull(queryOptions, "QueryOptions must not be null"); - return new Query(this.criteriaDefinitions, this.columns, this.sort, this.pagingState, - Optional.of(queryOptions), this.limit, this.allowFiltering); + return new Query(this.criteriaDefinitions, this.columns, this.sort, this.pagingState, Optional.of(queryOptions), + this.limit, this.allowFiltering); } /** @@ -240,8 +239,8 @@ public class Query implements Filter { * @return a new {@link Query} object containing the former settings with {@code limit} applied. */ public Query limit(long limit) { - return new Query(this.criteriaDefinitions, this.columns, this.sort, this.pagingState, - this.queryOptions, Optional.of(limit), this.allowFiltering); + return new Query(this.criteriaDefinitions, this.columns, this.sort, this.pagingState, this.queryOptions, + Optional.of(limit), this.allowFiltering); } /** @@ -257,8 +256,8 @@ public class Query implements Filter { * @return a new {@link Query} object containing the former settings with {@code allowFiltering} applied. */ public Query withAllowFiltering() { - return new Query(this.criteriaDefinitions, this.columns, this.sort, this.pagingState, - this.queryOptions, this.limit, true); + return new Query(this.criteriaDefinitions, this.columns, this.sort, this.pagingState, this.queryOptions, this.limit, + true); } /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/SerializationUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/SerializationUtils.java index 97456f4d8..a12b5633a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/SerializationUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/SerializationUtils.java @@ -123,9 +123,9 @@ abstract class SerializationUtils { } /** - * Creates a {@link String} representation from the given {@link Iterable} prepending the {@code prefix}, - * applying the given {@link Converter} to each element before adding it to the result {@link String}, - * concatenating each element with {@literal ,} and applying the {@code postfix}. + * Creates a {@link String} representation from the given {@link Iterable} prepending the {@code prefix}, applying the + * given {@link Converter} to each element before adding it to the result {@link String}, concatenating each element + * with {@literal ,} and applying the {@code postfix}. */ private static String iterableToDelimitedString(Iterable source, String prefix, String postfix, Converter transformer) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Update.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Update.java index 32f55c423..752df716c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Update.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Update.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.core.query; -import static org.springframework.data.cassandra.core.query.SerializationUtils.serializeToCqlSafely; +import static org.springframework.data.cassandra.core.query.SerializationUtils.*; import java.util.Arrays; import java.util.Collection; @@ -86,8 +86,8 @@ public class Update { * * @param columnName must not be {@literal null}. * @param value value to set on column with name. - * @return a new {@link Update} object containing the merge result of the existing assignments - * and the current assignment. + * @return a new {@link Update} object containing the merge result of the existing assignments and the current + * assignment. */ public Update set(String columnName, Object value) { return add(new SetOp(ColumnName.from(columnName), value)); @@ -509,8 +509,8 @@ public class Update { public String toString() { return Mode.PREPEND.equals(getMode()) - ? String.format("%s = %s + %s", getColumnName(), serializeToCqlSafely(value), getColumnName()) - : String.format("%s = %s + %s", getColumnName(), getColumnName(), serializeToCqlSafely(value)); + ? String.format("%s = %s + %s", getColumnName(), serializeToCqlSafely(value), getColumnName()) + : String.format("%s = %s + %s", getColumnName(), getColumnName(), serializeToCqlSafely(value)); } public enum Mode { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/package-info.java index 11f67ef62..0779e28bb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/package-info.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/package-info.java @@ -1,4 +1,4 @@ /** - * Spring Data's CQL abstraction. + * Spring Data's Cassandra abstraction. */ package org.springframework.data.cassandra; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java index b437d15d3..27bf5665e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java @@ -1,6 +1,6 @@ package org.springframework.data.cassandra.repository; -import org.springframework.data.cassandra.mapping.PrimaryKeyColumn; +import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.repository.support.BasicMapId; import org.springframework.data.repository.NoRepositoryBean; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/TypedIdCassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/TypedIdCassandraRepository.java index 20e5b5e0d..ece1711f7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/TypedIdCassandraRepository.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/TypedIdCassandraRepository.java @@ -17,10 +17,10 @@ package org.springframework.data.cassandra.repository; import java.util.List; -import org.springframework.data.cassandra.mapping.PrimaryKey; -import org.springframework.data.cassandra.mapping.PrimaryKeyClass; -import org.springframework.data.cassandra.mapping.PrimaryKeyColumn; -import org.springframework.data.cassandra.mapping.Table; +import org.springframework.data.cassandra.core.mapping.PrimaryKey; +import org.springframework.data.cassandra.core.mapping.PrimaryKeyClass; +import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; +import org.springframework.data.cassandra.core.mapping.Table; import org.springframework.data.cassandra.repository.support.BasicMapId; import org.springframework.data.domain.Persistable; import org.springframework.data.repository.CrudRepository; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtension.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtension.java index e2d32548a..258a1828f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtension.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtension.java @@ -22,7 +22,7 @@ import java.util.Optional; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.data.cassandra.config.DefaultBeanNames; -import org.springframework.data.cassandra.mapping.Table; +import org.springframework.data.cassandra.core.mapping.Table; import org.springframework.data.cassandra.repository.CassandraRepository; import org.springframework.data.cassandra.repository.support.CassandraRepositoryFactoryBean; import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java index d954492b2..445b74a22 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java @@ -15,6 +15,8 @@ */ package org.springframework.data.cassandra.repository.query; +import lombok.RequiredArgsConstructor; + import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -24,12 +26,12 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import lombok.RequiredArgsConstructor; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; -import org.springframework.data.cassandra.convert.CassandraConverter; import org.springframework.data.cassandra.core.CassandraOperations; +import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.repository.query.CassandraQueryExecution.CollectionExecution; import org.springframework.data.cassandra.repository.query.CassandraQueryExecution.ResultProcessingConverter; import org.springframework.data.cassandra.repository.query.CassandraQueryExecution.ResultProcessingExecution; @@ -45,9 +47,6 @@ import org.springframework.data.repository.query.ReturnedType; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; import com.datastax.driver.core.Statement; @@ -92,7 +91,7 @@ public abstract class AbstractCassandraQuery implements RepositoryQuery { @Deprecated public void setConversionService(ConversionService conversionService) { throw new UnsupportedOperationException("setConversionService(ConversionService) is not supported anymore. " - + "Please use CassandraMappingContext instead"); + + "Please use CassandraMappingContext instead"); } /** @@ -131,13 +130,12 @@ public abstract class AbstractCassandraQuery implements RepositoryQuery { CassandraParameterAccessor parameterAccessor = new ConvertingParameterAccessor(getOperations().getConverter(), new CassandraParametersParameterAccessor(getQueryMethod(), parameters)); - ResultProcessor resultProcessor = - getQueryMethod().getResultProcessor().withDynamicProjection(parameterAccessor); + ResultProcessor resultProcessor = getQueryMethod().getResultProcessor().withDynamicProjection(parameterAccessor); Statement statement = createQuery(parameterAccessor); - CassandraQueryExecution queryExecution = getExecution(new ResultProcessingConverter( - resultProcessor, getOperations().getConverter().getMappingContext(), getEntityInstantiators())); + CassandraQueryExecution queryExecution = getExecution(new ResultProcessingConverter(resultProcessor, + getOperations().getConverter().getMappingContext(), getEntityInstantiators())); CassandraReturnedType returnedType = new CassandraReturnedType(resultProcessor.getReturnedType(), getOperations().getConverter().getCustomConversions()); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractReactiveCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractReactiveCassandraQuery.java index ddd75bd45..58b9015b3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractReactiveCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractReactiveCassandraQuery.java @@ -18,6 +18,7 @@ package org.springframework.data.cassandra.repository.query; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import org.reactivestreams.Publisher; import org.springframework.core.convert.converter.Converter; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.ReactiveCassandraOperations; @@ -31,8 +32,6 @@ import org.springframework.data.repository.query.RepositoryQuery; import org.springframework.data.repository.query.ResultProcessor; import org.springframework.util.Assert; -import org.reactivestreams.Publisher; - import com.datastax.driver.core.Statement; /** @@ -107,17 +106,16 @@ public abstract class AbstractReactiveCassandraQuery implements RepositoryQuery private Object execute(CassandraParameterAccessor parameterAccessor) { - CassandraParameterAccessor convertingParameterAccessor = - new ConvertingParameterAccessor(getReactiveCassandraOperations().getConverter(), parameterAccessor); + CassandraParameterAccessor convertingParameterAccessor = new ConvertingParameterAccessor( + getReactiveCassandraOperations().getConverter(), parameterAccessor); Statement statement = createQuery(convertingParameterAccessor); - ResultProcessor resultProcessor = - getQueryMethod().getResultProcessor().withDynamicProjection(convertingParameterAccessor); + ResultProcessor resultProcessor = getQueryMethod().getResultProcessor() + .withDynamicProjection(convertingParameterAccessor); - ReactiveCassandraQueryExecution queryExecution = getExecution(new ResultProcessingConverter( - resultProcessor, getReactiveCassandraOperations().getConverter().getMappingContext(), - getEntityInstantiators())); + ReactiveCassandraQueryExecution queryExecution = getExecution(new ResultProcessingConverter(resultProcessor, + getReactiveCassandraOperations().getConverter().getMappingContext(), getEntityInstantiators())); CassandraReturnedType returnedType = new CassandraReturnedType(resultProcessor.getReturnedType(), getReactiveCassandraOperations().getConverter().getCustomConversions()); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraEntityMetadata.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraEntityMetadata.java index 6b5ef670d..a79f13551 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraEntityMetadata.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraEntityMetadata.java @@ -1,12 +1,12 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,12 +15,12 @@ */ package org.springframework.data.cassandra.repository.query; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.data.repository.core.EntityMetadata; /** * Extension of {@link EntityMetadata} to additionally expose the table name an entity shall be persisted to. - * + * * @author Alex Shvid * @author Matthew T. Adams * @param @@ -29,7 +29,7 @@ public interface CassandraEntityMetadata extends EntityMetadata { /** * Returns the name of the table the entity shall be persisted to. - * + * * @return */ CqlIdentifier getTableName(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameterAccessor.java index 09dbeeb49..798d74ba9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameterAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameterAccessor.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.repository.query; -import org.springframework.data.cassandra.mapping.CassandraType; +import org.springframework.data.cassandra.core.mapping.CassandraType; import org.springframework.data.repository.query.ParameterAccessor; import com.datastax.driver.core.DataType; @@ -31,14 +31,14 @@ public interface CassandraParameterAccessor extends ParameterAccessor { /** * Returns the Cassandra {@link DataType} for the declared parameter if the type is a - * {@link org.springframework.data.cassandra.mapping.CassandraSimpleTypeHolder simple type}. Parameter types may be - * specified using {@link org.springframework.data.cassandra.mapping.CassandraType}. + * {@link org.springframework.data.cassandra.core.mapping.CassandraSimpleTypeHolder simple type}. Parameter types may be + * specified using {@link org.springframework.data.cassandra.core.mapping.CassandraType}. * * @param index the parameter index * @return the Cassandra {@link DataType} or {@literal null} if the parameter type cannot be determined from - * {@link org.springframework.data.cassandra.mapping.CassandraSimpleTypeHolder} - * @see org.springframework.data.cassandra.mapping.CassandraSimpleTypeHolder - * @see org.springframework.data.cassandra.mapping.CassandraType + * {@link org.springframework.data.cassandra.core.mapping.CassandraSimpleTypeHolder} + * @see org.springframework.data.cassandra.core.mapping.CassandraSimpleTypeHolder + * @see org.springframework.data.cassandra.core.mapping.CassandraType */ DataType getDataType(int index); @@ -47,8 +47,8 @@ public interface CassandraParameterAccessor extends ParameterAccessor { * * @param index the parameter index * @return the Cassandra {@link CassandraType} or {@literal null}. - * @see org.springframework.data.cassandra.mapping.CassandraSimpleTypeHolder - * @see org.springframework.data.cassandra.mapping.CassandraType + * @see org.springframework.data.cassandra.core.mapping.CassandraSimpleTypeHolder + * @see org.springframework.data.cassandra.core.mapping.CassandraType */ CassandraType findCassandraType(int index); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameters.java index 787cd7629..a1210e690 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameters.java @@ -23,7 +23,7 @@ import java.util.List; import org.springframework.core.MethodParameter; import org.springframework.core.ResolvableType; import org.springframework.core.annotation.AnnotatedElementUtils; -import org.springframework.data.cassandra.mapping.CassandraType; +import org.springframework.data.cassandra.core.mapping.CassandraType; import org.springframework.data.cassandra.repository.query.CassandraParameters.CassandraParameter; import org.springframework.data.repository.query.Parameter; import org.springframework.data.repository.query.Parameters; @@ -102,7 +102,7 @@ public class CassandraParameters extends Parameters iterator) { - PersistentPropertyPath path = - getMappingContext().getPersistentPropertyPath(part.getProperty()); + PersistentPropertyPath path = getMappingContext() + .getPersistentPropertyPath(part.getProperty()); CassandraPersistentProperty property = path.getLeafProperty(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryExecution.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryExecution.java index 676e7d078..a289ebfa7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryExecution.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryExecution.java @@ -20,7 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.data.cassandra.core.CassandraOperations; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.convert.EntityInstantiators; import org.springframework.data.repository.query.ResultProcessor; import org.springframework.data.repository.query.ReturnedType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethod.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethod.java index c8b12568d..5cd25b9e9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethod.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethod.java @@ -21,8 +21,8 @@ import java.util.Optional; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.repository.Query; import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.repository.core.RepositoryMetadata; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java index 4b38cb717..043cac412 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java @@ -19,11 +19,11 @@ import java.util.Iterator; import java.util.Optional; import java.util.Set; -import org.springframework.data.cassandra.convert.CassandraConverter; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; -import org.springframework.data.cassandra.mapping.CassandraSimpleTypeHolder; -import org.springframework.data.cassandra.mapping.CassandraType; +import org.springframework.data.cassandra.core.convert.CassandraConverter; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; +import org.springframework.data.cassandra.core.mapping.CassandraSimpleTypeHolder; +import org.springframework.data.cassandra.core.mapping.CassandraType; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.mapping.PersistentProperty; @@ -142,16 +142,16 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor { private Object potentiallyConvert(int index, Optional bindableValue) { return bindableValue - .flatMap( - v -> converter.convertToColumnType(bindableValue, findTypeInformation(index, v, Optional.empty()))) + .flatMap(v -> converter.convertToColumnType(bindableValue, findTypeInformation(index, v, Optional.empty()))) .orElse(null); } @SuppressWarnings("unchecked") private Object potentiallyConvert(int index, Optional bindableValue, CassandraPersistentProperty property) { - return bindableValue.flatMap( - v -> converter.convertToColumnType(bindableValue, findTypeInformation(index, v, Optional.of(property)))) + return bindableValue + .flatMap( + v -> converter.convertToColumnType(bindableValue, findTypeInformation(index, v, Optional.of(property)))) .orElse(null); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DtoInstantiatingConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DtoInstantiatingConverter.java index ff850b108..55ce32a53 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DtoInstantiatingConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DtoInstantiatingConverter.java @@ -18,8 +18,8 @@ package org.springframework.data.cassandra.repository.query; import java.util.Optional; import org.springframework.core.convert.converter.Converter; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; -import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.convert.EntityInstantiator; import org.springframework.data.convert.EntityInstantiators; import org.springframework.data.mapping.PersistentEntity; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java index 3f58f205e..a45a24538 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java @@ -15,13 +15,13 @@ */ package org.springframework.data.cassandra.repository.query; -import org.springframework.data.cassandra.convert.UpdateMapper; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.core.StatementFactory; +import org.springframework.data.cassandra.core.convert.UpdateMapper; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.query.Query; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; import org.springframework.data.repository.query.QueryCreationException; import org.springframework.data.repository.query.QueryMethod; import org.springframework.data.repository.query.RepositoryQuery; @@ -59,8 +59,8 @@ public class PartTreeCassandraQuery extends AbstractCassandraQuery { } /** - * Returns the {@link CassandraMappingContext} used by this query to access mapping meta-data used to - * store (map) objects to Cassandra tables. + * Returns the {@link CassandraMappingContext} used by this query to access mapping meta-data used to store (map) + * objects to Cassandra tables. * * @return the {@link CassandraMappingContext} used by this query. * @see org.springframework.data.cassandra.mapping.CassandraMappingContext @@ -95,8 +95,7 @@ public class PartTreeCassandraQuery extends AbstractCassandraQuery { @Override protected Statement createQuery(CassandraParameterAccessor parameterAccessor) { - CassandraQueryCreator queryCreator = - new CassandraQueryCreator(getTree(), parameterAccessor, getMappingContext()); + CassandraQueryCreator queryCreator = new CassandraQueryCreator(getTree(), parameterAccessor, getMappingContext()); Query query = queryCreator.createQuery(); @@ -105,8 +104,8 @@ public class PartTreeCassandraQuery extends AbstractCassandraQuery { query.limit(getTree().getMaxResults()); } - CassandraPersistentEntity persistentEntity = - getMappingContext().getRequiredPersistentEntity(getQueryMethod().getDomainClass()); + CassandraPersistentEntity persistentEntity = getMappingContext() + .getRequiredPersistentEntity(getQueryMethod().getDomainClass()); return getStatementFactory().select(query, persistentEntity); } catch (RuntimeException e) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java index a1a98cd7e..cbb0111d4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java @@ -20,7 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.data.cassandra.core.ReactiveCassandraOperations; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.convert.EntityInstantiators; import org.springframework.data.repository.query.ResultProcessor; import org.springframework.data.repository.query.ReturnedType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryMethod.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryMethod.java index cf720aefe..71efadcb2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryMethod.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryMethod.java @@ -17,7 +17,7 @@ package org.springframework.data.cassandra.repository.query; import java.lang.reflect.Method; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.repository.query.CassandraParameters.CassandraParameter; import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.repository.core.RepositoryMetadata; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java index 84dec193f..d0f1f75c0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java @@ -15,12 +15,12 @@ */ package org.springframework.data.cassandra.repository.query; -import org.springframework.data.cassandra.convert.UpdateMapper; import org.springframework.data.cassandra.core.ReactiveCassandraOperations; import org.springframework.data.cassandra.core.StatementFactory; +import org.springframework.data.cassandra.core.convert.UpdateMapper; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.query.Query; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; import org.springframework.data.repository.query.QueryCreationException; import org.springframework.data.repository.query.RepositoryQuery; import org.springframework.data.repository.query.parser.PartTree; @@ -59,8 +59,8 @@ public class ReactivePartTreeCassandraQuery extends AbstractReactiveCassandraQue } /** - * Returns the {@link CassandraMappingContext} used by this query to access mapping meta-data used to - * store (map) objects to Cassandra tables. + * Returns the {@link CassandraMappingContext} used by this query to access mapping meta-data used to store (map) + * objects to Cassandra tables. * * @return the {@link CassandraMappingContext} used by this query. * @see org.springframework.data.cassandra.mapping.CassandraMappingContext @@ -95,8 +95,7 @@ public class ReactivePartTreeCassandraQuery extends AbstractReactiveCassandraQue @Override protected Statement createQuery(CassandraParameterAccessor parameterAccessor) { - CassandraQueryCreator queryCreator = - new CassandraQueryCreator(getTree(), parameterAccessor, getMappingContext()); + CassandraQueryCreator queryCreator = new CassandraQueryCreator(getTree(), parameterAccessor, getMappingContext()); Query query = queryCreator.createQuery(); @@ -105,8 +104,8 @@ public class ReactivePartTreeCassandraQuery extends AbstractReactiveCassandraQue query.limit(getTree().getMaxResults()); } - CassandraPersistentEntity persistentEntity = - getMappingContext().getRequiredPersistentEntity(getQueryMethod().getDomainClass()); + CassandraPersistentEntity persistentEntity = getMappingContext() + .getRequiredPersistentEntity(getQueryMethod().getDomainClass()); return getStatementFactory().select(query, persistentEntity); } catch (RuntimeException e) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveStringBasedCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveStringBasedCassandraQuery.java index be75a48bc..5a288e21d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveStringBasedCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveStringBasedCassandraQuery.java @@ -15,15 +15,14 @@ */ package org.springframework.data.cassandra.repository.query; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.cassandra.core.ReactiveCassandraOperations; import org.springframework.data.repository.query.EvaluationContextProvider; import org.springframework.data.repository.query.QueryCreationException; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.util.Assert; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.datastax.driver.core.SimpleStatement; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/SimpleCassandraEntityMetadata.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/SimpleCassandraEntityMetadata.java index a32737798..9fbaa201e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/SimpleCassandraEntityMetadata.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/SimpleCassandraEntityMetadata.java @@ -15,8 +15,8 @@ */ package org.springframework.data.cassandra.repository.query; -import org.springframework.cassandra.core.cql.CqlIdentifier; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQuery.java index 52804ec2c..4771892df 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQuery.java @@ -15,14 +15,13 @@ */ package org.springframework.data.cassandra.repository.query; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.repository.query.EvaluationContextProvider; import org.springframework.data.repository.query.QueryCreationException; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.datastax.driver.core.SimpleStatement; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java index f1e9b7a46..11dcfc25a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; -import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.cassandra.repository.MapId; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java index 7ba4297fa..e0451de9f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java @@ -19,8 +19,8 @@ import java.lang.reflect.Method; import java.util.Optional; import org.springframework.data.cassandra.core.CassandraOperations; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.repository.TypedIdCassandraRepository; import org.springframework.data.cassandra.repository.query.CassandraEntityInformation; import org.springframework.data.cassandra.repository.query.CassandraQueryMethod; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java index bc4421e47..870d92faa 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java @@ -18,12 +18,12 @@ package org.springframework.data.cassandra.repository.support; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; -import org.springframework.cassandra.core.cql.CqlIdentifier; -import org.springframework.data.cassandra.convert.CassandraConverter; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; -import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; +import org.springframework.data.cassandra.core.convert.CassandraConverter; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.cassandra.repository.MapId; import org.springframework.data.cassandra.repository.query.CassandraEntityInformation; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.data.mapping.PropertyHandler; import org.springframework.data.repository.core.support.AbstractEntityInformation; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java index 64ee62d61..6b784e0cc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java @@ -19,8 +19,8 @@ import java.lang.reflect.Method; import java.util.Optional; import org.springframework.data.cassandra.core.ReactiveCassandraOperations; -import org.springframework.data.cassandra.mapping.CassandraMappingContext; -import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.repository.query.CassandraEntityInformation; import org.springframework.data.cassandra.repository.query.ReactiveCassandraQueryMethod; import org.springframework.data.cassandra.repository.query.ReactivePartTreeCassandraQuery; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlClusterFactoryBean.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlClusterFactoryBean.java index 6487509f6..c8257939b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlClusterFactoryBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; import java.util.ArrayList; import java.util.HashSet; @@ -26,15 +26,15 @@ import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.cassandra.core.CqlTemplate; -import org.springframework.cassandra.core.cql.generator.CreateKeyspaceCqlGenerator; -import org.springframework.cassandra.core.cql.generator.DropKeyspaceCqlGenerator; -import org.springframework.cassandra.core.keyspace.CreateKeyspaceSpecification; -import org.springframework.cassandra.core.keyspace.DropKeyspaceSpecification; -import org.springframework.cassandra.core.keyspace.KeyspaceActionSpecification; -import org.springframework.cassandra.support.CassandraExceptionTranslator; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.PersistenceExceptionTranslator; +import org.springframework.data.cql.core.CqlTemplate; +import org.springframework.data.cql.core.generator.CreateKeyspaceCqlGenerator; +import org.springframework.data.cql.core.generator.DropKeyspaceCqlGenerator; +import org.springframework.data.cql.core.keyspace.CreateKeyspaceSpecification; +import org.springframework.data.cql.core.keyspace.DropKeyspaceSpecification; +import org.springframework.data.cql.core.keyspace.KeyspaceActionSpecification; +import org.springframework.data.cql.support.CassandraExceptionTranslator; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -629,7 +629,7 @@ public class CassandraCqlClusterFactoryBean * * @param clusterBuilderConfigurer {@link ClusterBuilderConfigurer} used to configure the * {@link com.datastax.driver.core.Cluster.Builder}. - * @see org.springframework.cassandra.config.ClusterBuilderConfigurer + * @see org.springframework.data.cql.config.ClusterBuilderConfigurer */ public void setClusterBuilderConfigurer(ClusterBuilderConfigurer clusterBuilderConfigurer) { this.clusterBuilderConfigurer = clusterBuilderConfigurer; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlSessionFactoryBean.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlSessionFactoryBean.java index cb96c6b5a..e3011df8e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlSessionFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; import java.util.ArrayList; import java.util.Collections; @@ -25,11 +25,11 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.cassandra.core.CqlOperations; -import org.springframework.cassandra.core.CqlTemplate; -import org.springframework.cassandra.support.CassandraExceptionTranslator; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.PersistenceExceptionTranslator; +import org.springframework.data.cql.core.CqlOperations; +import org.springframework.data.cql.core.CqlTemplate; +import org.springframework.data.cql.support.CassandraExceptionTranslator; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -48,8 +48,8 @@ import com.datastax.driver.core.Session; * @see org.springframework.beans.factory.FactoryBean * @see org.springframework.beans.factory.InitializingBean * @see org.springframework.dao.support.PersistenceExceptionTranslator - * @see org.springframework.cassandra.core.CqlTemplate - * @see org.springframework.cassandra.support.CassandraExceptionTranslator + * @see org.springframework.data.cql.core.CqlTemplate + * @see org.springframework.data.cql.support.CassandraExceptionTranslator * @see com.datastax.driver.core.Cluster * @see com.datastax.driver.core.Session */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlTemplateFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlTemplateFactoryBean.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlTemplateFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlTemplateFactoryBean.java index 775f90956..a2a52284b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlTemplateFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlTemplateFactoryBean.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.cassandra.core.CqlTemplate; +import org.springframework.data.cql.core.CqlTemplate; import org.springframework.util.Assert; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/ClusterBuilderConfigurer.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/ClusterBuilderConfigurer.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/ClusterBuilderConfigurer.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/ClusterBuilderConfigurer.java index 743a4cd2c..f5c9299ff 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/ClusterBuilderConfigurer.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/ClusterBuilderConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; import com.datastax.driver.core.Cluster; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CompressionType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CompressionType.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CompressionType.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CompressionType.java index cbdb76546..2ec2638b8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CompressionType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CompressionType.java @@ -1,23 +1,23 @@ /* * Copyright 2013-2016 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; /** * Simple enumeration for the various compression types. - * + * * @author Alex Shvid * @author Mark Paluch */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/DataCenterReplication.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/DataCenterReplication.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/DataCenterReplication.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/DataCenterReplication.java index dc2575953..5c348abd8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/DataCenterReplication.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/DataCenterReplication.java @@ -1,19 +1,19 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; /** * Simple data structure to be used when setting the replication factor for a given data center. @@ -22,7 +22,7 @@ public class DataCenterReplication { /** * Creates a new {@link DataCenterReplication} given {@code dataCenter} and {@code replicationFactor}. - * + * * @param dataCenter must not be {@literal null}. * @param replicationFactor * @return diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAction.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/KeyspaceAction.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAction.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/KeyspaceAction.java index 394ac5f61..afd85f31b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAction.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/KeyspaceAction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; /** * Available actions for Keyspace Specifications diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/KeyspaceActionSpecificationFactoryBean.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/KeyspaceActionSpecificationFactoryBean.java index 33b3980c0..a831c422d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/KeyspaceActionSpecificationFactoryBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; import java.util.HashMap; import java.util.HashSet; @@ -25,13 +25,13 @@ import java.util.Set; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.cassandra.core.keyspace.CreateKeyspaceSpecification; -import org.springframework.cassandra.core.keyspace.DefaultOption; -import org.springframework.cassandra.core.keyspace.DropKeyspaceSpecification; -import org.springframework.cassandra.core.keyspace.KeyspaceActionSpecification; -import org.springframework.cassandra.core.keyspace.KeyspaceOption; -import org.springframework.cassandra.core.keyspace.KeyspaceOption.ReplicationStrategy; -import org.springframework.cassandra.core.keyspace.Option; +import org.springframework.data.cql.core.keyspace.CreateKeyspaceSpecification; +import org.springframework.data.cql.core.keyspace.DefaultOption; +import org.springframework.data.cql.core.keyspace.DropKeyspaceSpecification; +import org.springframework.data.cql.core.keyspace.KeyspaceActionSpecification; +import org.springframework.data.cql.core.keyspace.KeyspaceOption; +import org.springframework.data.cql.core.keyspace.KeyspaceOption.ReplicationStrategy; +import org.springframework.data.cql.core.keyspace.Option; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAttributes.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/KeyspaceAttributes.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAttributes.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/KeyspaceAttributes.java index 001031eaa..ddbdd4373 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAttributes.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/KeyspaceAttributes.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; import java.util.HashMap; import java.util.Map; -import org.springframework.cassandra.core.keyspace.DefaultOption; -import org.springframework.cassandra.core.keyspace.KeyspaceOption; -import org.springframework.cassandra.core.keyspace.KeyspaceOption.ReplicationStrategy; -import org.springframework.cassandra.core.keyspace.Option; -import org.springframework.cassandra.core.util.MapBuilder; +import org.springframework.data.cql.core.keyspace.DefaultOption; +import org.springframework.data.cql.core.keyspace.KeyspaceOption; +import org.springframework.data.cql.core.keyspace.KeyspaceOption.ReplicationStrategy; +import org.springframework.data.cql.core.keyspace.Option; +import org.springframework.data.cql.core.util.MapBuilder; /** * Keyspace attributes. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/MultiLevelSetFlattenerFactoryBean.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/MultiLevelSetFlattenerFactoryBean.java index a27ead6e6..4aa53f90d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/MultiLevelSetFlattenerFactoryBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; import java.util.Collection; import java.util.HashSet; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/PoolingOptionsFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/PoolingOptionsFactoryBean.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/PoolingOptionsFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/PoolingOptionsFactoryBean.java index 428a8fef7..51f53d470 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/PoolingOptionsFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/PoolingOptionsFactoryBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; import static org.springframework.util.ReflectionUtils.*; @@ -133,8 +133,8 @@ public class PoolingOptionsFactoryBean implements FactoryBean, I * {@link PoolingOptionsFactoryBean}'s {@link HostDistance#LOCAL}-based {@link PoolingOptions}. * @see com.datastax.driver.core.HostDistance#LOCAL * @see com.datastax.driver.core.PoolingOptions - * @see org.springframework.cassandra.config.PoolingOptionsFactoryBean.HostDistancePoolingOptions - * @see org.springframework.cassandra.config.PoolingOptionsFactoryBean.LocalHostDistancePoolingOptions + * @see org.springframework.data.cql.config.PoolingOptionsFactoryBean.HostDistancePoolingOptions + * @see org.springframework.data.cql.config.PoolingOptionsFactoryBean.LocalHostDistancePoolingOptions */ protected HostDistancePoolingOptions newLocalHostDistancePoolingOptions() { return LocalHostDistancePoolingOptions.create(getLocalCoreConnections(), getLocalMaxConnections(), @@ -149,8 +149,8 @@ public class PoolingOptionsFactoryBean implements FactoryBean, I * {@link PoolingOptionsFactoryBean}'s {@link HostDistance#REMOTE}-based {@link PoolingOptions}. * @see com.datastax.driver.core.HostDistance#REMOTE * @see com.datastax.driver.core.PoolingOptions - * @see org.springframework.cassandra.config.PoolingOptionsFactoryBean.HostDistancePoolingOptions - * @see org.springframework.cassandra.config.PoolingOptionsFactoryBean.RemoteHostDistancePoolingOptions + * @see org.springframework.data.cql.config.PoolingOptionsFactoryBean.HostDistancePoolingOptions + * @see org.springframework.data.cql.config.PoolingOptionsFactoryBean.RemoteHostDistancePoolingOptions */ protected HostDistancePoolingOptions newRemoteHostDistancePoolingOptions() { return RemoteHostDistancePoolingOptions.create(getRemoteCoreConnections(), getRemoteMaxConnections(), diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/SocketOptionsFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/SocketOptionsFactoryBean.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/SocketOptionsFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/SocketOptionsFactoryBean.java index afa257f65..9d668b2a4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/SocketOptionsFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/SocketOptionsFactoryBean.java @@ -1,19 +1,19 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; @@ -23,7 +23,7 @@ import com.datastax.driver.core.SocketOptions; /** * Socket Options Factory Bean. - * + * * @author Matthew T. Adams * @author David Webb */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractClusterConfiguration.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractClusterConfiguration.java index 7cd4e95c1..2ad64b729 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractClusterConfiguration.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config.java; +package org.springframework.data.cql.config.java; import java.util.Collections; import java.util.List; -import org.springframework.cassandra.config.CassandraCqlClusterFactoryBean; -import org.springframework.cassandra.config.ClusterBuilderConfigurer; -import org.springframework.cassandra.config.CompressionType; -import org.springframework.cassandra.core.keyspace.CreateKeyspaceSpecification; -import org.springframework.cassandra.core.keyspace.DropKeyspaceSpecification; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.cql.config.CassandraCqlClusterFactoryBean; +import org.springframework.data.cql.config.ClusterBuilderConfigurer; +import org.springframework.data.cql.config.CompressionType; +import org.springframework.data.cql.core.keyspace.CreateKeyspaceSpecification; +import org.springframework.data.cql.core.keyspace.DropKeyspaceSpecification; import com.datastax.driver.core.AuthProvider; import com.datastax.driver.core.NettyOptions; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCqlTemplateConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractCqlTemplateConfiguration.java similarity index 84% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCqlTemplateConfiguration.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractCqlTemplateConfiguration.java index 94c46f051..71b8c4c63 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCqlTemplateConfiguration.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractCqlTemplateConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config.java; +package org.springframework.data.cql.config.java; -import org.springframework.cassandra.core.CqlTemplate; import org.springframework.context.annotation.Bean; +import org.springframework.data.cql.core.CqlTemplate; /** * Abstract configuration class to create a {@link CqlTemplate} and inheriting {@link com.datastax.driver.core.Session} @@ -24,8 +24,8 @@ import org.springframework.context.annotation.Bean; * * @author Matthew T. Adams * @author Mark Paluch - * @see org.springframework.cassandra.config.java.AbstractClusterConfiguration - * @see org.springframework.cassandra.config.java.AbstractSessionConfiguration + * @see org.springframework.data.cql.config.java.AbstractClusterConfiguration + * @see org.springframework.data.cql.config.java.AbstractSessionConfiguration * @see com.datastax.driver.core.Session * @see com.datastax.driver.core.Cluster * @see CqlTemplate diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractSessionConfiguration.java similarity index 84% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractSessionConfiguration.java index 2750f8043..5a1622c5a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractSessionConfiguration.java @@ -1,25 +1,25 @@ /* * Copyright 2013-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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config.java; +package org.springframework.data.cql.config.java; -import org.springframework.cassandra.config.CassandraCqlSessionFactoryBean; -import org.springframework.cassandra.core.session.DefaultSessionFactory; -import org.springframework.cassandra.core.session.SessionFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.cql.config.CassandraCqlSessionFactoryBean; +import org.springframework.data.cql.core.session.DefaultSessionFactory; +import org.springframework.data.cql.core.session.SessionFactory; /** * Spring {@link @Configuration} class used to configure a Cassandra client application @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration; * @author Matthew T. Adams * @author John Blum * @author Mark Paluch - * @see org.springframework.cassandra.config.java.AbstractClusterConfiguration + * @see org.springframework.data.cql.config.java.AbstractClusterConfiguration * @see org.springframework.context.annotation.Configuration */ @Configuration @@ -56,7 +56,7 @@ public abstract class AbstractSessionConfiguration extends AbstractClusterConfig /** * Creates a {@link DefaultSessionFactory} using the configured {@link #session()} to be used with - * {@link org.springframework.cassandra.core.CqlTemplate}. + * {@link org.springframework.data.cql.core.CqlTemplate}. * * @return {@link SessionFactory} used to initialize the Template API. * @since 2.0 diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/package-info.java similarity index 50% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/package-info.java index 3629c2207..fc77868df 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/package-info.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/package-info.java @@ -1,4 +1,4 @@ /** * Spring Java configuration for Spring CQL. */ -package org.springframework.cassandra.config.java; +package org.springframework.data.cql.config.java; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/package-info.java similarity index 70% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/package-info.java index 11a79a73a..3fc0d860a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/package-info.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/package-info.java @@ -1,4 +1,4 @@ /** * Spring CQL {@link org.springframework.beans.factory.FactoryBean factory beans} and configuration. */ -package org.springframework.cassandra.config; +package org.springframework.data.cql.config; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlClusterParser.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParser.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlClusterParser.java index 444e9c691..e69f41ba6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlClusterParser.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config.xml; +package org.springframework.data.cql.config.xml; -import static org.springframework.cassandra.config.xml.ParsingUtils.*; +import static org.springframework.data.cql.config.xml.ParsingUtils.*; import java.util.ArrayList; import java.util.List; @@ -28,13 +28,13 @@ import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.support.ManagedSet; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.cassandra.config.CassandraCqlClusterFactoryBean; -import org.springframework.cassandra.config.KeyspaceActionSpecificationFactoryBean; -import org.springframework.cassandra.config.KeyspaceAttributes; -import org.springframework.cassandra.config.MultiLevelSetFlattenerFactoryBean; -import org.springframework.cassandra.config.PoolingOptionsFactoryBean; -import org.springframework.cassandra.config.SocketOptionsFactoryBean; -import org.springframework.cassandra.core.keyspace.KeyspaceActionSpecification; +import org.springframework.data.cql.config.CassandraCqlClusterFactoryBean; +import org.springframework.data.cql.config.KeyspaceActionSpecificationFactoryBean; +import org.springframework.data.cql.config.KeyspaceAttributes; +import org.springframework.data.cql.config.MultiLevelSetFlattenerFactoryBean; +import org.springframework.data.cql.config.PoolingOptionsFactoryBean; +import org.springframework.data.cql.config.SocketOptionsFactoryBean; +import org.springframework.data.cql.core.keyspace.KeyspaceActionSpecification; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; import org.w3c.dom.Element; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlSessionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlSessionParser.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlSessionParser.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlSessionParser.java index 273bac2eb..92d4003d0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlSessionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlSessionParser.java @@ -1,28 +1,28 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config.xml; +package org.springframework.data.cql.config.xml; -import static org.springframework.cassandra.config.xml.ParsingUtils.*; +import static org.springframework.data.cql.config.xml.ParsingUtils.*; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.cassandra.config.CassandraCqlSessionFactoryBean; +import org.springframework.data.cql.config.CassandraCqlSessionFactoryBean; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; import org.w3c.dom.Attr; @@ -31,7 +31,7 @@ import org.w3c.dom.NamedNodeMap; /** * Parser for <session> definitions. - * + * * @author David Webb * @author Matthew T. Adams */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlTemplateParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlTemplateParser.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlTemplateParser.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlTemplateParser.java index a099b0d02..fc2112996 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlTemplateParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlTemplateParser.java @@ -1,34 +1,34 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config.xml; +package org.springframework.data.cql.config.xml; -import static org.springframework.cassandra.config.xml.ParsingUtils.*; +import static org.springframework.data.cql.config.xml.ParsingUtils.*; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.cassandra.config.CassandraCqlTemplateFactoryBean; +import org.springframework.data.cql.config.CassandraCqlTemplateFactoryBean; import org.springframework.util.StringUtils; import org.w3c.dom.Element; /** * Parser for <template> definitions. - * + * * @author David Webb * @author Matthew T. Adams */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraNamespaceHandler.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraNamespaceHandler.java index eac45cd3a..3eef09eff 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraNamespaceHandler.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config.xml; +package org.springframework.data.cql.config.xml; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; /** * Namespace handler for spring-cassandra. - * + * * @author Alex Shvid * @author Matthew T. Adams */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/DefaultCqlBeanNames.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/DefaultCqlBeanNames.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/DefaultCqlBeanNames.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/DefaultCqlBeanNames.java index 4ba2a6647..ac533a7d0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/DefaultCqlBeanNames.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/DefaultCqlBeanNames.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config.xml; +package org.springframework.data.cql.config.xml; /** * @author Alex Shvid diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/ParsingUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/ParsingUtils.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/ParsingUtils.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/ParsingUtils.java index 1c73c49fb..9fa7ee596 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/ParsingUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/ParsingUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.config.xml; +package org.springframework.data.cql.config.xml; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/package-info.java similarity index 55% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/package-info.java index c63f235fe..51cb7c69c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/package-info.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/package-info.java @@ -1,4 +1,4 @@ /** * Spring XML namespace configuration for Spring CQL. */ -package org.springframework.cassandra.config.xml; +package org.springframework.data.cql.config.xml; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ArgumentPreparedStatementBinder.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ArgumentPreparedStatementBinder.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ArgumentPreparedStatementBinder.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ArgumentPreparedStatementBinder.java index 5b496da68..d7b12926d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ArgumentPreparedStatementBinder.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ArgumentPreparedStatementBinder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.PreparedStatement; @@ -21,7 +21,7 @@ import com.datastax.driver.core.exceptions.DriverException; /** * Simple adapter for {@link PreparedStatementBinder} that applies a given array of arguments. - * + * * @author Mark Paluch * @since 2.0 */ @@ -31,7 +31,7 @@ public class ArgumentPreparedStatementBinder implements PreparedStatementBinder /** * Create a new {@link ArgumentPreparedStatementBinder} for the given arguments. - * + * * @param args the arguments to set. May be empty or {@link null} if no arguments are provided. */ public ArgumentPreparedStatementBinder(Object[] args) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncCqlOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlOperations.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncCqlOperations.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlOperations.java index 073cf9265..d993b6f41 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncCqlOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlOperations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import reactor.core.publisher.Mono; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlTemplate.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncCqlTemplate.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlTemplate.java index c2d9884e3..d82b1310a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncCqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlTemplate.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.function.Function; -import org.springframework.cassandra.core.session.SessionFactory; -import org.springframework.cassandra.support.CassandraAccessor; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.DataAccessUtils; import org.springframework.dao.support.PersistenceExceptionTranslator; +import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cql.support.CassandraAccessor; import org.springframework.util.Assert; import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.SettableListenableFuture; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncPreparedStatementCreator.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncPreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncPreparedStatementCreator.java index e8f655020..d4d2f5f29 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncPreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncPreparedStatementCreator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import org.springframework.util.concurrent.ListenableFuture; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncSessionCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncSessionCallback.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncSessionCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncSessionCallback.java index f05d72f26..69291137a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncSessionCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncSessionCallback.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import org.springframework.dao.DataAccessException; import org.springframework.util.concurrent.ListenableFuture; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsynchronousQueryListener.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsynchronousQueryListener.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsynchronousQueryListener.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsynchronousQueryListener.java index 82aa842d3..141eec270 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsynchronousQueryListener.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsynchronousQueryListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import com.datastax.driver.core.ResultSetFuture; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CachedPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CachedPreparedStatementCreator.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CachedPreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CachedPreparedStatementCreator.java index 48aa310c6..29b7c85b1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CachedPreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CachedPreparedStatementCreator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CassandraUncategorizedDataAccessException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CassandraUncategorizedDataAccessException.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CassandraUncategorizedDataAccessException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CassandraUncategorizedDataAccessException.java index 44226c02b..45c86aae2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CassandraUncategorizedDataAccessException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CassandraUncategorizedDataAccessException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import org.springframework.dao.UncategorizedDataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ColumnMapRowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ColumnMapRowMapper.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ColumnMapRowMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ColumnMapRowMapper.java index 5e43d0f1c..a024e0879 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ColumnMapRowMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ColumnMapRowMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.Map; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlConstantType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlConstantType.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlConstantType.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlConstantType.java index 399f02030..19e5a1c3e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlConstantType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlConstantType.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql; +package org.springframework.data.cql.core; -import static org.springframework.cassandra.core.cql.CqlConstantType.Regex.*; +import static org.springframework.data.cql.core.CqlConstantType.Regex.*; import java.util.regex.Pattern; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlIdentifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlIdentifier.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlIdentifier.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlIdentifier.java index 2327eecbd..cb03aa036 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlIdentifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlIdentifier.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 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,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql; +package org.springframework.data.cql.core; import java.io.Serializable; import java.util.regex.Pattern; -import org.springframework.cassandra.core.ReservedKeyword; import org.springframework.util.Assert; import com.datastax.driver.core.KeyspaceMetadata; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlOperations.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlOperations.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlOperations.java index 2d9852e43..5e11212e3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlOperations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import reactor.core.publisher.Mono; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlProvider.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlProvider.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlProvider.java index 52af64a27..5e1156787 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlProvider.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; /** * Interface to be implemented by objects that can provide CQL strings. *

    * Typically implemented by {@link PreparedStatementCreator}s and statement callbacks that want to expose the CQL they * use to create their statements, to allow for better contextual information in case of exceptions. - * + * * @author Mark Paluch * @since 2.0 * @see PreparedStatementCreator @@ -31,7 +31,7 @@ public interface CqlProvider { /** * Return the CQL string for this object, i.e. typically the CQL used for creating statements. - * + * * @return the CQL string, or {@literal null}. */ String getCql(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlStringUtils.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlStringUtils.java index bd65659b0..4460a1023 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlStringUtils.java @@ -1,11 +1,11 @@ /* - * Copyright 2013-2014 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. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql; +package org.springframework.data.cql.core; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplate.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlTemplate.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplate.java index 280d24301..eda819632 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.Collection; import java.util.List; @@ -21,10 +21,10 @@ import java.util.Map; import java.util.Set; import java.util.function.Function; -import org.springframework.cassandra.core.session.SessionFactory; -import org.springframework.cassandra.support.CassandraAccessor; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.DataAccessUtils; +import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cql.support.CassandraAccessor; import org.springframework.util.Assert; import com.datastax.driver.core.BoundStatement; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ExceptionTranslatingListenableFutureAdapter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ExceptionTranslatingListenableFutureAdapter.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ExceptionTranslatingListenableFutureAdapter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ExceptionTranslatingListenableFutureAdapter.java index 8275454d2..892860c1f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ExceptionTranslatingListenableFutureAdapter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ExceptionTranslatingListenableFutureAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/GuavaListenableFutureAdapter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/GuavaListenableFutureAdapter.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/GuavaListenableFutureAdapter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/GuavaListenableFutureAdapter.java index 3a678a010..50999909e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/GuavaListenableFutureAdapter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/GuavaListenableFutureAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/HostMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/HostMapper.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/HostMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/HostMapper.java index c803b13a4..66aca59e4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/HostMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/HostMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.Collection; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/KeyspaceIdentifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/KeyspaceIdentifier.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/KeyspaceIdentifier.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/KeyspaceIdentifier.java index fb26205e1..7c27e0622 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/KeyspaceIdentifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/KeyspaceIdentifier.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql; +package org.springframework.data.cql.core; import java.util.regex.Pattern; -import org.springframework.cassandra.core.ReservedKeyword; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/Ordering.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/Ordering.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/Ordering.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/Ordering.java index 273287e97..4ba3b3a4b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/Ordering.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/Ordering.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.Comparator; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementBinder.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementBinder.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementBinder.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementBinder.java index 61cf92c1f..6cc540afa 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementBinder.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementBinder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.PreparedStatement; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementCallback.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementCallback.java index e54cdc5a5..9ee714052 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementCallback.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import org.springframework.dao.DataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementCreator.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementCreator.java index 08c15dc52..f78fefcae 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementCreator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PrimaryKeyType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PrimaryKeyType.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PrimaryKeyType.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PrimaryKeyType.java index c3b374fc6..d16ce8ddc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PrimaryKeyType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PrimaryKeyType.java @@ -1,26 +1,26 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.Comparator; /** * Values representing primary key column types. Implements {@link Comparator} in that * {@link PrimaryKeyType#PARTITIONED} is ordered before {@link PrimaryKeyType#CLUSTERED}. - * + * * @author Matthew T. Adams * @author Alex Shvid */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/QueryOptions.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptions.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/QueryOptions.java index 5a4d100e1..3d7f8f524 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/QueryOptions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.concurrent.TimeUnit; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptionsUtil.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/QueryOptionsUtil.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptionsUtil.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/QueryOptionsUtil.java index 573d45d9d..5197f3c5a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptionsUtil.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/QueryOptionsUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveCqlOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlOperations.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveCqlOperations.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlOperations.java index 47a9f4300..999f54d6c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveCqlOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlOperations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -21,9 +21,9 @@ import reactor.core.publisher.Mono; import java.util.Map; import org.reactivestreams.Publisher; -import org.springframework.cassandra.core.session.ReactiveResultSet; import org.springframework.dao.DataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; +import org.springframework.data.cql.core.session.ReactiveResultSet; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Row; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlTemplate.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveCqlTemplate.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlTemplate.java index 732bedd43..a7175d715 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveCqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -23,13 +23,13 @@ import java.util.Optional; import java.util.function.Function; import org.reactivestreams.Publisher; -import org.springframework.cassandra.core.session.DefaultReactiveSessionFactory; -import org.springframework.cassandra.core.session.ReactiveResultSet; -import org.springframework.cassandra.core.session.ReactiveSession; -import org.springframework.cassandra.core.session.ReactiveSessionFactory; -import org.springframework.cassandra.support.ReactiveCassandraAccessor; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.DataAccessUtils; +import org.springframework.data.cql.core.session.DefaultReactiveSessionFactory; +import org.springframework.data.cql.core.session.ReactiveResultSet; +import org.springframework.data.cql.core.session.ReactiveSession; +import org.springframework.data.cql.core.session.ReactiveSessionFactory; +import org.springframework.data.cql.support.ReactiveCassandraAccessor; import org.springframework.util.Assert; import com.datastax.driver.core.BoundStatement; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactivePreparedStatementCallback.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactivePreparedStatementCallback.java index b44087bfb..62fbb265f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactivePreparedStatementCallback.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import org.reactivestreams.Publisher; -import org.springframework.cassandra.core.session.ReactiveSession; import org.springframework.dao.DataAccessException; +import org.springframework.data.cql.core.session.ReactiveSession; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Statement; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactivePreparedStatementCreator.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactivePreparedStatementCreator.java index 8f6f4c64b..e12ea8d89 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactivePreparedStatementCreator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import reactor.core.publisher.Mono; -import org.springframework.cassandra.core.session.ReactiveSession; +import org.springframework.data.cql.core.session.ReactiveSession; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.exceptions.DriverException; @@ -43,7 +43,7 @@ public interface ReactivePreparedStatementCreator { * Create a statement in this session. Allows implementations to use {@link PreparedStatement}s. The * {@link ReactiveCqlTemplate} will attempt to cache the {@link PreparedStatement}s for future use without the * overhead of re-preparing on the entire cluster. - * + * * @param session Session to use to create statement, must not be {@literal null}. * @return a prepared statement * @throws DriverException there is no need to catch DriverException that may be thrown in the implementation of this diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveResultSetExtractor.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveResultSetExtractor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveResultSetExtractor.java index e14892243..aadfac7ea 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveResultSetExtractor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import org.reactivestreams.Publisher; -import org.springframework.cassandra.core.session.ReactiveResultSet; import org.springframework.dao.DataAccessException; +import org.springframework.data.cql.core.session.ReactiveResultSet; import com.datastax.driver.core.exceptions.DriverException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveRowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveRowMapperResultSetExtractor.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveRowMapperResultSetExtractor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveRowMapperResultSetExtractor.java index b419f9efd..1e64f983c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveRowMapperResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveRowMapperResultSetExtractor.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import reactor.core.publisher.Mono; import org.reactivestreams.Publisher; -import org.springframework.cassandra.core.session.ReactiveResultSet; import org.springframework.dao.DataAccessException; +import org.springframework.data.cql.core.session.ReactiveResultSet; import org.springframework.util.Assert; import com.datastax.driver.core.exceptions.DriverException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveSessionCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveSessionCallback.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveSessionCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveSessionCallback.java index 26a8f03e4..589318adc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveSessionCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveSessionCallback.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import org.reactivestreams.Publisher; -import org.springframework.cassandra.core.session.ReactiveSession; import org.springframework.dao.DataAccessException; +import org.springframework.data.cql.core.session.ReactiveSession; import com.datastax.driver.core.Statement; import com.datastax.driver.core.exceptions.DriverException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveStatementCallback.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveStatementCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveStatementCallback.java index 593d31343..b8185e8ae 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveStatementCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveStatementCallback.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import org.reactivestreams.Publisher; -import org.springframework.cassandra.core.session.ReactiveSession; import org.springframework.dao.DataAccessException; +import org.springframework.data.cql.core.session.ReactiveSession; import com.datastax.driver.core.Statement; import com.datastax.driver.core.exceptions.DriverException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReservedKeyword.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReservedKeyword.java index 7fce8237b..29d940c1d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReservedKeyword.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.HashSet; import java.util.Set; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ResultSetExtractor.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ResultSetExtractor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ResultSetExtractor.java index 58a66095b..dbde6b13f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ResultSetExtractor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import org.springframework.dao.DataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RingMember.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMember.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RingMember.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMember.java index 4bbba6ce8..76f4ca1c5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RingMember.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMember.java @@ -1,19 +1,19 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.io.Serializable; @@ -23,7 +23,7 @@ import com.datastax.driver.core.Host; /** * Domain object representing a Cassandra host. - * + * * @author David Webb * @author Mark Paluch */ @@ -44,7 +44,7 @@ public final class RingMember implements Serializable { /** * Creates a new {@link RingMember} given {@link Host}. - * + * * @param host * @return */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RingMemberHostMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMemberHostMapper.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RingMemberHostMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMemberHostMapper.java index 6da6d728d..2ebe9c3bc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RingMemberHostMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMemberHostMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.Collection; import java.util.stream.Collectors; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowCallbackHandler.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowCallbackHandler.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowCallbackHandler.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowCallbackHandler.java index 1bfbd0c47..e20213690 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowCallbackHandler.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowCallbackHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import com.datastax.driver.core.Row; import com.datastax.driver.core.exceptions.DriverException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapper.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapper.java index 511b09761..c806c78bf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import com.datastax.driver.core.Row; import com.datastax.driver.core.exceptions.DriverException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapperResultSetExtractor.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowMapperResultSetExtractor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapperResultSetExtractor.java index 8fb10462b..e4aa4c851 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowMapperResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapperResultSetExtractor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.ArrayList; import java.util.List; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SessionCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SessionCallback.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SessionCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SessionCallback.java index ec8a6f89f..4f8b549ee 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SessionCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SessionCallback.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import org.springframework.dao.DataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SimplePreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SimplePreparedStatementCreator.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SimplePreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SimplePreparedStatementCreator.java index 6711e08eb..d0c41846a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SimplePreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SimplePreparedStatementCreator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SingleColumnRowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SingleColumnRowMapper.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SingleColumnRowMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SingleColumnRowMapper.java index abfd1082a..01c9c984c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SingleColumnRowMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SingleColumnRowMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; -import org.springframework.cassandra.support.RowUtils; -import org.springframework.cassandra.support.exception.IncorrectResultSetColumnCountException; import org.springframework.dao.TypeMismatchDataAccessException; +import org.springframework.data.cql.support.RowUtils; +import org.springframework.data.cql.support.exception.IncorrectResultSetColumnCountException; import org.springframework.util.ClassUtils; import org.springframework.util.NumberUtils; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/WriteOptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/WriteOptions.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/WriteOptions.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/WriteOptions.java index 80b5a8276..862062757 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/WriteOptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/WriteOptions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core; +package org.springframework.data.cql.core; import java.util.concurrent.TimeUnit; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/AbstractResultSetConverter.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/AbstractResultSetConverter.java index 724cedc8f..7be3d755b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/AbstractResultSetConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.util.List; import java.util.Map; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetToBasicFixedTypeConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/AbstractResultSetToBasicFixedTypeConverter.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetToBasicFixedTypeConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/AbstractResultSetToBasicFixedTypeConverter.java index 761cfc231..29234df7e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetToBasicFixedTypeConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/AbstractResultSetToBasicFixedTypeConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToArrayConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToArrayConverter.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToArrayConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToArrayConverter.java index 6a140a4a3..e976e6f3b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToArrayConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToArrayConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.util.ArrayList; import java.util.List; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigDecimalConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigDecimalConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigDecimalConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigDecimalConverter.java index 615e642f8..51d578c3c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigDecimalConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigDecimalConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.math.BigDecimal; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigIntegerConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigIntegerConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigIntegerConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigIntegerConverter.java index 47e5c0ddf..c04f3c212 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigIntegerConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigIntegerConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.math.BigInteger; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBooleanConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBooleanConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBooleanConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBooleanConverter.java index 00577edfb..d86646ae2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBooleanConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBooleanConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import org.springframework.core.convert.converter.Converter; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToByteBufferConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToByteBufferConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToByteBufferConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToByteBufferConverter.java index eada7e0de..8de83e03b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToByteBufferConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToByteBufferConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.nio.ByteBuffer; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDateConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDateConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDateConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDateConverter.java index a86cefe61..824c25ed5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDateConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDateConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.util.Date; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDoubleConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDoubleConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDoubleConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDoubleConverter.java index cb8cdfdc2..b7f1fec47 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDoubleConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDoubleConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import org.springframework.core.convert.converter.Converter; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToFloatConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToFloatConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToFloatConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToFloatConverter.java index 5e241f51e..245df6599 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToFloatConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToFloatConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import org.springframework.core.convert.converter.Converter; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToInetAddressConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToInetAddressConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToInetAddressConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToInetAddressConverter.java index 7cd812d1b..b4c9bfab7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToInetAddressConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToInetAddressConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.net.InetAddress; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToIntegerConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToIntegerConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToIntegerConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToIntegerConverter.java index ef5b8af9d..0c1e1de51 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToIntegerConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToIntegerConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import org.springframework.core.convert.converter.Converter; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListConverter.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListConverter.java index 6f50a86ef..73dfa4fb1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.util.ArrayList; import java.util.List; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListOfStringConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListOfStringConverter.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListOfStringConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListOfStringConverter.java index fc9c36994..b50bad850 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListOfStringConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListOfStringConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.util.ArrayList; import java.util.List; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToLongConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToLongConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToLongConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToLongConverter.java index 765cabef0..56e1341a1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToLongConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToLongConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import org.springframework.core.convert.converter.Converter; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToStringConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToStringConverter.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToStringConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToStringConverter.java index 435dc13a5..ba3721d9b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToStringConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToStringConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.util.List; import java.util.Map; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToUuidConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToUuidConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToUuidConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToUuidConverter.java index 52d73cf5b..c3923f64f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToUuidConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToUuidConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.util.UUID; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToArrayConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToArrayConverter.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToArrayConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToArrayConverter.java index b67ac24a1..e5bfc8285 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToArrayConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToArrayConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.util.List; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToListConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToListConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToListConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToListConverter.java index 22c2d9de1..400e9fceb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToListConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToListConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.util.List; import java.util.stream.Collectors; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToMapConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToMapConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToMapConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToMapConverter.java index 8d5d83a28..9aa156888 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToMapConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToMapConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.converter; +package org.springframework.data.cql.core.converter; import java.util.HashMap; import java.util.Map; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/package-info.java new file mode 100644 index 000000000..4558d99a2 --- /dev/null +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/package-info.java @@ -0,0 +1,4 @@ +/** + * CQL specific converters. + */ +package org.springframework.data.cql.core.converter; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AddColumnCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AddColumnCqlGenerator.java similarity index 82% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AddColumnCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AddColumnCqlGenerator.java index c4597cd51..db221ccd0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AddColumnCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AddColumnCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; -import org.springframework.cassandra.core.keyspace.AddColumnSpecification; +import org.springframework.data.cql.core.keyspace.AddColumnSpecification; /** * CQL generator for generating an {@code ADD} clause of an {@code ALTER TABLE} statement. @@ -26,7 +26,7 @@ import org.springframework.cassandra.core.keyspace.AddColumnSpecification; * @author Mark Paluch * @see AddColumnSpecification * @see ColumnChangeCqlGenerator - * @see org.springframework.cassandra.core.keyspace.AlterTableSpecification + * @see org.springframework.data.cql.core.keyspace.AlterTableSpecification */ public class AddColumnCqlGenerator extends ColumnChangeCqlGenerator { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterColumnCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterColumnCqlGenerator.java similarity index 85% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterColumnCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterColumnCqlGenerator.java index 441a68974..77cf6dd22 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterColumnCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterColumnCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; -import org.springframework.cassandra.core.keyspace.AlterColumnSpecification; +import org.springframework.data.cql.core.keyspace.AlterColumnSpecification; /** * CQL generator for generating an {@code ALTER} column clause of an ALTER TABLE statement. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterKeyspaceCqlGenerator.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterKeyspaceCqlGenerator.java index 7562c079b..0288605a7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterKeyspaceCqlGenerator.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; import java.util.Map; -import org.springframework.cassandra.core.keyspace.AlterKeyspaceSpecification; -import org.springframework.cassandra.core.keyspace.Option; +import org.springframework.data.cql.core.keyspace.AlterKeyspaceSpecification; +import org.springframework.data.cql.core.keyspace.Option; /** * CQL generator for generating {@code ALTER TABLE} statements. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterTableCqlGenerator.java similarity index 85% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterTableCqlGenerator.java index bf3b88f20..ea95e35dd 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterTableCqlGenerator.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; import java.util.Map; -import org.springframework.cassandra.core.keyspace.AddColumnSpecification; -import org.springframework.cassandra.core.keyspace.AlterColumnSpecification; -import org.springframework.cassandra.core.keyspace.AlterTableSpecification; -import org.springframework.cassandra.core.keyspace.ColumnChangeSpecification; -import org.springframework.cassandra.core.keyspace.DropColumnSpecification; -import org.springframework.cassandra.core.keyspace.Option; -import org.springframework.cassandra.core.keyspace.RenameColumnSpecification; -import org.springframework.cassandra.core.keyspace.TableOption; +import org.springframework.data.cql.core.keyspace.AddColumnSpecification; +import org.springframework.data.cql.core.keyspace.AlterColumnSpecification; +import org.springframework.data.cql.core.keyspace.AlterTableSpecification; +import org.springframework.data.cql.core.keyspace.ColumnChangeSpecification; +import org.springframework.data.cql.core.keyspace.DropColumnSpecification; +import org.springframework.data.cql.core.keyspace.Option; +import org.springframework.data.cql.core.keyspace.RenameColumnSpecification; +import org.springframework.data.cql.core.keyspace.TableOption; /** * CQL generator for generating {@code ALTER TABLE} statements. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterUserTypeCqlGenerator.java similarity index 86% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterUserTypeCqlGenerator.java index 800be845d..0ed4ab2d7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterUserTypeCqlGenerator.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; -import org.springframework.cassandra.core.keyspace.AddColumnSpecification; -import org.springframework.cassandra.core.keyspace.AlterColumnSpecification; -import org.springframework.cassandra.core.keyspace.AlterUserTypeSpecification; -import org.springframework.cassandra.core.keyspace.ColumnChangeSpecification; -import org.springframework.cassandra.core.keyspace.RenameColumnSpecification; +import org.springframework.data.cql.core.keyspace.AddColumnSpecification; +import org.springframework.data.cql.core.keyspace.AlterColumnSpecification; +import org.springframework.data.cql.core.keyspace.AlterUserTypeSpecification; +import org.springframework.data.cql.core.keyspace.ColumnChangeSpecification; +import org.springframework.data.cql.core.keyspace.RenameColumnSpecification; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/ColumnChangeCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/ColumnChangeCqlGenerator.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/ColumnChangeCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/ColumnChangeCqlGenerator.java index d38ff28e9..2721863c4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/ColumnChangeCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/ColumnChangeCqlGenerator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import org.springframework.cassandra.core.keyspace.ColumnChangeSpecification; +import org.springframework.data.cql.core.keyspace.ColumnChangeSpecification; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateIndexCqlGenerator.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateIndexCqlGenerator.java index b918862f7..439c22b81 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateIndexCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; -import org.springframework.cassandra.core.keyspace.CreateIndexSpecification; +import org.springframework.data.cql.core.keyspace.CreateIndexSpecification; /** * CQL generator for generating a {@code CREATE INDEX} statement. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateKeyspaceCqlGenerator.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateKeyspaceCqlGenerator.java index 091dc3967..bdca1a2a6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateKeyspaceCqlGenerator.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; import java.util.Map; -import org.springframework.cassandra.config.KeyspaceAttributes; -import org.springframework.cassandra.core.keyspace.CreateKeyspaceSpecification; -import org.springframework.cassandra.core.keyspace.KeyspaceOption; -import org.springframework.cassandra.core.keyspace.Option; +import org.springframework.data.cql.config.KeyspaceAttributes; +import org.springframework.data.cql.core.keyspace.CreateKeyspaceSpecification; +import org.springframework.data.cql.core.keyspace.KeyspaceOption; +import org.springframework.data.cql.core.keyspace.Option; /** * CQL generator for generating a {@code CREATE TABLE} statement. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateTableCqlGenerator.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateTableCqlGenerator.java index 1172cbae4..dc3c9d5b0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateTableCqlGenerator.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.PrimaryKeyType.*; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cql.core.PrimaryKeyType.*; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.springframework.cassandra.core.keyspace.ColumnSpecification; -import org.springframework.cassandra.core.keyspace.CreateTableSpecification; -import org.springframework.cassandra.core.keyspace.Option; +import org.springframework.data.cql.core.keyspace.ColumnSpecification; +import org.springframework.data.cql.core.keyspace.CreateTableSpecification; +import org.springframework.data.cql.core.keyspace.Option; /** * CQL generator for generating a {@code CREATE TABLE} statement. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateUserTypeCqlGenerator.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateUserTypeCqlGenerator.java index 05a4cfc76..d63ac4359 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateUserTypeCqlGenerator.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; -import org.springframework.cassandra.core.keyspace.CreateUserTypeSpecification; -import org.springframework.cassandra.core.keyspace.FieldSpecification; +import org.springframework.data.cql.core.keyspace.CreateUserTypeSpecification; +import org.springframework.data.cql.core.keyspace.FieldSpecification; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropColumnCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropColumnCqlGenerator.java similarity index 80% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropColumnCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropColumnCqlGenerator.java index d722b6b6e..418ada3d8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropColumnCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropColumnCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; -import org.springframework.cassandra.core.keyspace.DropColumnSpecification; +import org.springframework.data.cql.core.keyspace.DropColumnSpecification; /** * CQL generator for generating a {@code DROP} column clause of an {@code ALTER TABLE} statement. @@ -25,7 +25,7 @@ import org.springframework.cassandra.core.keyspace.DropColumnSpecification; * @author Matthew T. Adams * @see DropColumnSpecification * @see ColumnChangeCqlGenerator - * @see org.springframework.cassandra.core.keyspace.AlterTableSpecification + * @see org.springframework.data.cql.core.keyspace.AlterTableSpecification */ public class DropColumnCqlGenerator extends ColumnChangeCqlGenerator { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropIndexCqlGenerator.java similarity index 86% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropIndexCqlGenerator.java index 6c5594361..c4246316b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropIndexCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; -import org.springframework.cassandra.core.keyspace.DropIndexSpecification; +import org.springframework.data.cql.core.keyspace.DropIndexSpecification; /** * CQL generator for generating a {@code DROP INDEX} statement. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropKeyspaceCqlGenerator.java similarity index 85% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropKeyspaceCqlGenerator.java index 46e04b3e9..fa1bb17d3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropKeyspaceCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; -import org.springframework.cassandra.core.keyspace.DropKeyspaceSpecification; +import org.springframework.data.cql.core.keyspace.DropKeyspaceSpecification; /** * CQL generator for generating a {@code DROP TABLE} statement. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropTableCqlGenerator.java similarity index 85% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropTableCqlGenerator.java index e7eee26fe..c563d6e06 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropTableCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; -import org.springframework.cassandra.core.keyspace.DropTableSpecification; +import org.springframework.data.cql.core.keyspace.DropTableSpecification; /** * CQL generator for generating a {@code DROP TABLE} statement. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropUserTypeCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropUserTypeCqlGenerator.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropUserTypeCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropUserTypeCqlGenerator.java index 419d7d724..c9625b3f8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropUserTypeCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropUserTypeCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; -import org.springframework.cassandra.core.keyspace.DropUserTypeSpecification; +import org.springframework.data.cql.core.keyspace.DropUserTypeSpecification; /** * CQL generator for generating a {@code DROP TYPE} statement. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/IndexNameCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/IndexNameCqlGenerator.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/IndexNameCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/IndexNameCqlGenerator.java index 743600ea3..7ec0d6fd7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/IndexNameCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/IndexNameCqlGenerator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import org.springframework.cassandra.core.keyspace.IndexNameSpecification; +import org.springframework.data.cql.core.keyspace.IndexNameSpecification; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/KeyspaceCqlGenerator.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/KeyspaceCqlGenerator.java index 000cc5325..4fd9e3d7d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/KeyspaceCqlGenerator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import org.springframework.cassandra.core.keyspace.KeyspaceSpecification; +import org.springframework.data.cql.core.keyspace.KeyspaceSpecification; /** * Base class that contains behavior common to CQL generation for table operations. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceNameCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/KeyspaceNameCqlGenerator.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceNameCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/KeyspaceNameCqlGenerator.java index 6834a2016..d8cbe0f7a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceNameCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/KeyspaceNameCqlGenerator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import org.springframework.cassandra.core.keyspace.KeyspaceActionSpecification; +import org.springframework.data.cql.core.keyspace.KeyspaceActionSpecification; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceOptionsCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/KeyspaceOptionsCqlGenerator.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceOptionsCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/KeyspaceOptionsCqlGenerator.java index 6b543de5a..d7fbcced6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceOptionsCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/KeyspaceOptionsCqlGenerator.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; import java.util.Map; -import org.springframework.cassandra.core.keyspace.KeyspaceOptionsSpecification; -import org.springframework.cassandra.core.keyspace.Option; +import org.springframework.data.cql.core.keyspace.KeyspaceOptionsSpecification; +import org.springframework.data.cql.core.keyspace.Option; /** * Base class that contains behavior common to CQL generation for table operations. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/RenameColumnCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/RenameColumnCqlGenerator.java similarity index 82% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/RenameColumnCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/RenameColumnCqlGenerator.java index 7389c0dd1..5847c4015 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/RenameColumnCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/RenameColumnCqlGenerator.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; -import org.springframework.cassandra.core.keyspace.ColumnChangeSpecification; -import org.springframework.cassandra.core.keyspace.RenameColumnSpecification; +import org.springframework.data.cql.core.keyspace.ColumnChangeSpecification; +import org.springframework.data.cql.core.keyspace.RenameColumnSpecification; /** * CQL generator for generating an {@code RENAME} column clause of an {@code ALTER TABLE} statement. @@ -27,7 +27,7 @@ import org.springframework.cassandra.core.keyspace.RenameColumnSpecification; * @since 1.5 * @see ColumnChangeCqlGenerator * @see RenameColumnSpecification - * @see org.springframework.cassandra.core.keyspace.AlterTableSpecification + * @see org.springframework.data.cql.core.keyspace.AlterTableSpecification */ public class RenameColumnCqlGenerator extends ColumnChangeCqlGenerator { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/TableCqlGenerator.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/TableCqlGenerator.java index deb71070d..90a9d7a65 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/TableCqlGenerator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import org.springframework.cassandra.core.keyspace.TableSpecification; +import org.springframework.data.cql.core.keyspace.TableSpecification; /** * Base class that contains behavior common to CQL generation for table operations. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableNameCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/TableNameCqlGenerator.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableNameCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/TableNameCqlGenerator.java index ca856c0d2..23824c48e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableNameCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/TableNameCqlGenerator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import org.springframework.cassandra.core.keyspace.TableNameSpecification; +import org.springframework.data.cql.core.keyspace.TableNameSpecification; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableOptionsCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/TableOptionsCqlGenerator.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableOptionsCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/TableOptionsCqlGenerator.java index 7161785ad..bb9dc0407 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableOptionsCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/TableOptionsCqlGenerator.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; import java.util.Map; -import org.springframework.cassandra.core.keyspace.Option; -import org.springframework.cassandra.core.keyspace.TableOptionsSpecification; +import org.springframework.data.cql.core.keyspace.Option; +import org.springframework.data.cql.core.keyspace.TableOptionsSpecification; /** * Base class that contains behavior common to CQL generation for table operations. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/UserTypeNameCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/UserTypeNameCqlGenerator.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/UserTypeNameCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/UserTypeNameCqlGenerator.java index 59f19cf88..b740ac0a2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/UserTypeNameCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/UserTypeNameCqlGenerator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.cql.generator; +package org.springframework.data.cql.core.generator; -import org.springframework.cassandra.core.keyspace.UserTypeNameSpecification; +import org.springframework.data.cql.core.keyspace.UserTypeNameSpecification; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/package-info.java new file mode 100644 index 000000000..61e9a0c55 --- /dev/null +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/package-info.java @@ -0,0 +1,4 @@ +/** + * CQL generators for Keyspace object actions. + */ +package org.springframework.data.cql.core.generator; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AddColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AddColumnSpecification.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AddColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AddColumnSpecification.java index b0612c1a3..3e843922f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AddColumnSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AddColumnSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterColumnSpecification.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterColumnSpecification.java index 33cf7d6f6..00e5e87ed 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterColumnSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterColumnSpecification.java @@ -1,27 +1,27 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import com.datastax.driver.core.DataType; /** * Value object for altering a column. - * + * * @author Matthew T. Adams * @author Mark Paluch * @see CqlIdentifier diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterKeyspaceSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterKeyspaceSpecification.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterKeyspaceSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterKeyspaceSpecification.java index 40aca6d00..20a2d7997 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterKeyspaceSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterKeyspaceSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import org.springframework.cassandra.core.cql.KeyspaceIdentifier; +import org.springframework.data.cql.core.KeyspaceIdentifier; public class AlterKeyspaceSpecification extends KeyspaceOptionsSpecification { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterTableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterTableSpecification.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterTableSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterTableSpecification.java index 719cf4ad3..2064504bc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterTableSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterTableSpecification.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import com.datastax.driver.core.DataType; @@ -35,7 +35,7 @@ import com.datastax.driver.core.DataType; * @see CreateTableSpecification * @see DropTableSpecification * @see TableOptionsSpecification - * @see org.springframework.cassandra.core.cql.generator.AlterTableCqlGenerator + * @see org.springframework.data.cql.core.generator.AlterTableCqlGenerator */ public class AlterTableSpecification extends TableOptionsSpecification { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterUserTypeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterUserTypeSpecification.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterUserTypeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterUserTypeSpecification.java index ceeb93e06..910ad72c5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterUserTypeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterUserTypeSpecification.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnChangeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnChangeSpecification.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnChangeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnChangeSpecification.java index 48de8a923..5c63715ff 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnChangeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnChangeSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.cql.CqlIdentifier.*; +import static org.springframework.data.cql.core.CqlIdentifier.*; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnSpecification.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnSpecification.java index a5ace6074..ff874a455 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnSpecification.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.Ordering.*; -import static org.springframework.cassandra.core.PrimaryKeyType.*; -import static org.springframework.cassandra.core.cql.CqlIdentifier.*; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cql.core.Ordering.*; +import static org.springframework.data.cql.core.PrimaryKeyType.*; -import org.springframework.cassandra.core.Ordering; -import org.springframework.cassandra.core.PrimaryKeyType; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.core.Ordering; +import org.springframework.data.cql.core.PrimaryKeyType; import org.springframework.util.Assert; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnTypeChangeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnTypeChangeSpecification.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnTypeChangeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnTypeChangeSpecification.java index 06b583ba5..b1e57140e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnTypeChangeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnTypeChangeSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.cql.CqlIdentifier.*; +import static org.springframework.data.cql.core.CqlIdentifier.*; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateIndexSpecification.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateIndexSpecification.java index 1f2ee1aff..a663656dc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateIndexSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.cql.CqlIdentifier.*; +import static org.springframework.data.cql.core.CqlIdentifier.*; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateKeyspaceSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateKeyspaceSpecification.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateKeyspaceSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateKeyspaceSpecification.java index 49e57aa43..62578bcc4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateKeyspaceSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateKeyspaceSpecification.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import org.springframework.cassandra.config.DataCenterReplication; -import org.springframework.cassandra.core.cql.KeyspaceIdentifier; -import org.springframework.cassandra.core.keyspace.KeyspaceOption.ReplicationStrategy; -import org.springframework.cassandra.core.util.MapBuilder; +import org.springframework.data.cql.config.DataCenterReplication; +import org.springframework.data.cql.core.KeyspaceIdentifier; +import org.springframework.data.cql.core.keyspace.KeyspaceOption.ReplicationStrategy; +import org.springframework.data.cql.core.util.MapBuilder; public class CreateKeyspaceSpecification extends KeyspaceSpecification { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateTableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateTableSpecification.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateTableSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateTableSpecification.java index ffb25d03e..bf757dc0c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateTableSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateTableSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; /** * Builder class to construct a {@code CREATE TABLE} specification. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateUserTypeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateUserTypeSpecification.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateUserTypeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateUserTypeSpecification.java index f2dbba751..6354b7079 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateUserTypeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateUserTypeSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; /** * Builder class to construct a {@code CREATE TYPE} specification. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultOption.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DefaultOption.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultOption.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DefaultOption.java index 30a08a2bc..795c3a5cc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultOption.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DefaultOption.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultTableDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DefaultTableDescriptor.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultTableDescriptor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DefaultTableDescriptor.java index 6a1551d39..dc41bc894 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultTableDescriptor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DefaultTableDescriptor.java @@ -1,24 +1,24 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; /** * Convenient default implementation of {@link TableDescriptor} as an extension of {@link TableSpecification} that * doesn't require the use of generics. - * + * * @author Matthew T. Adams */ public class DefaultTableDescriptor extends TableSpecification { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropColumnSpecification.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropColumnSpecification.java index 701c9ddac..1b4ac3991 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropColumnSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropColumnSpecification.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; /** * A specification to drop a column. - * + * * @author Matthew T. Adams */ public class DropColumnSpecification extends ColumnChangeSpecification { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropIndexSpecification.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropIndexSpecification.java index e205ba2bc..c980938e2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropIndexSpecification.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; /** * Builder class that supports the construction of {@code DROP INDEX} specifications. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropKeyspaceSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropKeyspaceSpecification.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropKeyspaceSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropKeyspaceSpecification.java index 624bec2cf..20dcf4391 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropKeyspaceSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropKeyspaceSpecification.java @@ -1,21 +1,21 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import org.springframework.cassandra.core.cql.KeyspaceIdentifier; +import org.springframework.data.cql.core.KeyspaceIdentifier; public class DropKeyspaceSpecification extends KeyspaceActionSpecification { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropTableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropTableSpecification.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropTableSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropTableSpecification.java index 3c3e8db35..77bf3f502 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropTableSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropTableSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; /** * Builder class that supports the construction of {@code DROP TABLE} specifications. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropUserTypeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropUserTypeSpecification.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropUserTypeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropUserTypeSpecification.java index 79c532170..f7da259ac 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropUserTypeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropUserTypeSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; /** * Builder class that supports the construction of {@code DROP TYPE} specifications. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/FieldSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/FieldSpecification.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/FieldSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/FieldSpecification.java index 4063d57a4..dc6a81a44 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/FieldSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/FieldSpecification.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.cql.CqlIdentifier.*; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/IndexDescriptor.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexDescriptor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/IndexDescriptor.java index 6131fc361..d63af08a8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexDescriptor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/IndexDescriptor.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; /** * Describes an index. - * + * * @author Matthew T. Adams * @author David Webb */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexNameSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/IndexNameSpecification.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexNameSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/IndexNameSpecification.java index ad32b1cdf..dd5a6261b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexNameSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/IndexNameSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.cql.CqlIdentifier.*; +import static org.springframework.data.cql.core.CqlIdentifier.*; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceActionSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceActionSpecification.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceActionSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceActionSpecification.java index a2b072aab..78c9e82fe 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceActionSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceActionSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.cql.KeyspaceIdentifier.*; +import static org.springframework.data.cql.core.KeyspaceIdentifier.*; -import org.springframework.cassandra.core.cql.KeyspaceIdentifier; +import org.springframework.data.cql.core.KeyspaceIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceDescriptor.java similarity index 87% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceDescriptor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceDescriptor.java index fdab62736..8d9a2cb0a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceDescriptor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceDescriptor.java @@ -1,27 +1,27 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; import java.util.Map; -import org.springframework.cassandra.core.cql.KeyspaceIdentifier; +import org.springframework.data.cql.core.KeyspaceIdentifier; /** * Describes a Keyspace. - * + * * @author John McPeek */ public interface KeyspaceDescriptor { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOption.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceOption.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOption.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceOption.java index f311e912e..434b0d5aa 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOption.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceOption.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; import java.util.Map; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceOptionsSpecification.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceOptionsSpecification.java index becd3a0f5..043556b50 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceOptionsSpecification.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.cassandra.core.cql.CqlStringUtils; +import org.springframework.data.cql.core.CqlStringUtils; /** * Abstract builder class to support the construction of table specifications that have table options, that is, those diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceSpecification.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceSpecification.java index 2d82b560a..7fd1d2eba 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceSpecification.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; /** * Builder class to support the construction of keyspace specifications that have columns. This class can also be used diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/Option.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/Option.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/Option.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/Option.java index e318a08cf..2ee5ca4e5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/Option.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/Option.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; /** * Interface to represent option types. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/RenameColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/RenameColumnSpecification.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/RenameColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/RenameColumnSpecification.java index 7d228e8b4..18f5620cb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/RenameColumnSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/RenameColumnSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.cql.CqlIdentifier.*; +import static org.springframework.data.cql.core.CqlIdentifier.*; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableDescriptor.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableDescriptor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableDescriptor.java index a46123a41..02be2aaa9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableDescriptor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableDescriptor.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; import java.util.List; import java.util.Map; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; /** * Describes a table. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableNameSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableNameSpecification.java similarity index 87% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableNameSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableNameSpecification.java index d93ac4a48..64248ef84 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableNameSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableNameSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.cql.CqlIdentifier.*; +import static org.springframework.data.cql.core.CqlIdentifier.*; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOption.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableOption.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOption.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableOption.java index 5b4cc0bf4..c02a4acb2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOption.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableOption.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; import java.util.Map; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOptionsSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableOptionsSpecification.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOptionsSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableOptionsSpecification.java index be788349b..8fe6715d3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOptionsSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableOptionsSpecification.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cql.core.CqlStringUtils.*; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.cassandra.core.cql.CqlIdentifier; -import org.springframework.cassandra.core.cql.CqlStringUtils; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.core.CqlStringUtils; /** * Abstract builder class to support the construction of table specifications that have table options, that is, those diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableSpecification.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableSpecification.java index b7374896e..2c501febe 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableSpecification.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.PrimaryKeyType.*; -import static org.springframework.cassandra.core.cql.CqlIdentifier.*; +import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cql.core.PrimaryKeyType.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; -import org.springframework.cassandra.core.Ordering; -import org.springframework.cassandra.core.PrimaryKeyType; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cql.core.Ordering; +import org.springframework.data.cql.core.PrimaryKeyType; import org.springframework.util.Assert; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeNameSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/UserTypeNameSpecification.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeNameSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/UserTypeNameSpecification.java index cf16ca97f..eae1c14f3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeNameSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/UserTypeNameSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/UserTypeSpecification.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/UserTypeSpecification.java index cd53006d1..85a1a0ba7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/UserTypeSpecification.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; -import static org.springframework.cassandra.core.cql.CqlIdentifier.*; +import static org.springframework.data.cql.core.CqlIdentifier.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cql.core.CqlIdentifier; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/package-info.java similarity index 65% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/package-info.java index db09edf5a..a60d6b59f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/package-info.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/package-info.java @@ -1,4 +1,4 @@ /** * Keyspace object action specifications such as {@code CREATE TABLE}, {@code DROP INDEX}. */ -package org.springframework.cassandra.core.keyspace; +package org.springframework.data.cql.core.keyspace; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/package-info.java new file mode 100644 index 000000000..0e0253f71 --- /dev/null +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/package-info.java @@ -0,0 +1,4 @@ +/** + * CQL core support. + */ +package org.springframework.data.cql.core; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultBridgedReactiveSession.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultBridgedReactiveSession.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultBridgedReactiveSession.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultBridgedReactiveSession.java index 52a56ad92..7448d11e6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultBridgedReactiveSession.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultBridgedReactiveSession.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session; +package org.springframework.data.cql.core.session; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultReactiveSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultReactiveSessionFactory.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultReactiveSessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultReactiveSessionFactory.java index 7a76dd92c..1313e992c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultReactiveSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultReactiveSessionFactory.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session; +package org.springframework.data.cql.core.session; -import org.springframework.cassandra.core.ReactiveRowMapperResultSetExtractor; +import org.springframework.data.cql.core.ReactiveRowMapperResultSetExtractor; /** * Default implementation of {@link ReactiveSessionFactory}. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultSessionFactory.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultSessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultSessionFactory.java index 9acfd944f..9c67bb4a4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultSessionFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session; +package org.springframework.data.cql.core.session; import org.springframework.util.Assert; @@ -23,7 +23,7 @@ import com.datastax.driver.core.Session; * Default {@link SessionFactory} implementation. *

    * This class uses a singleton {@link Session} and returns the same instances. - * + * * @author Mark Paluch * @since 2.0 * @see #getSession() diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveResultSet.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveResultSet.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveResultSet.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveResultSet.java index a550f1697..6159498bf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveResultSet.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveResultSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session; +package org.springframework.data.cql.core.session; import reactor.core.publisher.Flux; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveSession.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveSession.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveSession.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveSession.java index 4aaa3bb8b..51a7e0871 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveSession.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveSession.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session; +package org.springframework.data.cql.core.session; import reactor.core.publisher.Mono; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveSessionFactory.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveSessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveSessionFactory.java index f5434d9c7..cc490651f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveSessionFactory.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session; +package org.springframework.data.cql.core.session; -import org.springframework.cassandra.core.ReactiveCqlTemplate; +import org.springframework.data.cql.core.ReactiveCqlTemplate; /** * Strategy interface to produce {@link ReactiveSession} instances. @@ -34,7 +34,7 @@ public interface ReactiveSessionFactory { /** * Return a {@link ReactiveSession} to be used directly or inside a callback inside {@link ReactiveCqlTemplate}. - * + * * @return a {@link ReactiveSession}. */ ReactiveSession getSession(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/SessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/SessionFactory.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/SessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/SessionFactory.java index f8b0c7e67..c43e942ad 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/SessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/SessionFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session; +package org.springframework.data.cql.core.session; import com.datastax.driver.core.Session; @@ -28,7 +28,7 @@ import com.datastax.driver.core.Session; * {@link Session} is moved to a different server, the property for the server can be changed. The benefit is that * because the data source's properties can be changed, any code accessing that {@link SessionFactory} does not need to * be changed. - * + * * @author Mark Paluch * @since 2.0 */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/AbstractRoutingSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactory.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/AbstractRoutingSessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactory.java index 04d54095f..f9ac0e23d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/AbstractRoutingSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactory.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session.lookup; +package org.springframework.data.cql.core.session.lookup; import java.util.HashMap; import java.util.Map; import org.springframework.beans.factory.InitializingBean; -import org.springframework.cassandra.core.session.SessionFactory; +import org.springframework.data.cql.core.session.SessionFactory; import org.springframework.util.Assert; import com.datastax.driver.core.Session; /** - * Abstract {@link org.springframework.cassandra.core.session.SessionFactory} implementation that routes + * Abstract {@link org.springframework.data.cql.core.session.SessionFactory} implementation that routes * {@link #getSession()} calls to one of various target {@link SessionFactory factories} based on a lookup key. The * latter is usually (but not necessarily) determined through some thread-bound transaction context. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/BeanFactorySessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookup.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/BeanFactorySessionFactoryLookup.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookup.java index 39d6eb063..cf31b6214 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/BeanFactorySessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookup.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session.lookup; +package org.springframework.data.cql.core.session.lookup; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.cassandra.core.session.SessionFactory; +import org.springframework.data.cql.core.session.SessionFactory; import org.springframework.util.Assert; /** * {@link SessionFactoryLookup} implementation based on a Spring {@link BeanFactory}. *

    * Will lookup Spring managed beans identified by bean name, expecting them to be of type - * {@link org.springframework.cassandra.core.session.SessionFactory}. + * {@link org.springframework.data.cql.core.session.SessionFactory}. * * @author Mark Paluch * @since 2.0 @@ -52,7 +52,7 @@ public class BeanFactorySessionFactoryLookup implements SessionFactoryLookup, Be * contract). So only use this constructor if you are using this class outside the context of a Spring IoC container. * * @param beanFactory the bean factory to be used to lookup - * {@link org.springframework.cassandra.core.session.SessionFactory session factories}, must not be + * {@link org.springframework.data.cql.core.session.SessionFactory session factories}, must not be * {@literal null}. */ public BeanFactorySessionFactoryLookup(BeanFactory beanFactory) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/MapSessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookup.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/MapSessionFactoryLookup.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookup.java index e12b3a710..6bab7cc65 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/MapSessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookup.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session.lookup; +package org.springframework.data.cql.core.session.lookup; import java.util.Collections; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.cassandra.core.session.SessionFactory; +import org.springframework.data.cql.core.session.SessionFactory; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SessionFactoryLookup.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookup.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SessionFactoryLookup.java index f84a54940..e341e5cdf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SessionFactoryLookup.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session.lookup; +package org.springframework.data.cql.core.session.lookup; -import org.springframework.cassandra.core.session.SessionFactory; +import org.springframework.data.cql.core.session.SessionFactory; /** - * Strategy interface for looking up {@link org.springframework.cassandra.core.session.SessionFactory} by name. + * Strategy interface for looking up {@link org.springframework.data.cql.core.session.SessionFactory} by name. *

    * Implementing classes resolve session factories keyed by {@link String} from an underlying source such as a * {@link java.util.Map} or the {@link org.springframework.beans.factory.BeanFactory}. diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookupFailureException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SessionFactoryLookupFailureException.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookupFailureException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SessionFactoryLookupFailureException.java index d4ee1c9c8..8dbe0b4af 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookupFailureException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SessionFactoryLookupFailureException.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session.lookup; +package org.springframework.data.cql.core.session.lookup; import org.springframework.dao.NonTransientDataAccessException; /** * Exception to be thrown by a {@link SessionFactoryLookup} implementation, indicating that the specified - * {@link org.springframework.cassandra.core.session.SessionFactory} could not be obtained. + * {@link org.springframework.data.cql.core.session.SessionFactory} could not be obtained. * * @author Mark Paluch * @since 2.0 diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SingleSessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookup.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SingleSessionFactoryLookup.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookup.java index f3d4fbe18..b06873536 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SingleSessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookup.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.session.lookup; +package org.springframework.data.cql.core.session.lookup; -import org.springframework.cassandra.core.session.SessionFactory; +import org.springframework.data.cql.core.session.SessionFactory; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/package-info.java new file mode 100644 index 000000000..9f85ef514 --- /dev/null +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/package-info.java @@ -0,0 +1,6 @@ +/** + * Provides a strategy for looking up {@link org.springframework.data.cql.core.session.SessionFactory}. + * + * @author Mark Paluch + */ +package org.springframework.data.cql.core.session.lookup; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/package-info.java similarity index 73% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/package-info.java index 6c7c42000..1decac44f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/package-info.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/package-info.java @@ -1,7 +1,7 @@ /** * Provides utility classes for simple {@link com.datastax.driver.core.Session} access and various session * implementations. - * + * * @author Mark Paluch */ -package org.springframework.cassandra.core.session; +package org.springframework.data.cql.core.session; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/support/CQLExceptionTranslator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/CQLExceptionTranslator.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/support/CQLExceptionTranslator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/CQLExceptionTranslator.java index 33b601e62..721682154 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/support/CQLExceptionTranslator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/CQLExceptionTranslator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.support; +package org.springframework.data.cql.core.support; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.PersistenceExceptionTranslator; @@ -38,7 +38,7 @@ public interface CQLExceptionTranslator extends PersistenceExceptionTranslator { * However, client code may not generally rely on this due to {@link DataAccessException}s possibly being caused by * other resource APIs as well. That said, a {@code getRootCause() instanceof DataAccessException} check (and * subsequent cast) is considered reliable when expecting Cassandra-based access to have happened. - * + * * @param task readable text describing the task being attempted * @param cql CQL query or update that caused the problem (may be {@code null}) * @param ex the offending {@link DriverException} diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/package-info.java new file mode 100644 index 000000000..195078141 --- /dev/null +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/package-info.java @@ -0,0 +1,4 @@ +/** + * CQL support classes. + */ +package org.springframework.data.cql.core.support; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/util/MapBuilder.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/util/MapBuilder.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/core/util/MapBuilder.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/util/MapBuilder.java index 55bde956a..f5d72d430 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/util/MapBuilder.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/util/MapBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.core.util; +package org.springframework.data.cql.core.util; import java.util.Collection; import java.util.Collections; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/package-info.java new file mode 100644 index 000000000..8f7bf978b --- /dev/null +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/package-info.java @@ -0,0 +1,4 @@ +/** + * Spring Data's CQL abstraction. + */ +package org.springframework.data.cql; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraAccessor.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraAccessor.java index 9e3725129..7472188e8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraAccessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support; +package org.springframework.data.cql.support; import java.util.Map; import java.util.Optional; @@ -22,19 +22,19 @@ import java.util.stream.StreamSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.cassandra.core.ArgumentPreparedStatementBinder; -import org.springframework.cassandra.core.ColumnMapRowMapper; -import org.springframework.cassandra.core.CqlProvider; -import org.springframework.cassandra.core.PreparedStatementBinder; -import org.springframework.cassandra.core.ResultSetExtractor; -import org.springframework.cassandra.core.RowCallbackHandler; -import org.springframework.cassandra.core.RowMapper; -import org.springframework.cassandra.core.RowMapperResultSetExtractor; -import org.springframework.cassandra.core.SingleColumnRowMapper; -import org.springframework.cassandra.core.session.DefaultSessionFactory; -import org.springframework.cassandra.core.session.SessionFactory; -import org.springframework.cassandra.core.support.CQLExceptionTranslator; import org.springframework.dao.DataAccessException; +import org.springframework.data.cql.core.ArgumentPreparedStatementBinder; +import org.springframework.data.cql.core.ColumnMapRowMapper; +import org.springframework.data.cql.core.CqlProvider; +import org.springframework.data.cql.core.PreparedStatementBinder; +import org.springframework.data.cql.core.ResultSetExtractor; +import org.springframework.data.cql.core.RowCallbackHandler; +import org.springframework.data.cql.core.RowMapper; +import org.springframework.data.cql.core.RowMapperResultSetExtractor; +import org.springframework.data.cql.core.SingleColumnRowMapper; +import org.springframework.data.cql.core.session.DefaultSessionFactory; +import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cql.core.support.CQLExceptionTranslator; import org.springframework.util.Assert; import com.datastax.driver.core.ConsistencyLevel; @@ -312,9 +312,9 @@ public class CassandraAccessor implements InitializingBean { * * @param rowCallbackHandler {@link RowCallbackHandler} to adapt as a {@link ResultSetExtractor}. * @return a {@link ResultSetExtractor} implementation adapting an instance of the {@link RowCallbackHandler}. - * @see org.springframework.cassandra.core.AsyncCqlTemplate.RowCallbackHandlerResultSetExtractor - * @see org.springframework.cassandra.core.ResultSetExtractor - * @see org.springframework.cassandra.core.RowCallbackHandler + * @see org.springframework.data.cql.core.AsyncCqlTemplate.RowCallbackHandlerResultSetExtractor + * @see org.springframework.data.cql.core.ResultSetExtractor + * @see org.springframework.data.cql.core.RowCallbackHandler */ protected RowCallbackHandlerResultSetExtractor newResultSetExtractor(RowCallbackHandler rowCallbackHandler) { return new RowCallbackHandlerResultSetExtractor(rowCallbackHandler); @@ -326,9 +326,9 @@ public class CassandraAccessor implements InitializingBean { * * @param rowMapper {@link RowMapper} to adapt as a {@link ResultSetExtractor}. * @return a {@link ResultSetExtractor} implementation adapting an instance of the {@link RowMapper}. - * @see org.springframework.cassandra.core.ResultSetExtractor - * @see org.springframework.cassandra.core.RowMapper - * @see org.springframework.cassandra.core.RowMapperResultSetExtractor + * @see org.springframework.data.cql.core.ResultSetExtractor + * @see org.springframework.data.cql.core.RowMapper + * @see org.springframework.data.cql.core.RowMapperResultSetExtractor */ protected RowMapperResultSetExtractor newResultSetExtractor(RowMapper rowMapper) { return new RowMapperResultSetExtractor<>(rowMapper); @@ -341,9 +341,9 @@ public class CassandraAccessor implements InitializingBean { * @param rowMapper {@link RowMapper} to adapt as a {@link ResultSetExtractor}. * @param rowsExpected number of expected rows in the {@link ResultSet}. * @return a {@link ResultSetExtractor} implementation adapting an instance of the {@link RowMapper}. - * @see org.springframework.cassandra.core.ResultSetExtractor - * @see org.springframework.cassandra.core.RowMapper - * @see org.springframework.cassandra.core.RowMapperResultSetExtractor + * @see org.springframework.data.cql.core.ResultSetExtractor + * @see org.springframework.data.cql.core.RowMapper + * @see org.springframework.data.cql.core.RowMapperResultSetExtractor */ protected RowMapperResultSetExtractor newResultSetExtractor(RowMapper rowMapper, int rowsExpected) { return new RowMapperResultSetExtractor<>(rowMapper, rowsExpected); diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraExceptionTranslator.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraExceptionTranslator.java index 29154745b..694be1376 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraExceptionTranslator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support; +package org.springframework.data.cql.support; import java.net.InetSocketAddress; import java.util.Arrays; @@ -22,12 +22,12 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.springframework.cassandra.core.support.CQLExceptionTranslator; -import org.springframework.cassandra.support.exception.*; import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.dao.TransientDataAccessResourceException; import org.springframework.dao.support.PersistenceExceptionTranslator; +import org.springframework.data.cql.core.support.CQLExceptionTranslator; +import org.springframework.data.cql.support.exception.*; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/ReactiveCassandraAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/ReactiveCassandraAccessor.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/ReactiveCassandraAccessor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/ReactiveCassandraAccessor.java index ca18d00d7..4ce2948c8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/ReactiveCassandraAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/ReactiveCassandraAccessor.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support; +package org.springframework.data.cql.support; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.cassandra.core.session.ReactiveSession; -import org.springframework.cassandra.core.session.ReactiveSessionFactory; -import org.springframework.cassandra.core.support.CQLExceptionTranslator; import org.springframework.dao.DataAccessException; +import org.springframework.data.cql.core.session.ReactiveSession; +import org.springframework.data.cql.core.session.ReactiveSessionFactory; +import org.springframework.data.cql.core.support.CQLExceptionTranslator; import org.springframework.util.Assert; import com.datastax.driver.core.exceptions.DriverException; /** - * Base class for {@link org.springframework.cassandra.core.ReactiveCqlTemplate} and other CQL-accessing DAO helpers, + * Base class for {@link org.springframework.data.cql.core.ReactiveCqlTemplate} and other CQL-accessing DAO helpers, * defining common properties such as {@link ReactiveSessionFactory} and exception translator. *

    * Not intended to be used directly. @@ -36,7 +36,7 @@ import com.datastax.driver.core.exceptions.DriverException; * @since 2.0 * @see InitializingBean * @see ReactiveSession - * @see org.springframework.cassandra.core.ReactiveCqlTemplate + * @see org.springframework.data.cql.core.ReactiveCqlTemplate */ public abstract class ReactiveCassandraAccessor implements InitializingBean { @@ -49,7 +49,7 @@ public abstract class ReactiveCassandraAccessor implements InitializingBean { /** * Sets the {@link ReactiveSessionFactory} to use. - * + * * @param sessionFactory must not be {@literal null}. */ public void setSessionFactory(ReactiveSessionFactory sessionFactory) { @@ -61,7 +61,7 @@ public abstract class ReactiveCassandraAccessor implements InitializingBean { /** * Returns the configured {@link ReactiveSessionFactory}. - * + * * @return the configured {@link ReactiveSessionFactory}. */ public ReactiveSessionFactory getSessionFactory() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/RowUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/RowUtils.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/RowUtils.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/RowUtils.java index 9dcdb6f13..0d3b3725a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/RowUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/RowUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support; +package org.springframework.data.cql.support; import java.math.BigDecimal; import java.nio.ByteBuffer; @@ -27,7 +27,7 @@ import com.datastax.driver.core.UDTValue; /** * Generic utility methods for working with Cassandra. Mainly for internal use within the framework, but also useful for * custom CQL access code. - * + * * @author Mark Paluch * @since 2.0 */ @@ -41,7 +41,7 @@ public abstract class RowUtils { *

    * Note that the returned value may not be assignable to the specified required type, in case of an unknown type. * Calling code needs to deal with this case appropriately, e.g. throwing a corresponding exception. - * + * * @param row is the {@link Row} holding the data * @param index is the column index * @param requiredType the required value type (may be {@code null}) diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraAuthenticationException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraAuthenticationException.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraAuthenticationException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraAuthenticationException.java index 4d9f48395..7eee9bde5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraAuthenticationException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraAuthenticationException.java @@ -1,19 +1,19 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import java.net.InetAddress; @@ -21,7 +21,7 @@ import org.springframework.dao.PermissionDeniedDataAccessException; /** * Spring data access exception for a Cassandra authentication failure. - * + * * @author Matthew T. Adams */ public class CassandraAuthenticationException extends PermissionDeniedDataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraConnectionFailureException.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraConnectionFailureException.java index e8aba45d7..a30616c5a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraConnectionFailureException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import java.net.InetSocketAddress; import java.util.Collections; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInsufficientReplicasAvailableException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInsufficientReplicasAvailableException.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInsufficientReplicasAvailableException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInsufficientReplicasAvailableException.java index 0bd96229d..dd47893db 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInsufficientReplicasAvailableException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInsufficientReplicasAvailableException.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.TransientDataAccessException; /** * Spring data access exception for Cassandra when insufficient replicas are available for a given consistency level. - * + * * @author Matthew T. Adams */ public class CassandraInsufficientReplicasAvailableException extends TransientDataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInternalException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInternalException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInternalException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInternalException.java index 9e7ad335c..8f53931ce 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInternalException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInternalException.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.DataAccessException; /** * Spring data access exception for a Cassandra internal error. - * + * * @author Matthew T. Adams */ public class CassandraInternalException extends DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidConfigurationInQueryException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInvalidConfigurationInQueryException.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidConfigurationInQueryException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInvalidConfigurationInQueryException.java index e755c354b..324edaef3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidConfigurationInQueryException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInvalidConfigurationInQueryException.java @@ -1,26 +1,26 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.InvalidDataAccessApiUsageException; /** * Spring data access exception for a Cassandra query that is syntactically correct but has an invalid configuration * clause. - * + * * @author Matthew T. Adams */ public class CassandraInvalidConfigurationInQueryException extends InvalidDataAccessApiUsageException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidQueryException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInvalidQueryException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidQueryException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInvalidQueryException.java index 6b01a9a2d..91db1f3ed 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidQueryException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInvalidQueryException.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.InvalidDataAccessApiUsageException; /** * Spring data access exception for a Cassandra query that's syntactically correct but invalid. - * + * * @author Matthew T. Adams */ public class CassandraInvalidQueryException extends InvalidDataAccessApiUsageException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraKeyspaceExistsException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraKeyspaceExistsException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraKeyspaceExistsException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraKeyspaceExistsException.java index ac5ffdd8a..4ae1a9e1e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraKeyspaceExistsException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraKeyspaceExistsException.java @@ -1,23 +1,23 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; /** * Spring data access exception for Cassandra when a keyspace being created already exists. - * + * * @author Matthew T. Adams */ public class CassandraKeyspaceExistsException extends CassandraSchemaElementExistsException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraQuerySyntaxException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraQuerySyntaxException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraQuerySyntaxException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraQuerySyntaxException.java index 7107a90e1..3f1b77c05 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraQuerySyntaxException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraQuerySyntaxException.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.InvalidDataAccessApiUsageException; /** * Spring data access exception for a Cassandra query syntax error. - * + * * @author Matthew T. Adams */ public class CassandraQuerySyntaxException extends InvalidDataAccessApiUsageException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraReadTimeoutException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraReadTimeoutException.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraReadTimeoutException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraReadTimeoutException.java index 9faca987e..632e35480 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraReadTimeoutException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraReadTimeoutException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.QueryTimeoutException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraSchemaElementExistsException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraSchemaElementExistsException.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraSchemaElementExistsException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraSchemaElementExistsException.java index 44e733937..12eb49942 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraSchemaElementExistsException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraSchemaElementExistsException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.NonTransientDataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTableExistsException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTableExistsException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTableExistsException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTableExistsException.java index 8649a65ef..7acd5789e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTableExistsException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTableExistsException.java @@ -1,23 +1,23 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; /** * Spring data access exception for when a Cassandra table being created already exists. - * + * * @author Matthew T. Adams */ public class CassandraTableExistsException extends CassandraSchemaElementExistsException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTraceRetrievalException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTraceRetrievalException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTraceRetrievalException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTraceRetrievalException.java index 2bf4b7d98..1613f80cb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTraceRetrievalException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTraceRetrievalException.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.TransientDataAccessException; /** * Spring data access exception for a Cassandra trace retrieval exception. - * + * * @author Matthew T. Adams */ public class CassandraTraceRetrievalException extends TransientDataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTruncateException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTruncateException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTruncateException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTruncateException.java index 2189e7402..ec889fd56 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTruncateException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTruncateException.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.TransientDataAccessException; /** * Spring data access exception for a Cassandra truncate exception. - * + * * @author Matthew T. Adams */ public class CassandraTruncateException extends TransientDataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTypeMismatchException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTypeMismatchException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTypeMismatchException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTypeMismatchException.java index b2459b4fd..462397d76 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTypeMismatchException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTypeMismatchException.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.TypeMismatchDataAccessException; /** * Spring data access exception for a Cassandra type mismatch exception. - * + * * @author Matthew T. Adams */ public class CassandraTypeMismatchException extends TypeMismatchDataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUnauthorizedException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraUnauthorizedException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUnauthorizedException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraUnauthorizedException.java index 3d02cd8c4..6e776c76e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUnauthorizedException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraUnauthorizedException.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.PermissionDeniedDataAccessException; /** * Spring data access exception for when access to a Cassandra element is denied. - * + * * @author Matthew T. Adams */ public class CassandraUnauthorizedException extends PermissionDeniedDataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUncategorizedException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraUncategorizedException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUncategorizedException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraUncategorizedException.java index c047da092..312ab3be5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUncategorizedException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraUncategorizedException.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.UncategorizedDataAccessException; /** * Spring data access exception for an uncategorized Cassandra exception. - * + * * @author Alex Shvid * @author Matthew T. Adams */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraWriteTimeoutException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraWriteTimeoutException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraWriteTimeoutException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraWriteTimeoutException.java index 609bd21f3..e529da294 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraWriteTimeoutException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraWriteTimeoutException.java @@ -1,25 +1,25 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.QueryTimeoutException; /** * Spring data access exception for a Cassandra write timeout. - * + * * @author Matthew T. Adams */ public class CassandraWriteTimeoutException extends QueryTimeoutException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/IncorrectResultSetColumnCountException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/IncorrectResultSetColumnCountException.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/IncorrectResultSetColumnCountException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/IncorrectResultSetColumnCountException.java index 81ca4137a..7e0265fff 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/IncorrectResultSetColumnCountException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/IncorrectResultSetColumnCountException.java @@ -1,4 +1,4 @@ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.DataRetrievalFailureException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/UnsupportedCassandraOperationException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/UnsupportedCassandraOperationException.java index 1ed8b551b..d1512325d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/UnsupportedCassandraOperationException.java @@ -1,19 +1,19 @@ /* * Copyright 2013-2014 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; import org.springframework.dao.InvalidDataAccessApiUsageException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/package-info.java similarity index 54% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/package-info.java index 01e5018a9..2375db5b3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/package-info.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/package-info.java @@ -1,4 +1,4 @@ /** * Spring Data's Cassandra specific Data Access Exceptions. */ -package org.springframework.cassandra.support.exception; +package org.springframework.data.cql.support.exception; diff --git a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/package-info.java similarity index 55% rename from spring-data-cassandra/src/main/java/org/springframework/cassandra/support/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cql/support/package-info.java index 24041becc..0c1c6f299 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/package-info.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/package-info.java @@ -1,4 +1,4 @@ /** * CQL support classes and Exception translation. */ -package org.springframework.cassandra.support; +package org.springframework.data.cql.support; diff --git a/spring-data-cassandra/src/main/resources/META-INF/spring.handlers b/spring-data-cassandra/src/main/resources/META-INF/spring.handlers index fbb804718..696050158 100644 --- a/spring-data-cassandra/src/main/resources/META-INF/spring.handlers +++ b/spring-data-cassandra/src/main/resources/META-INF/spring.handlers @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/cql=org.springframework.cassandra.config.xml.CassandraNamespaceHandler +http\://www.springframework.org/schema/cql=org.springframework.data.cql.config.xml.CassandraNamespaceHandler http\://www.springframework.org/schema/data/cassandra=org.springframework.data.cassandra.config.xml.CassandraNamespaceHandler diff --git a/spring-data-cassandra/src/main/resources/META-INF/spring.schemas b/spring-data-cassandra/src/main/resources/META-INF/spring.schemas index 3e9e87819..38d278f63 100644 --- a/spring-data-cassandra/src/main/resources/META-INF/spring.schemas +++ b/spring-data-cassandra/src/main/resources/META-INF/spring.schemas @@ -1,7 +1,7 @@ -http\://www.springframework.org/schema/cql/spring-cql-1.0.xsd=org/springframework/cassandra/config/spring-cql-1.0.xsd -http\://www.springframework.org/schema/cql/spring-cql-1.5.xsd=org/springframework/cassandra/config/spring-cql-1.5.xsd -http\://www.springframework.org/schema/cql/spring-cql-2.0.xsd=org/springframework/cassandra/config/spring-cql-2.0.xsd -http\://www.springframework.org/schema/cql/spring-cql.xsd=org/springframework/cassandra/config/spring-cql-2.0.xsd +http\://www.springframework.org/schema/cql/spring-cql-1.0.xsd=org/springframework/data/cql/config/spring-cql-1.0.xsd +http\://www.springframework.org/schema/cql/spring-cql-1.5.xsd=org/springframework/data/cql/config/spring-cql-1.5.xsd +http\://www.springframework.org/schema/cql/spring-cql-2.0.xsd=org/springframework/data/cql/config/spring-cql-2.0.xsd +http\://www.springframework.org/schema/cql/spring-cql.xsd=org/springframework/data/cql/config/spring-cql-2.0.xsd http\://www.springframework.org/schema/data/cassandra/spring-cassandra-1.0.xsd=org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd http\://www.springframework.org/schema/data/cassandra/spring-cassandra-1.5.xsd=org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd diff --git a/spring-data-cassandra/src/main/resources/META-INF/spring.tooling b/spring-data-cassandra/src/main/resources/META-INF/spring.tooling index 10f8c4d56..af7e4af5c 100644 --- a/spring-data-cassandra/src/main/resources/META-INF/spring.tooling +++ b/spring-data-cassandra/src/main/resources/META-INF/spring.tooling @@ -1,7 +1,7 @@ # Tooling related information for the cql namespace http\://www.springframework.org/schema/cql@name=Spring Cassandra CQL Namespace -http\://www.springframework.org/schema/cql@prefix=cassandra -http\://www.springframework.org/schema/cql@icon=org/springframework/data/cassandra/config/spring-cql.gif +http\://www.springframework.org/schema/cql@prefix=cql +http\://www.springframework.org/schema/cql@icon=org/springframework/data/cql/config/spring-cql.gif # Tooling related information for the cassandra namespace http\://www.springframework.org/schema/data/cassandra@name=Spring Data Cassandra Namespace diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-2.0.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-2.0.xsd index 25ed0024e..35c58eb4a 100644 --- a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-2.0.xsd +++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-2.0.xsd @@ -24,7 +24,7 @@ Defines configuration elements in the XML namespace for Spring Data for Apache C @@ -194,7 +194,7 @@ to the com.datastax.driver.core.Cluster.Builder. - + @@ -258,7 +258,7 @@ pooling options (see com.datastax.driver.core.HostDistance and com.datastax.driv - + type="org.springframework.data.cassandra.core.convert.CassandraConverter" /> @@ -781,7 +781,7 @@ Defines a CassandraMappingContext for holding rich entity mapping information. ]]> + type="org.springframework.data.cassandra.core.mapping.CassandraMappingContext" /> @@ -810,7 +810,7 @@ The reference to a UserTypeResolver. UserTypeResolver is required when working w ]]> + type="org.springframework.data.cassandra.core.mapping.UserTypeResolver" /> @@ -842,7 +842,7 @@ The reference to a CassandraTemplate. Will default to 'cqlTemplate'. - + @@ -866,7 +866,7 @@ The reference to a CassandraTemplate. Will default to 'cqlTemplate'. + type="org.springframework.data.cql.core.CqlTemplate"/> @@ -877,7 +877,7 @@ The reference to a CassandraTemplate. Will default to 'cqlTemplate'. - + diff --git a/spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-1.0.xsd similarity index 100% rename from spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd rename to spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-1.0.xsd diff --git a/spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-1.5.xsd similarity index 100% rename from spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd rename to spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-1.5.xsd diff --git a/spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-2.0.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-2.0.xsd similarity index 98% rename from spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-2.0.xsd rename to spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-2.0.xsd index 5d74ed4a2..72ce39602 100644 --- a/spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-2.0.xsd +++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-2.0.xsd @@ -17,7 +17,7 @@ Defines configuration elements in the XML namespace for Spring for Apache Cassan @@ -31,7 +31,7 @@ Defines a Cassandra cluster. @@ -45,13 +45,13 @@ Defines a Cassandra session. + type="org.springframework.data.cql.core.CqlTemplate"/> @@ -187,7 +187,7 @@ to the com.datastax.driver.core.Cluster.Builder. - + @@ -251,7 +251,7 @@ pooling options (see com.datastax.driver.core.HostDistance and com.datastax.driv - - + - + diff --git a/spring-data-cassandra/src/test/resources/logback.xml b/spring-data-cassandra/src/test/resources/logback.xml index 77ebbd2af..893e1683a 100644 --- a/spring-data-cassandra/src/test/resources/logback.xml +++ b/spring-data-cassandra/src/test/resources/logback.xml @@ -8,7 +8,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-converters.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-converters.xml index aa0c8e749..fdadf84ca 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-converters.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-converters.xml @@ -13,7 +13,7 @@ - + diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-mapping-contexts.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-mapping-contexts.xml index 756810c16..1605f0a0a 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-mapping-contexts.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-mapping-contexts.xml @@ -8,6 +8,6 @@ - + diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests-context.xml index 08bc63f82..86f30e646 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests-context.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests-context.xml @@ -8,7 +8,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/cql http://www.springframework.org/schema/cql/spring-cql.xsd"> - + diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryXmlConfigIntegrationTests-context.xml index c9e8b75d8..8156d0609 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryXmlConfigIntegrationTests-context.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryXmlConfigIntegrationTests-context.xml @@ -8,7 +8,7 @@ - + diff --git a/spring-data-cassandra/src/test/resources/org/springframework/cassandra/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml similarity index 86% rename from spring-data-cassandra/src/test/resources/org/springframework/cassandra/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml rename to spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml index cb2472fa1..43078af98 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/cassandra/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml @@ -8,9 +8,9 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + location="classpath:/config/cassandra-connection.properties,classpath:/org/springframework/data/cql/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.properties"/> - + + location="classpath:/org/springframework/data/cql/config/xml/ppncxct.properties"/> - + @@ -29,10 +29,10 @@ class="com.datastax.driver.core.policies.DowngradingConsistencyRetryPolicy"/> + class="org.springframework.data.cql.config.xml.TestHostStateListener"/> + class="org.springframework.data.cql.config.xml.TestLatencyTracker"/> - + diff --git a/spring-data-cassandra/src/test/resources/org/springframework/cassandra/config/xml/XmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/XmlConfigIntegrationTests-context.xml similarity index 88% rename from spring-data-cassandra/src/test/resources/org/springframework/cassandra/config/xml/XmlConfigIntegrationTests-context.xml rename to spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/XmlConfigIntegrationTests-context.xml index 203acdb8d..b4c68f7e3 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/cassandra/config/xml/XmlConfigIntegrationTests-context.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/XmlConfigIntegrationTests-context.xml @@ -17,13 +17,14 @@ - + - + - + diff --git a/spring-data-cassandra/src/test/resources/org/springframework/cassandra/config/xml/ppncxct.properties b/spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/ppncxct.properties similarity index 100% rename from spring-data-cassandra/src/test/resources/org/springframework/cassandra/config/xml/ppncxct.properties rename to spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/ppncxct.properties diff --git a/src/main/asciidoc/reference/cassandra.adoc b/src/main/asciidoc/reference/cassandra.adoc index e8a76a2f9..4c5525f95 100644 --- a/src/main/asciidoc/reference/cassandra.adoc +++ b/src/main/asciidoc/reference/cassandra.adoc @@ -152,8 +152,8 @@ First, create a simple domain object class to persist. ---- package org.spring.data.cassandra.example; -import org.springframework.data.cassandra.mapping.PrimaryKey; -import org.springframework.data.cassandra.mapping.Table; +import org.springframework.data.cassandra.core.mapping.PrimaryKey; +import org.springframework.data.cassandra.core.mapping.Table; @Table public class Person {