Merge pull request #1916 from ClickHouse/v2_fix_readin_404_error_msg

[client-v2] Fixed issue with 404 error message

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java

@@ -531,6 +531,7 @@ private HttpEntity wrapEntity(HttpEntity httpEntity, int httpStatus, boolean isR
                 case HttpStatus.SC_NOT_MODIFIED:
                 case HttpStatus.SC_BAD_REQUEST:
                 case HttpStatus.SC_INTERNAL_SERVER_ERROR:
+                case HttpStatus.SC_NOT_FOUND:
                     boolean useHttpCompression = MapUtils.getFlag(chConfiguration, "client.use_http_compression", false);
                     return new LZ4Entity(httpEntity, useHttpCompression, serverCompression, clientCompression,
                             MapUtils.getInt(chConfiguration, "compression.lz4.uncompressed_buffer_size"), isResponse);

client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java

@@ -341,6 +341,16 @@ public void testServerErrorHandling(ClickHouseFormat format, boolean serverCompr
                         "Unexpected error message: " + e.getMessage());
             }
 
+            querySettings.serverSetting("unknown_setting", "1");
+            try (QueryResponse response = client.query("CREATE TABLE table_from_csv AS SELECT * FROM file('empty.csv')", querySettings)
+                    .get(1, TimeUnit.SECONDS)) {
+                Assert.fail("Expected exception");
+            } catch (ServerException e) {
+                e.printStackTrace();
+                Assert.assertEquals(e.getCode(), 115);
+                Assert.assertTrue(e.getMessage().startsWith("Code: 115. DB::Exception: Setting unknown_setting is neither a builtin setting nor started with the prefix 'custom_' registered for user-defined settings. (UNKNOWN_SETTING)"),
+                        "Unexpected error message: " + e.getMessage());
+            }
 
         } catch (Exception e) {
             e.printStackTrace();