Skip to content

Commit f0f6895

Browse files
mp911demp911de
committed
Polishing.
Fix import ordering. See #1329
1 parent 86f8528 commit f0f6895

File tree

253 files changed

+440
-494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+440
-494
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.springframework.lang.Nullable;
3232
import org.springframework.util.ClassUtils;
3333
import org.springframework.util.StringUtils;
34-
3534
import org.w3c.dom.Element;
3635

3736
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
import org.apache.commons.logging.Log;
3232
import org.apache.commons.logging.LogFactory;
33-
3433
import org.springframework.beans.factory.DisposableBean;
3534
import org.springframework.beans.factory.FactoryBean;
3635
import org.springframework.beans.factory.InitializingBean;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceAttributes;
3131
import org.springframework.util.StringUtils;
3232
import org.springframework.util.xml.DomUtils;
33-
3433
import org.w3c.dom.Element;
3534

3635
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.springframework.lang.Nullable;
3434
import org.springframework.util.StringUtils;
3535
import org.springframework.util.xml.DomUtils;
36-
3736
import org.w3c.dom.Element;
3837

3938
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
2424
import org.springframework.beans.factory.xml.ParserContext;
2525
import org.springframework.util.StringUtils;
26-
2726
import org.w3c.dom.Element;
2827

2928
/**

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,8 @@
2525
import java.util.stream.Collectors;
2626
import java.util.stream.StreamSupport;
2727

28-
import com.datastax.oss.driver.api.core.CqlIdentifier;
29-
import com.datastax.oss.driver.api.core.CqlSession;
30-
import com.datastax.oss.driver.api.core.DriverException;
31-
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
32-
import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
33-
import com.datastax.oss.driver.api.core.cql.BoundStatement;
34-
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
35-
import com.datastax.oss.driver.api.core.cql.ResultSet;
36-
import com.datastax.oss.driver.api.core.cql.Row;
37-
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
38-
import com.datastax.oss.driver.api.core.cql.Statement;
39-
import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
40-
import com.datastax.oss.driver.api.querybuilder.delete.Delete;
41-
import com.datastax.oss.driver.api.querybuilder.insert.Insert;
42-
import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert;
43-
import com.datastax.oss.driver.api.querybuilder.select.Select;
44-
import com.datastax.oss.driver.api.querybuilder.truncate.Truncate;
45-
import com.datastax.oss.driver.api.querybuilder.update.Update;
4628
import org.apache.commons.logging.Log;
4729
import org.apache.commons.logging.LogFactory;
48-
4930
import org.springframework.beans.BeansException;
5031
import org.springframework.context.ApplicationContext;
5132
import org.springframework.context.ApplicationContextAware;
@@ -58,7 +39,20 @@
5839
import org.springframework.data.cassandra.core.EntityOperations.AdaptibleEntity;
5940
import org.springframework.data.cassandra.core.convert.CassandraConverter;
6041
import org.springframework.data.cassandra.core.convert.MappingCassandraConverter;
61-
import org.springframework.data.cassandra.core.cql.*;
42+
import org.springframework.data.cassandra.core.cql.AsyncCqlOperations;
43+
import org.springframework.data.cassandra.core.cql.AsyncCqlTemplate;
44+
import org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator;
45+
import org.springframework.data.cassandra.core.cql.AsyncResultSetExtractor;
46+
import org.springframework.data.cassandra.core.cql.AsyncSessionCallback;
47+
import org.springframework.data.cassandra.core.cql.CassandraAccessor;
48+
import org.springframework.data.cassandra.core.cql.CqlProvider;
49+
import org.springframework.data.cassandra.core.cql.PreparedStatementBinder;
50+
import org.springframework.data.cassandra.core.cql.QueryExtractorDelegate;
51+
import org.springframework.data.cassandra.core.cql.QueryOptions;
52+
import org.springframework.data.cassandra.core.cql.RowCallbackHandler;
53+
import org.springframework.data.cassandra.core.cql.RowMapper;
54+
import org.springframework.data.cassandra.core.cql.SingleColumnRowMapper;
55+
import org.springframework.data.cassandra.core.cql.WriteOptions;
6256
import org.springframework.data.cassandra.core.cql.session.DefaultSessionFactory;
6357
import org.springframework.data.cassandra.core.cql.util.StatementBuilder;
6458
import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity;
@@ -82,6 +76,25 @@
8276
import org.springframework.lang.Nullable;
8377
import org.springframework.util.Assert;
8478

79+
import com.datastax.oss.driver.api.core.CqlIdentifier;
80+
import com.datastax.oss.driver.api.core.CqlSession;
81+
import com.datastax.oss.driver.api.core.DriverException;
82+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
83+
import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
84+
import com.datastax.oss.driver.api.core.cql.BoundStatement;
85+
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
86+
import com.datastax.oss.driver.api.core.cql.ResultSet;
87+
import com.datastax.oss.driver.api.core.cql.Row;
88+
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
89+
import com.datastax.oss.driver.api.core.cql.Statement;
90+
import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
91+
import com.datastax.oss.driver.api.querybuilder.delete.Delete;
92+
import com.datastax.oss.driver.api.querybuilder.insert.Insert;
93+
import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert;
94+
import com.datastax.oss.driver.api.querybuilder.select.Select;
95+
import com.datastax.oss.driver.api.querybuilder.truncate.Truncate;
96+
import com.datastax.oss.driver.api.querybuilder.update.Update;
97+
8598
/**
8699
* Primary implementation of {@link AsyncCassandraOperations}. It simplifies the use of asynchronous Cassandra usage and
87100
* helps to avoid common errors. It executes core Cassandra workflow. This class executes CQL queries or updates,

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.stream.Collectors;
2525

2626
import org.jetbrains.annotations.NotNull;
27-
2827
import org.springframework.data.cassandra.core.cql.generator.CreateIndexCqlGenerator;
2928
import org.springframework.data.cassandra.core.cql.generator.CreateTableCqlGenerator;
3029
import org.springframework.data.cassandra.core.cql.generator.CreateUserTypeCqlGenerator;

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java‎

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,8 @@
2121
import java.util.function.Supplier;
2222
import java.util.stream.Stream;
2323

24-
import com.datastax.oss.driver.api.core.CqlIdentifier;
25-
import com.datastax.oss.driver.api.core.CqlSession;
26-
import com.datastax.oss.driver.api.core.DriverException;
27-
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
28-
import com.datastax.oss.driver.api.core.cql.BatchType;
29-
import com.datastax.oss.driver.api.core.cql.BoundStatement;
30-
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
31-
import com.datastax.oss.driver.api.core.cql.ResultSet;
32-
import com.datastax.oss.driver.api.core.cql.Row;
33-
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
34-
import com.datastax.oss.driver.api.core.cql.Statement;
35-
import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
36-
import com.datastax.oss.driver.api.querybuilder.delete.Delete;
37-
import com.datastax.oss.driver.api.querybuilder.insert.Insert;
38-
import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert;
39-
import com.datastax.oss.driver.api.querybuilder.select.Select;
40-
import com.datastax.oss.driver.api.querybuilder.truncate.Truncate;
41-
import com.datastax.oss.driver.api.querybuilder.update.Update;
4224
import org.apache.commons.logging.Log;
4325
import org.apache.commons.logging.LogFactory;
44-
4526
import org.springframework.beans.BeansException;
4627
import org.springframework.context.ApplicationContext;
4728
import org.springframework.context.ApplicationContextAware;
@@ -56,7 +37,18 @@
5637
import org.springframework.data.cassandra.core.convert.MappingCassandraConverter;
5738
import org.springframework.data.cassandra.core.convert.QueryMapper;
5839
import org.springframework.data.cassandra.core.convert.UpdateMapper;
59-
import org.springframework.data.cassandra.core.cql.*;
40+
import org.springframework.data.cassandra.core.cql.CassandraAccessor;
41+
import org.springframework.data.cassandra.core.cql.CqlOperations;
42+
import org.springframework.data.cassandra.core.cql.CqlProvider;
43+
import org.springframework.data.cassandra.core.cql.CqlTemplate;
44+
import org.springframework.data.cassandra.core.cql.PreparedStatementBinder;
45+
import org.springframework.data.cassandra.core.cql.PreparedStatementCreator;
46+
import org.springframework.data.cassandra.core.cql.QueryExtractorDelegate;
47+
import org.springframework.data.cassandra.core.cql.QueryOptions;
48+
import org.springframework.data.cassandra.core.cql.RowMapper;
49+
import org.springframework.data.cassandra.core.cql.SessionCallback;
50+
import org.springframework.data.cassandra.core.cql.SingleColumnRowMapper;
51+
import org.springframework.data.cassandra.core.cql.WriteOptions;
6052
import org.springframework.data.cassandra.core.cql.session.DefaultSessionFactory;
6153
import org.springframework.data.cassandra.core.cql.util.StatementBuilder;
6254
import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity;
@@ -80,6 +72,25 @@
8072
import org.springframework.lang.Nullable;
8173
import org.springframework.util.Assert;
8274

75+
import com.datastax.oss.driver.api.core.CqlIdentifier;
76+
import com.datastax.oss.driver.api.core.CqlSession;
77+
import com.datastax.oss.driver.api.core.DriverException;
78+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
79+
import com.datastax.oss.driver.api.core.cql.BatchType;
80+
import com.datastax.oss.driver.api.core.cql.BoundStatement;
81+
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
82+
import com.datastax.oss.driver.api.core.cql.ResultSet;
83+
import com.datastax.oss.driver.api.core.cql.Row;
84+
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
85+
import com.datastax.oss.driver.api.core.cql.Statement;
86+
import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
87+
import com.datastax.oss.driver.api.querybuilder.delete.Delete;
88+
import com.datastax.oss.driver.api.querybuilder.insert.Insert;
89+
import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert;
90+
import com.datastax.oss.driver.api.querybuilder.select.Select;
91+
import com.datastax.oss.driver.api.querybuilder.truncate.Truncate;
92+
import com.datastax.oss.driver.api.querybuilder.update.Update;
93+
8394
/**
8495
* Primary implementation of {@link CassandraOperations}. It simplifies the use of Cassandra usage and helps to avoid
8596
* common errors. It executes core Cassandra workflow. This class executes CQL queries or updates, initiating iteration

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/PreparedStatementDelegate.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.function.Supplier;
2323

2424
import org.apache.commons.logging.Log;
25-
2625
import org.springframework.data.cassandra.core.cql.QueryExtractorDelegate;
2726
import org.springframework.lang.Nullable;
2827
import org.springframework.util.Assert;

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchOperations.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Collections;
2121

2222
import org.reactivestreams.Subscriber;
23-
2423
import org.springframework.data.cassandra.core.cql.WriteOptions;
2524
import org.springframework.util.Assert;
2625

0 commit comments

Comments
 (0)