Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue of connecting to influxdb without username/password on okhttp 4.x.x #644

Merged
merged 5 commits into from
Dec 22, 2019
Merged

Fix issue of connecting to influxdb without username/password on okhttp 4.x.x #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f3953c
Fix issue of connecting InfluxDB without username / password in OkHtt…
vinh0604 Dec 21, 2019
dd665db
Use InfluxDB instead of InfluxDBImpl
vinh0604 Dec 21, 2019
322afb6
Fix import style and remove redundant casting
vinh0604 Dec 22, 2019
68f931d
Add test case to cover the condition check for adding BasicAuthInterc…
vinh0604 Dec 22, 2019
5f050c4
Remove the condition check for adding BasicAuthInterceptor in the int…
vinh0604 Dec 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,12 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.14.4</version>
<version>4.2.2</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
<version>3.14.4</version>
<version>4.2.2</version>
</dependency>
</dependencies>
<profiles>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/influxdb/impl/BatchProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public final class BatchProcessor {
protected final BlockingQueue<AbstractBatchEntry> queue;
private final ScheduledExecutorService scheduler;
private final BiConsumer<Iterable<Point>, Throwable> exceptionHandler;
final InfluxDBImpl influxDB;
final InfluxDB influxDB;
final int actions;
private final TimeUnit flushIntervalUnit;
private final int flushInterval;
Expand All @@ -48,7 +48,7 @@ public final class BatchProcessor {
* The Builder to create a BatchProcessor instance.
*/
public static final class Builder {
private final InfluxDBImpl influxDB;
private final InfluxDB influxDB;
private ThreadFactory threadFactory = Executors.defaultThreadFactory();
private int actions;
private TimeUnit flushIntervalUnit;
Expand Down Expand Up @@ -77,7 +77,7 @@ public Builder threadFactory(final ThreadFactory threadFactory) {
* is mandatory.
*/
public Builder(final InfluxDB influxDB) {
this.influxDB = (InfluxDBImpl) influxDB;
this.influxDB = influxDB;
}

/**
Expand Down Expand Up @@ -259,7 +259,7 @@ public static Builder builder(final InfluxDB influxDB) {
return new Builder(influxDB);
}

BatchProcessor(final InfluxDBImpl influxDB, final BatchWriter batchWriter, final ThreadFactory threadFactory,
BatchProcessor(final InfluxDB influxDB, final BatchWriter batchWriter, final ThreadFactory threadFactory,
final int actions, final TimeUnit flushIntervalUnit, final int flushInterval, final int jitterInterval,
final BiConsumer<Iterable<Point>, Throwable> exceptionHandler,
final ConsistencyLevel consistencyLevel, final TimeUnit precision) {
Expand Down
17 changes: 11 additions & 6 deletions src/main/java/org/influxdb/impl/InfluxDBImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,12 @@ public InfluxDBImpl(final String url, final String username, final String passwo
setLogLevel(LOG_LEVEL);

this.gzipRequestInterceptor = new GzipRequestInterceptor();
OkHttpClient.Builder clonedOkHttpBuilder = okHttpBuilder.build().newBuilder();
clonedOkHttpBuilder.addInterceptor(loggingInterceptor).addInterceptor(gzipRequestInterceptor).
addInterceptor(new BasicAuthInterceptor(username, password));
OkHttpClient.Builder clonedOkHttpBuilder = okHttpBuilder.build().newBuilder()
.addInterceptor(loggingInterceptor)
.addInterceptor(gzipRequestInterceptor);
if (username != null && password != null) {
clonedOkHttpBuilder.addInterceptor(new BasicAuthInterceptor(username, password));
}
Factory converterFactory = null;
switch (responseFormat) {
case MSGPACK:
Expand Down Expand Up @@ -195,9 +198,11 @@ public InfluxDBImpl(final String url, final String username, final String passwo
setLogLevel(LOG_LEVEL);

this.gzipRequestInterceptor = new GzipRequestInterceptor();
OkHttpClient.Builder clonedBuilder = client.build().newBuilder();
this.client = clonedBuilder.addInterceptor(loggingInterceptor).addInterceptor(gzipRequestInterceptor).
addInterceptor(new BasicAuthInterceptor(username, password)).build();
OkHttpClient.Builder clonedBuilder = client.build().newBuilder()
.addInterceptor(loggingInterceptor)
.addInterceptor(gzipRequestInterceptor)
.addInterceptor(new BasicAuthInterceptor(username, password));
this.client = clonedBuilder.build();
this.retrofit = new Retrofit.Builder().baseUrl(url)
.client(this.client)
.addConverterFactory(MoshiConverterFactory.create()).build();
Expand Down
8 changes: 7 additions & 1 deletion src/test/java/org/influxdb/InfluxDBFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,17 @@ public class InfluxDBFactoryTest {
* Test for a {@link InfluxDBFactory #connect(String)}.
*/
@Test
public void testCreateInfluxDBInstanceWithoutUserNameAndPassword() {
public void testShouldNotUseBasicAuthWhenCreateInfluxDBInstanceWithoutUserNameAndPassword() {
InfluxDB influxDB = InfluxDBFactory.connect("http://" + TestUtils.getInfluxIP() + ":" + TestUtils.getInfluxPORT(true));
verifyInfluxDBInstance(influxDB);
}

@Test
public void testShouldNotUseBasicAuthWhenCreateInfluxDBInstanceWithUserNameAndWithoutPassword() {
InfluxDB influxDB = InfluxDBFactory.connect("http://" + TestUtils.getInfluxIP() + ":" + TestUtils.getInfluxPORT(true), "admin", null);
verifyInfluxDBInstance(influxDB);
}

private void verifyInfluxDBInstance(InfluxDB influxDB) {
Assertions.assertNotNull(influxDB);
Pong pong = influxDB.ping();
Expand Down