Fix cfRayId after merge and test cases

Author: novalisdenahi

src/main/java/com/configcat/ConfigFetcher.java

@@ -145,23 +145,19 @@ public void onResponse(@NotNull Call call, @NotNull Response response) {
                         logger.error(1101, formattableLogMessage);
                     }
                 } catch (SocketTimeoutException e) {
-                    FormattableLogMessage formattableLogMessage = ConfigCatLogMessages.getFetchFailedDueToRequestTimeout(httpClient.connectTimeoutMillis(), httpClient.readTimeoutMillis(), httpClient.writeTimeoutMillis());
-                    fetchResponse = FetchResponse.failed(formattableLogMessage, false, null, true);
                     FormattableLogMessage formattableLogMessage = ConfigCatLogMessages.getFetchFailedDueToRequestTimeout(httpClient.connectTimeoutMillis(), httpClient.readTimeoutMillis(), httpClient.writeTimeoutMillis(), cfRayId);
+                    fetchResponse = FetchResponse.failed(formattableLogMessage, false, cfRayId, true);
                     logger.error(1102, formattableLogMessage, e);
-                    future.complete(FetchResponse.failed(formattableLogMessage, false, cfRayId));
                 } catch (Exception e) {
-                    String message = ConfigCatLogMessages.FETCH_FAILED_DUE_TO_UNEXPECTED_ERROR;
-                    fetchResponse = FetchResponse.failed(message, false, null, true);
-                    logger.error(1103, message, e);
+                    FormattableLogMessage formattableLogMessage = ConfigCatLogMessages.getFetchFailedDueToUnexpectedError(cfRayId);
+                    fetchResponse = FetchResponse.failed(formattableLogMessage, false, cfRayId, true);
+                    logger.error(1103, formattableLogMessage, e);
                 } finally {
                     if(fetchResponse == null) {
-                        fetchResponse = FetchResponse.failed(ConfigCatLogMessages.FETCH_FAILED_DUE_TO_UNEXPECTED_ERROR,false, null, false);
+                        FormattableLogMessage formattableLogMessage = ConfigCatLogMessages.getFetchFailedDueToUnexpectedError(cfRayId);
+                        fetchResponse = FetchResponse.failed(formattableLogMessage,false, cfRayId, false);
                     }
                     future.complete(fetchResponse);
-                    FormattableLogMessage formattableLogMessage = ConfigCatLogMessages.getFetchFailedDueToUnexpectedError(cfRayId);
-                    logger.error(1103, formattableLogMessage, e);
-                    future.complete(FetchResponse.failed(formattableLogMessage, false, cfRayId));
                 }
             }
         });

src/test/java/com/configcat/ConfigFetcherTest.java

@@ -100,6 +100,8 @@ public void fetchTimeOutExceptionContainsCFRayIdIfPresented() throws IOException
                 PollingModes.manualPoll().getPollingIdentifier());
 
         this.server.enqueue(new MockResponse().setBody("test").setHeader("CF-RAY", "12345").setBodyDelay(2, TimeUnit.SECONDS));
+        this.server.enqueue(new MockResponse().setBody("test").setHeader("CF-RAY", "12345").setBodyDelay(2, TimeUnit.SECONDS));
+
         FetchResponse response = fetch.fetchAsync(null).get();
         assertTrue(response.isFailed());
         assertTrue(response.entry().isEmpty());
@@ -126,6 +128,12 @@ public void fetchUnexpectedErrorExceptionContainsCFRayIdIfPresented() throws IOE
                 false,
                 PollingModes.manualPoll().getPollingIdentifier());
 
+        this.server.enqueue(
+                new MockResponse()
+                        .setResponseCode(200)
+                        .setHeader("CF-RAY", "12345")
+                        .setBody("test")
+                        .setSocketPolicy(SocketPolicy.DISCONNECT_DURING_RESPONSE_BODY));
         this.server.enqueue(
                 new MockResponse()
                         .setResponseCode(200)