Added possibility to reuse client as a core part of Reactive client #493

bednar · 2018-08-22T11:23:24Z

This PR solve #392 by adding possibility to reuse influxdb-java client as a core part of influxdb-java-reactive - Reactive Java client for InfluxDB.

Summary of changes

The InfluxDBImpl constructor has parameter for customise Retrofit.Builder. That builder is use in influxdb-java-reactive client for create reactive version of InfluxDBService.

* The InfluxDBImpl constructor has parameter for customise Retrofit.Builder. That builder is use in influxdb-java-reactive client for create reactive version of InfluxDBService. * The InfluxDBResultMapper is able to handle results which a different time precision * The InfluxDBResultMapper is able to map Integer to Instant

codecov-io · 2018-08-22T11:31:41Z

Codecov Report

Merging #493 into master will increase coverage by 0.15%.
The diff coverage is 100%.

@@             Coverage Diff              @@
##             master     #493      +/-   ##
============================================
+ Coverage     87.53%   87.69%   +0.15%     
- Complexity      365      368       +3     
============================================
  Files            25       25              
  Lines          1500     1503       +3     
  Branches        167      167              
============================================
+ Hits           1313     1318       +5     
  Misses          120      120              
+ Partials         67       65       -2

Impacted Files	Coverage Δ	Complexity Δ
src/main/java/org/influxdb/impl/InfluxDBImpl.java	`89.89% <100%> (+0.08%)`	`79 <1> (+1)`	⬆️
src/main/java/org/influxdb/InfluxDBException.java	`94.54% <0%> (+3.63%)`	`14% <0%> (+2%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 24c5542...e6c9ad2. Read the comment docs.

majst01 · 2018-08-24T06:29:43Z

Hi @bednar

You are solving 3 Issues with one PR, from my understanding only your first point is related to rxjava.

We only want to have PR´s which are focused on one single Issue.

If i am wrong can you please elaborate more details.

bednar · 2018-08-24T07:02:15Z

Hi @majst01,

Yes, you are right.

During implementation the reactive client I found two issues with InfluxDBResultMapper:

InfluxDBResultMapper is not able to handle results which a different time precision then milliseconds
InfluxDBResultMapper is not able to map Integer to Instant

I will split the current PR to three pull requests:

The InfluxDBResultMapper is able to map Integer to Instant
The InfluxDBResultMapper is able to handle results which a different time precision
Added possibility to reuse client as a core part of Reactive client

It will be ok for you?

fmachado

These were my comments that I incorrectly gave on the wrong PR from bonitoo and now moved to here.

fmachado · 2018-08-24T07:40:28Z

src/main/java/org/influxdb/impl/InfluxDBImpl.java

@@ -146,7 +169,7 @@ public InfluxDBImpl(final String url, final String username, final String passwo
      break;
    }

-    this.retrofit = new Retrofit.Builder().baseUrl(url).client(
+    this.retrofit = retrofitBuilder.baseUrl(url).client(


Just a heads up: you may have here ConcurrentModificationException as you are adding a converterFactory to a shared and non thread-safe retrofitBuilder. Worst case scenatio if you don't trigger a CME, you will end up having multiple converterFactory added to the internal list in retrofitBuilder.

Yes, you are right. It could cause same errors as in #445, so I will use same approach to avoid potential problems:

Retrofit.Builder clonedRetrofitBuilder = retrofitBuilder.baseUrl(url).build().newBuilder(); this.retrofit = clonedRetrofitBuilder.client(clonedOkHttpBuilder.build()) .addConverterFactory(converterFactory).build();

fmachado · 2018-08-24T07:41:12Z

src/main/java/org/influxdb/impl/InfluxDBResultMapper.java

@@ -152,7 +202,7 @@ void throwExceptionIfResultWithError(final QueryResult queryResult) {
    });
  }

-  void cacheMeasurementClass(final Class<?>... classVarAgrs) {
+  public void cacheMeasurementClass(final Class<?>... classVarAgrs) {


Please revert the access modifier from this method on this class and from all methods from other classes to the minimum required. There is no need to make this method public.

fmachado · 2018-08-24T07:41:49Z

src/main/java/org/influxdb/impl/InfluxDBResultMapper.java

    return ((Measurement) clazz.getAnnotation(Measurement.class)).name();
  }

+  public <T> ConcurrentMap<String, Field> getColNameAndFieldMap(final Class<T> clazz) {


There is no need to have this method: you are not mocking it and now you are exposing an internal structure publicly to the external code, allowing it to be changed. Please, revert this change.

fmachado · 2018-08-24T07:53:46Z

src/main/java/org/influxdb/impl/InfluxDBResultMapper.java

@@ -263,9 +324,11 @@ String getMeasurementName(final Class<?> clazz) {
      if (value instanceof String) {
        instant = Instant.from(ISO8601_FORMATTER.parse(String.valueOf(value)));
      } else if (value instanceof Long) {
-        instant = Instant.ofEpochMilli((Long) value);
+        instant = Instant.ofEpochMilli(toMillis((Long) value, precision));


Could you please do a tinny improvement here by casting to primitives instead of Object wrappers? If you do, then please change the method signature from toMillis(final Long value, ... to toMillis(final long value, ... (just to avoid unboxing).

…ove unnecessary unboxing

…cationException

bednar · 2018-08-28T04:18:17Z

@fmachado I made the required changes. Can you check it?

majst01 · 2018-08-28T05:49:06Z

Hi @bednar

This PR still modifies around precision handling, and instantiation of a new influxdb service. I doubt these are all related to the usage in a reactive environment.

As long as we have mixed modifications in this PR we will not accept that.

bednar · 2018-08-28T05:56:55Z

Hi @majst01, thanks for response.

Today, I will create separate PR for handling precision and leave this PR only for instantiation of a new InfluxDB service.

bednar · 2018-08-28T11:18:21Z

Hi @majst01, @fmachado

I created pull request (#501) for the InfluxDBResultMapper precision issue and also changed description of current PR to reflect changes.

Thanks for your reviews

majst01 · 2018-08-28T11:29:52Z

src/main/java/org/influxdb/InfluxDBException.java

@@ -126,7 +126,7 @@ public boolean isRetryWorth() {
    }
  }

-  private static InfluxDBException buildExceptionFromErrorMessage(final String errorMessage) {
+  public static InfluxDBException buildExceptionFromErrorMessage(final String errorMessage) {


Why public, if you want to test this like below, write the test in the matching package.

Please add a changelog.md entry with pointers where the usage of influxdb-java in a reactive environment is shown.

Because I want to reuse this method in influxdb-java-reactive to parse errors from HTTP header X-Influx-Error. If its is a problem I can use something like this:

String errorBody = String.format("{\"error\":\"%s\"}", errorHeader);

Can I let this method public?

The CHANGELOG.md was updated.

…ivate

bednar · 2018-08-29T06:54:38Z

Hi @majst01,

I changed method InfluxDBException#buildExceptionFromErrorMessage to private.

Thanks for your review

bednar requested review from majst01 and fmachado August 22, 2018 11:23

fmachado suggested changes Aug 24, 2018

View reviewed changes

fmachado reviewed Aug 24, 2018

View reviewed changes

bednar added 2 commits August 24, 2018 10:58

InfluxDBResultMapper: removed useless changes, used primitives to rem…

69e635d

…ove unnecessary unboxing

Using the cloned Retrofit.Builder to avoid potential ConcurrentModifi…

4a1f929

…cationException

ivankudibal added this to the 2.13 milestone Aug 28, 2018

The time precision was move to separate pull request influxdata#501

c2b5530

majst01 requested changes Aug 28, 2018

View reviewed changes

bednar added 2 commits August 28, 2018 13:55

Added link to reactive client which use the influxdb-java as core part

a51233c

Changed method InfluxDBException#buildExceptionFromErrorMessage to pr…

e6c9ad2

…ivate

fmachado approved these changes Aug 31, 2018

View reviewed changes

majst01 approved these changes Sep 6, 2018

View reviewed changes

majst01 merged commit 490fb25 into influxdata:master Sep 6, 2018

bednar deleted the reactive-pull-request branch October 1, 2018 06:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added possibility to reuse client as a core part of Reactive client #493

Added possibility to reuse client as a core part of Reactive client #493

bednar commented Aug 22, 2018 •

edited

Loading

codecov-io commented Aug 22, 2018 •

edited

Loading

majst01 commented Aug 24, 2018

bednar commented Aug 24, 2018

fmachado left a comment

fmachado Aug 24, 2018

bednar Aug 24, 2018

fmachado Aug 24, 2018

fmachado Aug 24, 2018

fmachado Aug 24, 2018

bednar commented Aug 28, 2018

majst01 commented Aug 28, 2018

bednar commented Aug 28, 2018

bednar commented Aug 28, 2018

majst01 Aug 28, 2018

majst01 Aug 28, 2018

bednar Aug 28, 2018

bednar Aug 28, 2018

bednar commented Aug 29, 2018

Added possibility to reuse client as a core part of Reactive client #493

Added possibility to reuse client as a core part of Reactive client #493

Conversation

bednar commented Aug 22, 2018 • edited Loading

Summary of changes

codecov-io commented Aug 22, 2018 • edited Loading

Codecov Report

majst01 commented Aug 24, 2018

bednar commented Aug 24, 2018

fmachado left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bednar commented Aug 28, 2018

majst01 commented Aug 28, 2018

bednar commented Aug 28, 2018

bednar commented Aug 28, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bednar commented Aug 29, 2018

bednar commented Aug 22, 2018 •

edited

Loading

codecov-io commented Aug 22, 2018 •

edited

Loading