Skip to content

Commit 5517888

Browse files
olim7tolim7t
committed
JAVA-1774: Standardize policy locations
For all the policies that are customizable through the configuration: - the interface is in an 'api' package - the implementations are in the corresponding 'internal' package
1 parent 0f3e4dd commit 5517888

46 files changed

Lines changed: 80 additions & 59 deletions

File tree

Some content is hidden

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

‎changelog/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### 4.0.0-alpha4 (in progress)
66

7+
- [improvement] JAVA-1774: Standardize policy locations
78
- [improvement] JAVA-1798: Allow passing the default LBP filter as a session builder argument
89
- [new feature] JAVA-1523: Add query logger
910
- [improvement] JAVA-1801: Revisit NodeStateListener and SchemaChangeListener APIs

‎core/src/main/java/com/datastax/oss/driver/api/core/auth/AuthProvider.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.datastax.oss.driver.api.core.auth;
1717

18+
import com.datastax.oss.driver.internal.core.auth.PlainTextAuthProvider;
1819
import java.net.SocketAddress;
1920

2021
/**

core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/RequestThrottler.java renamed to core/src/main/java/com/datastax/oss/driver/api/core/session/throttling/RequestThrottler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datastax.oss.driver.internal.core.session.throttling;
16+
package com.datastax.oss.driver.api.core.session.throttling;
1717

1818
import java.io.Closeable;
1919

core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/Throttled.java renamed to core/src/main/java/com/datastax/oss/driver/api/core/session/throttling/Throttled.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datastax.oss.driver.internal.core.session.throttling;
16+
package com.datastax.oss.driver.api.core.session.throttling;
1717

1818
import com.datastax.oss.driver.api.core.RequestThrottlingException;
1919

20-
/** A request that may be subjected to throttling by a {@link RequestThrottler}. */
20+
/**
21+
* A request that may be subjected to throttling by a {@link
22+
* com.datastax.oss.driver.api.core.session.throttling.RequestThrottler}.
23+
*/
2124
public interface Throttled {
2225

2326
/**

core/src/main/java/com/datastax/oss/driver/api/core/addresstranslation/PassThroughAddressTranslator.java renamed to core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/PassThroughAddressTranslator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datastax.oss.driver.api.core.addresstranslation;
16+
package com.datastax.oss.driver.internal.core.addresstranslation;
1717

18+
import com.datastax.oss.driver.api.core.addresstranslation.AddressTranslator;
1819
import com.datastax.oss.driver.api.core.context.DriverContext;
1920
import java.net.InetSocketAddress;
2021
import net.jcip.annotations.ThreadSafe;

‎core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/ThrottledAdminRequestHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import com.datastax.oss.driver.api.core.DriverTimeoutException;
1919
import com.datastax.oss.driver.api.core.RequestThrottlingException;
2020
import com.datastax.oss.driver.api.core.metrics.DefaultSessionMetric;
21+
import com.datastax.oss.driver.api.core.session.throttling.RequestThrottler;
22+
import com.datastax.oss.driver.api.core.session.throttling.Throttled;
2123
import com.datastax.oss.driver.internal.core.channel.DriverChannel;
2224
import com.datastax.oss.driver.internal.core.metrics.SessionMetricUpdater;
23-
import com.datastax.oss.driver.internal.core.session.throttling.RequestThrottler;
24-
import com.datastax.oss.driver.internal.core.session.throttling.Throttled;
2525
import com.datastax.oss.protocol.internal.Message;
2626
import java.nio.ByteBuffer;
2727
import java.time.Duration;

core/src/main/java/com/datastax/oss/driver/api/core/auth/PlainTextAuthProvider.java renamed to core/src/main/java/com/datastax/oss/driver/internal/core/auth/PlainTextAuthProvider.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datastax.oss.driver.api.core.auth;
16+
package com.datastax.oss.driver.internal.core.auth;
1717

18+
import com.datastax.oss.driver.api.core.auth.AuthProvider;
19+
import com.datastax.oss.driver.api.core.auth.Authenticator;
20+
import com.datastax.oss.driver.api.core.auth.SyncAuthenticator;
1821
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
1922
import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
2023
import com.datastax.oss.driver.api.core.context.DriverContext;

core/src/main/java/com/datastax/oss/driver/api/core/connection/ExponentialReconnectionPolicy.java renamed to core/src/main/java/com/datastax/oss/driver/internal/core/connection/ExponentialReconnectionPolicy.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datastax.oss.driver.api.core.connection;
16+
package com.datastax.oss.driver.internal.core.connection;
1717

1818
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
1919
import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
20+
import com.datastax.oss.driver.api.core.connection.ReconnectionPolicy;
2021
import com.datastax.oss.driver.api.core.context.DriverContext;
2122
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
2223
import java.time.Duration;

‎core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.datastax.oss.driver.api.core.metadata.NodeStateListener;
3030
import com.datastax.oss.driver.api.core.metadata.schema.SchemaChangeListener;
3131
import com.datastax.oss.driver.api.core.retry.RetryPolicy;
32+
import com.datastax.oss.driver.api.core.session.throttling.RequestThrottler;
3233
import com.datastax.oss.driver.api.core.specex.SpeculativeExecutionPolicy;
3334
import com.datastax.oss.driver.api.core.ssl.SslEngineFactory;
3435
import com.datastax.oss.driver.api.core.time.TimestampGenerator;
@@ -62,7 +63,6 @@
6263
import com.datastax.oss.driver.internal.core.servererrors.WriteTypeRegistry;
6364
import com.datastax.oss.driver.internal.core.session.PoolManager;
6465
import com.datastax.oss.driver.internal.core.session.RequestProcessorRegistry;
65-
import com.datastax.oss.driver.internal.core.session.throttling.RequestThrottler;
6666
import com.datastax.oss.driver.internal.core.ssl.JdkSslHandlerFactory;
6767
import com.datastax.oss.driver.internal.core.ssl.SslHandlerFactory;
6868
import com.datastax.oss.driver.internal.core.type.codec.registry.DefaultCodecRegistry;

‎core/src/main/java/com/datastax/oss/driver/internal/core/context/InternalDriverContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.datastax.oss.driver.api.core.metadata.NodeStateListener;
2222
import com.datastax.oss.driver.api.core.metadata.schema.SchemaChangeListener;
2323
import com.datastax.oss.driver.api.core.session.SessionBuilder;
24+
import com.datastax.oss.driver.api.core.session.throttling.RequestThrottler;
2425
import com.datastax.oss.driver.api.core.tracker.RequestTracker;
2526
import com.datastax.oss.driver.internal.core.ConsistencyLevelRegistry;
2627
import com.datastax.oss.driver.internal.core.ProtocolVersionRegistry;
@@ -39,7 +40,6 @@
3940
import com.datastax.oss.driver.internal.core.servererrors.WriteTypeRegistry;
4041
import com.datastax.oss.driver.internal.core.session.PoolManager;
4142
import com.datastax.oss.driver.internal.core.session.RequestProcessorRegistry;
42-
import com.datastax.oss.driver.internal.core.session.throttling.RequestThrottler;
4343
import com.datastax.oss.driver.internal.core.ssl.SslHandlerFactory;
4444
import com.datastax.oss.protocol.internal.Compressor;
4545
import com.datastax.oss.protocol.internal.FrameCodec;

0 commit comments

Comments
 (0)