Skip to content

Commit 2cf7e8c

Browse files
mp911demp911de
committed
Polishing.
Fix Javadoc references. See #1595
1 parent f407545 commit 2cf7e8c

10 files changed

+32
-32
lines changed

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,10 @@ public abstract class AbstractCassandraConfiguration extends AbstractSessionConf
5959
private @Nullable ClassLoader beanClassLoader;
6060

6161
/**
62-
* Creates a {@link CassandraConverter} using the configured {@link #cassandraMapping()}. Will apply all specified
63-
* {@link #customConversions()}.
62+
* Creates a {@link CassandraConverter} using the configured {@link #cassandraMappingContext(CassandraManagedTypes)}.
63+
* Will apply all specified {@link #customConversions()}.
6464
*
6565
* @return {@link CassandraConverter} used to convert Java and Cassandra value types during the mapping process.
66-
* @see #cassandraMapping()
6766
* @see #customConversions()
6867
*/
6968
@Bean
@@ -153,8 +152,9 @@ public CassandraAdminTemplate cassandraTemplate() {
153152

154153
/**
155154
* Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
156-
* {@link CustomConversions} will be registered with the {@link #cassandraConverter()} and {@link #cassandraMapping()}
157-
* . Returns an empty {@link CustomConversions} instance by default.
155+
* {@link CustomConversions} will be registered with the {@link #cassandraConverter()} and
156+
* {@link #cassandraMappingContext(CassandraManagedTypes)}. Returns an empty {@link CustomConversions} instance by
157+
* default.
158158
*
159159
* @return must not be {@literal null}.
160160
* @since 1.5
@@ -235,7 +235,7 @@ public SchemaAction getSchemaAction() {
235235
}
236236

237237
/**
238-
* Creates a {@link KeyspacePopulator} to cleanup the keyspace.
238+
* Creates a {@link KeyspacePopulator} to clean up the keyspace.
239239
*
240240
* @return the {@link KeyspacePopulator} or {@code null} if none configured.
241241
* @see org.springframework.data.cassandra.core.cql.session.init.ResourceKeyspacePopulator

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/AlterTableSpecification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static AlterTableSpecification alterTable(CqlIdentifier tableName) {
7575
/**
7676
* Entry point into the {@link AlterTableSpecification}'s fluent API given {@code tableName} to alter a table.
7777
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
78-
* {@code keyspace} is not {@link null}, then the table name is prefixed with {@code keyspace}.
78+
* {@code keyspace} is not {@literal null}, then the table name is prefixed with {@code keyspace}.
7979
*
8080
* @param keyspace can be {@literal null}.
8181
* @param tableName must not be {@literal null}.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/AlterUserTypeSpecification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static AlterUserTypeSpecification alterType(CqlIdentifier typeName) {
6565
/**
6666
* Entry point into the {@link AlterUserTypeSpecification}'s fluent API given {@code typeName} to alter a type.
6767
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
68-
* {@code keyspace} is not {@link null}, then the table name is prefixed with {@code keyspace}.
68+
* {@code keyspace} is not {@literal null}, then the table name is prefixed with {@code keyspace}.
6969
*
7070
* @param keyspace can be {@literal null}.
7171
* @param typeName must not be {@literal null}.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateIndexSpecification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public static CreateIndexSpecification createIndex(CqlIdentifier indexName) {
8989
/**
9090
* Entry point into the {@link CreateIndexSpecification}'s fluent API given {@code keyspace} and {@code indexName} to
9191
* create an index. Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null;
92-
* otherwise, of the {@code keyspace} is not {@link null}, then the index and table name are prefixed with
92+
* otherwise, of the {@code keyspace} is not {@literal null}, then the index and table name are prefixed with
9393
* {@code keyspace}.
9494
*
9595
* @param keyspace can be {@literal null}.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateTableSpecification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static CreateTableSpecification createTable(CqlIdentifier tableName) {
5858
/**
5959
* Entry point into the {@link CreateTableSpecification}'s fluent API given {@code tableName} to create a table.
6060
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
61-
* {@code keyspace} is not {@link null}, then the table name is prefixed with {@code keyspace}.
61+
* {@code keyspace} is not {@literal null}, then the table name is prefixed with {@code keyspace}.
6262
*
6363
* @param keyspace can be {@literal null}.
6464
* @param tableName must not be {@literal null}.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateUserTypeSpecification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static CreateUserTypeSpecification createType(CqlIdentifier typeName) {
6262
/**
6363
* Entry point into the {@link CreateUserTypeSpecification}'s fluent API given {@code typeName} to create a type.
6464
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
65-
* {@code keyspace} is not {@link null}, then the UDT name is prefixed with {@code keyspace}.
65+
* {@code keyspace} is not {@literal null}, then the UDT name is prefixed with {@code keyspace}.
6666
*
6767
* @param keyspace can be {@literal null}.
6868
* @param typeName must not {@literal null}.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropIndexSpecification.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public static DropIndexSpecification dropIndex(CqlIdentifier indexName) {
5454

5555
/**
5656
* Create a new {@link DropIndexSpecification} for the given {@code indexName}. Uses the default keyspace if
57-
* {@code keyspace} is null; otherwise, of the {@code keyspace} is not {@link null}, then the index name is prefixed
58-
* with {@code keyspace}.
57+
* {@code keyspace} is null; otherwise, of the {@code keyspace} is not {@literal null}, then the index name is
58+
* prefixed with {@code keyspace}.
5959
*
6060
* @param keyspace can be {@literal null}.
6161
* @param indexName must not be {@literal null}.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropTableSpecification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static DropTableSpecification dropTable(CqlIdentifier tableName) {
5959
/**
6060
* Entry point into the {@link DropTableSpecification}'s fluent API given {@code tableName} to drop a table.
6161
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
62-
* {@code keyspace} is not {@link null}, then the table name is prefixed with {@code keyspace}.
62+
* {@code keyspace} is not {@literal null}, then the table name is prefixed with {@code keyspace}.
6363
*
6464
* @param keyspace can be {@literal null}.
6565
* @param tableName must not be {@literal null}.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropUserTypeSpecification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static DropUserTypeSpecification dropType(CqlIdentifier typeName) {
6161
/**
6262
* Entry point into the {@link DropUserTypeSpecification}'s fluent API given {@code typeName} to drop a type.
6363
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
64-
* {@code keyspace} is not {@link null}, then the UDT name is prefixed with {@code keyspace}.
64+
* {@code keyspace} is not {@literal null}, then the UDT name is prefixed with {@code keyspace}.
6565
*
6666
* @param keyspace can be {@code null}.
6767
* @param typeName must not be {@code null} or empty.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/SpecificationBuilder.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public static CreateTableSpecification createTable(String tableName) {
125125
/**
126126
* Entry point into the {@link CreateTableSpecification}'s fluent API given {@code tableName} to create a table.
127127
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
128-
* {@code keyspace} is not {@link null}, then the table name is prefixed with {@code keyspace}.
128+
* {@code keyspace} is not {@literal null}, then the table name is prefixed with {@code keyspace}.
129129
*
130130
* @param keyspace can be {@literal null}.
131131
* @param tableName must not be {@literal null}.
@@ -149,7 +149,7 @@ public static CreateTableSpecification createTable(CqlIdentifier tableName) {
149149
/**
150150
* Entry point into the {@link CreateTableSpecification}'s fluent API given {@code tableName} to create a table.
151151
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
152-
* {@code keyspace} is not {@link null}, then the table name is prefixed with {@code keyspace}.
152+
* {@code keyspace} is not {@literal null}, then the table name is prefixed with {@code keyspace}.
153153
*
154154
* @param keyspace can be {@literal null}.
155155
* @param tableName must not be {@literal null}.
@@ -173,7 +173,7 @@ public static AlterTableSpecification alterTable(String tableName) {
173173
/**
174174
* Entry point into the {@link AlterTableSpecification}'s fluent API given {@code tableName} to alter a table.
175175
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
176-
* {@code keyspace} is not {@link null}, then the table name is prefixed with {@code keyspace}.
176+
* {@code keyspace} is not {@literal null}, then the table name is prefixed with {@code keyspace}.
177177
*
178178
* @param keyspace can be {@literal null}.
179179
* @param tableName must not be {@literal null}.
@@ -197,7 +197,7 @@ public static AlterTableSpecification alterTable(CqlIdentifier tableName) {
197197
/**
198198
* Entry point into the {@link AlterTableSpecification}'s fluent API given {@code tableName} to alter a table.
199199
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
200-
* {@code keyspace} is not {@link null}, then the table name is prefixed with {@code keyspace}.
200+
* {@code keyspace} is not {@literal null}, then the table name is prefixed with {@code keyspace}.
201201
*
202202
* @param keyspace can be {@literal null}.
203203
* @param tableName must not be {@literal null}.
@@ -221,7 +221,7 @@ public static DropTableSpecification dropTable(String tableName) {
221221
/**
222222
* Entry point into the {@link DropTableSpecification}'s fluent API given {@code tableName} to drop a table.
223223
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
224-
* {@code keyspace} is not {@link null}, then the table name is prefixed with {@code keyspace}.
224+
* {@code keyspace} is not {@literal null}, then the table name is prefixed with {@code keyspace}.
225225
*
226226
* @param keyspace can be {@literal null}.
227227
* @param tableName must not be {@literal null}.
@@ -245,7 +245,7 @@ public static DropTableSpecification dropTable(CqlIdentifier tableName) {
245245
/**
246246
* Entry point into the {@link DropTableSpecification}'s fluent API given {@code tableName} to drop a table.
247247
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
248-
* {@code keyspace} is not {@link null}, then the table name is prefixed with {@code keyspace}.
248+
* {@code keyspace} is not {@literal null}, then the table name is prefixed with {@code keyspace}.
249249
*
250250
* @param keyspace can be {@literal null}.
251251
* @param tableName must not be {@literal null}.
@@ -371,7 +371,7 @@ public static CreateIndexSpecification createIndex(CqlIdentifier indexName) {
371371
/**
372372
* Entry point into the {@link CreateIndexSpecification}'s fluent API given {@code keyspace} and {@code indexName} to
373373
* create an index. Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null;
374-
* otherwise, of the {@code keyspace} is not {@link null}, then the index and table name are prefixed with
374+
* otherwise, of the {@code keyspace} is not {@literal null}, then the index and table name are prefixed with
375375
* {@code keyspace}.
376376
*
377377
* @param keyspace can be {@literal null}.
@@ -395,8 +395,8 @@ public static DropIndexSpecification dropIndex(String indexName) {
395395

396396
/**
397397
* Create a new {@link DropIndexSpecification} for the given {@code indexName}. Uses the default keyspace if
398-
* {@code keyspace} is null; otherwise, of the {@code keyspace} is not {@link null}, then the index name is prefixed
399-
* with {@code keyspace}.
398+
* {@code keyspace} is null; otherwise, of the {@code keyspace} is not {@literal null}, then the index name is
399+
* prefixed with {@code keyspace}.
400400
*
401401
* @param keyspace can be {@literal null}.
402402
* @param indexName must not be {@literal null}.
@@ -418,8 +418,8 @@ public static DropIndexSpecification dropIndex(CqlIdentifier indexName) {
418418

419419
/**
420420
* Create a new {@link DropIndexSpecification} for the given {@code indexName}. Uses the default keyspace if
421-
* {@code keyspace} is null; otherwise, of the {@code keyspace} is not {@link null}, then the index name is prefixed
422-
* with {@code keyspace}.
421+
* {@code keyspace} is null; otherwise, of the {@code keyspace} is not {@literal null}, then the index name is
422+
* prefixed with {@code keyspace}.
423423
*
424424
* @param keyspace can be {@literal null}.
425425
* @param indexName must not be {@literal null}.
@@ -447,7 +447,7 @@ public static CreateUserTypeSpecification createType(String typeName) {
447447
/**
448448
* Entry point into the {@link CreateUserTypeSpecification}'s fluent API given {@code name} to create a type.
449449
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
450-
* {@code keyspace} is not {@link null}, then the UDT name is prefixed with {@code keyspace}.
450+
* {@code keyspace} is not {@literal null}, then the UDT name is prefixed with {@code keyspace}.
451451
*
452452
* @param keyspace can be {@literal null}.
453453
* @param typeName must not {@literal null}.
@@ -471,7 +471,7 @@ public static CreateUserTypeSpecification createType(CqlIdentifier name) {
471471
/**
472472
* Entry point into the {@link CreateUserTypeSpecification}'s fluent API given {@code typeName} to create a type.
473473
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
474-
* {@code keyspace} is not {@link null}, then the UDT name is prefixed with {@code keyspace}.
474+
* {@code keyspace} is not {@literal null}, then the UDT name is prefixed with {@code keyspace}.
475475
*
476476
* @param keyspace can be {@literal null}.
477477
* @param name must not {@literal null}.
@@ -495,7 +495,7 @@ public static AlterUserTypeSpecification alterType(String typeName) {
495495
/**
496496
* Entry point into the {@link AlterUserTypeSpecification}'s fluent API given {@code typeName} to alter a type.
497497
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
498-
* {@code keyspace} is not {@link null}, then the table name is prefixed with {@code keyspace}.
498+
* {@code keyspace} is not {@literal null}, then the table name is prefixed with {@code keyspace}.
499499
*
500500
* @param keyspace can be {@literal null}.
501501
* @param typeName must not be {@literal null}.
@@ -519,7 +519,7 @@ private static AlterUserTypeSpecification alterType(CqlIdentifier typeName) {
519519
/**
520520
* Entry point into the {@link AlterUserTypeSpecification}'s fluent API given {@code typeName} to alter a type.
521521
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
522-
* {@code keyspace} is not {@link null}, then the table name is prefixed with {@code keyspace}.
522+
* {@code keyspace} is not {@literal null}, then the table name is prefixed with {@code keyspace}.
523523
*
524524
* @param keyspace can be {@literal null}.
525525
* @param typeName must not be {@literal null}.
@@ -543,7 +543,7 @@ public static DropUserTypeSpecification dropType(String typeName) {
543543
/**
544544
* Entry point into the {@link DropUserTypeSpecification}'s fluent API given {@code typeName} to drop a type.
545545
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
546-
* {@code keyspace} is not {@link null}, then the UDT name is prefixed with {@code keyspace}.
546+
* {@code keyspace} is not {@literal null}, then the UDT name is prefixed with {@code keyspace}.
547547
*
548548
* @param keyspace can be {@code null}.
549549
* @param typeName must not be {@code null} or empty.
@@ -567,7 +567,7 @@ public static DropUserTypeSpecification dropType(CqlIdentifier typeName) {
567567
/**
568568
* Entry point into the {@link DropUserTypeSpecification}'s fluent API given {@code typeName} to drop a type.
569569
* Convenient if imported statically. Uses the default keyspace if {@code keyspace} is null; otherwise, of the
570-
* {@code keyspace} is not {@link null}, then the UDT name is prefixed with {@code keyspace}.
570+
* {@code keyspace} is not {@literal null}, then the UDT name is prefixed with {@code keyspace}.
571571
*
572572
* @param keyspace can be {@code null}.
573573
* @param typeName must not be {@code null} or empty.

0 commit comments

Comments
 (0)