Datasets:

JetBrains-Research

/

lca-bug-localization

like 1

Follow

JetBrains Research 47

clickhouse/clickhouse-java/1070/1069

clickhouse

clickhouse-java

https://github.com/ClickHouse/clickhouse-java/issues/1069

https://github.com/ClickHouse/clickhouse-java/pull/1070

https://github.com/ClickHouse/clickhouse-java/pull/1070

fixes

BasicAuthentication Support

Is basic authentication supported in the most recent version of the clickhouse JDBC drivers? (`clickhouse-jdbc-0.3.2-patch11` is my version). I found an older PR saying that everyone got switched over https://github.com/ClickHouse/clickhouse-jdbc/issues/522, but looks like it may not be true in the most revent version. I tried using the `custom_http_headers` property to set my own auth header, but the client complains about double auth because https://github.com/ClickHouse/clickhouse-jdbc/blob/f285b73d45597e29cf36dff4daf4cb4f9f53453a/clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnection.java#L166 this method is still always attempting to add the `X-Clickhouse` user and password methods. I can't find anywhere in the codebase that ever attempts to set an accessToken based method. Am I missing a way to properly configure the client to use a `BasicAuth` header?

4077e59b845f7d8f95a221dbedea233dbc04b8c8

12b95acc6af2a0bc8770a1b68a4855b822233d70

https://github.com/clickhouse/clickhouse-java/compare/4077e59b845f7d8f95a221dbedea233dbc04b8c8...12b95acc6af2a0bc8770a1b68a4855b822233d70

diff --git a/clickhouse-client/src/test/java/com/clickhouse/client/BaseIntegrationTest.java b/clickhouse-client/src/test/java/com/clickhouse/client/BaseIntegrationTest.java index 578825d3..7a4e8fd4 100644 --- a/clickhouse-client/src/test/java/com/clickhouse/client/BaseIntegrationTest.java +++ b/clickhouse-client/src/test/java/com/clickhouse/client/BaseIntegrationTest.java @@ -19,6 +19,10 @@ public abstract class BaseIntegrationTest { return ClickHouseServerForTest.getClickHouseNode(protocol, true, ClickHouseNode.builder().build()); } + protected ClickHouseNode getSecureServer(ClickHouseProtocol protocol, ClickHouseNode base) { + return ClickHouseServerForTest.getClickHouseNode(protocol, true, base); + } + protected ClickHouseNode getServer(ClickHouseProtocol protocol) { return ClickHouseServerForTest.getClickHouseNode(protocol, false, ClickHouseNode.builder().build()); } diff --git a/clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java b/clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java index bf9e3897..9c4e616f 100644 --- a/clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java +++ b/clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java @@ -101,12 +101,14 @@ public abstract class ClientIntegrationTest extends BaseIntegrationTest { return builder; } - protected ClickHouseClient getClient() { - return initClient(ClickHouseClient.builder()).nodeSelector(ClickHouseNodeSelector.of(getProtocol())).build(); + protected ClickHouseClient getClient(ClickHouseConfig... configs) { + return initClient(ClickHouseClient.builder()).config(new ClickHouseConfig(configs)) + .nodeSelector(ClickHouseNodeSelector.of(getProtocol())).build(); } - protected ClickHouseClient getSecureClient() { + protected ClickHouseClient getSecureClient(ClickHouseConfig... configs) { return initClient(ClickHouseClient.builder()) + .config(new ClickHouseConfig(configs)) .nodeSelector(ClickHouseNodeSelector.of(getProtocol())) .option(ClickHouseClientOption.SSL, true) .option(ClickHouseClientOption.SSL_MODE, ClickHouseSslMode.STRICT) @@ -117,14 +119,22 @@ public abstract class ClientIntegrationTest extends BaseIntegrationTest { .build(); } - protected ClickHouseNode getServer() { - return getServer(getProtocol()); + protected ClickHouseNode getSecureServer(ClickHouseNode base) { + return getSecureServer(getProtocol(), base); } protected ClickHouseNode getSecureServer() { return getSecureServer(getProtocol()); } + protected ClickHouseNode getServer(ClickHouseNode base) { + return getServer(getProtocol(), base); + } + + protected ClickHouseNode getServer() { + return getServer(getProtocol()); + } + @DataProvider(name = "compressionMatrix") protected Object[][] getCompressionMatrix() { ClickHouseFormat[] formats = new ClickHouseFormat[] { @@ -1402,7 +1412,11 @@ public abstract class ClientIntegrationTest extends BaseIntegrationTest { request.query("drop temporary table if exists my_temp_table").execute().get(); request.query("create temporary table my_temp_table(a Int8)").execute().get(); request.query("insert into my_temp_table values(2)").execute().get(); - request.write().table("my_temp_table").data(new ByteArrayInputStream(new byte[] { 3 })).execute().get(); + try (ClickHouseResponse resp = request.write().table("my_temp_table") + .data(new ByteArrayInputStream(new byte[] { 3 })).executeAndWait()) { + // ignore + } + int count = 0; try (ClickHouseResponse resp = request.format(ClickHouseFormat.RowBinaryWithNamesAndTypes) .query("select * from my_temp_table order by a").execute().get()) { diff --git a/clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnection.java b/clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnection.java index 9917f124..ce9aae26 100644 --- a/clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnection.java +++ b/clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnection.java @@ -9,6 +9,7 @@ import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.Map.Entry; @@ -158,39 +159,52 @@ public abstract class ClickHouseHttpConnection implements AutoCloseable { protected static Map<String, String> createDefaultHeaders(ClickHouseConfig config, ClickHouseNode server) { Map<String, String> map = new LinkedHashMap<>(); + boolean hasAuthorizationHeader = false; // add customer headers - map.putAll(ClickHouseOption.toKeyValuePairs(config.getStrOption(ClickHouseHttpOption.CUSTOM_HEADERS))); - map.put("Accept", "*/*"); + for (Entry<String, String> header : ClickHouseOption + .toKeyValuePairs(config.getStrOption(ClickHouseHttpOption.CUSTOM_HEADERS)).entrySet()) { + String name = header.getKey().toLowerCase(Locale.ROOT); + String value = header.getValue(); + if (value == null) { + continue; + } + if ("authorization".equals(name)) { + hasAuthorizationHeader = true; + } + map.put(name, value); + } + + map.put("accept", "*/*"); if (!config.getBoolOption(ClickHouseHttpOption.KEEP_ALIVE)) { - map.put("Connection", "Close"); + map.put("connection", "Close"); } - map.put("User-Agent", config.getClientName()); + map.put("user-agent", config.getClientName()); ClickHouseCredentials credentials = server.getCredentials(config); if (credentials.useAccessToken()) { // TODO check if auth-scheme is available and supported - map.put("Authorization", credentials.getAccessToken()); - } else { - map.put("X-ClickHouse-User", credentials.getUserName()); + map.put("authorization", credentials.getAccessToken()); + } else if (!hasAuthorizationHeader) { + map.put("x-clickhouse-user", credentials.getUserName()); if (config.isSsl() && !ClickHouseChecker.isNullOrEmpty(config.getSslCert())) { - map.put("X-ClickHouse-SSL-Certificate-Auth", "on"); + map.put("x-clickhouse-ssl-certificate-auth", "on"); } else if (!ClickHouseChecker.isNullOrEmpty(credentials.getPassword())) { - map.put("X-ClickHouse-Key", credentials.getPassword()); + map.put("x-clickhouse-key", credentials.getPassword()); } } String database = server.getDatabase(config); if (!ClickHouseChecker.isNullOrEmpty(database)) { - map.put("X-ClickHouse-Database", database); + map.put("x-clickhouse-database", database); } // Also, you can use the ‘default_format’ URL parameter - map.put("X-ClickHouse-Format", config.getFormat().name()); + map.put("x-clickhouse-format", config.getFormat().name()); if (config.isResponseCompressed()) { - map.put("Accept-Encoding", config.getResponseCompressAlgorithm().encoding()); + map.put("accept-encoding", config.getResponseCompressAlgorithm().encoding()); } if (config.isRequestCompressed() && config.getRequestCompressAlgorithm() != ClickHouseCompression.LZ4) { - map.put("Content-Encoding", config.getRequestCompressAlgorithm().encoding()); + map.put("content-encoding", config.getRequestCompressAlgorithm().encoding()); } return map; } @@ -251,10 +265,12 @@ public abstract class ClickHouseHttpConnection implements AutoCloseable { Map<String, String> merged = new LinkedHashMap<>(); merged.putAll(defaultHeaders); for (Entry<String, String> header : requestHeaders.entrySet()) { - if (header.getValue() == null) { - merged.remove(header.getKey()); + String name = header.getKey().toLowerCase(Locale.ROOT); + String value = header.getValue(); + if (value == null) { + merged.remove(name); } else { - merged.put(header.getKey(), header.getValue()); + merged.put(name, value); } } return merged; diff --git a/clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnectionFactory.java b/clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnectionFactory.java index ac06e19a..a3c18ec5 100644 --- a/clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnectionFactory.java +++ b/clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnectionFactory.java @@ -6,9 +6,12 @@ import java.util.concurrent.ExecutorService; import com.clickhouse.client.ClickHouseNode; import com.clickhouse.client.ClickHouseRequest; -public abstract class ClickHouseHttpConnectionFactory { +public final class ClickHouseHttpConnectionFactory { public static ClickHouseHttpConnection createConnection(ClickHouseNode server, ClickHouseRequest<?> request, ExecutorService executor) throws IOException { return new HttpUrlConnectionImpl(server, request, executor); } + + private ClickHouseHttpConnectionFactory() { + } } diff --git a/clickhouse-http-client/src/main/java/com/clickhouse/client/http/HttpUrlConnectionImpl.java b/clickhouse-http-client/src/main/java/com/clickhouse/client/http/HttpUrlConnectionImpl.java index fd293590..ca9bb9fa 100644 --- a/clickhouse-http-client/src/main/java/com/clickhouse/client/http/HttpUrlConnectionImpl.java +++ b/clickhouse-http-client/src/main/java/com/clickhouse/client/http/HttpUrlConnectionImpl.java @@ -45,11 +45,11 @@ import javax.net.ssl.SSLContext; public class HttpUrlConnectionImpl extends ClickHouseHttpConnection { private static final Logger log = LoggerFactory.getLogger(HttpUrlConnectionImpl.class); - private static final byte[] HEADER_CONTENT_DISPOSITION = "Content-Disposition: form-data; name=\\"" + private static final byte[] HEADER_CONTENT_DISPOSITION = "content-disposition: form-data; name=\\"" .getBytes(StandardCharsets.US_ASCII); - private static final byte[] HEADER_OCTET_STREAM = "Content-Type: application/octet-stream\\r\\n" + private static final byte[] HEADER_OCTET_STREAM = "content-type: application/octet-stream\\r\\n" .getBytes(StandardCharsets.US_ASCII); - private static final byte[] HEADER_BINARY_ENCODING = "Content-Transfer-Encoding: binary\\r\\n\\r\\n" + private static final byte[] HEADER_BINARY_ENCODING = "content-transfer-encoding: binary\\r\\n\\r\\n" .getBytes(StandardCharsets.US_ASCII); private static final byte[] DOUBLE_DASH = new byte[] { '-', '-' }; @@ -217,14 +217,14 @@ public class HttpUrlConnectionImpl extends ClickHouseHttpConnection { protected ClickHouseHttpResponse post(String sql, ClickHouseInputStream data, List<ClickHouseExternalTable> tables, String url, Map<String, String> headers, ClickHouseConfig config, Runnable postCloseAction) throws IOException { - Charset charset = StandardCharsets.US_ASCII; + Charset ascii = StandardCharsets.US_ASCII; byte[] boundary = null; if (tables != null && !tables.isEmpty()) { String uuid = UUID.randomUUID().toString(); - conn.setRequestProperty("Content-Type", "multipart/form-data; boundary=".concat(uuid)); - boundary = uuid.getBytes(charset); + conn.setRequestProperty("content-type", "multipart/form-data; boundary=".concat(uuid)); + boundary = uuid.getBytes(ascii); } else { - conn.setRequestProperty("Content-Type", "text/plain; charset=UTF-8"); + conn.setRequestProperty("content-type", "text/plain; charset=UTF-8"); } setHeaders(conn, headers); @@ -241,7 +241,8 @@ public class HttpUrlConnectionImpl extends ClickHouseHttpConnection { : (hasInput ? ClickHouseClient.getAsyncRequestOutputStream(config, conn.getOutputStream(), null) // latch::countDown) : ClickHouseClient.getRequestOutputStream(c, conn.getOutputStream(), null))) { - byte[] sqlBytes = hasFile ? new byte[0] : sql.getBytes(StandardCharsets.UTF_8); + Charset utf8 = StandardCharsets.UTF_8; + byte[] sqlBytes = hasFile ? new byte[0] : sql.getBytes(utf8); if (boundary != null) { out.writeBytes(LINE_PREFIX); out.writeBytes(boundary); @@ -250,7 +251,7 @@ public class HttpUrlConnectionImpl extends ClickHouseHttpConnection { out.writeBytes(SUFFIX_QUERY); out.writeBytes(sqlBytes); for (ClickHouseExternalTable t : tables) { - byte[] tableName = t.getName().getBytes(StandardCharsets.UTF_8); + byte[] tableName = t.getName().getBytes(utf8); for (int i = 0; i < 3; i++) { out.writeBytes(LINE_PREFIX); out.writeBytes(boundary); @@ -259,10 +260,10 @@ public class HttpUrlConnectionImpl extends ClickHouseHttpConnection { out.writeBytes(tableName); if (i == 0) { out.writeBytes(SUFFIX_FORMAT); - out.writeBytes(t.getFormat().name().getBytes(charset)); + out.writeBytes(t.getFormat().name().getBytes(ascii)); } else if (i == 1) { out.writeBytes(SUFFIX_STRUCTURE); - out.writeBytes(t.getStructure().getBytes(StandardCharsets.UTF_8)); + out.writeBytes(t.getStructure().getBytes(utf8)); } else { out.writeBytes(SUFFIX_FILENAME); out.writeBytes(tableName); diff --git a/clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java b/clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java index cbc7d931..1d7d81e8 100644 --- a/clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java +++ b/clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java @@ -19,7 +19,9 @@ public enum ClickHouseHttpOption implements ClickHouseOption { */ CUSTOM_HEADERS("custom_http_headers", "", "Custom HTTP headers."), /** - * Custom HTTP query parameters. + * Custom HTTP query parameters. Consider + * {@link com.clickhouse.client.config.ClickHouseClientOption#CUSTOM_SETTINGS} + * if you don't want your implementation ties to http protocol. */ CUSTOM_PARAMS("custom_http_params", "", "Custom HTTP query parameters."), /** diff --git a/clickhouse-http-client/src/main/java11/com/clickhouse/client/http/ClickHouseHttpConnectionFactory.java b/clickhouse-http-client/src/main/java11/com/clickhouse/client/http/ClickHouseHttpConnectionFactory.java index 024be20e..9bd6d54b 100644 --- a/clickhouse-http-client/src/main/java11/com/clickhouse/client/http/ClickHouseHttpConnectionFactory.java +++ b/clickhouse-http-client/src/main/java11/com/clickhouse/client/http/ClickHouseHttpConnectionFactory.java @@ -8,7 +8,7 @@ import com.clickhouse.client.ClickHouseRequest; import com.clickhouse.client.http.config.ClickHouseHttpOption; import com.clickhouse.client.http.config.HttpConnectionProvider; -public abstract class ClickHouseHttpConnectionFactory { +public final class ClickHouseHttpConnectionFactory { public static ClickHouseHttpConnection createConnection(ClickHouseNode server, ClickHouseRequest<?> request, ExecutorService executor) throws IOException { HttpConnectionProvider provider = request.getConfig().getOption(ClickHouseHttpOption.CONNECTION_PROVIDER, @@ -24,4 +24,7 @@ public abstract class ClickHouseHttpConnectionFactory { return new HttpUrlConnectionImpl(server, request, executor); } } + + private ClickHouseHttpConnectionFactory() { + } } diff --git a/clickhouse-http-client/src/main/java11/com/clickhouse/client/http/HttpClientConnectionImpl.java b/clickhouse-http-client/src/main/java11/com/clickhouse/client/http/HttpClientConnectionImpl.java index f0a5d94f..9bafbe1d 100644 --- a/clickhouse-http-client/src/main/java11/com/clickhouse/client/http/HttpClientConnectionImpl.java +++ b/clickhouse-http-client/src/main/java11/com/clickhouse/client/http/HttpClientConnectionImpl.java @@ -41,6 +41,7 @@ import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.net.http.HttpClient.Redirect; import java.net.http.HttpClient.Version; +import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.List; @@ -77,6 +78,23 @@ public class HttpClientConnectionImpl extends ClickHouseHttpConnection { private static final Logger log = LoggerFactory.getLogger(HttpClientConnectionImpl.class); + private static final byte[] HEADER_CONTENT_DISPOSITION = "content-disposition: form-data; name=\\"" + .getBytes(StandardCharsets.US_ASCII); + private static final byte[] HEADER_OCTET_STREAM = "content-type: application/octet-stream\\r\\n" + .getBytes(StandardCharsets.US_ASCII); + private static final byte[] HEADER_BINARY_ENCODING = "content-transfer-encoding: binary\\r\\n\\r\\n" + .getBytes(StandardCharsets.US_ASCII); + + private static final byte[] DOUBLE_DASH = new byte[] { '-', '-' }; + private static final byte[] END_OF_NAME = new byte[] { '"', '\\r', '\\n' }; + private static final byte[] LINE_PREFIX = new byte[] { '\\r', '\\n', '-', '-' }; + private static final byte[] LINE_SUFFIX = new byte[] { '\\r', '\\n' }; + + private static final byte[] SUFFIX_QUERY = "query\\"\\r\\n\\r\\n".getBytes(StandardCharsets.US_ASCII); + private static final byte[] SUFFIX_FORMAT = "_format\\"\\r\\n\\r\\n".getBytes(StandardCharsets.US_ASCII); + private static final byte[] SUFFIX_STRUCTURE = "_structure\\"\\r\\n\\r\\n".getBytes(StandardCharsets.US_ASCII); + private static final byte[] SUFFIX_FILENAME = "\\"; filename=\\"".getBytes(StandardCharsets.US_ASCII); + private final HttpClient httpClient; private final HttpRequest pingRequest; @@ -205,55 +223,68 @@ public class HttpClientConnectionImpl extends ClickHouseHttpConnection { responseInfo -> new ClickHouseResponseHandler(config.getMaxQueuedBuffers(), config.getSocketTimeout())); } - private ClickHouseHttpResponse postStream(ClickHouseConfig config, HttpRequest.Builder reqBuilder, String boundary, + private ClickHouseHttpResponse postStream(ClickHouseConfig config, HttpRequest.Builder reqBuilder, byte[] boundary, String sql, ClickHouseInputStream data, List<ClickHouseExternalTable> tables, Runnable postAction) throws IOException { + Charset ascii = StandardCharsets.US_ASCII; + ClickHouseConfig c = config; final boolean hasFile = data != null && data.getUnderlyingFile().isAvailable(); - ClickHousePipedOutputStream stream = ClickHouseDataStreamFactory.getInstance().createPipedOutputStream(config, + + ClickHousePipedOutputStream stream = ClickHouseDataStreamFactory.getInstance().createPipedOutputStream(c, null); reqBuilder.POST(HttpRequest.BodyPublishers.ofInputStream(stream::getInputStream)); - // running in async is necessary to avoid deadlock of the piped stream CompletableFuture<HttpResponse<InputStream>> f = postRequest(reqBuilder.build()); - try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(stream, StandardCharsets.UTF_8))) { - if (boundary != null) { - String line = "\\r\\n--" + boundary + "\\r\\n"; - writer.write(line); - writer.write("Content-Disposition: form-data; name=\\"query\\"\\r\\n\\r\\n"); - writer.write(sql); + try (ClickHouseOutputStream out = stream) { + Charset utf8 = StandardCharsets.UTF_8; + byte[] sqlBytes = hasFile ? new byte[0] : sql.getBytes(utf8); + + if (boundary != null) { + out.writeBytes(LINE_PREFIX); + out.writeBytes(boundary); + out.writeBytes(LINE_SUFFIX); + out.writeBytes(HEADER_CONTENT_DISPOSITION); + out.writeBytes(SUFFIX_QUERY); + out.writeBytes(sqlBytes); for (ClickHouseExternalTable t : tables) { - String tableName = t.getName(); - StringBuilder builder = new StringBuilder(); - builder.append(line).append("Content-Disposition: form-data; name=\\"").append(tableName) - .append("_format\\"\\r\\n\\r\\n").append(t.getFormat().name()); - builder.append(line).append("Content-Disposition: form-data; name=\\"").append(tableName) - .append("_structure\\"\\r\\n\\r\\n").append(t.getStructure()); - builder.append(line).append("Content-Disposition: form-data; name=\\"").append(tableName) - .append("\\"; filename=\\"").append(tableName).append("\\"\\r\\n") - .append("Content-Type: application/octet-stream\\r\\n") - .append("Content-Transfer-Encoding: binary\\r\\n\\r\\n"); - writer.write(builder.toString()); - writer.flush(); - - ClickHouseInputStream.pipe(t.getContent(), stream, config.getWriteBufferSize()); + byte[] tableName = t.getName().getBytes(utf8); + for (int i = 0; i < 3; i++) { + out.writeBytes(LINE_PREFIX); + out.writeBytes(boundary); + out.writeBytes(LINE_SUFFIX); + out.writeBytes(HEADER_CONTENT_DISPOSITION); + out.writeBytes(tableName); + if (i == 0) { + out.writeBytes(SUFFIX_FORMAT); + out.writeBytes(t.getFormat().name().getBytes(ascii)); + } else if (i == 1) { + out.writeBytes(SUFFIX_STRUCTURE); + out.writeBytes(t.getStructure().getBytes(utf8)); + } else { + out.writeBytes(SUFFIX_FILENAME); + out.writeBytes(tableName); + out.writeBytes(END_OF_NAME); + break; + } + } + out.writeBytes(HEADER_OCTET_STREAM); + out.writeBytes(HEADER_BINARY_ENCODING); + ClickHouseInputStream.pipe(t.getContent(), out, c.getWriteBufferSize()); } - writer.write("\\r\\n--" + boundary + "--\\r\\n"); - writer.flush(); + out.writeBytes(LINE_PREFIX); + out.writeBytes(boundary); + out.writeBytes(DOUBLE_DASH); + out.writeBytes(LINE_SUFFIX); } else { - if (!hasFile) { - writer.write(sql); - writer.flush(); - } - - if (data.available() > 0) { + out.writeBytes(sqlBytes); + if (data != null && data.available() > 0) { // append \\n - if (!hasFile && sql.charAt(sql.length() - 1) != '\\n') { - stream.write(10); + if (sqlBytes.length > 0 && sqlBytes[sqlBytes.length - 1] != (byte) '\\n') { + out.write(10); } - - ClickHouseInputStream.pipe(data, stream, config.getWriteBufferSize()); + ClickHouseInputStream.pipe(data, out, c.getWriteBufferSize()); } } } @@ -303,12 +334,13 @@ public class HttpClientConnectionImpl extends ClickHouseHttpConnection { HttpRequest.Builder reqBuilder = HttpRequest.newBuilder() .uri(URI.create(ClickHouseChecker.isNullOrEmpty(url) ? this.url : url)) .timeout(Duration.ofMillis(c.getSocketTimeout())); - String boundary = null; + byte[] boundary = null; if (tables != null && !tables.isEmpty()) { - boundary = UUID.randomUUID().toString(); - reqBuilder.setHeader("Content-Type", "multipart/form-data; boundary=" + boundary); + String uuid = UUID.randomUUID().toString(); + reqBuilder.setHeader("content-type", "multipart/form-data; boundary=" + uuid); + boundary = uuid.getBytes(StandardCharsets.US_ASCII); } else { - reqBuilder.setHeader("Content-Type", "text/plain; charset=UTF-8"); + reqBuilder.setHeader("content-type", "text/plain; charset=UTF-8"); } headers = mergeHeaders(headers); diff --git a/clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java b/clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java index c915196d..c50cd83f 100644 --- a/clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java +++ b/clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java @@ -3,6 +3,7 @@ package com.clickhouse.client.http; import java.util.UUID; import com.clickhouse.client.ClickHouseClient; +import com.clickhouse.client.ClickHouseConfig; import com.clickhouse.client.ClickHouseCredentials; import com.clickhouse.client.ClickHouseFormat; import com.clickhouse.client.ClickHouseNode; @@ -35,6 +36,36 @@ public class ClickHouseHttpClientTest extends ClientIntegrationTest { return ClickHouseHttpClient.class; } + @Test(groups = "integration") + public void testAuthentication() throws Exception { + String sql = "select currentUser()"; + try (ClickHouseClient client = getClient( + new ClickHouseConfig(null, ClickHouseCredentials.fromUserAndPassword("dba", "dba"), null, null)); + ClickHouseResponse response = client + .connect(getServer()) + // .option(ClickHouseHttpOption.CUSTOM_PARAMS, "user=dba,password=incorrect") + .query(sql).executeAndWait()) { + Assert.assertEquals(response.firstRecord().getValue(0).asString(), "dba"); + } + + try (ClickHouseClient client = getClient(); + ClickHouseResponse response = client + .connect(getServer()) + .option(ClickHouseHttpOption.CUSTOM_HEADERS, "Authorization=Basic ZGJhOmRiYQ==") + // .option(ClickHouseHttpOption.CUSTOM_PARAMS, "user=dba,password=incorrect") + .query(sql).executeAndWait()) { + Assert.assertEquals(response.firstRecord().getValue(0).asString(), "dba"); + } + + try (ClickHouseClient client = getClient(); + ClickHouseResponse response = client + .connect(getServer(ClickHouseNode + .of("http://localhost?custom_http_headers=aUthorization%3DBasic%20ZGJhOmRiYQ%3D%3D"))) + .query(sql).executeAndWait()) { + Assert.assertEquals(response.firstRecord().getValue(0).asString(), "dba"); + } + } + @Test(groups = "integration") @Override public void testSession() throws Exception {

['clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnection.java', 'clickhouse-http-client/src/main/java/com/clickhouse/client/http/HttpUrlConnectionImpl.java', 'clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java', 'clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java', 'clickhouse-http-client/src/main/java11/com/clickhouse/client/http/ClickHouseHttpConnectionFactory.java', 'clickhouse-client/src/test/java/com/clickhouse/client/BaseIntegrationTest.java', 'clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnectionFactory.java', 'clickhouse-http-client/src/main/java11/com/clickhouse/client/http/HttpClientConnectionImpl.java', 'clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java']

{'.java': 9}

Java

{'Java': 3989428, 'Shell': 397}

Apache License 2.0

clickhouse/clickhouse-java/940/920

clickhouse

clickhouse-java

https://github.com/ClickHouse/clickhouse-java/issues/920

https://github.com/ClickHouse/clickhouse-java/pull/940

https://github.com/ClickHouse/clickhouse-java/pull/940

closes

Multiple values insert prepared statement

[QUESTION] about multiple values in prepared statement. Probably, after this [COMMIT](https://github.com/ClickHouse/clickhouse-jdbc/commit/09cd66e564966d76d72f996754dbf8311bf1b49d) between **patch5** and **patch6** and later versions. I can't anymore use multiple values in prepared statement, like `PreparedStatement stmt = Connection#prepareStatement("insert into table values(?,?), (?,?)");` only `PreparedStatement stmt = Connection#prepareStatement("insert into table values(?,?)");` and then insert values for each row separated by `stmt.addBatch()` Is it final change or, maybe some options are needed to be turned on? Under the hood detail. `values (?,?), (?,?)` is not properly parsed and it doesn't see `ClickHouseSqlStatement.KEYWORD_VALUES_START` (values start position index in sql). Here in the [CODE](https://github.com/ClickHouse/clickhouse-jdbc/blob/1d6257c51a1d5db0a4732441fc3c1c7dba7b5316/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java#L601) returns null which cause NPE later in code. For `values (?,?)` all worked correctly.

44a1986ba59705fd1254af9705c315d5853e91c8

7db110ff8cf708c59121adcbb8a7684fd74f87ec

https://github.com/clickhouse/clickhouse-java/compare/44a1986ba59705fd1254af9705c315d5853e91c8...7db110ff8cf708c59121adcbb8a7684fd74f87ec

diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java index ebef724b..3df1afb6 100644 --- a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java +++ b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java @@ -615,14 +615,17 @@ public class ClickHouseConnectionImpl extends JdbcWrapper implements ClickHouseC !parsedStmt.containsKeyword("SELECT") && parsedStmt.hasValues() && (!parsedStmt.hasFormat() || clientRequest.getFormat().name().equals(parsedStmt.getFormat()))) { String query = parsedStmt.getSQL(); - int startIndex = parsedStmt.getPositions().get(ClickHouseSqlStatement.KEYWORD_VALUES_START); - int endIndex = parsedStmt.getPositions().get(ClickHouseSqlStatement.KEYWORD_VALUES_END); - boolean useStream = true; - for (int i = startIndex + 1; i < endIndex; i++) { - char ch = query.charAt(i); - if (ch != '?' && ch != ',' && !Character.isWhitespace(ch)) { - useStream = false; - break; + boolean useStream = false; + Integer startIndex = parsedStmt.getPositions().get(ClickHouseSqlStatement.KEYWORD_VALUES_START); + if (startIndex != null) { + useStream = true; + int endIndex = parsedStmt.getPositions().get(ClickHouseSqlStatement.KEYWORD_VALUES_END); + for (int i = startIndex + 1; i < endIndex; i++) { + char ch = query.charAt(i); + if (ch != '?' && ch != ',' && !Character.isWhitespace(ch)) { + useStream = false; + break; + } } } diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java index 025b67ad..2f496ff9 100644 --- a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java +++ b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java @@ -1,8 +1,10 @@ package com.clickhouse.jdbc; import java.io.ByteArrayInputStream; +import java.math.BigDecimal; import java.net.Inet4Address; import java.net.Inet6Address; +import java.net.URL; import java.nio.charset.StandardCharsets; import java.sql.BatchUpdateException; import java.sql.Connection; @@ -1257,4 +1259,46 @@ public class ClickHousePreparedStatementTest extends JdbcIntegrationTest { Assert.assertFalse(rs.next()); } } + + @Test(groups = "integration") + public void testInsertWithMultipleValues() throws Exception { + try (ClickHouseConnection conn = newConnection(new Properties()); + Statement s = conn.createStatement()) { + s.execute("drop table if exists test_insert_with_multiple_values; " + + "CREATE TABLE test_insert_with_multiple_values(a Int32, b Nullable(String)) ENGINE=Memory"); + try (PreparedStatement ps = conn.prepareStatement( + "INSERT INTO test_insert_with_multiple_values values(?, ?), (2 , ? ), ( ? , '') , (?,?) ,( ? ,? )")) { + ps.setInt(1, 1); + ps.setNull(2, Types.VARCHAR); + ps.setObject(3, "er"); + ps.setInt(4, 3); + ps.setInt(5, 4); + ps.setURL(6, new URL("http://some.host")); + ps.setInt(7, 5); + ps.setString(8, null); + ps.executeUpdate(); + } + + try (ResultSet rs = s.executeQuery("select * from test_insert_with_multiple_values order by a")) { + Assert.assertTrue(rs.next()); + Assert.assertEquals(rs.getByte(1), (byte) 1); + Assert.assertEquals(rs.getObject(2), null); + Assert.assertTrue(rs.wasNull()); + Assert.assertTrue(rs.next()); + Assert.assertEquals(rs.getBigDecimal(1), BigDecimal.valueOf(2L)); + Assert.assertEquals(rs.getString(2), "er"); + Assert.assertTrue(rs.next()); + Assert.assertEquals(rs.getString(1), "3"); + Assert.assertEquals(rs.getObject(2), ""); + Assert.assertTrue(rs.next()); + Assert.assertEquals(rs.getShort(1), (short) 4); + Assert.assertEquals(rs.getURL(2), new URL("http://some.host")); + Assert.assertTrue(rs.next()); + Assert.assertEquals(rs.getObject(1), Integer.valueOf(5)); + Assert.assertEquals(rs.getString(2), null); + Assert.assertTrue(rs.wasNull()); + Assert.assertFalse(rs.next()); + } + } + } }

['clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java', 'clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java']

{'.java': 2}

Java

{'Java': 3989428, 'Shell': 397}

Apache License 2.0

clickhouse/clickhouse-java/901/889

clickhouse

clickhouse-java

https://github.com/ClickHouse/clickhouse-java/issues/889

https://github.com/ClickHouse/clickhouse-java/pull/901

https://github.com/ClickHouse/clickhouse-java/pull/901

closes

ClickHouseColumn bug when parsing a tuple type

Hi. There is a bug or unexpected behavior in ClickHouseColumn when parsing a tuple type: `ClickHouseColumn.parse("col_name Tuple(s String, i Int64)")` is throwing the following exception: ``` java.lang.IllegalArgumentException: Unknown data type: s String ``` My use case retrieves the types with a `DESCRIBE TABLE` query and parsing them via `ClickHouseColumn.parse`.

b76a2eefb97802eefe02f7cae83c591d285610d3

2c7bf7773bfc09dd3708c63623c90d14fd97084f

https://github.com/clickhouse/clickhouse-java/compare/b76a2eefb97802eefe02f7cae83c591d285610d3...2c7bf7773bfc09dd3708c63623c90d14fd97084f

diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseColumn.java b/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseColumn.java index 34011606..aac9dc41 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseColumn.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseColumn.java @@ -321,16 +321,18 @@ public final class ClickHouseColumn implements Serializable { StringBuilder sb = new StringBuilder(); i = ClickHouseUtils.readNameOrQuotedString(args, i, len, sb); String modifier = sb.toString(); + String normalizedModifier = modifier.toUpperCase(); sb.setLength(0); boolean startsWithNot = false; - if ("not".equalsIgnoreCase(modifier)) { + if ("NOT".equals(normalizedModifier)) { startsWithNot = true; i = ClickHouseUtils.readNameOrQuotedString(args, i, len, sb); modifier = sb.toString(); + normalizedModifier = modifier.toUpperCase(); sb.setLength(0); } - if ("null".equalsIgnoreCase(modifier)) { + if ("NULL".equals(normalizedModifier)) { if (nullable) { throw new IllegalArgumentException("Nullable and NULL cannot be used together"); } @@ -339,14 +341,14 @@ public final class ClickHouseColumn implements Serializable { break; } else if (startsWithNot) { throw new IllegalArgumentException("Expect keyword NULL after NOT"); - } else if ("alias".equalsIgnoreCase(modifier) || "codec".equalsIgnoreCase(modifier) - || "default".equalsIgnoreCase(modifier) || "materialized".equalsIgnoreCase(modifier) - || "ttl".equalsIgnoreCase(modifier)) { // stop words + } else if ("ALIAS".equals(normalizedModifier) || "CODEC".equals(normalizedModifier) + || "DEFAULT".equals(normalizedModifier) || "MATERIALIZED".equals(normalizedModifier) + || "TTL".equals(normalizedModifier)) { // stop words i = ClickHouseUtils.skipContentsUntil(args, i, len, ',') - 1; break; } else { if ((name == null || name.isEmpty()) - && !ClickHouseDataType.mayStartWith(builder.toString())) { + && !ClickHouseDataType.mayStartWith(builder.toString(), normalizedModifier)) { return readColumn(args, i - modifier.length(), len, builder.toString(), list); } else { builder.append(' '); diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseDataType.java b/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseDataType.java index bf17c071..38de0871 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseDataType.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseDataType.java @@ -181,19 +181,25 @@ public enum ClickHouseDataType { } /** - * Checks if any alias uses the given prefix. + * Checks if any alias uses the given prefixes. * - * @param prefix prefix to check - * @return true if any alias using the given prefix; false otherwise + * @param prefixes prefixes to check + * @return true if any alias using the given prefixes; false otherwise */ - public static boolean mayStartWith(String prefix) { - if (prefix == null || prefix.isEmpty()) { + public static boolean mayStartWith(String... prefixes) { + if (prefixes == null || prefixes.length == 0) { return false; } - prefix = prefix.toUpperCase(); + StringBuilder builder = new StringBuilder(); + for (int i = 0, len = prefixes.length; i < len; i++) { + builder.append(prefixes[i].toUpperCase()).append(' '); + } + String prefix = builder.toString(); + builder.setLength(builder.length() - 1); + String typeName = builder.toString(); for (String alias : allAliases) { - if (alias.startsWith(prefix)) { + if (alias.startsWith(prefix) || alias.equals(typeName)) { return true; } } diff --git a/clickhouse-client/src/test/java/com/clickhouse/client/ClickHouseColumnTest.java b/clickhouse-client/src/test/java/com/clickhouse/client/ClickHouseColumnTest.java index 1e041d4e..ecdea072 100644 --- a/clickhouse-client/src/test/java/com/clickhouse/client/ClickHouseColumnTest.java +++ b/clickhouse-client/src/test/java/com/clickhouse/client/ClickHouseColumnTest.java @@ -17,6 +17,14 @@ public class ClickHouseColumnTest { @DataProvider(name = "objectTypesProvider") private Object[][] getObjectTypes() { return new Object[][] { + { "Tuple(not NChar Large Object)" }, + { "nchar Large Object" }, + { "Tuple(int Int32)" }, + { "a Tuple(i Int32)" }, + { "b Tuple(i1 Int32)" }, + { "Tuple(i Int32)" }, + { "Tuple(i1 Int32)" }, + { "Tuple(i Int32, a Array(Int32), m Map(LowCardinality(String), Int32))" }, { "Int8" }, { "TINYINT SIGNED" }, { "k1 Int8" }, { "k1 TINYINT SIGNED" }, { "k1 Nullable(Int8)" }, { "k1 Nullable( Int8 )" }, { "k1 TINYINT SIGNED null" },

['clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseDataType.java', 'clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseColumn.java', 'clickhouse-client/src/test/java/com/clickhouse/client/ClickHouseColumnTest.java']

{'.java': 3}

Java

{'Java': 3989428, 'Shell': 397}

Apache License 2.0

clickhouse/clickhouse-java/658/657

clickhouse

clickhouse-java

https://github.com/ClickHouse/clickhouse-java/issues/657

https://github.com/ClickHouse/clickhouse-java/pull/658

https://github.com/ClickHouse/clickhouse-java/pull/658

fixes

Incorrect value returned from getAutoCommit

Since transactions are implicitly enabled for new connections (they are not supported at all), the `getAutoCommit` should return true.

339453f5173dd7a064051d31876c81baad38decd

5ca9485fe76bce8e5e8cb4effcaa74b4ffc5a089

https://github.com/clickhouse/clickhouse-java/compare/339453f5173dd7a064051d31876c81baad38decd...5ca9485fe76bce8e5e8cb4effcaa74b4ffc5a089

diff --git a/clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java b/clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java index 6ec960ca..0b498c6a 100644 --- a/clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java +++ b/clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java @@ -214,7 +214,7 @@ public class ClickHouseConnectionImpl implements ClickHouseConnection { @Override public boolean getAutoCommit() throws SQLException { - return false; + return true; } @Override

['clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java']

{'.java': 1}

Java

{'Java': 3989428, 'Shell': 397}

Apache License 2.0

clickhouse/clickhouse-java/540/462

clickhouse

clickhouse-java

https://github.com/ClickHouse/clickhouse-java/issues/462

https://github.com/ClickHouse/clickhouse-java/pull/540

https://github.com/ClickHouse/clickhouse-java/pull/540

fix

NoHttpResponseException while intensive inserts

Hi! I catch an error using sendStream in RowBinary format intensive queries(1M rows in batch every 3 second) One batch inserts in ~10-15 seconds. Clickhouse machine cpu usage is about 25%. It appears after 5 minutes of job start. I tried to catch problematic batch and insert in separately. Everything was fine. clickouse-jdbc 0.2.4 #https://github.com/ClickHouse/ClickHouse/issues/11766 Sample of usage ``` try (ClickHouseStatement statement = clickHouseDataSource.getConnection().createStatement()) { statement.write().send(QUERY_INSERT, batch, ClickHouseFormat.RowBinary); ``` Simple schema ``` CREATE TABLE IF NOT EXISTS t1 ( timestamp DateTime, sid FixedString(10), url1 String, url2 String, importMonth UInt32 default toYYYYMM(now()), sidHash UInt32 DEFAULT xxHash32(sid), url1Domain String DEFAULT domainWithoutWWW(url1) ) ENGINE = MergeTree PARTITION BY (importMonth) ORDER BY (sidHash); ``` Timeouts config ``` clickHouseDataSource.getProperties().setSessionTimeout(600_000L); clickHouseDataSource.getProperties().setConnectionTimeout(600_000); clickHouseDataSource.getProperties().setSocketTimeout(600_000); clickHouseDataSource.getProperties().setDataTransferTimeout(600_000); clickHouseDataSource.getProperties().setKeepAliveTimeout(600_000); ``` Exception ``` Caused by: org.apache.http.NoHttpResponseException: server:8123 failed to respond at org.apache.http.impl.conn.DefaultHttpResponseParser.parseHead(DefaultHttpResponseParser.java:141) at org.apache.http.impl.conn.DefaultHttpResponseParser.parseHead(DefaultHttpResponseParser.java:56) at org.apache.http.impl.io.AbstractMessageParser.parse(AbstractMessageParser.java:259) at org.apache.http.impl.DefaultBHttpClientConnection.receiveResponseHeader(DefaultBHttpClientConnection.java:163) at org.apache.http.impl.conn.CPoolProxy.receiveResponseHeader(CPoolProxy.java:157) at org.apache.http.protocol.HttpRequestExecutor.doReceiveResponse(HttpRequestExecutor.java:273) at org.apache.http.protocol.HttpRequestExecutor.execute(HttpRequestExecutor.java:125) at org.apache.http.impl.execchain.MainClientExec.execute(MainClientExec.java:272) at org.apache.http.impl.execchain.ProtocolExec.execute(ProtocolExec.java:186) at org.apache.http.impl.execchain.RetryExec.execute(RetryExec.java:89) at org.apache.http.impl.client.InternalHttpClient.doExecute(InternalHttpClient.java:185) at org.apache.http.impl.client.CloseableHttpClient.execute(CloseableHttpClient.java:83) at org.apache.http.impl.client.CloseableHttpClient.execute(CloseableHttpClient.java:108) at ru.yandex.clickhouse.ClickHouseStatementImpl.sendStream(ClickHouseStatementImpl.java:849) ... 13 common frames omitted ``` Error in clickhouse log ``` 2020.06.18 15:10:11.079888 [ 966 ] {c2912eff-d759-4b1b-80b3-151e5a96196a} <Error> executeQuery: Code: 23, e.displayText() = DB::Exception: Cannot read from istream at offset 22020096 (version 20.4.4.18 (official build)) (from server:53702) (in query: INSERT INTO tabl1(timestamp,sid,url1,url2) FORMAT RowBinary ), Stack trace (when copying this message, always include the lines below): 0. Poco::Exception::Exception(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, int) @ 0x104191d0 in /usr/bin/clickhouse 1. DB::Exception::Exception(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, int) @ 0x8fff8ad in /usr/bin/clickhouse 2. ? @ 0x90db204 in /usr/bin/clickhouse 3. DB::CompressedReadBufferBase::readCompressedData(unsigned long&, unsigned long&) @ 0xcdf7dce in /usr/bin/clickhouse 4. DB::CompressedReadBuffer::nextImpl() @ 0xcdf616b in /usr/bin/clickhouse 5. DB::ConcatReadBuffer::nextImpl() @ 0x90e8912 in /usr/bin/clickhouse 6. DB::ConcatReadBuffer::nextImpl() @ 0x90e8912 in /usr/bin/clickhouse 7. DB::ReadBuffer::readStrict(char*, unsigned long) @ 0x903b525 in /usr/bin/clickhouse 8. DB::DataTypeString::deserializeBinary(DB::IColumn&, DB::ReadBuffer&) const @ 0xcf3ade5 in /usr/bin/clickhouse 9. DB::BinaryRowInputFormat::readRow(std::__1::vector<COW<DB::IColumn>::mutable_ptr<DB::IColumn>, std::__1::allocator<COW<DB::IColumn>::mutable_ptr<DB::IColumn> > >&, DB::RowReadExtension&) @ 0xdb683af in /usr/bin/clickhouse 10. DB::IRowInputFormat::generate() @ 0xdb5d151 in /usr/bin/clickhouse 11. DB::ISource::work() @ 0xdaf3d8b in /usr/bin/clickhouse 12. DB::InputStreamFromInputFormat::readImpl() @ 0xdab99fd in /usr/bin/clickhouse 13. DB::IBlockInputStream::read() @ 0xce4825d in /usr/bin/clickhouse 14. DB::AddingDefaultsBlockInputStream::readImpl() @ 0xce3896b in /usr/bin/clickhouse 15. DB::IBlockInputStream::read() @ 0xce4825d in /usr/bin/clickhouse 16. DB::InputStreamFromASTInsertQuery::readImpl() @ 0xd1cbc39 in /usr/bin/clickhouse 17. DB::IBlockInputStream::read() @ 0xce4825d in /usr/bin/clickhouse 18. DB::copyData(DB::IBlockInputStream&, DB::IBlockOutputStream&, std::__1::atomic<bool>*) @ 0xce7717e in /usr/bin/clickhouse 19. DB::executeQuery(DB::ReadBuffer&, DB::WriteBuffer&, bool, DB::Context&, std::__1::function<void (std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&)>) @ 0xd54d5ab in /usr/bin/clickhouse 20. DB::HTTPHandler::processQuery(Poco::Net::HTTPServerRequest&, HTMLForm&, Poco::Net::HTTPServerResponse&, DB::HTTPHandler::Output&) @ 0x90e47fc in /usr/bin/clickhouse 21. DB::HTTPHandler::handleRequest(Poco::Net::HTTPServerRequest&, Poco::Net::HTTPServerResponse&) @ 0x90e8256 in /usr/bin/clickhouse 22. Poco::Net::HTTPServerConnection::run() @ 0x102c9b83 in /usr/bin/clickhouse 23. Poco::Net::TCPServerConnection::start() @ 0x10304f4b in /usr/bin/clickhouse 24. Poco::Net::TCPServerDispatcher::run() @ 0x103053db in /usr/bin/clickhouse 25. Poco::PooledThread::run() @ 0x104b2fa6 in /usr/bin/clickhouse 26. Poco::ThreadImpl::runnableEntry(void*) @ 0x104ae260 in /usr/bin/clickhouse 27. start_thread @ 0x7fa3 in /lib/x86_64-linux-gnu/libpthread-2.28.so 28. __clone @ 0xf94cf in /lib/x86_64-linux-gnu/libc-2.28.so 2020.06.18 15:10:11.080144 [ 966 ] {} <Error> DynamicQueryHandler: Code: 23, e.displayText() = DB::Exception: Cannot read from istream at offset 22020096, Stack trace (when copying this message, always include the lines below): 0. Poco::Exception::Exception(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, int) @ 0x104191d0 in /usr/bin/clickhouse 1. DB::Exception::Exception(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, int) @ 0x8fff8ad in /usr/bin/clickhouse 2. ? @ 0x90db204 in /usr/bin/clickhouse 3. DB::CompressedReadBufferBase::readCompressedData(unsigned long&, unsigned long&) @ 0xcdf7dce in /usr/bin/clickhouse 4. DB::CompressedReadBuffer::nextImpl() @ 0xcdf616b in /usr/bin/clickhouse 5. DB::ConcatReadBuffer::nextImpl() @ 0x90e8912 in /usr/bin/clickhouse 6. DB::ConcatReadBuffer::nextImpl() @ 0x90e8912 in /usr/bin/clickhouse 7. DB::ReadBuffer::readStrict(char*, unsigned long) @ 0x903b525 in /usr/bin/clickhouse 8. DB::DataTypeString::deserializeBinary(DB::IColumn&, DB::ReadBuffer&) const @ 0xcf3ade5 in /usr/bin/clickhouse 9. DB::BinaryRowInputFormat::readRow(std::__1::vector<COW<DB::IColumn>::mutable_ptr<DB::IColumn>, std::__1::allocator<COW<DB::IColumn>::mutable_ptr<DB::IColumn> > >&, DB::RowReadExtension&) @ 0xdb683af in /usr/bin/clickhouse 10. DB::IRowInputFormat::generate() @ 0xdb5d151 in /usr/bin/clickhouse 11. DB::ISource::work() @ 0xdaf3d8b in /usr/bin/clickhouse 12. DB::InputStreamFromInputFormat::readImpl() @ 0xdab99fd in /usr/bin/clickhouse 13. DB::IBlockInputStream::read() @ 0xce4825d in /usr/bin/clickhouse 14. DB::AddingDefaultsBlockInputStream::readImpl() @ 0xce3896b in /usr/bin/clickhouse 15. DB::IBlockInputStream::read() @ 0xce4825d in /usr/bin/clickhouse 16. DB::InputStreamFromASTInsertQuery::readImpl() @ 0xd1cbc39 in /usr/bin/clickhouse 17. DB::IBlockInputStream::read() @ 0xce4825d in /usr/bin/clickhouse 18. DB::copyData(DB::IBlockInputStream&, DB::IBlockOutputStream&, std::__1::atomic<bool>*) @ 0xce7717e in /usr/bin/clickhouse 19. DB::executeQuery(DB::ReadBuffer&, DB::WriteBuffer&, bool, DB::Context&, std::__1::function<void (std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&)>) @ 0xd54d5ab in /usr/bin/clickhouse 20. DB::HTTPHandler::processQuery(Poco::Net::HTTPServerRequest&, HTMLForm&, Poco::Net::HTTPServerResponse&, DB::HTTPHandler::Output&) @ 0x90e47fc in /usr/bin/clickhouse 21. DB::HTTPHandler::handleRequest(Poco::Net::HTTPServerRequest&, Poco::Net::HTTPServerResponse&) @ 0x90e8256 in /usr/bin/clickhouse 22. Poco::Net::HTTPServerConnection::run() @ 0x102c9b83 in /usr/bin/clickhouse 23. Poco::Net::TCPServerConnection::start() @ 0x10304f4b in /usr/bin/clickhouse 24. Poco::Net::TCPServerDispatcher::run() @ 0x103053db in /usr/bin/clickhouse 25. Poco::PooledThread::run() @ 0x104b2fa6 in /usr/bin/clickhouse 26. Poco::ThreadImpl::runnableEntry(void*) @ 0x104ae260 in /usr/bin/clickhouse 27. start_thread @ 0x7fa3 in /lib/x86_64-linux-gnu/libpthread-2.28.so 28. __clone @ 0xf94cf in /lib/x86_64-linux-gnu/libc-2.28.so (version 20.4.4.18 (official build)) ```

8e68aa489d21fcb4a0f4d48c05028f804f048169

f90acb005c077b4b82dbb6d6d92d64930cef4d4d

https://github.com/clickhouse/clickhouse-java/compare/8e68aa489d21fcb4a0f4d48c05028f804f048169...f90acb005c077b4b82dbb6d6d92d64930cef4d4d

diff --git a/src/main/java/ru/yandex/clickhouse/settings/ClickHouseConnectionSettings.java b/src/main/java/ru/yandex/clickhouse/settings/ClickHouseConnectionSettings.java index 202574fe..6928a340 100644 --- a/src/main/java/ru/yandex/clickhouse/settings/ClickHouseConnectionSettings.java +++ b/src/main/java/ru/yandex/clickhouse/settings/ClickHouseConnectionSettings.java @@ -27,6 +27,7 @@ public enum ClickHouseConnectionSettings implements DriverPropertyCreator { + " ClickHouse rejects request execution if its time exceeds max_execution_time"), + @Deprecated KEEP_ALIVE_TIMEOUT("keepAliveTimeout", 30 * 1000, ""), /** @@ -35,6 +36,7 @@ public enum ClickHouseConnectionSettings implements DriverPropertyCreator { TIME_TO_LIVE_MILLIS("timeToLiveMillis", 60 * 1000, ""), DEFAULT_MAX_PER_ROUTE("defaultMaxPerRoute", 500, ""), MAX_TOTAL("maxTotal", 10000, ""), + MAX_RETRIES("maxRetries", 3, "Maximum retries(default to 3) for idempotent operation. Set 0 to disable retry."), /** * additional diff --git a/src/main/java/ru/yandex/clickhouse/settings/ClickHouseProperties.java b/src/main/java/ru/yandex/clickhouse/settings/ClickHouseProperties.java index b368917e..6c01b194 100644 --- a/src/main/java/ru/yandex/clickhouse/settings/ClickHouseProperties.java +++ b/src/main/java/ru/yandex/clickhouse/settings/ClickHouseProperties.java @@ -22,6 +22,7 @@ public class ClickHouseProperties { private int timeToLiveMillis; private int defaultMaxPerRoute; private int maxTotal; + private int maxRetries; private String host; private int port; private boolean usePathAsDb; @@ -113,6 +114,7 @@ public class ClickHouseProperties { this.timeToLiveMillis = (Integer)getSetting(info, ClickHouseConnectionSettings.TIME_TO_LIVE_MILLIS); this.defaultMaxPerRoute = (Integer)getSetting(info, ClickHouseConnectionSettings.DEFAULT_MAX_PER_ROUTE); this.maxTotal = (Integer)getSetting(info, ClickHouseConnectionSettings.MAX_TOTAL); + this.maxRetries = (Integer)getSetting(info, ClickHouseConnectionSettings.MAX_RETRIES); this.maxCompressBufferSize = (Integer) getSetting(info, ClickHouseConnectionSettings.MAX_COMPRESS_BUFFER_SIZE); this.ssl = (Boolean) getSetting(info, ClickHouseConnectionSettings.SSL); this.sslRootCertificate = (String) getSetting(info, ClickHouseConnectionSettings.SSL_ROOT_CERTIFICATE); @@ -179,6 +181,7 @@ public class ClickHouseProperties { ret.put(ClickHouseConnectionSettings.TIME_TO_LIVE_MILLIS.getKey(), String.valueOf(timeToLiveMillis)); ret.put(ClickHouseConnectionSettings.DEFAULT_MAX_PER_ROUTE.getKey(), String.valueOf(defaultMaxPerRoute)); ret.put(ClickHouseConnectionSettings.MAX_TOTAL.getKey(), String.valueOf(maxTotal)); + ret.put(ClickHouseConnectionSettings.MAX_RETRIES.getKey(), String.valueOf(maxRetries)); ret.put(ClickHouseConnectionSettings.MAX_COMPRESS_BUFFER_SIZE.getKey(), String.valueOf(maxCompressBufferSize)); ret.put(ClickHouseConnectionSettings.SSL.getKey(), String.valueOf(ssl)); ret.put(ClickHouseConnectionSettings.SSL_ROOT_CERTIFICATE.getKey(), String.valueOf(sslRootCertificate)); @@ -248,6 +251,7 @@ public class ClickHouseProperties { setTimeToLiveMillis(properties.timeToLiveMillis); setDefaultMaxPerRoute(properties.defaultMaxPerRoute); setMaxTotal(properties.maxTotal); + setMaxRetries(properties.maxRetries); setMaxCompressBufferSize(properties.maxCompressBufferSize); setSsl(properties.ssl); setSslRootCertificate(properties.sslRootCertificate); @@ -594,6 +598,14 @@ public class ClickHouseProperties { this.maxTotal = maxTotal; } + public int getMaxRetries() { + return maxRetries; + } + + public void setMaxRetries(int maxRetries) { + this.maxRetries = maxRetries; + } + public int getMaxCompressBufferSize() { return maxCompressBufferSize; } diff --git a/src/main/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilder.java b/src/main/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilder.java index 59e89314..66bc9980 100644 --- a/src/main/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilder.java +++ b/src/main/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilder.java @@ -27,20 +27,19 @@ import javax.net.ssl.TrustManagerFactory; import org.apache.http.ConnectionReuseStrategy; import org.apache.http.Header; -import org.apache.http.HeaderElement; -import org.apache.http.HeaderElementIterator; import org.apache.http.HttpHeaders; import org.apache.http.HttpHost; import org.apache.http.HttpResponse; +import org.apache.http.NoHttpResponseException; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.AuthCache; import org.apache.http.client.CredentialsProvider; +import org.apache.http.client.HttpRequestRetryHandler; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.config.ConnectionConfig; import org.apache.http.config.RegistryBuilder; -import org.apache.http.conn.ConnectionKeepAliveStrategy; import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.NoopHostnameVerifier; @@ -50,11 +49,10 @@ import org.apache.http.impl.auth.BasicScheme; import org.apache.http.impl.client.BasicAuthCache; import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.DefaultHttpRequestRetryHandler; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.message.BasicHeader; -import org.apache.http.message.BasicHeaderElementIterator; -import org.apache.http.protocol.HTTP; import org.apache.http.protocol.HttpContext; import ru.yandex.clickhouse.settings.ClickHouseProperties; @@ -71,16 +69,32 @@ public class ClickHouseHttpClientBuilder { public CloseableHttpClient buildClient() throws Exception { return HttpClientBuilder.create() .setConnectionManager(getConnectionManager()) + .setRetryHandler(getRequestRetryHandler()) .setConnectionReuseStrategy(getConnectionReuseStrategy()) .setDefaultConnectionConfig(getConnectionConfig()) .setDefaultRequestConfig(getRequestConfig()) .setDefaultHeaders(getDefaultHeaders()) .setDefaultCredentialsProvider(getDefaultCredentialsProvider()) - .disableContentCompression() // gzip здесь ни к чему. Используется lz4 при compress=1 + .disableContentCompression() // gzip is not needed. Use lz4 when compress=1 .disableRedirectHandling() .build(); } + private HttpRequestRetryHandler getRequestRetryHandler() { + final int maxRetries = properties.getMaxRetries(); + return new DefaultHttpRequestRetryHandler(maxRetries, false) { + @Override + public boolean retryRequest(IOException exception, int executionCount, HttpContext context) { + if (executionCount > maxRetries || context == null + || !Boolean.TRUE.equals(context.getAttribute("is_idempotent"))) { + return false; + } + + return (exception instanceof NoHttpResponseException) || super.retryRequest(exception, executionCount, context); + } + }; + } + public static HttpClientContext createClientContext(ClickHouseProperties props) { if (props == null || !isConfigurationValidForAuth(props)) @@ -155,29 +169,6 @@ public class ClickHouseHttpClientBuilder { return headers; } - private ConnectionKeepAliveStrategy createKeepAliveStrategy() { - return new ConnectionKeepAliveStrategy() { - @Override - public long getKeepAliveDuration(HttpResponse httpResponse, HttpContext httpContext) { - // in case of errors keep-alive not always works. close connection just in case - if (httpResponse.getStatusLine().getStatusCode() != HttpURLConnection.HTTP_OK) { - return -1; - } - HeaderElementIterator it = new BasicHeaderElementIterator( - httpResponse.headerIterator(HTTP.CONN_DIRECTIVE)); - while (it.hasNext()) { - HeaderElement he = it.nextElement(); - String param = he.getName(); - //String value = he.getValue(); - if (param != null && param.equalsIgnoreCase(HTTP.CONN_KEEP_ALIVE)) { - return properties.getKeepAliveTimeout(); - } - } - return -1; - } - }; - } - private SSLContext getSSLContext() throws CertificateException, NoSuchAlgorithmException, KeyStoreException, IOException, KeyManagementException { SSLContext ctx = SSLContext.getInstance("TLS"); diff --git a/src/test/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilderTest.java b/src/test/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilderTest.java index e7cc8802..e7eee897 100644 --- a/src/test/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilderTest.java +++ b/src/test/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilderTest.java @@ -1,8 +1,12 @@ package ru.yandex.clickhouse.util; import org.apache.http.HttpHost; +import org.apache.http.NoHttpResponseException; import org.apache.http.client.methods.HttpPost; +import org.apache.http.conn.HttpHostConnectException; import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.protocol.BasicHttpContext; +import org.apache.http.protocol.HttpContext; import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; @@ -141,7 +145,72 @@ public class ClickHouseHttpClientBuilderTest { null, null, "baz", "Basic ZGVmYXVsdDpiYXo=" // default:baz }, }; + } + + private static WireMockServer newServer() { + WireMockServer server = new WireMockServer( + WireMockConfiguration.wireMockConfig().dynamicPort()); + server.start(); + server.stubFor(WireMock.post(WireMock.urlPathMatching("/*")) + .willReturn(WireMock.aResponse().withStatus(200).withHeader("Connection", "Keep-Alive") + .withHeader("Content-Type", "text/plain; charset=UTF-8") + .withHeader("Transfer-Encoding", "chunked").withHeader("Keep-Alive", "timeout=3") + .withBody("OK.........................").withFixedDelay(2))); + return server; + } + private static void shutDownServerWithDelay(final WireMockServer server, final long delayMs) { + new Thread() { + public void run() { + try { + Thread.sleep(delayMs); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + server.shutdownServer(); + server.stop(); + } + }.start(); } + // @Test(dependsOnMethods = { "testWithRetry" }, expectedExceptions = { NoHttpResponseException.class }) + public void testWithoutRetry() throws Exception { + final WireMockServer server = newServer(); + + ClickHouseProperties props = new ClickHouseProperties(); + props.setMaxRetries(0); + ClickHouseHttpClientBuilder builder = new ClickHouseHttpClientBuilder(props); + CloseableHttpClient client = builder.buildClient(); + HttpPost post = new HttpPost("http://localhost:" + server.port() + "/?db=system&query=select%201"); + + shutDownServerWithDelay(server, 100); + + try { + client.execute(post); + } finally { + client.close(); + } + } + + // @Test(expectedExceptions = { HttpHostConnectException.class }) + public void testWithRetry() throws Exception { + final WireMockServer server = newServer(); + + ClickHouseProperties props = new ClickHouseProperties(); + // props.setMaxRetries(3); + ClickHouseHttpClientBuilder builder = new ClickHouseHttpClientBuilder(props); + CloseableHttpClient client = builder.buildClient(); + HttpContext context = new BasicHttpContext(); + context.setAttribute("is_idempotent", Boolean.TRUE); + HttpPost post = new HttpPost("http://localhost:" + server.port() + "/?db=system&query=select%202"); + + shutDownServerWithDelay(server, 100); + + try { + client.execute(post, context); + } finally { + client.close(); + } + } }

['src/test/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilderTest.java', 'src/main/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilder.java', 'src/main/java/ru/yandex/clickhouse/settings/ClickHouseConnectionSettings.java', 'src/main/java/ru/yandex/clickhouse/settings/ClickHouseProperties.java']

{'.java': 4}

Java

{'Java': 3989428, 'Shell': 397}

Apache License 2.0

clickhouse/clickhouse-java/1082/1072

clickhouse

clickhouse-java

https://github.com/ClickHouse/clickhouse-java/issues/1072

https://github.com/ClickHouse/clickhouse-java/pull/1082

https://github.com/ClickHouse/clickhouse-java/pull/1082

fixes

File data insert using CSVWithNames is failing since v0.3.2-patch10

We are using ClickHouse JDBC driver to import CSV files that include a header line with column names. Here is the JRuby code that we use https://github.com/rsim/mondrian-olap/blob/master/spec/rake_tasks.rb#L377-L380 ```ruby conn.jdbc_connection.createStatement.write. query("INSERT INTO #{table_name}(#{columns_string})"). format(Java::com.clickhouse.client.ClickHouseFormat::CSVWithNames). data(file_path).send ``` It was working until the version v0.3.2-patch9 but since the version v0.3.2-patch10 it is failing with: ``` Java::JavaUtilConcurrent::CompletionException: com.clickhouse.client.ClickHouseException: Code: 27. DB::ParsingException: Cannot parse input: expected ',' before: 'id,the_date,the_day,the_month,the_year,day_of_month,week_of_year,month_of_year,quarter\\n1,2010-01-01 02:00:00,Friday,January,2010,1,0,1,Q1\\n2,2010-01-02 02:00:00,': Row 1: Column 0, name: id, type: Int32, ERROR: text "id,the_dat" is not like Int32 : While executing ParallelParsingBlockInputFormat: (at row 1) . (CANNOT_PARSE_INPUT_ASSERTION_FAILED) (version 22.1.4.1) , server ClickHouseNode [uri=http://localhost:8123/mondrian_test]com.clickhouse.client.ClickHouseClientBuilder$Agent.handle(com/clickhouse/client/ClickHouseClientBuilder.java:181) com.clickhouse.client.ClickHouseClientBuilder$Agent.send(com/clickhouse/client/ClickHouseClientBuilder.java:204) com.clickhouse.client.ClickHouseClientBuilder$Agent.execute(com/clickhouse/client/ClickHouseClientBuilder.java:234) com.clickhouse.client.ClickHouseRequest$Mutation.execute(com/clickhouse/client/ClickHouseRequest.java:241) com.clickhouse.client.ClickHouseRequest$Mutation.send(com/clickhouse/client/ClickHouseRequest.java:292) java.lang.reflect.Method.invoke(java/lang/reflect/Method.java:498) ``` It seems that now the CSV format (without the header line) is used instead of CSVWithNames and it complains about the first file line with column headers. I was browsing the changes between patch9 and patch10 but couldn't identify so far which change could be causing this.

94a5e7c2921047bfe907fbdf6aea2feaed3c2417

fe4e199876c89df9d99bf08e0ef9f9c50d2814b8

https://github.com/clickhouse/clickhouse-java/compare/94a5e7c2921047bfe907fbdf6aea2feaed3c2417...fe4e199876c89df9d99bf08e0ef9f9c50d2814b8

diff --git a/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/ClickHouseCommandLine.java b/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/ClickHouseCommandLine.java index 5565b2aa..c4835963 100644 --- a/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/ClickHouseCommandLine.java +++ b/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/ClickHouseCommandLine.java @@ -124,7 +124,9 @@ public class ClickHouseCommandLine implements AutoCloseable { process = null; } - cache.put(command, value); + if (value) { // no negative cache + cache.put(command, value); + } } return Boolean.TRUE.equals(value); diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseRequest.java b/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseRequest.java index 4a3caf04..62428bff 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseRequest.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseRequest.java @@ -196,7 +196,7 @@ public class ClickHouseRequest<SelfT extends ClickHouseRequest<SelfT>> implement final ClickHouseRequest<?> self = this; final ClickHouseFile wrappedFile = ClickHouseFile.of(file, compression, 0, null); - if (wrappedFile.hasFormat()) { + if (wrappedFile.hasFormat() && getFormat().defaultInputFormat() != wrappedFile.getFormat()) { format(wrappedFile.getFormat()); } this.input = changeProperty(PROP_DATA, this.input, ClickHouseDeferredValue diff --git a/clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java b/clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java index 0e2f42b8..c4a0f8f3 100644 --- a/clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java +++ b/clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java @@ -1403,7 +1403,7 @@ public abstract class ClientIntegrationTest extends BaseIntegrationTest { } @Test(groups = { "integration" }) - public void testInsertWithCustomFormat() throws ClickHouseException { + public void testInsertWithCustomFormat1() throws ClickHouseException, IOException { ClickHouseNode server = getServer(); sendAndWait(server, "drop table if exists test_custom_input_format", "create table test_custom_input_format(i Int8, f String)engine=Memory"); @@ -1415,18 +1415,30 @@ public abstract class ClientIntegrationTest extends BaseIntegrationTest { } try (ClickHouseResponse response = request.write().format(ClickHouseFormat.CSVWithNames) .table("test_custom_input_format") - .data(o -> o.writeBytes("i,f\\n2,CSVWithNames".getBytes())).executeAndWait()) { + .data(o -> o.writeBytes("i,f\\n2,CSVWithNames\\n3,CSVWithNames".getBytes(StandardCharsets.US_ASCII))) + .executeAndWait()) { + // ignore + } + + Path temp = Files.createTempFile("data", ".csv"); + Assert.assertEquals(Files.size(temp), 0L); + Files.write(temp, "i,f\\n4,CSVWithNames\\n5,CSVWithNames\\n".getBytes(StandardCharsets.US_ASCII)); + Assert.assertTrue(Files.size(temp) > 0L); + try (ClickHouseResponse response = request.write().format(ClickHouseFormat.CSVWithNames) + .table("test_custom_input_format") + .data(temp.toFile().getAbsolutePath()).executeAndWait()) { // ignore } + try (ClickHouseResponse response = request.query("select * from test_custom_input_format order by i") .executeAndWait()) { int count = 0; for (ClickHouseRecord r : response.records()) { Assert.assertEquals(r.getValue(0).asInteger(), count + 1); - Assert.assertEquals(r.getValue(1).asString(), count == 0 ? "RowBinary" : "CSVWithNames"); + Assert.assertEquals(r.getValue(1).asString(), count < 1 ? "RowBinary" : "CSVWithNames"); count++; } - Assert.assertEquals(count, 2); + Assert.assertEquals(count, 5); } } } @@ -1481,9 +1493,10 @@ public abstract class ClientIntegrationTest extends BaseIntegrationTest { try (ClickHouseClient client = getClient()) { ClickHouseRequest<?> request = client.connect(server).format(ClickHouseFormat.RowBinary) .session(sessionId); - request.query("drop temporary table if exists my_temp_table").executeAndWait(); - request.query("create temporary table my_temp_table(a Int8)").executeAndWait(); - request.query("insert into my_temp_table values(2)").executeAndWait(); + execute(request, "drop temporary table if exists my_temp_table"); + execute(request, "create temporary table my_temp_table(a Int8)"); + execute(request, "insert into my_temp_table values(2)"); + try (ClickHouseResponse resp = request.write().table("my_temp_table") .data(new ByteArrayInputStream(new byte[] { 3 })).executeAndWait()) { // ignore

['clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/ClickHouseCommandLine.java', 'clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseRequest.java', 'clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java']

{'.java': 3}

Java

{'Java': 3989428, 'Shell': 397}

Apache License 2.0

clickhouse/clickhouse-java/981/977

clickhouse

clickhouse-java

https://github.com/ClickHouse/clickhouse-java/issues/977

https://github.com/ClickHouse/clickhouse-java/pull/981

https://github.com/ClickHouse/clickhouse-java/pull/981

fix

Question about emptyBatchError

Currently, I use Flink JDBC + CK Driver to write data to clickhouse in real time, and there is a high probability of encountering the following errors , So maybe we can support writing empty batch ? ``` Caused by: java.lang.RuntimeException: Writing records to JDBC failed. at org.apache.flink.connector.jdbc.internal.JdbcBatchingOutputFormat.checkFlushException(JdbcBatchingOutputFormat.java:154) at org.apache.flink.connector.jdbc.internal.JdbcBatchingOutputFormat.writeRecord(JdbcBatchingOutputFormat.java:160) at org.apache.flink.streaming.api.functions.sink.OutputFormatSinkFunction.invoke(OutputFormatSinkFunction.java:87) at org.apache.flink.streaming.api.functions.sink.SinkFunction.invoke(SinkFunction.java:49) at org.apache.flink.table.runtime.operators.sink.SinkOperator.processElement(SinkOperator.java:73) at org.apache.flink.streaming.runtime.tasks.ChainingOutput.pushToOperator(ChainingOutput.java:113) at org.apache.flink.streaming.runtime.tasks.ChainingOutput.collect(ChainingOutput.java:94) at org.apache.flink.streaming.runtime.tasks.ChainingOutput.collect(ChainingOutput.java:40) at org.apache.flink.streaming.runtime.tasks.SourceOperatorStreamTask$AsyncDataOutputToOutput.emitRecord(SourceOperatorStreamTask.java:163) at org.apache.flink.streaming.api.operators.source.SourceOutputWithWatermarks.collect(SourceOutputWithWatermarks.java:110) at org.apache.flink.streaming.api.operators.source.SourceOutputWithWatermarks.collect(SourceOutputWithWatermarks.java:101) at org.apache.flink.connector.file.src.impl.FileSourceRecordEmitter.emitRecord(FileSourceRecordEmitter.java:45) at org.apache.flink.connector.file.src.impl.FileSourceRecordEmitter.emitRecord(FileSourceRecordEmitter.java:35) at org.apache.flink.connector.base.source.reader.SourceReaderBase.pollNext(SourceReaderBase.java:128) at org.apache.flink.streaming.api.operators.SourceOperator.emitNext(SourceOperator.java:275) at org.apache.flink.streaming.runtime.io.StreamTaskSourceInput.emitNext(StreamTaskSourceInput.java:67) at org.apache.flink.streaming.runtime.io.StreamOneInputProcessor.processInput(StreamOneInputProcessor.java:65) at org.apache.flink.streaming.runtime.tasks.StreamTask.processInput(StreamTask.java:398) at org.apache.flink.streaming.runtime.tasks.mailbox.MailboxProcessor.runMailboxLoop(MailboxProcessor.java:191) at org.apache.flink.streaming.runtime.tasks.StreamTask.runMailboxLoop(StreamTask.java:619) at org.apache.flink.streaming.runtime.tasks.StreamTask.invoke(StreamTask.java:583) at org.apache.flink.runtime.taskmanager.Task.doRun(Task.java:758) at org.apache.flink.runtime.taskmanager.Task.run(Task.java:573) at java.lang.Thread.run(Thread.java:748) Caused by: java.io.IOException: java.sql.SQLException: Please call addBatch method at least once before batch execution at org.apache.flink.connector.jdbc.internal.JdbcBatchingOutputFormat.flush(JdbcBatchingOutputFormat.java:190) at org.apache.flink.connector.jdbc.internal.JdbcBatchingOutputFormat.lambda$open$0(JdbcBatchingOutputFormat.java:128) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.runAndReset(FutureTask.java:308) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$301(ScheduledThreadPoolExecutor.java:180) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:294) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) ... 1 more Caused by: java.sql.SQLException: Please call addBatch method at least once before batch execution at com.clickhouse.jdbc.SqlExceptionUtils.clientError(SqlExceptionUtils.java:43) at com.clickhouse.jdbc.SqlExceptionUtils.emptyBatchError(SqlExceptionUtils.java:111) at com.clickhouse.jdbc.internal.InputBasedPreparedStatement.executeAny(InputBasedPreparedStatement.java:95) at com.clickhouse.jdbc.internal.AbstractPreparedStatement.executeLargeBatch(AbstractPreparedStatement.java:85) at com.clickhouse.jdbc.internal.ClickHouseStatementImpl.executeBatch(ClickHouseStatementImpl.java:568) at org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.executeBatch(FieldNamedPreparedStatementImpl.java:65) at org.apache.flink.connector.jdbc.internal.executor.TableSimpleStatementExecutor.executeBatch(TableSimpleStatementExecutor.java:64) at org.apache.flink.connector.jdbc.internal.executor.TableBufferedStatementExecutor.executeBatch(TableBufferedStatementExecutor.java:64) at org.apache.flink.connector.jdbc.internal.JdbcBatchingOutputFormat.attemptFlush(JdbcBatchingOutputFormat.java:216) at org.apache.flink.connector.jdbc.internal.JdbcBatchingOutputFormat.flush(JdbcBatchingOutputFormat.java:184) ... 8 more ```

e59bd468c1e1b049d84a0a8183758740735e8e9a

844b2b8013b3af7f51e2fa66f8335b50f47cc157

https://github.com/clickhouse/clickhouse-java/compare/e59bd468c1e1b049d84a0a8183758740735e8e9a...844b2b8013b3af7f51e2fa66f8335b50f47cc157

diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/SqlExceptionUtils.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/SqlExceptionUtils.java index da5b824b..25b3ffe3 100644 --- a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/SqlExceptionUtils.java +++ b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/SqlExceptionUtils.java @@ -107,10 +107,6 @@ public final class SqlExceptionUtils { return new BatchUpdateException("Unexpected error", SQL_STATE_SQL_ERROR, 0, updateCounts, cause); } - public static SQLException emptyBatchError() { - return clientError("Please call addBatch method at least once before batch execution"); - } - public static BatchUpdateException queryInBatchError(int[] updateCounts) { return new BatchUpdateException("Query is not allow in batch update", SQL_STATE_CLIENT_ERROR, updateCounts); } diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java index bae6de91..be75aa33 100644 --- a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java +++ b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java @@ -220,7 +220,7 @@ public class ClickHouseConnectionImpl extends JdbcWrapper implements ClickHouseC autoCommit = !jdbcConf.isJdbcCompliant() || jdbcConf.isAutoCommit(); ClickHouseNode node = connInfo.getServer(); - log.debug("Connecting to node: %s", node); + log.debug("Connecting to: %s", node); jvmTimeZone = TimeZone.getDefault(); diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java index 2b64d85c..94de8e5e 100644 --- a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java +++ b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java @@ -25,6 +25,7 @@ import com.clickhouse.client.ClickHouseResponseSummary; import com.clickhouse.client.ClickHouseSerializer; import com.clickhouse.client.ClickHouseUtils; import com.clickhouse.client.ClickHouseValue; +import com.clickhouse.client.ClickHouseValues; import com.clickhouse.client.config.ClickHouseClientOption; import com.clickhouse.client.config.ClickHouseConfigChangeListener; import com.clickhouse.client.config.ClickHouseOption; @@ -588,7 +589,7 @@ public class ClickHouseStatementImpl extends JdbcWrapper public long[] executeLargeBatch() throws SQLException { ensureOpen(); if (batchStmts.isEmpty()) { - throw SqlExceptionUtils.emptyBatchError(); + return ClickHouseValues.EMPTY_LONG_ARRAY; } boolean continueOnError = getConnection().getJdbcConfig().isContinueBatchOnError(); diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/InputBasedPreparedStatement.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/InputBasedPreparedStatement.java index 28c09b80..fd676de9 100644 --- a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/InputBasedPreparedStatement.java +++ b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/InputBasedPreparedStatement.java @@ -94,7 +94,7 @@ public class InputBasedPreparedStatement extends AbstractPreparedStatement imple boolean continueOnError = false; if (asBatch) { if (counter < 1) { - throw SqlExceptionUtils.emptyBatchError(); + return ClickHouseValues.EMPTY_LONG_ARRAY; } continueOnError = getConnection().getJdbcConfig().isContinueBatchOnError(); } else { diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/SqlBasedPreparedStatement.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/SqlBasedPreparedStatement.java index 8958f95d..664f999e 100644 --- a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/SqlBasedPreparedStatement.java +++ b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/SqlBasedPreparedStatement.java @@ -122,7 +122,7 @@ public class SqlBasedPreparedStatement extends AbstractPreparedStatement impleme boolean continueOnError = false; if (asBatch) { if (counter < 1) { - throw SqlExceptionUtils.emptyBatchError(); + return ClickHouseValues.EMPTY_LONG_ARRAY; } continueOnError = getConnection().getJdbcConfig().isContinueBatchOnError(); } else { diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/TableBasedPreparedStatement.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/TableBasedPreparedStatement.java index c389b589..e86c94e2 100644 --- a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/TableBasedPreparedStatement.java +++ b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/TableBasedPreparedStatement.java @@ -19,6 +19,7 @@ import java.util.Set; import com.clickhouse.client.ClickHouseRequest; import com.clickhouse.client.ClickHouseResponse; import com.clickhouse.client.ClickHouseUtils; +import com.clickhouse.client.ClickHouseValues; import com.clickhouse.client.data.ClickHouseExternalTable; import com.clickhouse.client.logging.Logger; import com.clickhouse.client.logging.LoggerFactory; @@ -75,7 +76,7 @@ public class TableBasedPreparedStatement extends AbstractPreparedStatement imple boolean continueOnError = false; if (asBatch) { if (batch.isEmpty()) { - throw SqlExceptionUtils.emptyBatchError(); + return ClickHouseValues.EMPTY_LONG_ARRAY; } continueOnError = getConnection().getJdbcConfig().isContinueBatchOnError(); } else { diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java index 2a811b79..c131e052 100644 --- a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java +++ b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java @@ -778,15 +778,22 @@ public class ClickHousePreparedStatementTest extends JdbcIntegrationTest { public void testBatchQuery() throws SQLException { try (ClickHouseConnection conn = newConnection(new Properties()); PreparedStatement stmt = conn.prepareStatement("select * from numbers(100) where number < ?")) { + Assert.assertEquals(stmt.executeBatch(), new int[0]); + Assert.assertEquals(stmt.executeLargeBatch(), new long[0]); Assert.assertThrows(SQLException.class, () -> stmt.setInt(0, 5)); Assert.assertThrows(SQLException.class, () -> stmt.setInt(2, 5)); Assert.assertThrows(SQLException.class, () -> stmt.addBatch()); stmt.setInt(1, 3); + Assert.assertEquals(stmt.executeBatch(), new int[0]); + Assert.assertEquals(stmt.executeLargeBatch(), new long[0]); stmt.addBatch(); stmt.setInt(1, 2); stmt.addBatch(); Assert.assertThrows(BatchUpdateException.class, () -> stmt.executeBatch()); + + Assert.assertEquals(stmt.executeBatch(), new int[0]); + Assert.assertEquals(stmt.executeLargeBatch(), new long[0]); } } diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java index 9a61a4bf..f0847918 100644 --- a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java +++ b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java @@ -136,6 +136,9 @@ public class ClickHouseStatementTest extends JdbcIntegrationTest { public void testMutation() throws SQLException { Properties props = new Properties(); try (ClickHouseConnection conn = newConnection(props); ClickHouseStatement stmt = conn.createStatement()) { + Assert.assertEquals(stmt.executeBatch(), new int[0]); + Assert.assertEquals(stmt.executeLargeBatch(), new long[0]); + Assert.assertFalse(stmt.execute("drop table if exists test_mutation;" + "create table test_mutation(a String, b UInt32) engine=MergeTree() order by tuple()"), "Should not return result set"); @@ -156,6 +159,9 @@ public class ClickHouseStatementTest extends JdbcIntegrationTest { stmt.addBatch("drop table non_existing_table"); stmt.addBatch("insert into test_mutation values('2',2)"); Assert.assertThrows(SQLException.class, () -> stmt.executeBatch()); + + Assert.assertEquals(stmt.executeBatch(), new int[0]); + Assert.assertEquals(stmt.executeLargeBatch(), new long[0]); } props.setProperty(JdbcConfig.PROP_CONTINUE_BATCH, "true"); @@ -269,7 +275,12 @@ public class ClickHouseStatementTest extends JdbcIntegrationTest { public void testExecuteBatch() throws SQLException { Properties props = new Properties(); try (Connection conn = newConnection(props); Statement stmt = conn.createStatement()) { - Assert.assertThrows(SQLException.class, () -> stmt.executeBatch()); + Assert.assertEquals(stmt.executeBatch(), new int[0]); + Assert.assertEquals(stmt.executeLargeBatch(), new long[0]); + stmt.addBatch("select 1"); + stmt.clearBatch(); + Assert.assertEquals(stmt.executeBatch(), new int[0]); + Assert.assertEquals(stmt.executeLargeBatch(), new long[0]); stmt.addBatch("select 1"); // mixed usage Assert.assertThrows(SQLException.class, () -> stmt.execute("select 2"));

['clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java', 'clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/SqlBasedPreparedStatement.java', 'clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java', 'clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/SqlExceptionUtils.java', 'clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/InputBasedPreparedStatement.java', 'clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java', 'clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/TableBasedPreparedStatement.java', 'clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java']

{'.java': 8}

Java

{'Java': 3989428, 'Shell': 397}

Apache License 2.0

clickhouse/clickhouse-java/1019/947

clickhouse

clickhouse-java

https://github.com/ClickHouse/clickhouse-java/issues/947

https://github.com/ClickHouse/clickhouse-java/pull/1019

https://github.com/ClickHouse/clickhouse-java/pull/1019

closes

Incorrect update count (0.3.2-patch9)

Hi! In `com.clickhouse.jdbc.internal.ClickHouseStatementImpl#updateResult`: ``` ... // FIXME apparently this is not always true if (currentUpdateCount <= 0L) { currentUpdateCount = 1L; } ... ``` Yes, this isn’t always true :) **Examples:** ``` Statement statement = connection.createStatement(); statement.execute(sql); int updateCount = statement.getUpdateCount(); ``` 1. `String sql = “CREATE TABLE new_table(x INT) engine = Memory;”` Expected `updateCount`: 0 Actual `updateCount`: 1 2. `String sql = "INSERT INTO new_table VALUES (1), (2), (3);"` Expected `updateCount`: 3 Actual `updateCount`: 1

cdaf8f3f6cfd7c7227df00284a71f58b9399838a

5f6d8b7ab6c0bd23db36ef807975b8f52c2f9abf

https://github.com/clickhouse/clickhouse-java/compare/cdaf8f3f6cfd7c7227df00284a71f58b9399838a...5f6d8b7ab6c0bd23db36ef807975b8f52c2f9abf

diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseResponseSummary.java b/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseResponseSummary.java index c75c9b8a..33bc639b 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseResponseSummary.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseResponseSummary.java @@ -10,6 +10,8 @@ import java.util.concurrent.atomic.AtomicReference; public class ClickHouseResponseSummary implements Serializable { private static final long serialVersionUID = 6241261266635143197L; + static final String ERROR_CANNOT_UPDATE = "Sealed summary cannot be updated"; + public static final ClickHouseResponseSummary EMPTY = new ClickHouseResponseSummary(null, null, true); /** @@ -18,6 +20,8 @@ public class ClickHouseResponseSummary implements Serializable { public static final class Progress implements Serializable { private static final long serialVersionUID = -1447066780591278108L; + static final Progress EMPTY = new Progress(0L, 0L, 0L, 0L, 0L); + private final long read_rows; private final long read_bytes; private final long total_rows_to_read; @@ -61,6 +65,11 @@ public class ClickHouseResponseSummary implements Serializable { public long getWrittenBytes() { return written_bytes; } + + public boolean isEmpty() { + return read_rows == 0L && read_bytes == 0L && total_rows_to_read == 0L && written_rows == 0L + && written_bytes == 0L; + } } /** @@ -69,6 +78,8 @@ public class ClickHouseResponseSummary implements Serializable { public static class Statistics implements Serializable { private static final long serialVersionUID = -7744796632866829161L; + static final Statistics EMPTY = new Statistics(0L, 0L, 0L, false, 0L); + private final long rows; private final long blocks; private final long allocated_bytes; @@ -112,6 +123,10 @@ public class ClickHouseResponseSummary implements Serializable { public long getRowsBeforeLimit() { return rows_before_limit; } + + public boolean isEmpty() { + return rows == 0L && blocks == 0L && allocated_bytes == 0L && !applied_limit && rows_before_limit == 0L; + } } private final AtomicReference<Progress> progress; @@ -139,9 +154,15 @@ public class ClickHouseResponseSummary implements Serializable { * @param sealed whether the summary is sealed */ protected ClickHouseResponseSummary(Progress progress, Statistics stats, boolean sealed) { - this.progress = new AtomicReference<>(progress != null ? progress : new Progress(0L, 0L, 0L, 0L, 0L)); - this.stats = new AtomicReference<>(stats != null ? stats : new Statistics(0L, 0L, 0L, false, 0L)); - this.updates = new AtomicInteger(1); + if (progress == null) { + progress = Progress.EMPTY; + } + if (stats == null) { + stats = Statistics.EMPTY; + } + this.progress = new AtomicReference<>(progress); + this.stats = new AtomicReference<>(stats); + this.updates = new AtomicInteger(progress.isEmpty() && stats.isEmpty() ? 0 : 1); this.sealed = sealed; } @@ -159,6 +180,10 @@ public class ClickHouseResponseSummary implements Serializable { * @return increased update counter */ public int update() { + if (sealed) { + throw new IllegalStateException(ERROR_CANNOT_UPDATE); + } + return this.updates.incrementAndGet(); } @@ -169,7 +194,7 @@ public class ClickHouseResponseSummary implements Serializable { */ public void update(Progress progress) { if (sealed) { - throw new IllegalStateException("Sealed summary cannot be updated"); + throw new IllegalStateException(ERROR_CANNOT_UPDATE); } if (progress != null) { @@ -179,7 +204,7 @@ public class ClickHouseResponseSummary implements Serializable { public void update(Statistics stats) { if (sealed) { - throw new IllegalStateException("Sealed summary cannot be updated"); + throw new IllegalStateException(ERROR_CANNOT_UPDATE); } if (stats != null) { @@ -228,4 +253,8 @@ public class ClickHouseResponseSummary implements Serializable { public int getUpdateCount() { return updates.get(); } + + public boolean isEmpty() { + return progress.get().isEmpty() && stats.get().isEmpty(); + } } diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java index 82e20603..d1b47522 100644 --- a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java +++ b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java @@ -95,8 +95,13 @@ public class ClickHouseStatementImpl extends JdbcWrapper } catch (Exception e) { throw SqlExceptionUtils.handle(e); } finally { - if (i + 1 < len && response != null) { + if (response == null) { + // something went wrong + } else if (i + 1 < len) { response.close(); + response = null; + } else { + updateResult(stmt, response); } } } @@ -166,18 +171,17 @@ public class ClickHouseStatementImpl extends JdbcWrapper protected int executeInsert(String sql, InputStream input) throws SQLException { boolean autoTx = connection.getAutoCommit() && connection.isTransactionSupported(); - ClickHouseResponseSummary summary = null; Mutation req = request.write().query(sql, queryId = connection.newQueryId()).data(input); try (ClickHouseResponse resp = autoTx ? req.executeWithinTransaction(connection.isImplicitTransactionSupported()) : req.transaction(connection.getTransaction()).sendAndWait(); ResultSet rs = updateResult(new ClickHouseSqlStatement(sql, StatementType.INSERT), resp)) { - summary = resp.getSummary(); + // ignore } catch (Exception e) { throw SqlExceptionUtils.handle(e); } - return summary != null && summary.getWrittenRows() > 0L ? (int) summary.getWrittenRows() : 1; + return (int) currentUpdateCount; } protected ClickHouseSqlStatement getLastStatement() { @@ -212,23 +216,17 @@ public class ClickHouseStatementImpl extends JdbcWrapper } protected ResultSet updateResult(ClickHouseSqlStatement stmt, ClickHouseResponse response) throws SQLException { - ResultSet rs = null; if (stmt.isQuery() || !response.getColumns().isEmpty()) { currentUpdateCount = -1L; currentResult = new ClickHouseResultSet(stmt.getDatabaseOrDefault(getConnection().getCurrentDatabase()), stmt.getTable(), this, response); - rs = currentResult; } else { - currentUpdateCount = response.getSummary().getWrittenRows(); - // FIXME apparently this is not always true - if (currentUpdateCount <= 0L) { - currentUpdateCount = 1L; - } - currentResult = null; response.close(); + currentUpdateCount = stmt.isDDL() ? 0L + : (response.getSummary().isEmpty() ? 1L : response.getSummary().getWrittenRows()); + currentResult = null; } - - return rs == null ? newEmptyResultSet() : rs; + return currentResult; } protected ClickHouseStatementImpl(ClickHouseConnectionImpl connection, ClickHouseRequest<?> request, @@ -303,18 +301,8 @@ public class ClickHouseStatementImpl extends JdbcWrapper } parseSqlStatements(sql); - - ClickHouseResponse response = getLastResponse(null, null, null); - - try { - return updateResult(getLastStatement(), response); - } catch (Exception e) { - if (response != null) { - response.close(); - } - - throw SqlExceptionUtils.handle(e); - } + getLastResponse(null, null, null); + return currentResult != null ? currentResult : newEmptyResultSet(); } @Override @@ -326,14 +314,11 @@ public class ClickHouseStatementImpl extends JdbcWrapper parseSqlStatements(sql); - ClickHouseResponseSummary summary = null; try (ClickHouseResponse response = getLastResponse(null, null, null)) { - summary = response.getSummary(); + return currentUpdateCount; } catch (Exception e) { throw SqlExceptionUtils.handle(e); } - - return summary != null ? summary.getWrittenRows() : 1L; } @Override diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java index c3ec0334..f8b54c32 100644 --- a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java +++ b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java @@ -845,6 +845,7 @@ public class ClickHousePreparedStatementTest extends JdbcIntegrationTest { @Test(dataProvider = "statementAndParams", groups = "integration") public void testExecuteWithOrWithoutParameters(String tableSuffix, String query, Class<?> clazz, boolean hasResultSet, String[] params, boolean checkTable) throws SQLException { + int expectedRowCount = "ddl".equals(tableSuffix) ? 0 : 1; String tableName = "test_execute_ps_" + tableSuffix; query = query.replace("$table", tableName); Properties props = new Properties(); @@ -932,7 +933,7 @@ public class ClickHousePreparedStatementTest extends JdbcIntegrationTest { if (hasResultSet) { Assert.assertThrows(SQLException.class, () -> ps.executeLargeBatch()); } else { - Assert.assertEquals(ps.executeLargeBatch(), new long[] { 1L }); + Assert.assertEquals(ps.executeLargeBatch(), new long[] { expectedRowCount }); } if (checkTable) checkTable(stmt, "select * from " + tableName, params); @@ -950,7 +951,7 @@ public class ClickHousePreparedStatementTest extends JdbcIntegrationTest { if (hasResultSet) { Assert.assertThrows(SQLException.class, () -> ps.executeBatch()); } else { - Assert.assertEquals(ps.executeBatch(), new int[] { 1 }); + Assert.assertEquals(ps.executeBatch(), new int[] { expectedRowCount }); } if (checkTable) checkTable(stmt, "select * from " + tableName, params); @@ -973,7 +974,7 @@ public class ClickHousePreparedStatementTest extends JdbcIntegrationTest { if (hasResultSet) { Assert.assertEquals(ps.executeLargeBatch(), new long[] { Statement.EXECUTE_FAILED }); } else { - Assert.assertEquals(ps.executeLargeBatch(), new long[] { 1L }); + Assert.assertEquals(ps.executeLargeBatch(), new long[] { expectedRowCount }); } if (checkTable) checkTable(stmt, "select * from " + tableName, params); @@ -988,7 +989,7 @@ public class ClickHousePreparedStatementTest extends JdbcIntegrationTest { if (hasResultSet) { Assert.assertEquals(ps.executeBatch(), new int[] { Statement.EXECUTE_FAILED }); } else { - Assert.assertEquals(ps.executeBatch(), new int[] { 1 }); + Assert.assertEquals(ps.executeBatch(), new int[] { expectedRowCount }); } if (checkTable) checkTable(stmt, "select * from " + tableName, params); diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java index 4861c29e..681bdeca 100644 --- a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java +++ b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java @@ -173,7 +173,7 @@ public class ClickHouseStatementTest extends JdbcIntegrationTest { // [update] tbl a [set] a.b = 1 where a.b != 1[ settings mutation_async=0] // alter table tbl a update a.b = 1 where a.b != 1 conn.setClientInfo("ApplicationName", "333"); - Assert.assertEquals(conn.createStatement().executeUpdate("update test_mutation set b = 22 where b = 1"), 0); + Assert.assertEquals(conn.createStatement().executeUpdate("update test_mutation set b = 22 where b = 1"), 1); Assert.assertThrows(SQLException.class, () -> stmt.executeUpdate("update non_existing_table set value=1 where key=1")); @@ -407,7 +407,7 @@ public class ClickHouseStatementTest extends JdbcIntegrationTest { rs = stmt.executeQuery("drop table if exists non_existing_table"); Assert.assertNotNull(rs, "Should never be null"); Assert.assertNull(stmt.getResultSet(), "Should be null"); - Assert.assertEquals(stmt.getUpdateCount(), 1); + Assert.assertEquals(stmt.getUpdateCount(), 0); Assert.assertFalse(rs.next(), "Should has no row"); } } @@ -519,7 +519,7 @@ public class ClickHouseStatementTest extends JdbcIntegrationTest { stmt.addBatch("drop table if exists non_existing_table2"); stmt.addBatch("drop table if exists non_existing_table3"); int[] results = stmt.executeBatch(); - Assert.assertEquals(results, new int[] { 1, 1, 1 }); + Assert.assertEquals(results, new int[] { 0, 0, 0 }); } }

['clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseResponseSummary.java', 'clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java', 'clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java', 'clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java']

{'.java': 4}

Java

{'Java': 3989428, 'Shell': 397}

Apache License 2.0

clickhouse/clickhouse-java/982/979

clickhouse

clickhouse-java

https://github.com/ClickHouse/clickhouse-java/issues/979

https://github.com/ClickHouse/clickhouse-java/pull/982

https://github.com/ClickHouse/clickhouse-java/pull/982

fix

ResultSet getObject with class return null values filled as it was not null

When selecting values from table with getObject(index, Class) simple types (like float/int/boolean) return 0/false as result (when null is expected). ``` CREATE TABLE db.tbl ( id int not null, double_col double, float_col float, varchar_col varchar(36), boolean_col boolean, int_col int, bigint_col bigint, char_col char(10), int32_col int32 primary key (id) ) distributed by (id) ``` `Expected: [1, null, null, null, null, null, null, null, null]` `Actual: [1, 0.0, 0.0, null, false, 0, 0, null, 0]` getObject(int columnIndex) returns null as expected. Is that expected behaivor? (it breaks Vertx jdbc client as it always uses getObject with expected class)

2f2f2eae501e59453aa0b8a77581cbe99f3949d3

70612d802499ed8d64a989932beb21853c62e73d

https://github.com/clickhouse/clickhouse-java/compare/2f2f2eae501e59453aa0b8a77581cbe99f3949d3...70612d802499ed8d64a989932beb21853c62e73d

diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseValue.java index e13bceb1..b55fc5df 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseValue.java @@ -88,6 +88,16 @@ public interface ClickHouseValue extends Serializable { return v != v; } + /** + * Checks whether the value is nullable. This always returns {@code false} for + * nested value type. + * + * @return true if the value is nullable; false otherwise + */ + default boolean isNullable() { + return true; + } + /** * Checks if the value is null, or empty for non-null types like Array, Tuple * and Map. @@ -485,7 +495,7 @@ public interface ClickHouseValue extends Serializable { * @return a typed object representing the value, could be null */ default <T, E extends Enum<E>> T asObject(Class<T> clazz) { - if (clazz == null) { + if (clazz == null || (isNullable() && isNullOrEmpty())) { return null; } else if (clazz == boolean.class || clazz == Boolean.class) { return clazz.cast(asBoolean()); @@ -531,6 +541,8 @@ public interface ClickHouseValue extends Serializable { return clazz.cast(asArray()); } else if (List.class.isAssignableFrom(clazz)) { return clazz.cast(asTuple()); + } else if (Map.class.isAssignableFrom(clazz)) { + return clazz.cast(asMap()); } else if (Enum.class.isAssignableFrom(clazz)) { return clazz.cast(asEnum((Class<E>) clazz)); } else { diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseArrayValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseArrayValue.java index 9bbdaec6..08612456 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseArrayValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseArrayValue.java @@ -128,6 +128,11 @@ public class ClickHouseArrayValue<T> extends ClickHouseObjectValue<T[]> { return new ClickHouseArrayValue<>(newValue); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { return getValue().length == 0; diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseBitmapValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseBitmapValue.java index 5aa18326..31c16d6e 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseBitmapValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseBitmapValue.java @@ -78,6 +78,11 @@ public class ClickHouseBitmapValue extends ClickHouseObjectValue<ClickHouseBitma return new ClickHouseBitmapValue(getValue()); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { return getValue().isEmpty(); diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoMultiPolygonValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoMultiPolygonValue.java index 80627407..5ec4c456 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoMultiPolygonValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoMultiPolygonValue.java @@ -149,6 +149,11 @@ public class ClickHouseGeoMultiPolygonValue extends ClickHouseObjectValue<double return convert(getValue(), length); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { return getValue().length == 0; diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoPointValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoPointValue.java index eec0ea3b..04bbe8bf 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoPointValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoPointValue.java @@ -95,6 +95,11 @@ public class ClickHouseGeoPointValue extends ClickHouseObjectValue<double[]> { return convert(getValue(), length); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { return false; diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoPolygonValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoPolygonValue.java index e59793da..899f6d4e 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoPolygonValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoPolygonValue.java @@ -144,6 +144,11 @@ public class ClickHouseGeoPolygonValue extends ClickHouseObjectValue<double[][][ return convert(getValue(), length); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { return getValue().length == 0; diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoRingValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoRingValue.java index 5483b5ee..074f78b1 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoRingValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoRingValue.java @@ -140,6 +140,11 @@ public class ClickHouseGeoRingValue extends ClickHouseObjectValue<double[][]> { return convert(getValue(), length); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { double[][] value = getValue(); diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseNestedValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseNestedValue.java index 12d95888..5b57517e 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseNestedValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseNestedValue.java @@ -187,6 +187,11 @@ public class ClickHouseNestedValue extends ClickHouseObjectValue<Object[][]> { return str; } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { Object[][] value = getValue(); diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseTupleValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseTupleValue.java index def2aa66..ebf2722c 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseTupleValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseTupleValue.java @@ -152,6 +152,11 @@ public class ClickHouseTupleValue extends ClickHouseObjectValue<List<Object>> { return getValue(); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { return getValue().isEmpty(); diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseByteArrayValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseByteArrayValue.java index 22c851f5..c2e09d2c 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseByteArrayValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseByteArrayValue.java @@ -133,6 +133,11 @@ public class ClickHouseByteArrayValue extends ClickHouseObjectValue<byte[]> { return new ClickHouseByteArrayValue(Arrays.copyOf(value, value.length)); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { return getValue().length == 0; diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseDoubleArrayValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseDoubleArrayValue.java index 47fd7853..1fde864a 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseDoubleArrayValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseDoubleArrayValue.java @@ -133,6 +133,11 @@ public class ClickHouseDoubleArrayValue extends ClickHouseObjectValue<double[]> return new ClickHouseDoubleArrayValue(Arrays.copyOf(value, value.length)); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { return getValue().length == 0; diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseFloatArrayValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseFloatArrayValue.java index 5444253c..a9c0fd66 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseFloatArrayValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseFloatArrayValue.java @@ -133,6 +133,11 @@ public class ClickHouseFloatArrayValue extends ClickHouseObjectValue<float[]> { return new ClickHouseFloatArrayValue(Arrays.copyOf(value, value.length)); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { return getValue().length == 0; diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseIntArrayValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseIntArrayValue.java index e91536e5..b2b28432 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseIntArrayValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseIntArrayValue.java @@ -133,6 +133,11 @@ public class ClickHouseIntArrayValue extends ClickHouseObjectValue<int[]> { return new ClickHouseIntArrayValue(Arrays.copyOf(value, value.length)); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { return getValue().length == 0; diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseLongArrayValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseLongArrayValue.java index dd4392ff..e39fd682 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseLongArrayValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseLongArrayValue.java @@ -133,6 +133,11 @@ public class ClickHouseLongArrayValue extends ClickHouseObjectValue<long[]> { return new ClickHouseLongArrayValue(Arrays.copyOf(value, value.length)); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { return getValue().length == 0; diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseShortArrayValue.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseShortArrayValue.java index 2ac35b15..b7db7083 100644 --- a/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseShortArrayValue.java +++ b/clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseShortArrayValue.java @@ -133,6 +133,11 @@ public class ClickHouseShortArrayValue extends ClickHouseObjectValue<short[]> { return new ClickHouseShortArrayValue(Arrays.copyOf(value, value.length)); } + @Override + public boolean isNullable() { + return false; + } + @Override public boolean isNullOrEmpty() { return getValue().length == 0; diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseResultSetTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseResultSetTest.java index 56b774a0..ef975e78 100644 --- a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseResultSetTest.java +++ b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseResultSetTest.java @@ -1,6 +1,7 @@ package com.clickhouse.jdbc; import java.math.BigDecimal; +import java.math.BigInteger; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; @@ -90,28 +91,28 @@ public class ClickHouseResultSetTest extends JdbcIntegrationTest { @DataProvider(name = "nullableColumns") private Object[][] getNullableColumns() { return new Object[][] { - new Object[] { "Bool", "false" }, - new Object[] { "Date", "1970-01-01" }, - new Object[] { "Date32", "1970-01-01" }, - new Object[] { "DateTime32('UTC')", "1970-01-01 00:00:00" }, - new Object[] { "DateTime64(3, 'UTC')", "1970-01-01 00:00:00" }, - new Object[] { "Decimal(10,4)", "0" }, - new Object[] { "Enum8('x'=0,'y'=1)", "x" }, - new Object[] { "Enum16('xx'=1,'yy'=0)", "yy" }, - new Object[] { "Float32", "0.0" }, - new Object[] { "Float64", "0.0" }, - new Object[] { "Int8", "0" }, - new Object[] { "UInt8", "0" }, - new Object[] { "Int16", "0" }, - new Object[] { "UInt16", "0" }, - new Object[] { "Int32", "0" }, - new Object[] { "UInt32", "0" }, - new Object[] { "Int64", "0" }, - new Object[] { "UInt64", "0" }, - new Object[] { "Int128", "0" }, - new Object[] { "UInt128", "0" }, - new Object[] { "Int256", "0" }, - new Object[] { "UInt256", "0" }, + new Object[] { "Bool", "false", Boolean.class }, + new Object[] { "Date", "1970-01-01", LocalDate.class }, + new Object[] { "Date32", "1970-01-01", LocalDate.class }, + new Object[] { "DateTime32('UTC')", "1970-01-01 00:00:00", LocalDateTime.class }, + new Object[] { "DateTime64(3, 'UTC')", "1970-01-01 00:00:00", OffsetDateTime.class }, + new Object[] { "Decimal(10,4)", "0", BigDecimal.class }, + new Object[] { "Enum8('x'=0,'y'=1)", "x", Integer.class }, + new Object[] { "Enum16('xx'=1,'yy'=0)", "yy", String.class }, + new Object[] { "Float32", "0.0", Float.class }, + new Object[] { "Float64", "0.0", Double.class }, + new Object[] { "Int8", "0", Byte.class }, + new Object[] { "UInt8", "0", Short.class }, + new Object[] { "Int16", "0", Short.class }, + new Object[] { "UInt16", "0", Integer.class }, + new Object[] { "Int32", "0", Integer.class }, + new Object[] { "UInt32", "0", Long.class }, + new Object[] { "Int64", "0", Long.class }, + new Object[] { "UInt64", "0", BigInteger.class }, + new Object[] { "Int128", "0", BigInteger.class }, + new Object[] { "UInt128", "0", BigInteger.class }, + new Object[] { "Int256", "0", BigInteger.class }, + new Object[] { "UInt256", "0", BigInteger.class }, }; } @@ -296,7 +297,7 @@ public class ClickHouseResultSetTest extends JdbcIntegrationTest { } @Test(dataProvider = "nullableColumns", groups = "integration") - public void testNullValue(String columnType, String defaultValue) throws Exception { + public void testNullValue(String columnType, String defaultValue, Class<?> clazz) throws Exception { Properties props = new Properties(); props.setProperty(JdbcConfig.PROP_NULL_AS_DEFAULT, "2"); String tableName = "test_query_null_value_" + columnType.split("\\\\(")[0].trim().toLowerCase(); @@ -312,6 +313,8 @@ public class ClickHouseResultSetTest extends JdbcIntegrationTest { Assert.assertTrue(rs.next(), "Should have at least one row"); Assert.assertEquals(rs.getInt(1), 1); Assert.assertEquals(rs.getString(2), defaultValue); + Assert.assertNotNull(rs.getObject(2)); + Assert.assertNotNull(rs.getObject(2, clazz)); Assert.assertFalse(rs.wasNull(), "Should not be null"); Assert.assertFalse(rs.next(), "Should have only one row"); } @@ -321,6 +324,7 @@ public class ClickHouseResultSetTest extends JdbcIntegrationTest { Assert.assertTrue(rs.next(), "Should have at least one row"); Assert.assertEquals(rs.getInt(1), 1); Assert.assertEquals(rs.getString(2), null); + Assert.assertEquals(rs.getObject(2, clazz), null); Assert.assertTrue(rs.wasNull(), "Should be null"); Assert.assertFalse(rs.next(), "Should have only one row"); } @@ -330,6 +334,7 @@ public class ClickHouseResultSetTest extends JdbcIntegrationTest { Assert.assertTrue(rs.next(), "Should have at least one row"); Assert.assertEquals(rs.getInt(1), 1); Assert.assertEquals(rs.getString(2), null); + Assert.assertEquals(rs.getObject(2, clazz), null); Assert.assertTrue(rs.wasNull(), "Should be null"); Assert.assertFalse(rs.next(), "Should have only one row"); }

['clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseBitmapValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseNestedValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseLongArrayValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseDoubleArrayValue.java', 'clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseResultSetTest.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoMultiPolygonValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoRingValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseArrayValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoPointValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoPolygonValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseByteArrayValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseIntArrayValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseFloatArrayValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseTupleValue.java', 'clickhouse-client/src/main/java/com/clickhouse/client/data/array/ClickHouseShortArrayValue.java']

{'.java': 16}

Java

{'Java': 3989428, 'Shell': 397}

Apache License 2.0

gradle/gradle-profiler/457/456

gradle

gradle-profiler

https://github.com/gradle/gradle-profiler/issues/456

https://github.com/gradle/gradle-profiler/pull/457

https://github.com/gradle/gradle-profiler/issues/456#issuecomment-1289037751

fixes

Using `--profile yourkit` in Windows build failed with java.lang.NullPointerException

### Environment gradle-profiler version: 0.19.0 YourKit version: 2022.9 **Crash log** ``` java.lang.NullPointerException at org.gradle.profiler.yourkit.YourKitJvmArgsCalculator.calculateJvmArgs(YourKitJvmArgsCalculator.java:33) at org.gradle.profiler.GradleScenarioInvoker.run(GradleScenarioInvoker.java:87) at org.gradle.profiler.GradleScenarioInvoker.run(GradleScenarioInvoker.java:22) at org.gradle.profiler.Main.invoke(Main.java:126) at org.gradle.profiler.Main.run(Main.java:86) at org.gradle.profiler.Main.main(Main.java:25) ``` ### Root cause In YourKit HOME dir yjpagent.dll exist in `bin/windows-x86-64/` but in gradle-profiler, the path still was `bin/win64/` https://github.com/gradle/gradle-profiler/blob/master/src/main/java/org/gradle/profiler/yourkit/YourKit.java#L41 So the `findJniLib()` result will be null ### Temporary solution copy `bin/windows-x86-64` and rename to `bin/win64`

5f376813f3042714121b41985e52a57dc9665e54

bb4a3b0b8412c80bb2ed7dea4acb4654e31d28d1

https://github.com/gradle/gradle-profiler/compare/5f376813f3042714121b41985e52a57dc9665e54...bb4a3b0b8412c80bb2ed7dea4acb4654e31d28d1

diff --git a/src/main/java/org/gradle/profiler/yourkit/YourKit.java b/src/main/java/org/gradle/profiler/yourkit/YourKit.java index d1f5cf55..e6cb56d6 100644 --- a/src/main/java/org/gradle/profiler/yourkit/YourKit.java +++ b/src/main/java/org/gradle/profiler/yourkit/YourKit.java @@ -38,7 +38,7 @@ public static File findControllerJar() { public static File findJniLib() { File yourKitHome = findYourKitHome(); if (OperatingSystem.isWindows()) { - return tryLocations(yourKitHome, "bin/win64/yjpagent.dll"); + return tryLocations(yourKitHome, "bin/win64/yjpagent.dll", "bin/windows-x86-64/yjpagent.dll"); } String macLibLocationPrefix = "Contents/Resources/bin/mac/libyjpagent."; return tryLocations(yourKitHome, macLibLocationPrefix + "jnilib", macLibLocationPrefix + "dylib", "bin/linux-x86-64/libyjpagent.so");

['src/main/java/org/gradle/profiler/yourkit/YourKit.java']

{'.java': 1}

Java

{'Java': 569946, 'Groovy': 279034, 'Perl': 35996, 'Kotlin': 28566, 'HTML': 16578, 'JavaScript': 9668, 'XSLT': 1566}

Apache License 2.0

google/conscrypt/920/902

google

conscrypt

https://github.com/google/conscrypt/issues/902

https://github.com/google/conscrypt/pull/920

https://github.com/google/conscrypt/pull/920

fixes

isAssignableFrom checks in KeyFactorySpi.engineGetKeySpec appear to be backwards

I would like to report a minor bug in Conscrypt's KeyFactorySpi.engineGetKeySpec implementations. This bug appears to impact both [OpenSSLRSAKeyFactory](https://github.com/google/conscrypt/blob/6e29d195147e73f824ae3a7576f791eb4bb165df/common/src/main/java/org/conscrypt/OpenSSLRSAKeyFactory.java#L77-L181) and [OpenSSLECKeyFactory](https://github.com/google/conscrypt/blob/6e29d195147e73f824ae3a7576f791eb4bb165df/common/src/main/java/org/conscrypt/OpenSSLECKeyFactory.java#L76-L145). Specifically, the "isAssignableFrom" checks in "engineGetKeySpec" appear to be backwards. The intent of these checks is to ensure that the KeySpec implementation understood by the KeyFactorySpi implements or extends the requested KeySpec and thus can be safely cast to it. Instead, it incorrectly checks to see if the requested KeySpec implements or extends the concrete implementation. The vast majority of the time the requested KeySpec is equal to the concrete implementation so the inversion does not matter. There are two user/developer facing implications of these bugs. * If a caller requests a subclass of the known KeySpec implementation, then the OpenJDK engineGetKeySpec implementations will incorrectly throw a "ClassCastException" rather than an "InvalidKeySpec". * If a caller requests a RSAPrivateKeySpec for an RSAPrivateCrtKey, then sun.security.rsa.RSAKeyFactory.engineGetKeySpec will return an instance of RSAPrivateKeySpec rather than opportunistically returning the subclass RSAPrivateCrtKeySpec (as appears to be the intention). This means that the CRT parameters will be lost and any keys created from the returned KeySpec will lack the CRT parameters and be less efficient. Both of these behaviors can be seen for the RSAKeyFactory in the following sample code: ``` import org.conscrypt.OpenSSLProvider; import java.security.KeyFactory; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.Security; import java.security.spec.*; public class BadSpecChecks { public static void main(String[] args) throws Exception { Security.insertProviderAt(new OpenSSLProvider(), 1); KeyPairGenerator kg = KeyPairGenerator.getInstance("RSA"); kg.initialize(2048); KeyPair pair = kg.generateKeyPair(); KeyFactory factory = KeyFactory.getInstance("RSA"); System.out.println("Since RSAPrivateCrtKeySpec inherits from RSAPrivateKeySpec, we'd expect this next line to return an instance of RSAPrivateKeySpec (because the private key has CRT parts). It doesn't."); KeySpec spec = factory.getKeySpec(pair.getPrivate(), RSAPrivateKeySpec.class); System.out.println(spec.getClass()); System.out.println("This next line should give an InvalidKeySpec exception"); try { FakeX509Spec oddSpec = factory.getKeySpec(pair.getPublic(), FakeX509Spec.class); System.out.println("This line shouldn't be reached."); } catch (final InvalidKeySpecException ex) { System.out.println("Caught expected exception"); ex.printStackTrace(System.out); } } public static class FakeX509Spec extends X509EncodedKeySpec { public FakeX509Spec(byte[] encodedKey) { super(encodedKey); } public FakeX509Spec(byte[] encodedKey, String algorithm) { super(encodedKey, algorithm); } } } ``` Please note that this bug is equivalent to [JDK-8254717](https://bugs.openjdk.java.net/browse/JDK-8254717)

ae487934dcc1ec3d3c37a6084b07632f7ef76d38

46ed27fda6350590b148a77037e2000e6f6ba1f7

https://github.com/google/conscrypt/compare/ae487934dcc1ec3d3c37a6084b07632f7ef76d38...46ed27fda6350590b148a77037e2000e6f6ba1f7

diff --git a/common/src/main/java/org/conscrypt/OpenSSLECKeyFactory.java b/common/src/main/java/org/conscrypt/OpenSSLECKeyFactory.java index 596e8711..b10e3391 100644 --- a/common/src/main/java/org/conscrypt/OpenSSLECKeyFactory.java +++ b/common/src/main/java/org/conscrypt/OpenSSLECKeyFactory.java @@ -87,12 +87,12 @@ public final class OpenSSLECKeyFactory extends KeyFactorySpi { throw new InvalidKeySpecException("Key must be an EC key"); } - if (key instanceof ECPublicKey && ECPublicKeySpec.class.isAssignableFrom(keySpec)) { + if (key instanceof ECPublicKey && keySpec.isAssignableFrom(ECPublicKeySpec.class)) { ECPublicKey ecKey = (ECPublicKey) key; @SuppressWarnings("unchecked") T result = (T) new ECPublicKeySpec(ecKey.getW(), ecKey.getParams()); return result; - } else if (key instanceof PublicKey && ECPublicKeySpec.class.isAssignableFrom(keySpec)) { + } else if (key instanceof PublicKey && keySpec.isAssignableFrom(ECPublicKeySpec.class)) { final byte[] encoded = key.getEncoded(); if (!"X.509".equals(key.getFormat()) || encoded == null) { throw new InvalidKeySpecException("Not a valid X.509 encoding"); @@ -102,12 +102,12 @@ public final class OpenSSLECKeyFactory extends KeyFactorySpi { T result = (T) new ECPublicKeySpec(ecKey.getW(), ecKey.getParams()); return result; } else if (key instanceof ECPrivateKey - && ECPrivateKeySpec.class.isAssignableFrom(keySpec)) { + && keySpec.isAssignableFrom(ECPrivateKeySpec.class)) { ECPrivateKey ecKey = (ECPrivateKey) key; @SuppressWarnings("unchecked") T result = (T) new ECPrivateKeySpec(ecKey.getS(), ecKey.getParams()); return result; - } else if (key instanceof PrivateKey && ECPrivateKeySpec.class.isAssignableFrom(keySpec)) { + } else if (key instanceof PrivateKey && keySpec.isAssignableFrom(ECPrivateKeySpec.class)) { final byte[] encoded = key.getEncoded(); if (!"PKCS#8".equals(key.getFormat()) || encoded == null) { throw new InvalidKeySpecException("Not a valid PKCS#8 encoding"); @@ -118,7 +118,7 @@ public final class OpenSSLECKeyFactory extends KeyFactorySpi { T result = (T) new ECPrivateKeySpec(ecKey.getS(), ecKey.getParams()); return result; } else if (key instanceof PrivateKey - && PKCS8EncodedKeySpec.class.isAssignableFrom(keySpec)) { + && keySpec.isAssignableFrom(PKCS8EncodedKeySpec.class)) { final byte[] encoded = key.getEncoded(); if (!"PKCS#8".equals(key.getFormat())) { throw new InvalidKeySpecException("Encoding type must be PKCS#8; was " @@ -128,7 +128,7 @@ public final class OpenSSLECKeyFactory extends KeyFactorySpi { } @SuppressWarnings("unchecked") T result = (T) new PKCS8EncodedKeySpec(encoded); return result; - } else if (key instanceof PublicKey && X509EncodedKeySpec.class.isAssignableFrom(keySpec)) { + } else if (key instanceof PublicKey && keySpec.isAssignableFrom(X509EncodedKeySpec.class)) { final byte[] encoded = key.getEncoded(); if (!"X.509".equals(key.getFormat())) { throw new InvalidKeySpecException("Encoding type must be X.509; was " diff --git a/common/src/main/java/org/conscrypt/OpenSSLRSAKeyFactory.java b/common/src/main/java/org/conscrypt/OpenSSLRSAKeyFactory.java index ce08d50e..073821e0 100644 --- a/common/src/main/java/org/conscrypt/OpenSSLRSAKeyFactory.java +++ b/common/src/main/java/org/conscrypt/OpenSSLRSAKeyFactory.java @@ -88,12 +88,12 @@ public final class OpenSSLRSAKeyFactory extends KeyFactorySpi { throw new InvalidKeySpecException("Key must be a RSA key"); } - if (key instanceof RSAPublicKey && RSAPublicKeySpec.class.isAssignableFrom(keySpec)) { + if (key instanceof RSAPublicKey && keySpec.isAssignableFrom(RSAPublicKeySpec.class)) { RSAPublicKey rsaKey = (RSAPublicKey) key; @SuppressWarnings("unchecked") T result = (T) new RSAPublicKeySpec(rsaKey.getModulus(), rsaKey.getPublicExponent()); return result; - } else if (key instanceof PublicKey && RSAPublicKeySpec.class.isAssignableFrom(keySpec)) { + } else if (key instanceof PublicKey && keySpec.isAssignableFrom(RSAPublicKeySpec.class)) { final byte[] encoded = key.getEncoded(); if (!"X.509".equals(key.getFormat()) || encoded == null) { throw new InvalidKeySpecException("Not a valid X.509 encoding"); @@ -104,7 +104,7 @@ public final class OpenSSLRSAKeyFactory extends KeyFactorySpi { T result = (T) new RSAPublicKeySpec(rsaKey.getModulus(), rsaKey.getPublicExponent()); return result; } else if (key instanceof RSAPrivateCrtKey - && RSAPrivateCrtKeySpec.class.isAssignableFrom(keySpec)) { + && keySpec.isAssignableFrom(RSAPrivateCrtKeySpec.class)) { RSAPrivateCrtKey rsaKey = (RSAPrivateCrtKey) key; @SuppressWarnings("unchecked") T result = (T) new RSAPrivateCrtKeySpec(rsaKey.getModulus(), rsaKey.getPublicExponent(), @@ -113,19 +113,19 @@ public final class OpenSSLRSAKeyFactory extends KeyFactorySpi { rsaKey.getCrtCoefficient()); return result; } else if (key instanceof RSAPrivateCrtKey - && RSAPrivateKeySpec.class.isAssignableFrom(keySpec)) { + && keySpec.isAssignableFrom(RSAPrivateKeySpec.class)) { RSAPrivateCrtKey rsaKey = (RSAPrivateCrtKey) key; @SuppressWarnings("unchecked") T result = (T) new RSAPrivateKeySpec(rsaKey.getModulus(), rsaKey.getPrivateExponent()); return result; } else if (key instanceof RSAPrivateKey - && RSAPrivateKeySpec.class.isAssignableFrom(keySpec)) { + && keySpec.isAssignableFrom(RSAPrivateKeySpec.class)) { RSAPrivateKey rsaKey = (RSAPrivateKey) key; @SuppressWarnings("unchecked") T result = (T) new RSAPrivateKeySpec(rsaKey.getModulus(), rsaKey.getPrivateExponent()); return result; } else if (key instanceof PrivateKey - && RSAPrivateCrtKeySpec.class.isAssignableFrom(keySpec)) { + && keySpec.isAssignableFrom(RSAPrivateCrtKeySpec.class)) { final byte[] encoded = key.getEncoded(); if (!"PKCS#8".equals(key.getFormat()) || encoded == null) { throw new InvalidKeySpecException("Not a valid PKCS#8 encoding"); @@ -143,7 +143,7 @@ public final class OpenSSLRSAKeyFactory extends KeyFactorySpi { } else { throw new InvalidKeySpecException("Encoded key is not an RSAPrivateCrtKey"); } - } else if (key instanceof PrivateKey && RSAPrivateKeySpec.class.isAssignableFrom(keySpec)) { + } else if (key instanceof PrivateKey && keySpec.isAssignableFrom(RSAPrivateKeySpec.class)) { final byte[] encoded = key.getEncoded(); if (!"PKCS#8".equals(key.getFormat()) || encoded == null) { throw new InvalidKeySpecException("Not a valid PKCS#8 encoding"); @@ -154,7 +154,7 @@ public final class OpenSSLRSAKeyFactory extends KeyFactorySpi { T result = (T) new RSAPrivateKeySpec(rsaKey.getModulus(), rsaKey.getPrivateExponent()); return result; } else if (key instanceof PrivateKey - && PKCS8EncodedKeySpec.class.isAssignableFrom(keySpec)) { + && keySpec.isAssignableFrom(PKCS8EncodedKeySpec.class)) { final byte[] encoded = key.getEncoded(); if (!"PKCS#8".equals(key.getFormat())) { throw new InvalidKeySpecException("Encoding type must be PKCS#8; was " @@ -164,7 +164,7 @@ public final class OpenSSLRSAKeyFactory extends KeyFactorySpi { } @SuppressWarnings("unchecked") T result = (T) new PKCS8EncodedKeySpec(encoded); return result; - } else if (key instanceof PublicKey && X509EncodedKeySpec.class.isAssignableFrom(keySpec)) { + } else if (key instanceof PublicKey && keySpec.isAssignableFrom(X509EncodedKeySpec.class)) { final byte[] encoded = key.getEncoded(); if (!"X.509".equals(key.getFormat())) { throw new InvalidKeySpecException("Encoding type must be X.509; was " diff --git a/common/src/test/java/org/conscrypt/java/security/KeyFactoryTestEC.java b/common/src/test/java/org/conscrypt/java/security/KeyFactoryTestEC.java index ee8fd515..dab3852e 100644 --- a/common/src/test/java/org/conscrypt/java/security/KeyFactoryTestEC.java +++ b/common/src/test/java/org/conscrypt/java/security/KeyFactoryTestEC.java @@ -15,54 +15,129 @@ */ package org.conscrypt.java.security; +import static org.junit.Assert.fail; + +import java.math.BigInteger; +import java.security.KeyFactory; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; +import java.security.Provider; +import java.security.Security; import java.security.interfaces.ECPrivateKey; import java.security.interfaces.ECPublicKey; +import java.security.spec.ECParameterSpec; +import java.security.spec.ECPoint; import java.security.spec.ECPrivateKeySpec; import java.security.spec.ECPublicKeySpec; import java.security.spec.InvalidKeySpecException; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; import java.util.Arrays; import java.util.List; +import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import tests.util.ServiceTester; @RunWith(JUnit4.class) -public class KeyFactoryTestEC extends - AbstractKeyFactoryTest<ECPublicKeySpec, ECPrivateKeySpec> { - - public KeyFactoryTestEC() { - super("EC", ECPublicKeySpec.class, ECPrivateKeySpec.class); - } - - @Override - public ServiceTester customizeTester(ServiceTester tester) { - // BC's EC keys always use explicit params, even though it's a bad idea, and we don't support - // those, so don't test BC keys - return tester.skipProvider("BC"); - } - - @Override - protected void check(KeyPair keyPair) throws Exception { - new SignatureHelper("SHA256withECDSA").test(keyPair); - } - - @Override - protected List<KeyPair> getKeys() throws NoSuchAlgorithmException, InvalidKeySpecException { - return Arrays.asList( - new KeyPair( - DefaultKeys.getPublicKey("EC"), - DefaultKeys.getPrivateKey("EC") - ), - new KeyPair( - new TestPublicKey(DefaultKeys.getPublicKey("EC")), - new TestPrivateKey(DefaultKeys.getPrivateKey("EC")) - ), - new KeyPair( - new TestECPublicKey((ECPublicKey)DefaultKeys.getPublicKey("EC")), - new TestECPrivateKey((ECPrivateKey)DefaultKeys.getPrivateKey("EC")) - ) - ); - } +public class KeyFactoryTestEC extends AbstractKeyFactoryTest<ECPublicKeySpec, ECPrivateKeySpec> { + public KeyFactoryTestEC() { + super("EC", ECPublicKeySpec.class, ECPrivateKeySpec.class); + } + + @Override + public ServiceTester customizeTester(ServiceTester tester) { + // BC's EC keys always use explicit params, even though it's a bad idea, and we don't + // support those, so don't test BC keys + return tester.skipProvider("BC"); + } + + @Override + protected void check(KeyPair keyPair) throws Exception { + new SignatureHelper("SHA256withECDSA").test(keyPair); + } + + @Override + protected List<KeyPair> getKeys() throws NoSuchAlgorithmException, InvalidKeySpecException { + return Arrays.asList( + new KeyPair(DefaultKeys.getPublicKey("EC"), DefaultKeys.getPrivateKey("EC")), + new KeyPair(new TestPublicKey(DefaultKeys.getPublicKey("EC")), + new TestPrivateKey(DefaultKeys.getPrivateKey("EC"))), + new KeyPair(new TestECPublicKey((ECPublicKey) DefaultKeys.getPublicKey("EC")), + new TestECPrivateKey((ECPrivateKey) DefaultKeys.getPrivateKey("EC")))); + } + + @Test + public void shouldThrowInvalidKeySpecException_whenKeySpecIsOdd() throws Exception { + Provider p = Security.getProvider(StandardNames.JSSE_PROVIDER_NAME); + final KeyFactory factory = KeyFactory.getInstance("EC", p); + + try { + factory.getKeySpec(new TestECPublicKey((ECPublicKey) DefaultKeys.getPublicKey("EC")), + FakeECPublicKeySpec.class); + fail(); + } catch (InvalidKeySpecException e) { + // expected + } + + try { + factory.getKeySpec(DefaultKeys.getPublicKey("EC"), FakeECPublicKeySpec.class); + fail(); + } catch (InvalidKeySpecException e) { + // expected + } + + try { + factory.getKeySpec(new TestECPrivateKey((ECPrivateKey) DefaultKeys.getPrivateKey("EC")), + FakeECPrivateKeySpec.class); + fail(); + } catch (InvalidKeySpecException e) { + // expected + } + + try { + factory.getKeySpec(DefaultKeys.getPrivateKey("EC"), FakeECPrivateKeySpec.class); + fail(); + } catch (InvalidKeySpecException e) { + // expected + } + + try { + factory.getKeySpec(DefaultKeys.getPrivateKey("EC"), FakePKCS8.class); + fail(); + } catch (InvalidKeySpecException e) { + // expected + } + + try { + factory.getKeySpec(DefaultKeys.getPublicKey("EC"), FakeX509.class); + fail(); + } catch (InvalidKeySpecException e) { + // expected + } + } + + private static class FakeECPublicKeySpec extends ECPublicKeySpec { + public FakeECPublicKeySpec(ECPoint w, ECParameterSpec params) { + super(w, params); + } + } + + private static class FakeECPrivateKeySpec extends ECPrivateKeySpec { + public FakeECPrivateKeySpec(BigInteger s, ECParameterSpec params) { + super(s, params); + } + } + + private static class FakePKCS8 extends PKCS8EncodedKeySpec { + public FakePKCS8(byte[] encodedKey) { + super(encodedKey); + } + } + + private static class FakeX509 extends X509EncodedKeySpec { + public FakeX509(byte[] encodedKey) { + super(encodedKey); + } + } } diff --git a/common/src/test/java/org/conscrypt/java/security/KeyFactoryTestRSA.java b/common/src/test/java/org/conscrypt/java/security/KeyFactoryTestRSA.java index c8fc2da0..76608ad5 100644 --- a/common/src/test/java/org/conscrypt/java/security/KeyFactoryTestRSA.java +++ b/common/src/test/java/org/conscrypt/java/security/KeyFactoryTestRSA.java @@ -17,12 +17,15 @@ package org.conscrypt.java.security; import static org.junit.Assert.fail; +import java.math.BigInteger; import java.security.KeyFactory; import java.security.KeyPair; +import java.security.KeyPairGenerator; import java.security.PrivateKey; import java.security.Provider; import java.security.PublicKey; import java.security.Security; +import java.security.interfaces.RSAPrivateCrtKey; import java.security.spec.InvalidKeySpecException; import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.RSAPrivateCrtKeySpec; @@ -34,9 +37,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @RunWith(JUnit4.class) -public class KeyFactoryTestRSA extends - AbstractKeyFactoryTest<RSAPublicKeySpec, RSAPrivateKeySpec> { - +public class KeyFactoryTestRSA extends AbstractKeyFactoryTest<RSAPublicKeySpec, RSAPrivateKeySpec> { public KeyFactoryTestRSA() { super("RSA", RSAPublicKeySpec.class, RSAPrivateKeySpec.class); } @@ -65,13 +66,13 @@ public class KeyFactoryTestRSA extends } @Test - public void testInvalidKeySpec() throws Exception { + public void shouldThrowInvalidKeySpec_whenKeyIsInvalid() throws Exception { Provider p = Security.getProvider(StandardNames.JSSE_PROVIDER_NAME); final KeyFactory factory = KeyFactory.getInstance("RSA", p); try { factory.getKeySpec(new TestPrivateKey(DefaultKeys.getPrivateKey("RSA"), "Invalid"), - RSAPrivateKeySpec.class); + RSAPrivateKeySpec.class); fail(); } catch (InvalidKeySpecException e) { // expected @@ -79,7 +80,7 @@ public class KeyFactoryTestRSA extends try { factory.getKeySpec(new TestPrivateKey(DefaultKeys.getPrivateKey("RSA"), "Invalid"), - RSAPrivateCrtKeySpec.class); + RSAPrivateCrtKeySpec.class); fail(); } catch (InvalidKeySpecException e) { // expected @@ -87,10 +88,86 @@ public class KeyFactoryTestRSA extends try { factory.getKeySpec(new TestPublicKey(DefaultKeys.getPublicKey("RSA"), "Invalid"), - RSAPublicKeySpec.class); + RSAPublicKeySpec.class); + fail(); + } catch (InvalidKeySpecException e) { + // expected + } + } + + @Test + public void shouldThrowInvalidKeySpec_whenKeySpecIsOdd() throws Exception { + Provider p = Security.getProvider(StandardNames.JSSE_PROVIDER_NAME); + final KeyFactory factory = KeyFactory.getInstance("RSA", p); + + try { + factory.getKeySpec(DefaultKeys.getPublicKey("RSA"), FakeRSAPublicKeySpec.class); + fail(); + } catch (InvalidKeySpecException e) { + // expected + } + + try { + factory.getKeySpec(generateRsaKey(), FakeRSAPrivateCrtKeySpec.class); fail(); } catch (InvalidKeySpecException e) { // expected } + + try { + factory.getKeySpec(DefaultKeys.getPrivateKey("RSA"), FakeRSAPrivateCrtKeySpec.class); + fail(); + } catch (InvalidKeySpecException e) { + // expected + } + + try { + factory.getKeySpec(DefaultKeys.getPrivateKey("RSA"), FakePKCS8.class); + fail(); + } catch (InvalidKeySpecException e) { + // expected + } + + try { + factory.getKeySpec(DefaultKeys.getPublicKey("RSA"), FakeX509.class); + fail(); + } catch (InvalidKeySpecException e) { + // expected + } + } + + private static RSAPrivateCrtKey generateRsaKey() throws Exception { + KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA"); + kpg.initialize(512); + + KeyPair keyPair = kpg.generateKeyPair(); + return (RSAPrivateCrtKey) keyPair.getPrivate(); + } + + private static class FakeRSAPublicKeySpec extends RSAPublicKeySpec { + public FakeRSAPublicKeySpec(BigInteger modulus, BigInteger publicExponent) { + super(modulus, publicExponent); + } + } + + private static class FakePKCS8 extends PKCS8EncodedKeySpec { + public FakePKCS8(byte[] encodedKey) { + super(encodedKey); + } + } + + private static class FakeRSAPrivateCrtKeySpec extends RSAPrivateCrtKeySpec { + public FakeRSAPrivateCrtKeySpec(BigInteger modulus, BigInteger publicExponent, + BigInteger privateExponent, BigInteger primeP, BigInteger primeQ, + BigInteger primeExponentP, BigInteger primeExponentQ, BigInteger crtCoefficient) { + super(modulus, publicExponent, privateExponent, primeP, primeQ, primeExponentP, + primeExponentQ, crtCoefficient); + } + } + + private static class FakeX509 extends X509EncodedKeySpec { + public FakeX509(byte[] encodedKey) { + super(encodedKey); + } } }

['common/src/main/java/org/conscrypt/OpenSSLRSAKeyFactory.java', 'common/src/main/java/org/conscrypt/OpenSSLECKeyFactory.java', 'common/src/test/java/org/conscrypt/java/security/KeyFactoryTestRSA.java', 'common/src/test/java/org/conscrypt/java/security/KeyFactoryTestEC.java']

{'.java': 4}

Java

{'Java': 3533745, 'C++': 526129, 'C': 7529, 'Python': 6764, 'Shell': 5171, 'Dockerfile': 3414, 'CMake': 1784, 'PowerShell': 1675, 'Batchfile': 1140, 'HTML': 756}

Apache License 2.0

google/conscrypt/843/840

google

conscrypt

https://github.com/google/conscrypt/issues/840

https://github.com/google/conscrypt/pull/843

https://github.com/google/conscrypt/pull/843

fixes

SSLEngine.beginHandshake() should throw SSLException after it was closed

During testing conscrypt in the netty testsuite we encountered that Conscrypt does not correct implement SSLEngine.beginHandshake(). See https://github.com/netty/netty/pull/10211/files#diff-08da41869dfc1d842df441440b1c605bR2084 If you call `beginHandshake()` after the engine was closed it must throw an `SSLException`. At the moment it throws an `IllegalStateException`. See also https://docs.oracle.com/javase/7/docs/api/javax/net/ssl/SSLEngine.html#beginHandshake()

78433b95e34e7455a2dcd6aedfbf5708f34c1650

2f7404fa4ca6de8683dbeb75f732cd4ad7235395

https://github.com/google/conscrypt/compare/78433b95e34e7455a2dcd6aedfbf5708f34c1650...2f7404fa4ca6de8683dbeb75f732cd4ad7235395

diff --git a/common/src/main/java/org/conscrypt/ConscryptEngine.java b/common/src/main/java/org/conscrypt/ConscryptEngine.java index f1eedcc7..8df11b5b 100644 --- a/common/src/main/java/org/conscrypt/ConscryptEngine.java +++ b/common/src/main/java/org/conscrypt/ConscryptEngine.java @@ -413,7 +413,7 @@ final class ConscryptEngine extends AbstractConscryptEngine implements NativeCry case STATE_CLOSED_INBOUND: case STATE_CLOSED_OUTBOUND: case STATE_CLOSED: - throw new IllegalStateException("Engine has already been closed"); + throw new SSLHandshakeException("Engine has already been closed"); default: // We've already started the handshake, just return return;

['common/src/main/java/org/conscrypt/ConscryptEngine.java']

{'.java': 1}

Java

{'Java': 3533745, 'C++': 526129, 'C': 7529, 'Python': 6764, 'Shell': 5171, 'Dockerfile': 3414, 'CMake': 1784, 'PowerShell': 1675, 'Batchfile': 1140, 'HTML': 756}

Apache License 2.0

google/conscrypt/785/781

google

conscrypt

https://github.com/google/conscrypt/issues/781

https://github.com/google/conscrypt/pull/785

https://github.com/google/conscrypt/pull/785

fixes

NullPointerException in getAlpnSelectedProtocol

We’ve got the exact same crash as #379 but this time we’re calling `getAlpnSelectedProtocol()` instead of `getProtocol()`. I presume the same fix will work: cache more session state when the connection is closed. ``` FATAL EXCEPTION: MockWebServer Process: com.xxx.xxx.xxx, PID: 5607 java.lang.AssertionError: java.lang.reflect.InvocationTargetException at okhttp3.internal.platform.android.AndroidSocketAdapter.a(SourceFile:86) at okhttp3.internal.platform.AndroidPlatform.b(SourceFile:86) at okhttp3.mockwebserver.MockWebServer$SocketHandler.handle(MockWebServer.kt:516) at okhttp3.mockwebserver.MockWebServer$serveConnection$$inlined$execute$1.run(Util.kt:580) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1167) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:641) at java.lang.Thread.run(Thread.java:764) Caused by: java.lang.reflect.InvocationTargetException at java.lang.reflect.Method.invoke(Native Method) at okhttp3.internal.platform.android.AndroidSocketAdapter.a(SourceFile:81) ... 6 more Caused by: java.lang.NullPointerException: ssl == null at com.android.org.conscrypt.NativeCrypto.getApplicationProtocol(Native Method) at com.android.org.conscrypt.NativeSsl.getApplicationProtocol(NativeSsl.java:568) at com.android.org.conscrypt.ConscryptFileDescriptorSocket.getApplicationProtocol(ConscryptFileDescriptorSocket.java:1085) at com.android.org.conscrypt.OpenSSLSocketImpl.getAlpnSelectedProtocol(OpenSSLSocketImpl.java:134) ... 8 more ```

d2aa6104ac4a9c92a36213bce65f144efdcd1a1b

d28d0a8d85a0461baa1cb29aec8dd813384f2ee1

https://github.com/google/conscrypt/compare/d2aa6104ac4a9c92a36213bce65f144efdcd1a1b...d28d0a8d85a0461baa1cb29aec8dd813384f2ee1

diff --git a/common/src/main/java/org/conscrypt/ActiveSession.java b/common/src/main/java/org/conscrypt/ActiveSession.java index 4726499a..b00a3fa5 100644 --- a/common/src/main/java/org/conscrypt/ActiveSession.java +++ b/common/src/main/java/org/conscrypt/ActiveSession.java @@ -37,6 +37,7 @@ final class ActiveSession implements ConscryptSession { private byte[] id; private long creationTime; private String protocol; + private String applicationProtocol; private String peerHost; private int peerPort = -1; private long lastAccessedTime = 0; @@ -153,25 +154,25 @@ final class ActiveSession implements ConscryptSession { @Override public void putValue(String name, Object value) { throw new UnsupportedOperationException( - "All calls to this method should be intercepted by ProvidedSessionDecorator."); + "All calls to this method should be intercepted by ExternalSession."); } @Override public Object getValue(String name) { throw new UnsupportedOperationException( - "All calls to this method should be intercepted by ProvidedSessionDecorator."); + "All calls to this method should be intercepted by ExternalSession."); } @Override public void removeValue(String name) { throw new UnsupportedOperationException( - "All calls to this method should be intercepted by ProvidedSessionDecorator."); + "All calls to this method should be intercepted by ExternalSession."); } @Override public String[] getValueNames() { throw new UnsupportedOperationException( - "All calls to this method should be intercepted by ProvidedSessionDecorator."); + "All calls to this method should be intercepted by ExternalSession."); } @Override @@ -275,6 +276,18 @@ final class ActiveSession implements ConscryptSession { return NativeConstants.SSL3_RT_MAX_PLAIN_LENGTH; } + @Override + public String getApplicationProtocol() { + String applicationProtocol = this.applicationProtocol; + if (applicationProtocol == null) { + synchronized (ssl) { + applicationProtocol = SSLUtils.toProtocolString(ssl.getApplicationProtocol()); + } + this.applicationProtocol = applicationProtocol; + } + return applicationProtocol; + } + /** * Configures the peer information once it has been received by the handshake. */ diff --git a/common/src/main/java/org/conscrypt/ConscryptFileDescriptorSocket.java b/common/src/main/java/org/conscrypt/ConscryptFileDescriptorSocket.java index efbc80a0..aa17760a 100644 --- a/common/src/main/java/org/conscrypt/ConscryptFileDescriptorSocket.java +++ b/common/src/main/java/org/conscrypt/ConscryptFileDescriptorSocket.java @@ -1118,7 +1118,7 @@ class ConscryptFileDescriptorSocket extends OpenSSLSocketImpl @Override public final String getApplicationProtocol() { - return SSLUtils.toProtocolString(ssl.getApplicationProtocol()); + return provideSession().getApplicationProtocol(); } @Override diff --git a/common/src/main/java/org/conscrypt/ConscryptSession.java b/common/src/main/java/org/conscrypt/ConscryptSession.java index e59c1921..ce89b418 100644 --- a/common/src/main/java/org/conscrypt/ConscryptSession.java +++ b/common/src/main/java/org/conscrypt/ConscryptSession.java @@ -52,4 +52,6 @@ interface ConscryptSession extends SSLSession { @Override X509Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException; + + String getApplicationProtocol(); } diff --git a/common/src/main/java/org/conscrypt/ExternalSession.java b/common/src/main/java/org/conscrypt/ExternalSession.java index 38a96c1b..18c67a3f 100644 --- a/common/src/main/java/org/conscrypt/ExternalSession.java +++ b/common/src/main/java/org/conscrypt/ExternalSession.java @@ -47,7 +47,7 @@ import javax.security.cert.X509Certificate; */ final class ExternalSession implements ConscryptSession { - // Use an initialcapacity of 2 to keep it small in the average case. + // Use an initial capacity of 2 to keep it small in the average case. private final HashMap<String, Object> values = new HashMap<String, Object>(2); private final Provider provider; @@ -156,6 +156,11 @@ final class ExternalSession implements ConscryptSession { return provider.provideSession().getApplicationBufferSize(); } + @Override + public String getApplicationProtocol() { + return provider.provideSession().getApplicationProtocol(); + } + @Override public Object getValue(String name) { if (name == null) { diff --git a/common/src/main/java/org/conscrypt/Java7ExtendedSSLSession.java b/common/src/main/java/org/conscrypt/Java7ExtendedSSLSession.java index 32cb0823..10b11046 100644 --- a/common/src/main/java/org/conscrypt/Java7ExtendedSSLSession.java +++ b/common/src/main/java/org/conscrypt/Java7ExtendedSSLSession.java @@ -177,4 +177,9 @@ class Java7ExtendedSSLSession extends ExtendedSSLSession implements ConscryptSes public final int getApplicationBufferSize() { return delegate.getApplicationBufferSize(); } + + @Override + public String getApplicationProtocol() { + return delegate.getApplicationProtocol(); + } } diff --git a/common/src/main/java/org/conscrypt/SSLNullSession.java b/common/src/main/java/org/conscrypt/SSLNullSession.java index 0cc9066a..b2668439 100644 --- a/common/src/main/java/org/conscrypt/SSLNullSession.java +++ b/common/src/main/java/org/conscrypt/SSLNullSession.java @@ -75,6 +75,11 @@ final class SSLNullSession implements ConscryptSession, Cloneable { return NativeConstants.SSL3_RT_MAX_PLAIN_LENGTH; } + @Override + public String getApplicationProtocol() { + return null; + } + @Override public String getCipherSuite() { return INVALID_CIPHER; @@ -149,13 +154,13 @@ final class SSLNullSession implements ConscryptSession, Cloneable { @Override public Object getValue(String name) { throw new UnsupportedOperationException( - "All calls to this method should be intercepted by ProvidedSessionDecorator."); + "All calls to this method should be intercepted by ExternalSession."); } @Override public String[] getValueNames() { throw new UnsupportedOperationException( - "All calls to this method should be intercepted by ProvidedSessionDecorator."); + "All calls to this method should be intercepted by ExternalSession."); } @Override @@ -170,12 +175,12 @@ final class SSLNullSession implements ConscryptSession, Cloneable { @Override public void putValue(String name, Object value) { throw new UnsupportedOperationException( - "All calls to this method should be intercepted by ProvidedSessionDecorator."); + "All calls to this method should be intercepted by ExternalSession."); } @Override public void removeValue(String name) { throw new UnsupportedOperationException( - "All calls to this method should be intercepted by ProvidedSessionDecorator."); + "All calls to this method should be intercepted by ExternalSession."); } } diff --git a/common/src/main/java/org/conscrypt/SessionSnapshot.java b/common/src/main/java/org/conscrypt/SessionSnapshot.java index d4a8bff4..28e63b96 100644 --- a/common/src/main/java/org/conscrypt/SessionSnapshot.java +++ b/common/src/main/java/org/conscrypt/SessionSnapshot.java @@ -39,6 +39,7 @@ final class SessionSnapshot implements ConscryptSession { private final String cipherSuite; private final String protocol; private final String peerHost; + private final String applicationProtocol; private final int peerPort; SessionSnapshot(ConscryptSession session) { @@ -53,6 +54,7 @@ final class SessionSnapshot implements ConscryptSession { protocol = session.getProtocol(); peerHost = session.getPeerHost(); peerPort = session.getPeerPort(); + applicationProtocol = session.getApplicationProtocol(); } @Override @@ -107,25 +109,25 @@ final class SessionSnapshot implements ConscryptSession { @Override public void putValue(String s, Object o) { throw new UnsupportedOperationException( - "All calls to this method should be intercepted by ProvidedSessionDecorator."); + "All calls to this method should be intercepted by ExternalSession."); } @Override public Object getValue(String s) { throw new UnsupportedOperationException( - "All calls to this method should be intercepted by ProvidedSessionDecorator."); + "All calls to this method should be intercepted by ExternalSession."); } @Override public void removeValue(String s) { throw new UnsupportedOperationException( - "All calls to this method should be intercepted by ProvidedSessionDecorator."); + "All calls to this method should be intercepted by ExternalSession."); } @Override public String[] getValueNames() { throw new UnsupportedOperationException( - "All calls to this method should be intercepted by ProvidedSessionDecorator."); + "All calls to this method should be intercepted by ExternalSession."); } @Override @@ -183,4 +185,9 @@ final class SessionSnapshot implements ConscryptSession { public int getApplicationBufferSize() { return NativeConstants.SSL3_RT_MAX_PLAIN_LENGTH; } + + @Override + public String getApplicationProtocol() { + return applicationProtocol; + } } diff --git a/openjdk/src/test/java/org/conscrypt/ConscryptEngineTest.java b/openjdk/src/test/java/org/conscrypt/ConscryptEngineTest.java index 6cdd235b..473cc738 100644 --- a/openjdk/src/test/java/org/conscrypt/ConscryptEngineTest.java +++ b/openjdk/src/test/java/org/conscrypt/ConscryptEngineTest.java @@ -375,16 +375,26 @@ public class ConscryptEngineTest { @Test public void savedSessionWorksAfterClose() throws Exception { + String alpnProtocol = "spdy/2"; + String[] alpnProtocols = new String[]{alpnProtocol}; + setupEngines(TestKeyStore.getClient(), TestKeyStore.getServer()); + Conscrypt.setApplicationProtocols(clientEngine, alpnProtocols); + Conscrypt.setApplicationProtocols(serverEngine, alpnProtocols); + doHandshake(true); SSLSession session = clientEngine.getSession(); String cipherSuite = session.getCipherSuite(); + String protocol = session.getProtocol(); + assertEquals(alpnProtocol, Conscrypt.getApplicationProtocol(clientEngine)); clientEngine.closeOutbound(); clientEngine.closeInbound(); assertEquals(cipherSuite, session.getCipherSuite()); + assertEquals(protocol, session.getProtocol()); + assertEquals(alpnProtocol, Conscrypt.getApplicationProtocol(clientEngine)); } private void doMutualAuthHandshake( diff --git a/openjdk/src/test/java/org/conscrypt/ConscryptSocketTest.java b/openjdk/src/test/java/org/conscrypt/ConscryptSocketTest.java index 7a15eefd..d0a7eb1d 100644 --- a/openjdk/src/test/java/org/conscrypt/ConscryptSocketTest.java +++ b/openjdk/src/test/java/org/conscrypt/ConscryptSocketTest.java @@ -623,15 +623,23 @@ public class ConscryptSocketTest { @Test public void savedSessionWorksAfterClose() throws Exception { + String alpnProtocol = "spdy/2"; + String[] alpnProtocols = new String[]{alpnProtocol}; TestConnection connection = new TestConnection(new X509Certificate[] {cert, ca}, certKey); + connection.clientHooks.alpnProtocols = alpnProtocols; + connection.serverHooks.alpnProtocols = alpnProtocols; connection.doHandshakeSuccess(); SSLSession session = connection.client.getSession(); String cipherSuite = session.getCipherSuite(); + String protocol = session.getProtocol(); + assertEquals(alpnProtocol, Conscrypt.getApplicationProtocol(connection.client)); connection.client.close(); assertEquals(cipherSuite, session.getCipherSuite()); + assertEquals(protocol, session.getProtocol()); + assertEquals(alpnProtocol, Conscrypt.getApplicationProtocol(connection.client)); } private static ServerSocket newServerSocket() throws IOException {

['common/src/main/java/org/conscrypt/ActiveSession.java', 'common/src/main/java/org/conscrypt/SessionSnapshot.java', 'common/src/main/java/org/conscrypt/ConscryptFileDescriptorSocket.java', 'openjdk/src/test/java/org/conscrypt/ConscryptSocketTest.java', 'openjdk/src/test/java/org/conscrypt/ConscryptEngineTest.java', 'common/src/main/java/org/conscrypt/SSLNullSession.java', 'common/src/main/java/org/conscrypt/ConscryptSession.java', 'common/src/main/java/org/conscrypt/Java7ExtendedSSLSession.java', 'common/src/main/java/org/conscrypt/ExternalSession.java']

{'.java': 9}

Java

{'Java': 3533745, 'C++': 526129, 'C': 7529, 'Python': 6764, 'Shell': 5171, 'Dockerfile': 3414, 'CMake': 1784, 'PowerShell': 1675, 'Batchfile': 1140, 'HTML': 756}

Apache License 2.0

google/conscrypt/784/783

google

conscrypt

https://github.com/google/conscrypt/issues/783

https://github.com/google/conscrypt/pull/784

https://github.com/google/conscrypt/pull/784

fixes

Possible java.util.ConcurrentModificationException when notifying handshake listeners

The listeners should be iterated that allows modification of the underlying list (such as using `toArray`). The listener implementation might remove the listener using `removeHandshakeCompletedListener` when notified. ``` Caused by: java.util.ConcurrentModificationException at java.base/java.util.ArrayList$Itr.checkForComodification(Unknown Source) at java.base/java.util.ArrayList$Itr.next(Unknown Source) at org.conscrypt.AbstractConscryptSocket.notifyHandshakeCompletedListeners(AbstractConscryptSocket.java:594) at org.conscrypt.ConscryptEngineSocket.onHandshakeFinished(ConscryptEngineSocket.java:515) at org.conscrypt.ConscryptEngineSocket.access$000(ConscryptEngineSocket.java:50) at org.conscrypt.ConscryptEngineSocket$1.onHandshakeFinished(ConscryptEngineSocket.java:120) at org.conscrypt.ConscryptEngine.finishHandshake(ConscryptEngine.java:1007) at org.conscrypt.ConscryptEngine.handshake(ConscryptEngine.java:996) ... 58 more ```

d2aa6104ac4a9c92a36213bce65f144efdcd1a1b

8ba5432c469d73062bd7e56f355729415e7a22ba

https://github.com/google/conscrypt/compare/d2aa6104ac4a9c92a36213bce65f144efdcd1a1b...8ba5432c469d73062bd7e56f355729415e7a22ba

diff --git a/common/src/main/java/org/conscrypt/AbstractConscryptSocket.java b/common/src/main/java/org/conscrypt/AbstractConscryptSocket.java index 7d67285b..1fe7a238 100644 --- a/common/src/main/java/org/conscrypt/AbstractConscryptSocket.java +++ b/common/src/main/java/org/conscrypt/AbstractConscryptSocket.java @@ -588,10 +588,11 @@ abstract class AbstractConscryptSocket extends SSLSocket { abstract void setApplicationProtocolSelector(ApplicationProtocolSelectorAdapter selector); final void notifyHandshakeCompletedListeners() { - if (listeners != null && !listeners.isEmpty()) { + List<HandshakeCompletedListener> listenersCopy = new ArrayList<>(listeners); + if (!listenersCopy.isEmpty()) { // notify the listeners HandshakeCompletedEvent event = new HandshakeCompletedEvent(this, getActiveSession()); - for (HandshakeCompletedListener listener : listeners) { + for (HandshakeCompletedListener listener : listenersCopy) { try { listener.handshakeCompleted(event); } catch (RuntimeException e) { diff --git a/common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java b/common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java index bfbd3a17..8f6c14b6 100644 --- a/common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java +++ b/common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java @@ -417,6 +417,7 @@ public class SSLSocketVersionCompatibilityTest { handshakeCompletedListenerCalled.notify(); } handshakeCompletedListenerCalled[0] = true; + socket.removeHandshakeCompletedListener(this); } catch (RuntimeException e) { throw e; } catch (Exception e) {

['common/src/main/java/org/conscrypt/AbstractConscryptSocket.java', 'common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java']

{'.java': 2}

Java

{'Java': 3533745, 'C++': 526129, 'C': 7529, 'Python': 6764, 'Shell': 5171, 'Dockerfile': 3414, 'CMake': 1784, 'PowerShell': 1675, 'Batchfile': 1140, 'HTML': 756}

Apache License 2.0

google/conscrypt/809/801

google

conscrypt

https://github.com/google/conscrypt/issues/801

https://github.com/google/conscrypt/pull/809

https://github.com/google/conscrypt/pull/809

fixes

resource stream leak on android

see log below from conscrypt 2.2.1 (2.3.0 is not yet available for android?) (tested on android 4.4) E/StrictMode: A resource was acquired at attached stack trace but never released. See java.io.Closeable for information on avoiding resource leaks. java.lang.Throwable: Explicit termination method 'end' not called at dalvik.system.CloseGuard.open(CloseGuard.java:184) at java.util.zip.Inflater.<init>(Inflater.java:82) at java.util.zip.ZipFile.getInputStream(ZipFile.java:310) at java.util.jar.JarFile.getInputStream(JarFile.java:409) at libcore.net.url.JarURLConnectionImpl.getInputStream(JarURLConnectionImpl.java:222) at java.net.URL.openStream(URL.java:470) at java.lang.ClassLoader.getResourceAsStream(ClassLoader.java:432) at java.lang.Class.getResourceAsStream(Class.java:1037) at org.conscrypt.Conscrypt.<clinit>(Conscrypt.java:80)

dec987186b9d716dd8814e7d22a61796c416e08c

64d4b3cbc43ca52b6b5784d3093637f7ada9bdde

https://github.com/google/conscrypt/compare/dec987186b9d716dd8814e7d22a61796c416e08c...64d4b3cbc43ca52b6b5784d3093637f7ada9bdde

diff --git a/common/src/main/java/org/conscrypt/Conscrypt.java b/common/src/main/java/org/conscrypt/Conscrypt.java index c562a69b..42440fdd 100644 --- a/common/src/main/java/org/conscrypt/Conscrypt.java +++ b/common/src/main/java/org/conscrypt/Conscrypt.java @@ -34,6 +34,7 @@ import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; +import org.conscrypt.io.IoUtils; /** * Core API for creating and configuring all Conscrypt types. @@ -76,8 +77,9 @@ public final class Conscrypt { int major = -1; int minor = -1; int patch = -1; + InputStream stream = null; try { - InputStream stream = Conscrypt.class.getResourceAsStream("conscrypt.properties"); + stream = Conscrypt.class.getResourceAsStream("conscrypt.properties"); if (stream != null) { Properties props = new Properties(); props.load(stream); @@ -86,6 +88,8 @@ public final class Conscrypt { patch = Integer.parseInt(props.getProperty("org.conscrypt.version.patch", "-1")); } } catch (IOException e) { + } finally { + IoUtils.closeQuietly(stream); } if ((major >= 0) && (minor >= 0) && (patch >= 0)) { VERSION = new Version(major, minor, patch);

['common/src/main/java/org/conscrypt/Conscrypt.java']

{'.java': 1}

Java

{'Java': 3533745, 'C++': 526129, 'C': 7529, 'Python': 6764, 'Shell': 5171, 'Dockerfile': 3414, 'CMake': 1784, 'PowerShell': 1675, 'Batchfile': 1140, 'HTML': 756}

Apache License 2.0

dtstack/taier/657/655

dtstack

taier

https://github.com/DTStack/Taier/issues/655

https://github.com/DTStack/Taier/pull/657

https://github.com/DTStack/Taier/pull/657

fix

资源组件HiveServer连接测试失败

报错信息： {"componentTypeCode":0,"errorMsg":"com.dtstack.taier.pluginapi.exception.PluginDefineException: get conn exception:com.dtstack.taier.pluginapi.exception.PluginDefineException: get conn exception:com.dtstack.taier.pluginapi.exception.PluginDefineException: java.lang.NullPointerException\\r\\ncom.dtstack.taier.pluginapi.exception.PluginDefineException: get conn exception:com.dtstack.taier.pluginapi.exception.PluginDefineException: get conn exception:com.dtstack.taier.pluginapi.exception.PluginDefineException: java.lang.NullPointerException\\r\\n\\tat com.dtstack.taier.rdbs.common.executor.AbstractConnFactory.init(AbstractConnFactory.java:91)\\r\\n\\tat com.dtstack.taier.rdbs.hive.HiveConnFactory.init(HiveConnFactory.java:66)\\r\\n\\tat com.dtstack.taier.rdbs.common.AbstractRdbsClient.testConnect(AbstractRdbsClient.java:160)\\r\\n\\tat com.dtstack.taier.common.client.ClientProxy.lambda$null$9(ClientProxy.java:273)\\r\\n\\tat com.dtstack.taier.pluginapi.callback.ClassLoaderCallBackMethod.callbackAndReset(ClassLoaderCallBackMethod.java:31)\\r\\n\\tat com.dtstack.taier.common.client.ClientProxy.lambda$testConnect$10(ClientProxy.java:273)\\r\\n\\tat java.util.concurrent.CompletableFuture$AsyncSupply.run$$$capture(CompletableFuture.java:1590)\\r\\n\\tat java.util.concurrent.CompletableFuture$AsyncSupply.run(CompletableFuture.java)\\r\\n\\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\\r\\n\\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\\r\\n\\tat java.lang.Thread.run(Thread.java:748)\\r\\n","result":false} 报错原因： com.dtstack.taier.rdbs.common.executor.AbstractConnFactory 85行处 properties.get("yarnConf")为null 解决办法： 重载com.dtstack.taier.scheduler.service.ComponentService中wrapperConfig方法：（对hiveserver组间补充yarnConf配置） public JSONObject wrapperConfig(int componentType, String componentConfig, Map<String, String> sftpConfig, KerberosConfig kerberosConfig) { JSONObject dataInfo = JSONObject.parseObject(componentConfig); if (EComponentType.YARN.getTypeCode() == componentType) { JSONObject confInfo = new JSONObject(); confInfo.put(EComponentType.YARN.getConfName(), dataInfo); dataInfo = confInfo; } else if (EComponentType.HDFS.getTypeCode() == componentType) { JSONObject confInfo = new JSONObject(); confInfo.put(EComponentType.HDFS.getConfName(), dataInfo); dataInfo = confInfo; } //开启了kerberos if (null != kerberosConfig) { dataInfo.put(KERBEROS_FILE_TIMESTAMP, kerberosConfig.getGmtModified()); dataInfo.put(OPEN_KERBEROS, kerberosConfig.getOpenKerberos()); dataInfo.put(REMOTE_DIR, kerberosConfig.getRemotePath()); dataInfo.put(PRINCIPAL_FILE, kerberosConfig.getName()); dataInfo.put(KRB_NAME, kerberosConfig.getKrbName()); dataInfo.put(PRINCIPAL, kerberosConfig.getPrincipal()); dataInfo.put(MERGE_KRB5_CONTENT_KEY, kerberosConfig.getMergeKrbContent()); } //common参数 dataInfo.put(EComponentType.SFTP.getConfName(), sftpConfig); return dataInfo; } private void putYarnConfig(Long clusterId, JSONObject dataInfo) { Map yarnMap = getComponentByClusterId(clusterId, EComponentType.YARN.getTypeCode(), false, Map.class, null); if (null != yarnMap) { dataInfo.put(EComponentType.YARN.getConfName(), yarnMap); } }

6f5f2e15ae6a25583d6ddc19fc0147147f8081cb

c125025e67ad7bc0a2414634671adfb3ec3e4b9c

https://github.com/dtstack/taier/compare/6f5f2e15ae6a25583d6ddc19fc0147147f8081cb...c125025e67ad7bc0a2414634671adfb3ec3e4b9c

diff --git a/taier-data-develop/src/main/java/com/dtstack/taier/develop/service/console/ConsoleComponentService.java b/taier-data-develop/src/main/java/com/dtstack/taier/develop/service/console/ConsoleComponentService.java index 2847d19f..c1e9fbc8 100644 --- a/taier-data-develop/src/main/java/com/dtstack/taier/develop/service/console/ConsoleComponentService.java +++ b/taier-data-develop/src/main/java/com/dtstack/taier/develop/service/console/ConsoleComponentService.java @@ -1098,7 +1098,7 @@ public class ConsoleComponentService { if (EComponentType.HDFS.getTypeCode().equals(componentType)) { typeName = componentService.buildHdfsTypeName(null, clusterId); } - JSONObject pluginInfo = componentService.wrapperConfig(componentType, componentConfig, sftpConfig, kerberosConfig); + JSONObject pluginInfo = componentService.wrapperConfig(componentType, componentConfig, sftpConfig, kerberosConfig, clusterId); pluginInfo.put(TYPE_NAME_KEY, typeName); componentTestResult = workerOperator.testConnect(pluginInfo.toJSONString()); if (null == componentTestResult) { diff --git a/taier-data-develop/src/main/java/com/dtstack/taier/develop/service/console/ConsoleService.java b/taier-data-develop/src/main/java/com/dtstack/taier/develop/service/console/ConsoleService.java index aab6dcb3..e257f6c8 100644 --- a/taier-data-develop/src/main/java/com/dtstack/taier/develop/service/console/ConsoleService.java +++ b/taier-data-develop/src/main/java/com/dtstack/taier/develop/service/console/ConsoleService.java @@ -457,7 +457,7 @@ public class ConsoleService { //开启kerberos 添加信息 KerberosConfig kerberosConfig = consoleKerberosMapper.getByComponentType(cluster.getId(), yarnComponent.getComponentTypeCode(), ComponentVersionUtil.formatMultiVersion(yarnComponent.getComponentTypeCode(),yarnComponent.getVersionValue())); Map sftpMap = componentService.getComponentByClusterId(cluster.getId(), EComponentType.SFTP.getTypeCode(), false, Map.class,null); - pluginInfo = componentService.wrapperConfig(yarnComponent.getComponentTypeCode(),componentConfig.toJSONString(),sftpMap,kerberosConfig); + pluginInfo = componentService.wrapperConfig(yarnComponent.getComponentTypeCode(),componentConfig.toJSONString(),sftpMap,kerberosConfig,cluster.getId()); } String typeName = componentConfig.getString(ConfigConstant.TYPE_NAME_KEY); if (StringUtils.isBlank(typeName)) { diff --git a/taier-scheduler/src/main/java/com/dtstack/taier/scheduler/service/ComponentService.java b/taier-scheduler/src/main/java/com/dtstack/taier/scheduler/service/ComponentService.java index df3127c0..abf42fb3 100644 --- a/taier-scheduler/src/main/java/com/dtstack/taier/scheduler/service/ComponentService.java +++ b/taier-scheduler/src/main/java/com/dtstack/taier/scheduler/service/ComponentService.java @@ -93,7 +93,7 @@ public class ComponentService { ComponentVersionUtil.formatMultiVersion(componentCode, componentVersion)); } Map sftpMap = getComponentByClusterId(clusterId, EComponentType.SFTP.getTypeCode(), false, Map.class, null); - pluginInfo = wrapperConfig(componentCode, componentConfig.toJSONString(), sftpMap, kerberosConfig); + pluginInfo = wrapperConfig(componentCode, componentConfig.toJSONString(), sftpMap, kerberosConfig,clusterId); return pluginInfo; } @@ -105,11 +105,13 @@ public class ComponentService { * @param componentConfig * @return */ - public JSONObject wrapperConfig(int componentType, String componentConfig, Map<String, String> sftpConfig, KerberosConfig kerberosConfig) { + public JSONObject wrapperConfig(int componentType, String componentConfig, Map<String, String> sftpConfig, KerberosConfig kerberosConfig,Long clusterId) { EComponentType eComponentType = EComponentType.getByCode(componentType); JSONObject dataInfo = new JSONObject(); if (EComponentType.YARN.equals(eComponentType) || EComponentType.HDFS.equals(eComponentType)) { dataInfo.put(eComponentType.getConfName(), JSONObject.parseObject(componentConfig)); + } if (EComponentType.HIVE_SERVER.equals(eComponentType)) { + putYarnConfig(clusterId, dataInfo); } else { dataInfo = JSONObject.parseObject(componentConfig); } @@ -130,6 +132,13 @@ public class ComponentService { return dataInfo; } + private void putYarnConfig(Long clusterId, JSONObject dataInfo) { + Map yarnMap = getComponentByClusterId(clusterId, EComponentType.YARN.getTypeCode(), false, Map.class, null); + if (null != yarnMap) { + dataInfo.put(EComponentType.YARN.getConfName(), yarnMap); + } + } + public Component getComponentByClusterId(Long clusterId, Integer componentType, String componentVersion) { return componentMapper.getByClusterIdAndComponentType(clusterId, componentType, componentVersion, null); }

['taier-data-develop/src/main/java/com/dtstack/taier/develop/service/console/ConsoleComponentService.java', 'taier-data-develop/src/main/java/com/dtstack/taier/develop/service/console/ConsoleService.java', 'taier-scheduler/src/main/java/com/dtstack/taier/scheduler/service/ComponentService.java']

{'.java': 3}

Java

{'Java': 9989416, 'TypeScript': 2279705, 'CSS': 713033, 'PLpgSQL': 515685, 'Scala': 85975, 'SCSS': 76346, 'JavaScript': 37746, 'Shell': 5499, 'Dockerfile': 1573, 'Mustache': 241}

Apache License 2.0

mekanism/mekanism/4868/4852

mekanism

mekanism

https://github.com/mekanism/Mekanism/issues/4852

https://github.com/mekanism/Mekanism/pull/4868

https://github.com/mekanism/Mekanism/pull/4868

fixes

[1.12] Electrolytic Separator + Energy Upgrades = Hydrogen Power

#### Issue description: The Electrolytic Separator accepts Energy Upgrades. In the past, this only increased the energy capacity. The Electrolytic Separator was the only machine to not receive a boost in efficiency in order to prevent an infinite energy loop using Hydrogen Gas. The Electrolytic Separator currently does get the energy boost and can produce an infinite energy loop using Hydrogen Gas. #### Steps to reproduce: 1. Stick a full set of Energy Upgrades in the Electrolytic Separator. 2. Supply Water 3. Burn Hydrogen in a Gas-Burning Generator for 10x the power you put in. A full set of Speed Upgrades will net you nearly 18k J/t. #### Version (make sure you are on the latest version before reporting): **Forge: 14.23.1.2561** **Mekanism: 9.4.2.327** Test pack included Mek Generators and Tools, and JEI 4.8.5.134. No other mods.

f09f8d28384592b7f16318b0ec04ad6c4faf218b

b8a83fb9ef6c0ac3499fd6f798556cd85c52aebe

https://github.com/mekanism/mekanism/compare/f09f8d28384592b7f16318b0ec04ad6c4faf218b...b8a83fb9ef6c0ac3499fd6f798556cd85c52aebe

diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 15fe5ff389..26df3dd624 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -646,4 +646,21 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement { return new Object[] {fluidTank, leftTank, rightTank}; } + + @Override + public void recalculateUpgradables(Upgrade upgrade) + { + super.recalculateUpgradables(upgrade); + + switch(upgrade) + { + case ENERGY: + maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY); + energyPerTick = BlockStateMachine.MachineType.ELECTROLYTIC_SEPARATOR.getUsage(); + setEnergy(Math.min(getMaxEnergy(), getEnergy())); + break; + default: + break; + } + } }

['src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java']

{'.java': 1}

Java

{'Java': 10634221, 'ZenScript': 66932, 'Groovy': 7193, 'Perl': 4725, 'GLSL': 4576, 'JavaScript': 1156, 'Python': 511}

MIT License

mekanism/mekanism/4544/3613

mekanism

mekanism

https://github.com/mekanism/Mekanism/issues/3613

https://github.com/mekanism/Mekanism/pull/4544

https://github.com/mekanism/Mekanism/pull/4544

fixes

[1.10.2] Cardboard box deletes Advanced Solar Generator when boxing the base of it.

The box and the Advanced Solar Generator just straight up disappear, never to be seen again.

b3f1a9fee43e6aec5689664f268fa6dbeebb50b0

6ba975b84f792322472582edf21bcf9d65394f5a

https://github.com/mekanism/mekanism/compare/b3f1a9fee43e6aec5689664f268fa6dbeebb50b0...6ba975b84f792322472582edf21bcf9d65394f5a

diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index a2860b183e..4033bc2254 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1426,11 +1426,21 @@ public class Mekanism public void onBlacklistUpdate(BoxBlacklistEvent event) { MekanismAPI.addBoxBlacklist(MekanismBlocks.CardboardBox, OreDictionary.WILDCARD_VALUE); + + // Mekanism multiblock structures MekanismAPI.addBoxBlacklist(MekanismBlocks.BoundingBlock, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(MekanismBlocks.BasicBlock2, 9); // Security Desk + MekanismAPI.addBoxBlacklist(MekanismBlocks.MachineBlock, 4); // Digital Miner + MekanismAPI.addBoxBlacklist(MekanismBlocks.MachineBlock2, 9); // Seismic Vibrator + MekanismAPI.addBoxBlacklist(MekanismBlocks.MachineBlock3, 1); // Solar Neutron Activator + + // Minecraft unobtainable MekanismAPI.addBoxBlacklist(Blocks.BEDROCK, 0); MekanismAPI.addBoxBlacklist(Blocks.PORTAL, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.END_PORTAL, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.END_PORTAL_FRAME, OreDictionary.WILDCARD_VALUE); + + // Minecraft multiblock structures MekanismAPI.addBoxBlacklist(Blocks.BED, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.OAK_DOOR, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.SPRUCE_DOOR, OreDictionary.WILDCARD_VALUE); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index b06fb7bc0b..0620e12a0e 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.io.IOException; +import mekanism.api.MekanismAPI; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.infuse.InfuseRegistry; @@ -275,4 +276,12 @@ public class MekanismGenerators implements IModule TypeConfigManager.updateConfigRecipes(GeneratorType.getGeneratorsForConfig(), generators.generatorsManager); } } + + @SubscribeEvent + public void onBlacklistUpdate(MekanismAPI.BoxBlacklistEvent event) + { + // Mekanism Generators multiblock structures + MekanismAPI.addBoxBlacklist(GeneratorsBlocks.Generator, 5); // Advanced Solar Generator + MekanismAPI.addBoxBlacklist(GeneratorsBlocks.Generator, 6); // Wind Generator + } }

['src/main/java/mekanism/generators/common/MekanismGenerators.java', 'src/main/java/mekanism/common/Mekanism.java']

{'.java': 2}

Java

{'Java': 10634221, 'ZenScript': 66932, 'Groovy': 7193, 'Perl': 4725, 'GLSL': 4576, 'JavaScript': 1156, 'Python': 511}

MIT License

mekanism/mekanism/4549/3534

mekanism

mekanism

https://github.com/mekanism/Mekanism/issues/3534

https://github.com/mekanism/Mekanism/pull/4549

https://github.com/mekanism/Mekanism/pull/4549

fixes

[Issue] Tesselating block model

Hi, Random client crash when i'm in my base, it seems to begin to happen since i've built a boiler. Crash log : http://pastebin.com/qQqD8yf6

b3f1a9fee43e6aec5689664f268fa6dbeebb50b0

4614c6775059b2533b7427b26a8d9e079f38805c

https://github.com/mekanism/mekanism/compare/b3f1a9fee43e6aec5689664f268fa6dbeebb50b0...4614c6775059b2533b7427b26a8d9e079f38805c

diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 6be823ca10..f420ff9d59 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -158,8 +158,8 @@ public abstract class BlockBasic extends Block implements ICTMBlock @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); - + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); + if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null) { state = state.withProperty(BlockStateFacing.facingProperty, ((TileEntityBasicBlock)tile).facing); @@ -344,7 +344,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock return false; case 9: case 11: - TileEntityDynamicTank tileEntity = (TileEntityDynamicTank)world.getTileEntity(pos); + TileEntityDynamicTank tileEntity = (TileEntityDynamicTank) MekanismUtils.getTileEntitySafe(world, pos); if(tileEntity != null) { @@ -372,7 +372,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock case 2: case 7: case 8: - TileEntityMultiblock tileEntity = (TileEntityMultiblock)world.getTileEntity(pos); + TileEntityMultiblock tileEntity = (TileEntityMultiblock) MekanismUtils.getTileEntitySafe(world, pos); if(tileEntity != null) { @@ -716,7 +716,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tileEntity = world.getTileEntity(pos); + TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos); int metadata = state.getBlock().getMetaFromState(state); if(tileEntity instanceof IActiveState) @@ -1044,4 +1044,4 @@ public abstract class BlockBasic extends Block implements ICTMBlock { return BasicBlockType.get(world.getBlockState(pos)).isBeaconBase; } -} \\ No newline at end of file +} diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index b2afc48576..45d337ab6b 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -87,7 +87,7 @@ public class BlockEnergyCube extends BlockContainer @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); if(tile instanceof TileEntityEnergyCube) { diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 64297680fa..f30c2c5c93 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -74,7 +74,7 @@ public class BlockGasTank extends BlockContainer @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); if(tile instanceof TileEntityGasTank) { diff --git a/src/main/java/mekanism/common/block/BlockGlowPanel.java b/src/main/java/mekanism/common/block/BlockGlowPanel.java index 0480378b6a..7aeea339d0 100644 --- a/src/main/java/mekanism/common/block/BlockGlowPanel.java +++ b/src/main/java/mekanism/common/block/BlockGlowPanel.java @@ -9,6 +9,7 @@ import mekanism.common.block.property.PropertyColor; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.block.states.BlockStateGlowPanel; import mekanism.common.tile.TileEntityGlowPanel; +import mekanism.common.util.MekanismUtils; import mekanism.common.util.MultipartUtils; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; @@ -71,7 +72,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos); + TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos); return tileEntity != null ? state.withProperty(BlockStateFacing.facingProperty, tileEntity.side) : state; } @@ -79,8 +80,8 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos); - + TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos); + if(tileEntity != null) { state = state.withProperty(BlockStateFacing.facingProperty, tileEntity.side); @@ -117,7 +118,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos); + TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos); if(!tileEntity.getWorld().isRemote && !canStay(tileEntity)) { @@ -137,7 +138,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos); if(tile != null && tile instanceof TileEntityGlowPanel) { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 6529f9ed9e..b29cee2430 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -206,7 +206,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null) { @@ -383,7 +383,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock { if(client.enableAmbientLighting) { - TileEntity tileEntity = world.getTileEntity(pos); + TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos); if(tileEntity instanceof IActiveState) { @@ -992,7 +992,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { MachineType type = MachineType.get(getMachineBlock(), state.getBlock().getMetaFromState(state)); - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos); if(type == null) { @@ -1025,12 +1025,6 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock { return false; } - - @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) - { - return super.getCollisionBoundingBox(state, world, pos); - } @Override public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) @@ -1111,7 +1105,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock @Override public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos); if(tile instanceof TileEntityLaserAmplifier) { diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 4b10f95f49..43061a2ab5 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -14,9 +14,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/common/block/BlockTransmitter.java b/src/main/java/mekanism/common/block/BlockTransmitter.java index 7b094a3fd5..2600250994 100644 --- a/src/main/java/mekanism/common/block/BlockTransmitter.java +++ b/src/main/java/mekanism/common/block/BlockTransmitter.java @@ -95,7 +95,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); if(tile instanceof TileEntitySidedPipe) { @@ -129,7 +129,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess w, BlockPos pos) { - TileEntitySidedPipe tile = (TileEntitySidedPipe)w.getTileEntity(pos); + TileEntitySidedPipe tile = (TileEntitySidedPipe) MekanismUtils.getTileEntitySafe(w, pos); if(tile != null) { @@ -147,7 +147,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos); if(tile instanceof TileEntitySidedPipe && ((TileEntitySidedPipe)tile).getTransmitterType().getSize() == Size.SMALL) { @@ -301,7 +301,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { - TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos); + TileEntitySidedPipe tile = (TileEntitySidedPipe) MekanismUtils.getTileEntitySafe(world, pos); EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ()); tile.onNeighborTileChange(side); } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index cdb259d814..c3abcca998 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -82,9 +82,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.TextComponentString; +import net.minecraft.world.ChunkCache; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -1526,4 +1528,9 @@ public final class MekanismUtils return prefix + "/"; } } + + public static TileEntity getTileEntitySafe(IBlockAccess worldIn, BlockPos pos) + { + return worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos); + } } diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index af3d46d507..70e8fe0f34 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -1,6 +1,7 @@ package mekanism.generators.common; import mekanism.common.item.ItemMekanism; +import mekanism.common.util.MekanismUtils; import mekanism.generators.common.item.ItemHohlraum; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.entity.player.EntityPlayer; @@ -20,7 +21,7 @@ public class GeneratorsItems @Override public boolean doesSneakBypassUse(ItemStack stack, IBlockAccess world, BlockPos pos, EntityPlayer player) { - return world.getTileEntity(pos) instanceof TileEntityTurbineRotor; + return MekanismUtils.getTileEntitySafe(world, pos) instanceof TileEntityTurbineRotor; } }; diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 03976ab9af..a02c398a5d 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -169,7 +169,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null) { @@ -254,7 +254,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock { if(client.enableAmbientLighting) { - TileEntity tileEntity = world.getTileEntity(pos); + TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos); if(tileEntity instanceof IActiveState && !(tileEntity instanceof TileEntitySolarGenerator)) { diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 00d86b3057..dea26a93be 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -75,7 +75,7 @@ public abstract class BlockReactor extends Block implements ICTMBlock, ITileEnti @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); if(tile instanceof TileEntityReactorController) { @@ -293,7 +293,7 @@ public abstract class BlockReactor extends Block implements ICTMBlock, ITileEnti @Override public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos); if(tile instanceof TileEntityReactorLogicAdapter) {

['src/main/java/mekanism/generators/common/GeneratorsItems.java', 'src/main/java/mekanism/common/block/BlockMachine.java', 'src/main/java/mekanism/generators/common/block/BlockReactor.java', 'src/main/java/mekanism/common/block/BlockGlowPanel.java', 'src/main/java/mekanism/common/block/BlockGasTank.java', 'src/main/java/mekanism/common/block/BlockPlastic.java', 'src/main/java/mekanism/generators/common/block/BlockGenerator.java', 'src/main/java/mekanism/common/block/BlockBasic.java', 'src/main/java/mekanism/common/block/BlockTransmitter.java', 'src/main/java/mekanism/common/block/BlockEnergyCube.java', 'src/main/java/mekanism/common/util/MekanismUtils.java']

{'.java': 11}

Java

{'Java': 10634221, 'ZenScript': 66932, 'Groovy': 7193, 'Perl': 4725, 'GLSL': 4576, 'JavaScript': 1156, 'Python': 511}

MIT License

mekanism/mekanism/4550/4484

mekanism

mekanism

https://github.com/mekanism/Mekanism/issues/4484

https://github.com/mekanism/Mekanism/pull/4550

https://github.com/mekanism/Mekanism/pull/4550

fixes

[1.11.2] Server Crash

#### Issue description: Hello! A few days ago, our official pack server started crashing whenever someone is near a Mekanism machine (tested with a Metallurgic Infuser and Enrichment Chamber). At first we thought that it was all due to Mekanism, but today we figured out that it doesn't happen when the crafting recipes in JEI bug out, as it sometimes happens with the 1.11.2 version. Then we tried changing the JEI version on the client back to the version where all was fine, but it didn't help. Either way, by the crash log we can tell that it has something to do with Mekanism. #### Version (make sure you are on the latest version before reporting): **Forge:** 13.20.0.2315 **Mekanism:** 9.3.2.307 **JEI (if it actually has to do with it)** 4.5.0.289 #### If a (crash)log is relevant for this issue, link it here: (_It's almost always relevant_) https://paste.ee/p/a1wzk

7b1e965509307591e82df93cb364118650288cf1

4a7b457bfc7bb1703b9d220fdeeffee3b7504972

https://github.com/mekanism/mekanism/compare/7b1e965509307591e82df93cb364118650288cf1...4a7b457bfc7bb1703b9d220fdeeffee3b7504972

diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index ca9cd31ed6..9609b648b4 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -9,6 +9,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.common.Mekanism; import mekanism.common.base.ISideConfiguration; import mekanism.common.content.transporter.TransitRequest.TransitResponse; import mekanism.common.content.transporter.TransporterStack.Path; @@ -113,6 +114,11 @@ public class TransporterManager { int slotID = slots[get]; + if (slotID >= ret.size()){ + Mekanism.logger.error("Inventory {} gave slot number >= the number of slots it reported! {} >= {} ", inv.getClass().getName(), slotID, ret.size()); + continue; + } + ret.set(slotID, !sidedInventory.getStackInSlot(slotID).isEmpty() ? sidedInventory.getStackInSlot(slotID).copy() : ItemStack.EMPTY); } diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 97cd975679..110c845a9e 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -578,7 +578,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public void setOwnerUUID(UUID uuid) { dataManager.set(OWNER_UUID, uuid.toString()); - dataManager.set(OWNER_NAME, UsernameCache.getLastKnownUsername(uuid)); + dataManager.set(OWNER_NAME, MekanismUtils.getLastKnownUsername(uuid)); } public boolean getFollowing() diff --git a/src/main/java/mekanism/common/frequency/Frequency.java b/src/main/java/mekanism/common/frequency/Frequency.java index b4d76e39e2..059b80db7b 100644 --- a/src/main/java/mekanism/common/frequency/Frequency.java +++ b/src/main/java/mekanism/common/frequency/Frequency.java @@ -9,6 +9,7 @@ import java.util.UUID; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; +import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.UsernameCache; @@ -118,7 +119,7 @@ public class Frequency { data.add(name); data.add(ownerUUID.toString()); - data.add(UsernameCache.getLastKnownUsername(ownerUUID)); + data.add(MekanismUtils.getLastKnownUsername(ownerUUID)); data.add(publicFreq); } diff --git a/src/main/java/mekanism/common/network/PacketSecurityUpdate.java b/src/main/java/mekanism/common/network/PacketSecurityUpdate.java index 4146b91b47..4c4c26e217 100644 --- a/src/main/java/mekanism/common/network/PacketSecurityUpdate.java +++ b/src/main/java/mekanism/common/network/PacketSecurityUpdate.java @@ -13,6 +13,7 @@ import mekanism.common.frequency.Frequency; import mekanism.common.network.PacketSecurityUpdate.SecurityUpdateMessage; import mekanism.common.security.SecurityData; import mekanism.common.security.SecurityFrequency; +import mekanism.common.util.MekanismUtils; import net.minecraftforge.common.UsernameCache; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; @@ -51,7 +52,7 @@ public class PacketSecurityUpdate implements IMessageHandler<SecurityUpdateMessa if(packetType == SecurityPacket.UPDATE) { playerUUID = uuid; - playerUsername = UsernameCache.getLastKnownUsername(uuid); + playerUsername = MekanismUtils.getLastKnownUsername(uuid); securityData = data; } } @@ -92,7 +93,7 @@ public class PacketSecurityUpdate implements IMessageHandler<SecurityUpdateMessa for(SecurityFrequency frequency : frequencies) { PacketHandler.writeString(dataStream, frequency.ownerUUID.toString()); - PacketHandler.writeString(dataStream, UsernameCache.getLastKnownUsername(frequency.ownerUUID)); + PacketHandler.writeString(dataStream, MekanismUtils.getLastKnownUsername(frequency.ownerUUID)); new SecurityData(frequency).write(dataStream); } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index 1a2c383d11..c4274f92c6 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -262,7 +262,7 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements if(ownerUUID != null) { data.add(true); - data.add(UsernameCache.getLastKnownUsername(ownerUUID)); + data.add(MekanismUtils.getLastKnownUsername(ownerUUID)); } else { data.add(false); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java index a2af50f493..3bf566b347 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java @@ -214,7 +214,7 @@ public class TileComponentSecurity implements ITileComponent { data.add(true); data.add(ownerUUID.toString()); - data.add(UsernameCache.getLastKnownUsername(ownerUUID)); + data.add(MekanismUtils.getLastKnownUsername(ownerUUID)); } else { data.add(false); diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 15638a322c..ce2b9d4b8b 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -1,5 +1,6 @@ package mekanism.common.util; +import com.mojang.authlib.GameProfile; import ic2.api.energy.EnergyNet; import java.io.BufferedReader; @@ -12,6 +13,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.UUID; import mekanism.api.Chunk3D; import mekanism.api.Coord4D; @@ -86,18 +88,22 @@ import net.minecraft.world.ChunkCache; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.UsernameCache; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import cofh.api.item.IToolHammer; +import javax.annotation.Nonnull; + /** * Utilities used by Mekanism. All miscellaneous methods are located here. * @author AidanBrady @@ -109,6 +115,8 @@ public final class MekanismUtils public static final Map<String, Class<?>> classesFound = new HashMap<String, Class<?>>(); + private static final List<UUID> warnedFails = new ArrayList<>(); + /** * Checks for a new version of Mekanism. */ @@ -1518,6 +1526,23 @@ public final class MekanismUtils return false; } + @Nonnull + public static String getLastKnownUsername(UUID uuid) + { + String ret = UsernameCache.getLastKnownUsername(uuid); + if (ret == null && !warnedFails.contains(uuid) && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){ // see if MC/Yggdrasil knows about it?! + GameProfile gp = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerProfileCache().getProfileByUUID(uuid); + if (gp != null){ + ret = gp.getName(); + } + } + if (ret == null && !warnedFails.contains(uuid)){ + Mekanism.logger.warn("Failed to retrieve username for UUID {}, you might want to add it to the JSON cache", uuid); + warnedFails.add(uuid); + } + return ret != null ? ret : "<???>"; + } + public static enum ResourceType { GUI("gui"),

['src/main/java/mekanism/common/frequency/Frequency.java', 'src/main/java/mekanism/common/entity/EntityRobit.java', 'src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java', 'src/main/java/mekanism/common/content/transporter/TransporterManager.java', 'src/main/java/mekanism/common/tile/component/TileComponentSecurity.java', 'src/main/java/mekanism/common/network/PacketSecurityUpdate.java', 'src/main/java/mekanism/common/util/MekanismUtils.java']

{'.java': 7}

Java

{'Java': 10634221, 'ZenScript': 66932, 'Groovy': 7193, 'Perl': 4725, 'GLSL': 4576, 'JavaScript': 1156, 'Python': 511}

MIT License

mekanism/mekanism/4551/4539

mekanism

mekanism

https://github.com/mekanism/Mekanism/issues/4539

https://github.com/mekanism/Mekanism/pull/4551

https://github.com/mekanism/Mekanism/pull/4551

fixes

[1.11.2] Placing water in a machine with a forestry tin can or capsule causes a ticking tile entity

Using a forestry tin can or capsule instead of a bucket in Mekanism machines causes ticking block crash. 1. Place electrolytic separator 2. Put water can in water slot 3. Crash Mekanism 307 Forge 13.20.1.2386 Minecraft 1.11.2 Log: https://paste.ee/p/oxUq9

b3f1a9fee43e6aec5689664f268fa6dbeebb50b0

9106ac94a747bf5c59884e470ede5e19cc2a6e24

https://github.com/mekanism/mekanism/compare/b3f1a9fee43e6aec5689664f268fa6dbeebb50b0...9106ac94a747bf5c59884e470ede5e19cc2a6e24

diff --git a/src/main/java/mekanism/common/util/FluidContainerUtils.java b/src/main/java/mekanism/common/util/FluidContainerUtils.java index 330829f5f9..37602c11c2 100644 --- a/src/main/java/mekanism/common/util/FluidContainerUtils.java +++ b/src/main/java/mekanism/common/util/FluidContainerUtils.java @@ -13,8 +13,10 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.items.ItemHandlerHelper; -public final class FluidContainerUtils +public final class FluidContainerUtils { + private FluidContainerUtils(){} + public static boolean isFluidContainer(ItemStack stack) { return !stack.isEmpty() && stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); @@ -27,28 +29,25 @@ public final class FluidContainerUtils public static FluidStack extractFluid(FluidTank tileTank, TileEntityContainerBlock tile, int slotID, FluidChecker checker) { - FluidStack ret = extractFluid(tileTank.getCapacity()-tileTank.getFluidAmount(), tile.inventory.get(slotID), checker); - tile.inventory.set(slotID, FluidUtil.getFluidHandler(tile.inventory.get(slotID)).getContainer()); - return ret; + return extractFluid(tileTank.getCapacity()-tileTank.getFluidAmount(), tile.inventory.get(slotID), checker); } public static FluidStack extractFluid(int needed, ItemStack container, FluidChecker checker) { IFluidHandlerItem handler = FluidUtil.getFluidHandler(container); + FluidStack fluidStack = FluidUtil.getFluidContained(container); - if(handler == null || FluidUtil.getFluidContained(container) == null) + if(handler == null || fluidStack == null) { return null; } - if(checker != null && !checker.isValid(FluidUtil.getFluidContained(container).getFluid())) + if(checker != null && !checker.isValid(fluidStack.getFluid())) { return null; } - FluidStack ret = handler.drain(needed, true); - - return ret; + return handler.drain(needed, true); } public static int insertFluid(FluidTank tileTank, ItemStack container) @@ -60,7 +59,7 @@ public final class FluidContainerUtils { IFluidHandler handler = FluidUtil.getFluidHandler(container); - if(fluid == null) + if(fluid == null || handler == null) { return 0; } @@ -128,8 +127,9 @@ public final class FluidContainerUtils return (checker == null || checker.isValid(f)) && (storedFinal == null || storedFinal == f); } }); - - ItemStack inputCopy = FluidUtil.getFluidHandler(input).getContainer(); + + IFluidHandlerItem iFluidHandlerItem = FluidUtil.getFluidHandler(input); + ItemStack inputCopy = iFluidHandlerItem != null ? iFluidHandlerItem.getContainer() : ItemStack.EMPTY; if(FluidUtil.getFluidContained(inputCopy) == null && !inputCopy.isEmpty()) {

['src/main/java/mekanism/common/util/FluidContainerUtils.java']

{'.java': 1}

Java

{'Java': 10634221, 'ZenScript': 66932, 'Groovy': 7193, 'Perl': 4725, 'GLSL': 4576, 'JavaScript': 1156, 'Python': 511}

MIT License

mekanism/mekanism/4552/4539

mekanism

mekanism

https://github.com/mekanism/Mekanism/issues/4539

https://github.com/mekanism/Mekanism/pull/4552

https://github.com/mekanism/Mekanism/pull/4552

fixes

[1.11.2] Placing water in a machine with a forestry tin can or capsule causes a ticking tile entity

Using a forestry tin can or capsule instead of a bucket in Mekanism machines causes ticking block crash. 1. Place electrolytic separator 2. Put water can in water slot 3. Crash Mekanism 307 Forge 13.20.1.2386 Minecraft 1.11.2 Log: https://paste.ee/p/oxUq9

46367a445ed8fc21871f15384f9a0ef0a68133c7

3815945d1efc4db3a3da7928cc868e1e4d5949a7

https://github.com/mekanism/mekanism/compare/46367a445ed8fc21871f15384f9a0ef0a68133c7...3815945d1efc4db3a3da7928cc868e1e4d5949a7

diff --git a/src/main/java/mekanism/common/util/FluidContainerUtils.java b/src/main/java/mekanism/common/util/FluidContainerUtils.java index 330829f5f9..7fa9616a04 100644 --- a/src/main/java/mekanism/common/util/FluidContainerUtils.java +++ b/src/main/java/mekanism/common/util/FluidContainerUtils.java @@ -27,40 +27,46 @@ public final class FluidContainerUtils public static FluidStack extractFluid(FluidTank tileTank, TileEntityContainerBlock tile, int slotID, FluidChecker checker) { - FluidStack ret = extractFluid(tileTank.getCapacity()-tileTank.getFluidAmount(), tile.inventory.get(slotID), checker); - tile.inventory.set(slotID, FluidUtil.getFluidHandler(tile.inventory.get(slotID)).getContainer()); + IFluidHandlerItem handler = FluidUtil.getFluidHandler(tile.inventory.get(slotID)); + FluidStack ret = null; + if (handler != null) + { + ret = extractFluid(tileTank.getCapacity() - tileTank.getFluidAmount(), handler, checker); + tile.inventory.set(slotID, handler.getContainer()); + } return ret; } - public static FluidStack extractFluid(int needed, ItemStack container, FluidChecker checker) + public static FluidStack extractFluid(int needed, IFluidHandlerItem handler, FluidChecker checker) { - IFluidHandlerItem handler = FluidUtil.getFluidHandler(container); - - if(handler == null || FluidUtil.getFluidContained(container) == null) + if (handler == null) { return null; } + + FluidStack fluidStack = handler.drain(Integer.MAX_VALUE, false); - if(checker != null && !checker.isValid(FluidUtil.getFluidContained(container).getFluid())) + if(fluidStack == null) { return null; } - FluidStack ret = handler.drain(needed, true); + if(checker != null && !checker.isValid(fluidStack.getFluid())) + { + return null; + } - return ret; + return handler.drain(needed, true); } public static int insertFluid(FluidTank tileTank, ItemStack container) { - return insertFluid(tileTank.getFluid(), container); + return insertFluid(tileTank.getFluid(), FluidUtil.getFluidHandler(container)); } - public static int insertFluid(FluidStack fluid, ItemStack container) + public static int insertFluid(FluidStack fluid, IFluidHandler handler) { - IFluidHandler handler = FluidUtil.getFluidHandler(container); - - if(fluid == null) + if(fluid == null || handler == null) { return 0; } @@ -79,8 +85,13 @@ public final class FluidContainerUtils { ItemStack inputCopy = StackUtils.size(inventory.get(inSlot).copy(), 1); - int drained = insertFluid(stack, inputCopy); - inputCopy = FluidUtil.getFluidHandler(inputCopy).getContainer(); + IFluidHandlerItem handler = FluidUtil.getFluidHandler(inputCopy); + int drained = 0; + if (handler != null) + { + drained = insertFluid(stack, handler); + inputCopy = handler.getContainer(); + } if(!inventory.get(outSlot).isEmpty() && (!ItemHandlerHelper.canItemStacksStack(inventory.get(outSlot), inputCopy) || inventory.get(outSlot).getCount() == inventory.get(outSlot).getMaxStackSize())) { @@ -120,8 +131,14 @@ public final class FluidContainerUtils { final Fluid storedFinal = stored != null ? stored.getFluid() : null; final ItemStack input = StackUtils.size(inventory.get(inSlot).copy(), 1); + final IFluidHandlerItem handler = FluidUtil.getFluidHandler(input); + + if (handler == null) + { + return stored; + } - FluidStack ret = extractFluid(needed, input, new FluidChecker() { + FluidStack ret = extractFluid(needed, handler, new FluidChecker() { @Override public boolean isValid(Fluid f) { @@ -129,7 +146,7 @@ public final class FluidContainerUtils } }); - ItemStack inputCopy = FluidUtil.getFluidHandler(input).getContainer(); + ItemStack inputCopy = handler.getContainer(); if(FluidUtil.getFluidContained(inputCopy) == null && !inputCopy.isEmpty()) {

['src/main/java/mekanism/common/util/FluidContainerUtils.java']

{'.java': 1}

Java

{'Java': 10634221, 'ZenScript': 66932, 'Groovy': 7193, 'Perl': 4725, 'GLSL': 4576, 'JavaScript': 1156, 'Python': 511}

MIT License

mekanism/mekanism/4752/4694

mekanism

mekanism

https://github.com/mekanism/Mekanism/issues/4694

https://github.com/mekanism/Mekanism/pull/4752

https://github.com/mekanism/Mekanism/pull/4752

fixes

[1.11.2] Logistical Sorter item filtering issue

#### Issue description: Using the logistical sorter to sort the drops from a mob farm and I've run into an issue when trying to send items like bows ect which are damaged to a different location it will only filter the exact bow that was used to create the filter because it's using the metadata from that item. With a bow filter in place it will send the bow or those with identical metadata to the correct storage but at the same time it also wont send the other bows to the other storage which is currently set to take everything not filtered so the bows will just sit in the original storage. I found a <a href="https://github.com/aidancbrady/Mekanism/issues/992">similar issue from 2014</a> where a subtype check was added but this doesn't seem to be an option in the logistical sorter anymore. #### Steps to reproduce: 1. Place storage. 2. Place logistical sorter pulling from the storage. 3. Place logistical transporters connecting the sorter to two more storage and paint the transporters different colours. 4. Set the sorters default filter to 1 of the colours then create a filter for bows set to the 2nd colour. 5. Add some random items and bows with different metadata to the first storage. 6. The random items will now be in the 2nd storage and any bows with the same metadata as the original will be in the 3rd storage all the remaining bows will still be in the first storage. #### Version (make sure you are on the latest version before reporting): **Forge:** 13.20.1.2454 **Mekanism:** 9.3.4 **Other relevant version:**

9c7164c0db3877538a6c525700b64d4353d20da5

6103bc2b119293dd5f15f95a2a3233538aaafff6

https://github.com/mekanism/mekanism/compare/9c7164c0db3877538a6c525700b64d4353d20da5...6103bc2b119293dd5f15f95a2a3233538aaafff6

diff --git a/src/main/java/mekanism/common/content/transporter/Finder.java b/src/main/java/mekanism/common/content/transporter/Finder.java index 0d268be899..64c42a809d 100644 --- a/src/main/java/mekanism/common/content/transporter/Finder.java +++ b/src/main/java/mekanism/common/content/transporter/Finder.java @@ -87,7 +87,7 @@ public abstract class Finder @Override public boolean modifies(ItemStack stack) { - return StackUtils.equalsWildcard(itemType, stack); + return itemType.getHasSubtypes() ? StackUtils.equalsWildcard(itemType, stack) : itemType.getItem() == stack.getItem(); } }

['src/main/java/mekanism/common/content/transporter/Finder.java']

{'.java': 1}

Java

{'Java': 10634221, 'ZenScript': 66932, 'Groovy': 7193, 'Perl': 4725, 'GLSL': 4576, 'JavaScript': 1156, 'Python': 511}

MIT License

mekanism/mekanism/4562/4560

mekanism

mekanism

https://github.com/mekanism/Mekanism/issues/4560

https://github.com/mekanism/Mekanism/pull/4562

https://github.com/mekanism/Mekanism/pull/4562

fixes

[1.11.2] Energy side configuration doesn't respect block orientation

#### Issue description: Regardless of which way a block is oriented the side configuration for energy always treats the faces as follows: - Front is North - Back is South - Left is West - Right is East - Bottom is Down - Top is Up Also tested with items but this seems to be functioning as expected. #### Steps to reproduce: 1. Face north 2. Place an energy cube / machine / quantum entangloporter 3. Configure the block to accept energy on every side 3. Surround the block with universal energy cables 4. Toggle the energy acceptance for each side on/off and make note of which cables detach 5. Repeat the process facing South, East, West, Up, Down as desired #### Version: **Forge:** 13.20.1.2393 **Mekanism:** 9.3.3.311-fix

77e46985ac243728b3210edcac2592852149d628

90cf4cea0849e9937b703789449933c62f87400b

https://github.com/mekanism/mekanism/compare/77e46985ac243728b3210edcac2592852149d628...90cf4cea0849e9937b703789449933c62f87400b

diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 21c55246dd..5df3f9693f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -394,6 +394,12 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt { return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); } + + @Override + public boolean sideIsConsumer(EnumFacing side) + { + return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); + } public void sortInventory() { diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index 682f2dafb7..5e8e65a9b2 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -70,11 +70,11 @@ public class TileComponentConfig implements ITileComponent SideConfig config = getConfig(type); EnumFacing[] translatedFacings = MekanismUtils.getBaseOrientations(facing); - for(int i = 0; i < EnumFacing.VALUES.length; i++) + for(EnumFacing sideToCheck : EnumFacing.values()) { - if(config.get(translatedFacings[i]) == dataIndex) + if(config.get(translatedFacings[sideToCheck.ordinal()]) == dataIndex) { - ret.add(translatedFacings[i]); + ret.add(sideToCheck); } } @@ -87,8 +87,8 @@ public class TileComponentConfig implements ITileComponent { return false; } - - return getConfig(type).get(sideToTest) == dataIndex; + EnumFacing[] translatedFacings = MekanismUtils.getBaseOrientations(facing); + return getConfig(type).get(translatedFacings[sideToTest.ordinal()]) == dataIndex; } public void setCanEject(TransmissionType type, boolean eject)

['src/main/java/mekanism/common/tile/TileEntityFactory.java', 'src/main/java/mekanism/common/tile/component/TileComponentConfig.java']

{'.java': 2}

Java

{'Java': 10634221, 'ZenScript': 66932, 'Groovy': 7193, 'Perl': 4725, 'GLSL': 4576, 'JavaScript': 1156, 'Python': 511}

MIT License

mekanism/mekanism/4567/4560

mekanism

mekanism

https://github.com/mekanism/Mekanism/issues/4560

https://github.com/mekanism/Mekanism/pull/4567

https://github.com/mekanism/Mekanism/pull/4567

fixes

[1.11.2] Energy side configuration doesn't respect block orientation

#### Issue description: Regardless of which way a block is oriented the side configuration for energy always treats the faces as follows: - Front is North - Back is South - Left is West - Right is East - Bottom is Down - Top is Up Also tested with items but this seems to be functioning as expected. #### Steps to reproduce: 1. Face north 2. Place an energy cube / machine / quantum entangloporter 3. Configure the block to accept energy on every side 3. Surround the block with universal energy cables 4. Toggle the energy acceptance for each side on/off and make note of which cables detach 5. Repeat the process facing South, East, West, Up, Down as desired #### Version: **Forge:** 13.20.1.2393 **Mekanism:** 9.3.3.311-fix

2a535733c1b5a5c38361acf5f3b267ea78efb165

341e11da7009aa077ff3c2240c504ec586d0a0fd

https://github.com/mekanism/mekanism/compare/2a535733c1b5a5c38361acf5f3b267ea78efb165...341e11da7009aa077ff3c2240c504ec586d0a0fd

diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 7d56ed0a0d..602769200c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -1566,6 +1566,13 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing), EnumFacing.DOWN); } + @Override + public boolean sideIsConsumer(EnumFacing side) + { + return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing) || side == EnumFacing.DOWN; + } + + @Override public TileComponentSecurity getSecurity() { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 9ddc607d74..48301963d5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -421,6 +421,12 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I return EnumSet.of(facing.getOpposite()); } + @Override + public boolean sideIsConsumer(EnumFacing side) + { + return facing.getOpposite() == side; + } + @Override public boolean canSetFacing(int side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 41770eb8a5..55b5e7b5d3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -384,6 +384,12 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen return EnumSet.of(facing.getOpposite()); } + @Override + public boolean sideIsConsumer(EnumFacing side) + { + return facing.getOpposite() == side; + } + @Override public boolean canSetFacing(int side) {

['src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java', 'src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java', 'src/main/java/mekanism/common/tile/TileEntityElectricPump.java']

{'.java': 3}

Java

{'Java': 10634221, 'ZenScript': 66932, 'Groovy': 7193, 'Perl': 4725, 'GLSL': 4576, 'JavaScript': 1156, 'Python': 511}

MIT License

mekanism/mekanism/4575/4573

mekanism

mekanism

https://github.com/mekanism/Mekanism/issues/4573

https://github.com/mekanism/Mekanism/pull/4575

https://github.com/mekanism/Mekanism/pull/4575

closes

[1.10.2] Rotary Condensentrator Bucket issue

#### Issue description: So when placing a bucket in the Rotary Condensentrator seems to not empty it but in fact gives you infinite liquid see the video below #### Steps to reproduce: https://www.youtube.com/watch?v=ZF6JDSpxur4 #### Version (make sure you are on the latest version before reporting): **Forge:** 12.18.3.2316 **Mekanism:** 9.2.2-final-fix **Other relevant version:** Mod pack tested in https://minecraft.curseforge.com/projects/space-astronomy-2

cf436ab42392749265a5cc986ce26379eb5b0687

8d98a98dd8b88302cf9058fe6809311eca6c1b4c

https://github.com/mekanism/mekanism/compare/cf436ab42392749265a5cc986ce26379eb5b0687...8d98a98dd8b88302cf9058fe6809311eca6c1b4c

diff --git a/src/main/java/mekanism/common/util/FluidContainerUtils.java b/src/main/java/mekanism/common/util/FluidContainerUtils.java index 35ac06d7b6..bb010342d8 100644 --- a/src/main/java/mekanism/common/util/FluidContainerUtils.java +++ b/src/main/java/mekanism/common/util/FluidContainerUtils.java @@ -123,8 +123,7 @@ public final class FluidContainerUtils public static FluidStack handleContainerItemEmpty(TileEntity tileEntity, ItemStack[] inventory, FluidStack stored, int needed, int inSlot, int outSlot, final FluidChecker checker) { final Fluid storedFinal = stored != null ? stored.getFluid() : null; - final ItemStack input = StackUtils.size(inventory[inSlot].copy(), 1); - + FluidStack ret = extractFluid(needed, inventory, inSlot, new FluidChecker() { @Override public boolean isValid(Fluid f) @@ -132,22 +131,7 @@ public final class FluidContainerUtils return (checker == null || checker.isValid(f)) && (storedFinal == null || storedFinal == f); } }); - - ItemStack inputCopy = input.copy(); - - if(inputCopy.stackSize == 0) - { - inputCopy = null; - } - - if(FluidUtil.getFluidContained(inputCopy) == null && inputCopy != null) - { - if(inventory[outSlot] != null && (!ItemHandlerHelper.canItemStacksStack(inventory[outSlot], inputCopy) || inventory[outSlot].stackSize == inventory[outSlot].getMaxStackSize())) - { - return stored; - } - } - + if(ret != null) { if(stored == null) @@ -157,37 +141,29 @@ public final class FluidContainerUtils else { stored.amount += ret.amount; } - + needed -= ret.amount; - + tileEntity.markDirty(); } - - if(FluidUtil.getFluidContained(inputCopy) == null || needed == 0) + + if(FluidUtil.getFluidContained(inventory[inSlot]) == null || needed == 0) { - if(inputCopy != null) + if (inventory[inSlot].stackSize > 0) { - if(inventory[outSlot] == null) - { - inventory[outSlot] = inputCopy; - } - else if(ItemHandlerHelper.canItemStacksStack(inventory[outSlot], inputCopy)) - { + if (inventory[outSlot] == null) { + inventory[outSlot] = inventory[inSlot].copy(); + inventory[inSlot] = null; + } else if (inventory[outSlot].isItemEqual(inventory[inSlot]) && ItemStack.areItemStackTagsEqual(inventory[inSlot], inventory[outSlot])){ inventory[outSlot].stackSize++; + inventory[inSlot] = null; } - } - - inventory[inSlot].stackSize--; - - if(inventory[inSlot].stackSize == 0) - { + tileEntity.markDirty(); + } else { inventory[inSlot] = null; + + tileEntity.markDirty(); } - - tileEntity.markDirty(); - } - else { - inventory[inSlot] = inputCopy; } return stored;

['src/main/java/mekanism/common/util/FluidContainerUtils.java']

{'.java': 1}

Java

{'Java': 10634221, 'ZenScript': 66932, 'Groovy': 7193, 'Perl': 4725, 'GLSL': 4576, 'JavaScript': 1156, 'Python': 511}

MIT License

mekanism/mekanism/4426/4425

mekanism

mekanism

https://github.com/mekanism/Mekanism/issues/4425

https://github.com/mekanism/Mekanism/pull/4426

https://github.com/mekanism/Mekanism/pull/4426

fixes

Thermal Evaporation Plant causes massive lag while entering world

It is caused by instancing many display lists during recalculation of water model inside the plant. Reproduction: Add one level to fully built and filled plant

16b6860f94d6c82ac9a40951b920bd478da2485e

b6d77c595d39bcca24795dbff1d3f1408bdb3d1e

https://github.com/mekanism/mekanism/compare/16b6860f94d6c82ac9a40951b920bd478da2485e...b6d77c595d39bcca24795dbff1d3f1408bdb3d1e

diff --git a/src/main/java/mekanism/client/render/RenderResizableCuboid.java b/src/main/java/mekanism/client/render/RenderResizableCuboid.java index db994b3325..b750223eca 100644 --- a/src/main/java/mekanism/client/render/RenderResizableCuboid.java +++ b/src/main/java/mekanism/client/render/RenderResizableCuboid.java @@ -161,7 +161,8 @@ public class RenderResizableCuboid { wr.begin(GL11.GL_QUADS, shadeTypes.vertexFormat); for (EnumFacing face : EnumFacing.values()) { - renderCuboidFace(wr, face, sprites, flips, textureStart, textureSize, size, textureOffset, shadeTypes, formula, faceFormula, world); + if(cube.shouldSideRender(face)) + renderCuboidFace(wr, face, sprites, flips, textureStart, textureSize, size, textureOffset, shadeTypes, formula, faceFormula, world); } tess.draw(); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java index ef8cb2a975..94e4f89d05 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java @@ -19,25 +19,26 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import java.util.Arrays; @SideOnly(Side.CLIENT) public class RenderThermalEvaporationController extends TileEntitySpecialRenderer<TileEntityThermalEvaporationController> { - private static Map<SalinationRenderData, HashMap<Fluid, DisplayInteger[]>> cachedCenterFluids = new HashMap<SalinationRenderData, HashMap<Fluid, DisplayInteger[]>>(); + private static HashMap<Fluid, DisplayInteger[]> cachedCenterFluids = new HashMap<Fluid, DisplayInteger[]>(); + private static final int LEVELS = 16; + private static final int ALL_LEVELS = LEVELS + 2; + private static final int RING_INDEX = ALL_LEVELS-2; + private static final int CONCAVE_INDEX = ALL_LEVELS-1; @Override public void renderTileEntityAt(TileEntityThermalEvaporationController tileEntity, double x, double y, double z, float partialTick, int destroyStage) { if(tileEntity.structured && tileEntity.inputTank.getFluid() != null) { - SalinationRenderData data = new SalinationRenderData(); - - data.height = tileEntity.height-2; - data.side = tileEntity.facing; bindTexture(MekanismRenderer.getBlocksTexture()); - if(data.height >= 1 && tileEntity.inputTank.getCapacity() > 0) + if(tileEntity.height-2 >= 1 && tileEntity.inputTank.getCapacity() > 0) { push(); @@ -45,11 +46,41 @@ public class RenderThermalEvaporationController extends TileEntitySpecialRendere MekanismRenderer.glowOn(tileEntity.inputTank.getFluid().getFluid().getLuminosity()); - DisplayInteger[] displayList = getListAndRender(data, tileEntity.inputTank.getFluid().getFluid()); + DisplayInteger[] displayList = getListAndRender(tileEntity.inputTank.getFluid().getFluid()); + + float levels = Math.min(((float)tileEntity.inputTank.getFluidAmount()/tileEntity.inputTank.getCapacity()), 1); + + levels *= (tileEntity.height-2); - float tankFillPercentage = Math.min(((float)tileEntity.inputTank.getFluidAmount()/tileEntity.inputTank.getCapacity()), 1); + int partialLevels = (int)((levels-(int)levels)*16); + + switch (tileEntity.facing) + { + case SOUTH: + GlStateManager.translate(-1, 0, -1); + break; + case EAST: + GlStateManager.translate(-1, 0, 0); + break; + case WEST: + GlStateManager.translate(0, 0, -1); + break; + } - displayList[(int)(tankFillPercentage * ((float)getStages(data.height)-1))].render(); + GlStateManager.translate(0, 0.01, 0); + + if((int)levels>0) + { + displayList[CONCAVE_INDEX].render(); + GlStateManager.translate(0, 1, 0); + + for (int i = 1; i < (int)levels; i++) + { + displayList[RING_INDEX].render(); + GlStateManager.translate(0, 1, 0); + } + } + displayList[partialLevels].render(); MekanismRenderer.glowOff(); @@ -74,118 +105,66 @@ public class RenderThermalEvaporationController extends TileEntitySpecialRendere GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); } - @SuppressWarnings("incomplete-switch") - private DisplayInteger[] getListAndRender(SalinationRenderData data, Fluid fluid) + + private DisplayInteger[] getListAndRender(Fluid fluid) { - if(cachedCenterFluids.containsKey(data) && cachedCenterFluids.get(data).containsKey(fluid)) + if(cachedCenterFluids.containsKey(fluid)) { - return cachedCenterFluids.get(data).get(fluid); + return cachedCenterFluids.get(fluid); } - Model3D toReturn = new Model3D(); - toReturn.baseBlock = Blocks.WATER; - toReturn.setTexture(MekanismRenderer.getFluidTexture(fluid, FluidType.STILL)); + DisplayInteger[] displays = new DisplayInteger[ALL_LEVELS]; - final int stages = getStages(data.height); - DisplayInteger[] displays = new DisplayInteger[stages]; - - if(cachedCenterFluids.containsKey(data)) - { - cachedCenterFluids.get(data).put(fluid, displays); - } - else { - HashMap<Fluid, DisplayInteger[]> map = new HashMap<Fluid, DisplayInteger[]>(); - map.put(fluid, displays); - cachedCenterFluids.put(data, map); - } + Model3D model = new Model3D(); + model.baseBlock = fluid.getBlock(); + model.setTexture(MekanismRenderer.getFluidTexture(fluid, FluidType.STILL)); MekanismRenderer.colorFluid(fluid); - for(int i = 0; i < stages; i++) + if(fluid.getStill() == null) { - displays[i] = DisplayInteger.createAndStart(); - - if(fluid.getStill() != null) + DisplayInteger empty = DisplayInteger.createAndStart(); + DisplayInteger.endList(); + Arrays.fill(displays, 0, LEVELS, empty); + } + else + { + model.setSideRender(EnumFacing.DOWN, false); + for (int i = 0; i < LEVELS; i++) { - switch(data.side) - { - case NORTH: - toReturn.minX = 0 + .01; - toReturn.minY = 0 + .01; - toReturn.minZ = 0 + .01; - - toReturn.maxX = 2 - .01; - toReturn.maxY = ((float)i/(float)stages)*data.height - .01; - toReturn.maxZ = 2 - .01; - break; - case SOUTH: - toReturn.minX = -1 + .01; - toReturn.minY = 0 + .01; - toReturn.minZ = -1 + .01; - - toReturn.maxX = 1 - .01; - toReturn.maxY = ((float)i/(float)stages)*data.height - .01; - toReturn.maxZ = 1 - .01; - break; - case WEST: - toReturn.minX = 0 + .01; - toReturn.minY = 0 + .01; - toReturn.minZ = -1 + .01; - - toReturn.maxX = 2 - .01; - toReturn.maxY = ((float)i/(float)stages)*data.height - .01; - toReturn.maxZ = 1 - .01; - break; - case EAST: - toReturn.minX = -1 + .01; - toReturn.minY = 0 + .01; - toReturn.minZ = 0 + .01; - - toReturn.maxX = 1 - .01; - toReturn.maxY = ((float)i/(float)stages)*data.height - .01; - toReturn.maxZ = 2 - .01; - break; - } - - MekanismRenderer.renderObject(toReturn); + displays[i] = generateLevel(i, model); } - - displays[i].endList(); + model.setSideRender(EnumFacing.UP, false); + displays[RING_INDEX] = generateLevel(LEVELS-1, model); + model.setSideRender(EnumFacing.DOWN, true); + displays[CONCAVE_INDEX] = generateLevel(LEVELS-1, model); } MekanismRenderer.resetColor(); - + cachedCenterFluids.put(fluid, displays); return displays; } - private int getStages(int height) + private DisplayInteger generateLevel(int height, Model3D model) { - return height*(TankUpdateProtocol.FLUID_PER_TANK/10); - } + DisplayInteger displayInteger = DisplayInteger.createAndStart(); - public static class SalinationRenderData - { - public int height; - public EnumFacing side; + model.minX = 0 + .01; + model.minY = 0; + model.minZ = 0 + .01; + model.maxX = 2 - .01; + model.maxY = (float)height/(float)(LEVELS-1) + (height==0?.02:0); + model.maxZ = 2 - .01; - @Override - public int hashCode() - { - int code = 1; - code = 31 * code + height; - return code; - } + MekanismRenderer.renderObject(model); + DisplayInteger.endList(); - @Override - public boolean equals(Object data) - { - return data instanceof SalinationRenderData && ((SalinationRenderData)data).height == height && - ((SalinationRenderData)data).side == side; - } + return displayInteger; } public static void resetDisplayInts() { cachedCenterFluids.clear(); } -} + +} \\ No newline at end of file

['src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java', 'src/main/java/mekanism/client/render/RenderResizableCuboid.java']

{'.java': 2}

Java

{'Java': 10634221, 'ZenScript': 66932, 'Groovy': 7193, 'Perl': 4725, 'GLSL': 4576, 'JavaScript': 1156, 'Python': 511}

MIT License

slimeknights/tinkersconstruct/1584/1561

slimeknights

tinkersconstruct

https://github.com/SlimeKnights/TinkersConstruct/issues/1561

https://github.com/SlimeKnights/TinkersConstruct/pull/1584

https://github.com/SlimeKnights/TinkersConstruct/pull/1584

fixes

Drying rack mirrors items horizontally if placed while facing north or west

http://i.imgur.com/6i51sRL.png Signs in the picture label which direction the player is facing. Also possibly worth noting: as evident in the pictures, they're not properly centered on the rack. This has been a problem as long as I can remember, frankly I'm surprised I can't find anything mentioning it.

9f0349c66b264e858d23665aebd4fdc99108dcaa

dfed1dd9f44505522d464622b204bb45aec4d0f6

https://github.com/slimeknights/tinkersconstruct/compare/9f0349c66b264e858d23665aebd4fdc99108dcaa...dfed1dd9f44505522d464622b204bb45aec4d0f6

diff --git a/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java index 23f46f3de..ee94797ba 100644 --- a/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java @@ -55,11 +55,23 @@ public class DryingRackSpecialRender extends TileEntitySpecialRenderer if (meta == 2) GL11.glTranslatef(0F, 0F, 0.375F); if (meta == 3) - GL11.glTranslatef(0F, 0F, -0.375F); + { + // Rotate, Flip. + GL11.glRotatef(180F, 0F, 1F, 0F); + GL11.glTranslatef(0F, 0F, 0.2F); + //GL11.glTranslatef(0F, 0F, -0.375F); + } if (meta == 4) + { GL11.glTranslatef(0F, 0F, 0.2875F); + } if (meta == 5) - GL11.glTranslatef(0F, 0F, -0.5F); + { + //Rotate, Flip. + GL11.glRotatef(180F, 0F, 1F, 0F); + GL11.glTranslatef(0F, 0F, 0.3F); + //GL11.glTranslatef(0F, 0F, -0.5F); + } } GL11.glScalef(2F, 2F, 2F); if (stack.getItem() instanceof ItemBlock)

['src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java']

{'.java': 1}

Java

{'Java': 5527226, 'ZenScript': 28851}

MIT License

stripe/stripe-android/57/55

stripe

stripe-android

https://github.com/stripe/stripe-android/issues/55

https://github.com/stripe/stripe-android/pull/57

https://github.com/stripe/stripe-android/pull/57

fixes

Duplicate card number prefix

Just wondering if there was a mistake on this line https://github.com/stripe/stripe-android/blob/master/stripe/src/main/java/com/stripe/android/model/Card.java#L19 or why is it that you are including `37` as a `Diners Club` prefix if according to your source page https://en.wikipedia.org/wiki/Bank_card_number#Issuer_identification_number_.28IIN.29 it clearly exclude `37`

f3366f28b0842f398984d6858d21a732ba0e7193

1d90219e20bf60db6c26ccf4455a0b0a5fffc410

https://github.com/stripe/stripe-android/compare/f3366f28b0842f398984d6858d21a732ba0e7193...1d90219e20bf60db6c26ccf4455a0b0a5fffc410

diff --git a/stripe/src/main/java/com/stripe/android/model/Card.java b/stripe/src/main/java/com/stripe/android/model/Card.java index 8bd357522e..395aa01d83 100644 --- a/stripe/src/main/java/com/stripe/android/model/Card.java +++ b/stripe/src/main/java/com/stripe/android/model/Card.java @@ -16,7 +16,7 @@ public class Card extends com.stripe.model.StripeObject { public static final String[] PREFIXES_AMERICAN_EXPRESS = {"34", "37"}; public static final String[] PREFIXES_DISCOVER = {"60", "62", "64", "65"}; public static final String[] PREFIXES_JCB = {"35"}; - public static final String[] PREFIXES_DINERS_CLUB = {"300", "301", "302", "303", "304", "305", "309", "36", "38", "37", "39"}; + public static final String[] PREFIXES_DINERS_CLUB = {"300", "301", "302", "303", "304", "305", "309", "36", "38", "39"}; public static final String[] PREFIXES_VISA = {"4"}; public static final String[] PREFIXES_MASTERCARD = {"50", "51", "52", "53", "54", "55"};

['stripe/src/main/java/com/stripe/android/model/Card.java']

{'.java': 1}

Kotlin

{'Kotlin': 9267111, 'Java': 69683, 'Shell': 18879, 'Python': 13927, 'Ruby': 7073}

MIT License

tony19/logback-android/221/213

tony19

logback-android

https://github.com/tony19/logback-android/issues/213

https://github.com/tony19/logback-android/pull/221

https://github.com/tony19/logback-android/pull/221

fixes

Daily rollover uses UTC instead of local time

## Description I configured daily rollover with TimeBasedRollingPolicy, according to example in [wiki](https://github.com/tony19/logback-android/wiki/Appender-Notes#configuration-in-code). It generally works, but rollover happens at UTC midnight, not local midnight. This may be confusing. I know it's possible to specify time zone explicitly, but I suppose local time should be used by default, like it was in older versions (e.g. 1.1.1). Maybe the same issue was reported at #198. ## Steps to reproduce 1. Checkout [sample project](https://github.com/gmk57/TestLogback) 1. Configure GMT+3 time zone on device or emulator 1. Leave app running overnight 1. log.txt contains events since 3:00, not 0:00 ## Environment * **`logback-android` version:** 2.0.0 * **Android version:** 5.1, 6.0 * **Platform:** devices, emulator

8386981b046084492df784bca739db2598db3107

e40e9fa4c1518038e066f4a246a4f6a539bfaed0

https://github.com/tony19/logback-android/compare/8386981b046084492df784bca739db2598db3107...e40e9fa4c1518038e066f4a246a4f6a539bfaed0

diff --git a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java index 2d461e535..d94336e94 100644 --- a/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java +++ b/logback-android/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java @@ -72,7 +72,9 @@ public class RollingCalendar extends GregorianCalendar { } public RollingCalendar(String datePattern) { - this(datePattern, GMT_TIMEZONE, Locale.US); + super(); + this.datePattern = datePattern; + this.periodicityType = computePeriodicityType(); } public RollingCalendar(String datePattern, TimeZone tz, Locale locale) { diff --git a/logback-android/src/test/java/ch/qos/logback/core/rolling/helper/RollingCalendarTest.java b/logback-android/src/test/java/ch/qos/logback/core/rolling/helper/RollingCalendarTest.java index 42578f15d..4ac32b39e 100644 --- a/logback-android/src/test/java/ch/qos/logback/core/rolling/helper/RollingCalendarTest.java +++ b/logback-android/src/test/java/ch/qos/logback/core/rolling/helper/RollingCalendarTest.java @@ -90,7 +90,7 @@ public class RollingCalendarTest { } private Calendar getEndOfNextNthPeriod(String dateFormat, Date date, int n) { - RollingCalendar rc = new RollingCalendar(dateFormat); + RollingCalendar rc = new RollingCalendar(dateFormat, GMT_TIMEZONE, Locale.US); Date nextDate = rc.getEndOfNextNthPeriod(date, n); Calendar cal = Calendar.getInstance(GMT_TIMEZONE, Locale.US); cal.setTime(nextDate); @@ -242,4 +242,4 @@ public class RollingCalendarTest { assertFalse(rc.isCollisionFree()); } } -} \\ No newline at end of file +}

['logback-android/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java', 'logback-android/src/test/java/ch/qos/logback/core/rolling/helper/RollingCalendarTest.java']

{'.java': 2}

Java

{'Java': 2511833, 'TypeScript': 19668, 'Shell': 8371, 'HTML': 6656, 'Roff': 482}

Apache License 2.0

appium/java-client/313/311

appium

java-client

https://github.com/appium/java-client/issues/311

https://github.com/appium/java-client/pull/313

https://github.com/appium/java-client/pull/313#issuecomment-180294535

resolve

Update page object features. Server node 1.5.x

These things should be done: - mark _name_ parameter _Decrecated_ as _By.name_ selector is not supported by native app automation - _By.id_ selector should be used by default (native content) when not any selector strategy defined. - _org.openqa.selenium.InvalidSelectorException_ should be handled.

138e2e8071c9346aeda51f995d506066b3b6ba41

c823138cf5f6605f834bfb33f5a1b5b11227b8f5

https://github.com/appium/java-client/compare/138e2e8071c9346aeda51f995d506066b3b6ba41...c823138cf5f6605f834bfb33f5a1b5b11227b8f5

diff --git a/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java b/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java index 1dd3e485..5569fe83 100644 --- a/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java +++ b/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java @@ -35,7 +35,11 @@ public @interface AndroidFindBy { String uiAutomator() default ""; String accessibility() default ""; String id() default ""; - String name() default ""; + @Deprecated + /** + * By.name selector is not supported by Appium server node since 1.5.x. + * So this option is going to be removed further. Be careful. + */String name() default ""; String className() default ""; String tagName() default ""; String xpath() default ""; diff --git a/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java b/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java index b7c71fe9..bcfb18bf 100644 --- a/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java +++ b/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java @@ -16,6 +16,7 @@ package io.appium.java_client.pagefactory; +import org.openqa.selenium.InvalidSelectorException; import org.openqa.selenium.StaleElementReferenceException; import java.lang.reflect.InvocationTargetException; @@ -28,7 +29,11 @@ class ThrowableUtil { return false; } - if (String.valueOf(e.getMessage()).contains(INVALID_SELECTOR_PATTERN)) { + if (InvalidSelectorException.class.isAssignableFrom(e.getClass())) { + return true; + } + + if (String.valueOf(e.getMessage()).contains(INVALID_SELECTOR_PATTERN) || String.valueOf(e.getMessage()).contains("Locator Strategy \\\\w+ is not supported")) { return true; } diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java b/src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java index b666df94..6f38ed2a 100644 --- a/src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java +++ b/src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java @@ -35,7 +35,11 @@ public @interface iOSFindBy { String uiAutomator() default ""; String accessibility() default ""; String id() default ""; - String name() default ""; + @Deprecated + /** + * By.name selector is not supported by Appium server node since 1.5.x. + * So this option is going to be removed further. Be careful. + */String name() default ""; String className() default ""; String tagName() default ""; String xpath() default ""; diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/SelendroidModeTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/SelendroidModeTest.java index b3129e67..fd15db3f 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/SelendroidModeTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/SelendroidModeTest.java @@ -17,6 +17,7 @@ package io.appium.java_client.pagefactory_tests; import io.appium.java_client.android.AndroidDriver; +import io.appium.java_client.android.AndroidElement; import io.appium.java_client.pagefactory.*; import io.appium.java_client.remote.AutomationName; import io.appium.java_client.remote.MobileCapabilityType; @@ -37,7 +38,7 @@ import java.util.concurrent.TimeUnit; import static org.junit.Assert.*; public class SelendroidModeTest { - private static int SELENDROID_PORT = 9999; + private static int SELENDROID_PORT = 9999; private static WebDriver driver; private static AppiumDriverLocalService service; @@ -63,15 +64,15 @@ public class SelendroidModeTest { private WebElement textXpath; @SelendroidFindBys({ - @SelendroidFindBy(id = "text1")}) + @SelendroidFindBy(id = "text1")}) private WebElement textIds; @SelendroidFindAll({ - @SelendroidFindBy(id = "text1")}) + @SelendroidFindBy(id = "text1")}) private WebElement textAll; @SelendroidFindAll({ - @SelendroidFindBy(id = "text1")}) + @SelendroidFindBy(id = "text1")}) private List<WebElement> textsAll; @SelendroidFindBy(className = "android.widget.TextView") @@ -79,14 +80,14 @@ public class SelendroidModeTest { @SelendroidFindBy(tagName = "TextView") private WebElement textTag; - + @SelendroidFindBy(linkText = "Accessibility") private WebElement textLink; - + @SelendroidFindBy(partialLinkText = "ccessibilit") private WebElement textPartialLink; - @BeforeClass + @BeforeClass public static void beforeClass() throws Exception { AppiumServiceBuilder builder = new AppiumServiceBuilder().withArgument(GeneralServerFlag.AUTOMATION_NAME, AutomationName.SELENDROID); service = builder.build(); @@ -123,8 +124,8 @@ public class SelendroidModeTest { public void findByIdElementTest() { assertNotEquals(null, textId.getAttribute("text")); } - - @Test + + @Test public void findBySelendroidSelectorTest() { assertNotEquals(null, textSelendroidId.getAttribute("text")); } @@ -173,15 +174,15 @@ public class SelendroidModeTest { public void findByElementByTagTest() { assertNotEquals(null, textTag.getAttribute("text")); } - + @Test public void findBySelendroidAnnotationOnlyTest() { assertNotEquals(null, textSelendroidId.getAttribute("text")); } - + @Test public void findBySelendroidLinkTextTest() { assertEquals("Accessibility", textLink.getText()); } -} +} \\ No newline at end of file diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java index ac7c04d1..ce83f338 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java @@ -37,9 +37,9 @@ import java.util.List; public class iOSPageObjectTest { - private static WebDriver driver; - private static AppiumDriverLocalService service; - private boolean populated = false; + private static WebDriver driver; + private static AppiumDriverLocalService service; + private boolean populated = false; @FindBy(className = "UIAButton") private List<WebElement> uiButtons; @@ -67,9 +67,9 @@ public class iOSPageObjectTest { private List<RemoteWebElement> remoteElementViews; @AndroidFindBys({ - @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\\"android:id/list\\")"), - @AndroidFindBy(className = "android.widget.TextView") - }) + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\\"android:id/list\\")"), + @AndroidFindBy(className = "android.widget.TextView") + }) private List<WebElement> chainElementViews; @@ -92,11 +92,11 @@ public class iOSPageObjectTest { @iOSFindBy(uiAutomator = ".elements()[0]") private MobileElement mobileButton; - @iOSFindBy(uiAutomator = ".elements()[0]") - private TouchableElement touchableButton; + @iOSFindBy(uiAutomator = ".elements()[0]") + private TouchableElement touchableButton; - @iOSFindBy(uiAutomator = ".elements()[0]") - private List<TouchableElement> touchableButtons; + @iOSFindBy(uiAutomator = ".elements()[0]") + private List<TouchableElement> touchableButtons; @FindBy(className = "UIAButton") private MobileElement mobiletFindBy_Button; @@ -105,69 +105,70 @@ public class iOSPageObjectTest { private RemoteWebElement remotetextVieW; @AndroidFindBys({ - @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\\"android:id/list\\")"), - @AndroidFindBy(className = "android.widget.TextView") - }) + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\\"android:id/list\\")"), + @AndroidFindBy(className = "android.widget.TextView") + }) private WebElement chainElementView; - + @iOSFindBy(uiAutomator = ".elements()[0]") private IOSElement iosButton; - + @iOSFindBy(uiAutomator = ".elements()[0]") private List<IOSElement> iosButtons; - + @iOSFindAll({ - @iOSFindBy(xpath = "ComputeSumButton_Test"), - @iOSFindBy(name = "ComputeSumButton") //it is real locator + @iOSFindBy(xpath = "ComputeSumButton_Test"), + @iOSFindBy(name = "ComputeSumButton") //it is real locator }) private WebElement findAllElement; - + @iOSFindAll({ - @iOSFindBy(xpath = "ComputeSumButton_Test"), - @iOSFindBy(name = "ComputeSumButton") //it is real locator + @iOSFindBy(xpath = "ComputeSumButton_Test"), + @iOSFindBy(name = "ComputeSumButton") //it is real locator }) private List<WebElement> findAllElements; - @AndroidFindBy(className = "android.widget.TextView") - @FindBy(css = "e.e1.e2") - private List<WebElement> elementsWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy; - - @AndroidFindBy(className = "android.widget.TextView") - @FindBy(css = "e.e1.e2") - private WebElement elementWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy; - - - @BeforeClass - public static void beforeClass() throws Exception { - service = AppiumDriverLocalService.buildDefaultService(); - service.start(); + @AndroidFindBy(className = "android.widget.TextView") + @FindBy(css = "e.e1.e2") + private List<WebElement> elementsWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy; - File appDir = new File("src/test/java/io/appium/java_client"); - File app = new File(appDir, "TestApp.app.zip"); - DesiredCapabilities capabilities = new DesiredCapabilities(); - capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); - capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "8.4"); - capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator"); - capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); - driver = new IOSDriver<>(service.getUrl(), capabilities); - } + @AndroidFindBy(className = "android.widget.TextView") + @FindBy(css = "e.e1.e2") + private WebElement elementWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy; + + + @BeforeClass + public static void beforeClass() throws Exception { + service = AppiumDriverLocalService.buildDefaultService(); + service.start(); + + File appDir = new File("src/test/java/io/appium/java_client"); + File app = new File(appDir, "TestApp.app.zip"); + DesiredCapabilities capabilities = new DesiredCapabilities(); + capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); + capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1"); + capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator"); + capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); + driver = new IOSDriver(service.getUrl(), capabilities); + } + @SuppressWarnings("rawtypes") @Before public void setUp() throws Exception { - if (!populated) - PageFactory.initElements(new AppiumFieldDecorator(driver), this); + if (!populated) + PageFactory.initElements(new AppiumFieldDecorator(driver), this); - populated = true; + populated = true; } - @AfterClass - public static void afterClass() throws Exception { - if (driver != null) - driver.quit(); + @AfterClass + public static void afterClass() throws Exception { + if (driver != null) + driver.quit(); - if (service != null) - service.stop(); - } + if (service != null) + service.stop(); + } @Test public void findByElementsTest() { @@ -273,7 +274,7 @@ public class iOSPageObjectTest { } Assert.assertNotNull(nsee); } - + @Test public void isIOSElementTest(){ Assert.assertNotEquals(null, iosButton.getText()); @@ -294,38 +295,38 @@ public class iOSPageObjectTest { Assert.assertNotEquals(null, findAllElement.getText()); } - @Test - public void isTouchAbleElement(){ - Assert.assertNotEquals(null, touchableButton.getText()); - } + @Test + public void isTouchAbleElement(){ + Assert.assertNotEquals(null, touchableButton.getText()); + } - @Test - public void areTouchAbleElements(){ - Assert.assertNotEquals(0, touchableButtons.size()); - } + @Test + public void areTouchAbleElements(){ + Assert.assertNotEquals(0, touchableButtons.size()); + } - @Test - @SuppressWarnings("unused") - public void isTheFieldIOSElement(){ + @Test + public void isTheFieldIOSElement(){ + @SuppressWarnings("unused") IOSElement iOSElement = (IOSElement) mobileButton; //declared as MobileElement - iOSElement = (IOSElement) iosUIAutomatorButton; //declared as WebElement - iOSElement = (IOSElement) remotetextVieW; //declared as RemoteWebElement - iOSElement = (IOSElement) touchableButton; //declared as TouchABLEElement - } - - @Test - public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy(){ - try { - Assert.assertNotEquals(null, elementWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.getAttribute("text")); - } - catch (NoSuchElementException ignored){ - return; - } - throw new RuntimeException(NoSuchElementException.class.getName() + " has been expected."); - } - - @Test - public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy_List(){ - Assert.assertEquals(0, elementsWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.size()); - } -} + iOSElement = (IOSElement) iosUIAutomatorButton; //declared as WebElement + iOSElement = (IOSElement) remotetextVieW; //declared as RemoteWebElement + iOSElement = (IOSElement) touchableButton; //declared as TouchABLEElement + } + + @Test + public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy(){ + try { + Assert.assertNotEquals(null, elementWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.getAttribute("text")); + } + catch (NoSuchElementException ignored){ + return; + } + throw new RuntimeException(NoSuchElementException.class.getName() + " has been expected."); + } + + @Test + public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy_List(){ + Assert.assertEquals(0, elementsWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.size()); + } +} \\ No newline at end of file

['src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java', 'src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java', 'src/test/java/io/appium/java_client/pagefactory_tests/SelendroidModeTest.java', 'src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java', 'src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java']

{'.java': 5}

Java

{'Java': 1674245, 'HTML': 80758}

Apache License 2.0

appium/java-client/769/764

appium

java-client

https://github.com/appium/java-client/issues/764

https://github.com/appium/java-client/pull/769

https://github.com/appium/java-client/pull/769

fix

Client asking to many times for session

## Description I'm seeing the java client asking for getSession too many times, probably like 5,6 times between commands, making the test to run slower. This make a big difference when running on a testing cloud since this calls are adding ~4 seconds between commands in the test. ## Environment This is a problem with the client itself. * java client build version or git revision if you use some shapshot: 5.0.4 (havent tried another version) * Appium server version or git revision if you use some shapshot: Any * Desktop OS/version used to run Appium if necessary: Any * Node.js version (unless using Appium.app|exe) or Appium CLI or Appium.app|exe: Any * Mobile platform/version under test: Any * Real device or emulator/simulator: Any ## Details ## Code To Reproduce Issue [ Good To Have ] Running a simple test using the java client, during logs we can see all the getSession commands. For ex. ``` INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, findElements {using=id, value=com.test.app:id/text1}] Nov 09, 2017 5:39:45 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:45 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:45 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:46 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:46 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:46 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:46 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:46 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:46 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:46 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:46 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:47 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:47 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:47 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:47 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:47 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:47 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:48 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:48 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:48 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:48 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:48 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:48 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:48 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:48 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:49 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:49 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:49 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:49 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:49 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:49 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getSession [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:50 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getSession {}] Nov 09, 2017 5:39:50 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executing: getElementText [f8b4312dda7c43bfba2620ef50605eec, getElementText {id=5201}] Nov 09, 2017 5:39:50 PM org.openqa.selenium.remote.RemoteWebDriver log INFO: Executed: [f8b4312dda7c43bfba2620ef50605eec, getElementText {id=5201}] ``` ## Ecxeption stacktraces No errors. ## Link to Appium logs

5dab23d599ac04bd4550c0b2cda68e110551d7c4

d10f5d1df3482ce8049cca115444aa0a2b191633

https://github.com/appium/java-client/compare/5dab23d599ac04bd4550c0b2cda68e110551d7c4...d10f5d1df3482ce8049cca115444aa0a2b191633

diff --git a/src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java b/src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java index 23e188b2..6376a265 100644 --- a/src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java +++ b/src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java @@ -153,7 +153,7 @@ abstract class DefaultGenericMobileDriver<T extends WebElement> extends RemoteWe @Override public String toString() { - return String.format("%s: %s", getPlatformName(), - getAutomationName()); + return String.format("%s, Capabilities: %s", getClass().getCanonicalName(), + getCapabilities().asMap().toString()); } } diff --git a/src/main/java/io/appium/java_client/internal/ElementMap.java b/src/main/java/io/appium/java_client/internal/ElementMap.java index 1d150ae9..65ff376e 100644 --- a/src/main/java/io/appium/java_client/internal/ElementMap.java +++ b/src/main/java/io/appium/java_client/internal/ElementMap.java @@ -16,9 +16,10 @@ package io.appium.java_client.internal; +import static org.apache.commons.lang3.StringUtils.isBlank; + import com.google.common.collect.ImmutableMap; -import io.appium.java_client.HasSessionDetails; import io.appium.java_client.MobileElement; import io.appium.java_client.android.AndroidElement; import io.appium.java_client.ios.IOSElement; @@ -68,17 +69,19 @@ public enum ElementMap { } /** - * @param hasSessionDetails something that implements {@link io.appium.java_client.HasSessionDetails}. - * @return subclass of {@link io.appium.java_client.MobileElement} that convenient to current session details. + * @param platform is the mobile platform. See {@link MobilePlatform}. + * @param automation is the mobile automation type. See {@link AutomationName} + * @return subclass of {@link org.openqa.selenium.remote.RemoteWebElement} that convenient + * to current session details. */ - public static Class<? extends RemoteWebElement> getElementClass(HasSessionDetails hasSessionDetails) { - if (hasSessionDetails == null) { + public static Class<? extends RemoteWebElement> getElementClass(String platform, String automation) { + if (isBlank(platform) && isBlank(automation)) { return RemoteWebElement.class; } - ElementMap element = Optional.ofNullable(mobileElementMap.get(String - .valueOf(hasSessionDetails.getAutomationName()).toLowerCase().trim())) + ElementMap element = Optional.ofNullable(mobileElementMap.get( + String.valueOf(platform).toLowerCase().trim())) .orElseGet(() -> mobileElementMap - .get(String.valueOf(hasSessionDetails.getPlatformName()).toLowerCase().trim())); + .get(String.valueOf(automation).toLowerCase().trim())); if (element == null) { return RemoteWebElement.class; } diff --git a/src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java b/src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java index 923910e7..5d752f64 100644 --- a/src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java +++ b/src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java @@ -37,7 +37,10 @@ import java.util.Collection; public class JsonToMobileElementConverter extends JsonToWebElementConverter { protected final RemoteWebDriver driver; - private final HasSessionDetails hasSessionDetails; + + private final String platform; + private final String automation; + /** * @param driver an instance of {@link org.openqa.selenium.remote.RemoteWebDriver} subclass @@ -46,7 +49,8 @@ public class JsonToMobileElementConverter extends JsonToWebElementConverter { public JsonToMobileElementConverter(RemoteWebDriver driver, HasSessionDetails hasSessionDetails) { super(driver); this.driver = driver; - this.hasSessionDetails = hasSessionDetails; + this.platform = hasSessionDetails.getPlatformName(); + this.automation = hasSessionDetails.getAutomationName(); } /** @@ -80,9 +84,9 @@ public class JsonToMobileElementConverter extends JsonToWebElementConverter { return result; } - protected RemoteWebElement newMobileElement() { + private RemoteWebElement newMobileElement() { Class<? extends RemoteWebElement> target; - target = getElementClass(hasSessionDetails); + target = getElementClass(platform, automation); try { Constructor<? extends RemoteWebElement> constructor = target.getDeclaredConstructor(); constructor.setAccessible(true); diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java index a08ffc31..a7acc71a 100644 --- a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java +++ b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java @@ -19,8 +19,11 @@ package io.appium.java_client.pagefactory; import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException; import static io.appium.java_client.pagefactory.ThrowableUtil.isInvalidSelectorRootCause; import static io.appium.java_client.pagefactory.ThrowableUtil.isStaleElementReferenceException; +import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.getCurrentContentType; +import static java.lang.String.format; +import io.appium.java_client.pagefactory.bys.ContentMappedBy; import io.appium.java_client.pagefactory.locator.CacheableLocator; import org.openqa.selenium.By; @@ -39,13 +42,15 @@ import java.util.function.Supplier; class AppiumElementLocator implements CacheableLocator { + private static final String exceptionMessageIfElementNotFound = "Can't locate an element by this strategy: %s"; + private final boolean shouldCache; private final By by; private final TimeOutDuration duration; private final SearchContext searchContext; private WebElement cachedElement; private List<WebElement> cachedElementList; - private final String exceptionMessageIfElementNotFound; + /** * Creates a new mobile element locator. It instantiates {@link WebElement} * using @AndroidFindBy (-s), @iOSFindBy (-s) and @FindBy (-s) annotation @@ -64,7 +69,25 @@ class AppiumElementLocator implements CacheableLocator { this.shouldCache = shouldCache; this.duration = duration; this.by = by; - this.exceptionMessageIfElementNotFound = "Can't locate an element by this strategy: " + by.toString(); + } + + /** + * This methods makes sets some settings of the {@link By} according to + * the given instance of {@link SearchContext}. If there is some {@link ContentMappedBy} + * then it is switched to the searching for some html or native mobile element. + * Otherwise nothing happens there. + * + * @param currentBy is some locator strategy + * @param currentContent is an instance of some subclass of the {@link SearchContext}. + * @return the corrected {@link By} for the further searching + */ + private static By getBy(By currentBy, SearchContext currentContent) { + if (!ContentMappedBy.class.isAssignableFrom(currentBy.getClass())) { + return currentBy; + } + + return ContentMappedBy.class.cast(currentBy) + .useContent(getCurrentContentType(currentContent)); } private <T> T waitFor(Supplier<T> supplier) { @@ -91,15 +114,16 @@ class AppiumElementLocator implements CacheableLocator { return cachedElement; } + By bySearching = getBy(this.by, searchContext); try { WebElement result = waitFor(() -> - searchContext.findElement(by)); + searchContext.findElement(bySearching)); if (shouldCache) { cachedElement = result; } return result; } catch (TimeoutException | StaleElementReferenceException e) { - throw new NoSuchElementException(exceptionMessageIfElementNotFound, e); + throw new NoSuchElementException(format(exceptionMessageIfElementNotFound, bySearching.toString()), e); } } @@ -114,11 +138,9 @@ class AppiumElementLocator implements CacheableLocator { List<WebElement> result; try { result = waitFor(() -> { - List<WebElement> list = searchContext.findElements(by); - if (list.size() > 0) { - return list; - } - return null; + List<WebElement> list = searchContext + .findElements(getBy(by, searchContext)); + return list.size() > 0 ? list : null; }); } catch (TimeoutException | StaleElementReferenceException e) { result = new ArrayList<>(); @@ -135,7 +157,7 @@ class AppiumElementLocator implements CacheableLocator { } @Override public String toString() { - return String.format("Located by %s", by); + return format("Located by %s", by); } diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java index 9753736e..9d189d31 100644 --- a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java +++ b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java @@ -20,6 +20,7 @@ import static io.appium.java_client.internal.ElementMap.getElementClass; import static io.appium.java_client.pagefactory.utils.ProxyFactory.getEnhancedProxy; import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility .unpackWebDriverFromSearchContext; +import static java.util.Optional.ofNullable; import com.google.common.collect.ImmutableList; @@ -64,13 +65,12 @@ public class AppiumFieldDecorator implements FieldDecorator { IOSElement.class, WindowsElement.class); public static long DEFAULT_TIMEOUT = 1; public static TimeUnit DEFAULT_TIMEUNIT = TimeUnit.SECONDS; - private final WebDriver originalDriver; + private final WebDriver webDriver; private final DefaultFieldDecorator defaultElementFieldDecoracor; private final AppiumElementLocatorFactory widgetLocatorFactory; private final String platform; private final String automation; private final TimeOutDuration duration; - private final HasSessionDetails hasSessionDetails; public AppiumFieldDecorator(SearchContext context, long timeout, @@ -87,14 +87,18 @@ public class AppiumFieldDecorator implements FieldDecorator { * @param duration is a desired duration of the waiting for an element presence. */ public AppiumFieldDecorator(SearchContext context, TimeOutDuration duration) { - this.originalDriver = unpackWebDriverFromSearchContext(context); - if (originalDriver == null - || !HasSessionDetails.class.isAssignableFrom(originalDriver.getClass())) { - hasSessionDetails = null; + this.webDriver = unpackWebDriverFromSearchContext(context); + HasSessionDetails hasSessionDetails = ofNullable(this.webDriver).map(webDriver -> { + if (!HasSessionDetails.class.isAssignableFrom(webDriver.getClass())) { + return null; + } + return HasSessionDetails.class.cast(webDriver); + }).orElse(null); + + if (hasSessionDetails == null) { platform = null; automation = null; } else { - hasSessionDetails = HasSessionDetails.class.cast(originalDriver); platform = hasSessionDetails.getPlatformName(); automation = hasSessionDetails.getAutomationName(); } @@ -202,7 +206,7 @@ public class AppiumFieldDecorator implements FieldDecorator { if (isAlist) { return getEnhancedProxy(ArrayList.class, - new WidgetListInterceptor(locator, originalDriver, map, widgetType, + new WidgetListInterceptor(locator, webDriver, map, widgetType, duration)); } @@ -210,11 +214,11 @@ public class AppiumFieldDecorator implements FieldDecorator { WidgetConstructorUtil.findConvenientConstructor(widgetType); return getEnhancedProxy(widgetType, new Class[] {constructor.getParameterTypes()[0]}, new Object[] {proxyForAnElement(locator)}, - new WidgetInterceptor(locator, originalDriver, null, map, duration)); + new WidgetInterceptor(locator, webDriver, null, map, duration)); } private WebElement proxyForAnElement(ElementLocator locator) { - ElementInterceptor elementInterceptor = new ElementInterceptor(locator, originalDriver); - return getEnhancedProxy(getElementClass(hasSessionDetails), elementInterceptor); + ElementInterceptor elementInterceptor = new ElementInterceptor(locator, webDriver); + return getEnhancedProxy(getElementClass(platform, automation), elementInterceptor); } } diff --git a/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java index ff4a9f74..9c752322 100644 --- a/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java +++ b/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java @@ -18,6 +18,7 @@ package io.appium.java_client.pagefactory; import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException; import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.getCurrentContentType; +import static java.util.Optional.ofNullable; import io.appium.java_client.pagefactory.bys.ContentType; import io.appium.java_client.pagefactory.interceptors.InterceptorOfAListOfElements; @@ -59,8 +60,9 @@ class WidgetListInterceptor extends InterceptorOfAListOfElements { cachedElements = elements; cachedWidgets.clear(); + ContentType type = null; for (WebElement element : cachedElements) { - ContentType type = getCurrentContentType(element); + type = ofNullable(type).orElseGet(() -> getCurrentContentType(element)); Class<?>[] params = new Class<?>[] {instantiationMap.get(type).getParameterTypes()[0]}; cachedWidgets.add(ProxyFactory diff --git a/src/main/java/io/appium/java_client/pagefactory/bys/ContentMappedBy.java b/src/main/java/io/appium/java_client/pagefactory/bys/ContentMappedBy.java index 95a6659c..1f995bbe 100644 --- a/src/main/java/io/appium/java_client/pagefactory/bys/ContentMappedBy.java +++ b/src/main/java/io/appium/java_client/pagefactory/bys/ContentMappedBy.java @@ -16,7 +16,8 @@ package io.appium.java_client.pagefactory.bys; -import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.getCurrentContentType; +import static com.google.common.base.Preconditions.checkNotNull; +import static io.appium.java_client.pagefactory.bys.ContentType.NATIVE_MOBILE_SPECIFIC; import org.openqa.selenium.By; import org.openqa.selenium.SearchContext; @@ -24,32 +25,36 @@ import org.openqa.selenium.WebElement; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; public class ContentMappedBy extends By { private final Map<ContentType, By> map; + private ContentType currentContent = NATIVE_MOBILE_SPECIFIC; public ContentMappedBy(Map<ContentType, By> map) { this.map = map; } + /** + * This method sets required content type for the further searching. + * @param type required content type {@link ContentType} + * @return self-reference. + */ + public By useContent(@Nonnull ContentType type) { + checkNotNull(type); + currentContent = type; + return this; + } + @Override public WebElement findElement(SearchContext context) { - return context.findElement(map.get(getCurrentContentType(context))); + return context.findElement(map.get(currentContent)); } @Override public List<WebElement> findElements(SearchContext context) { - return context.findElements(map.get(getCurrentContentType(context))); + return context.findElements(map.get(currentContent)); } @Override public String toString() { - By defaultBy = map.get(ContentType.HTML_OR_DEFAULT); - By nativeBy = map.get(ContentType.NATIVE_MOBILE_SPECIFIC); - - if (defaultBy.equals(nativeBy)) { - return defaultBy.toString(); - } - - return "Locator map: " + "\\n" - + "- native content: \\"" + nativeBy.toString() + "\\" \\n" - + "- html content: \\"" + defaultBy.toString() + "\\""; + return map.get(currentContent).toString(); } } diff --git a/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java b/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java index 279ba4f0..ac004a41 100644 --- a/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java +++ b/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java @@ -19,6 +19,7 @@ package io.appium.java_client.pagefactory.utils; import static io.appium.java_client.pagefactory.bys.ContentType.HTML_OR_DEFAULT; import static io.appium.java_client.pagefactory.bys.ContentType.NATIVE_MOBILE_SPECIFIC; import static java.util.Optional.ofNullable; +import static org.apache.commons.lang3.StringUtils.containsIgnoreCase; import io.appium.java_client.HasSessionDetails; import io.appium.java_client.pagefactory.bys.ContentType; @@ -77,7 +78,8 @@ public final class WebDriverUnpackUtility { * extension/implementation. * Note: if you want to use your own implementation then it should * implement {@link org.openqa.selenium.ContextAware} or - * {@link org.openqa.selenium.internal.WrapsDriver} + * {@link org.openqa.selenium.internal.WrapsDriver} or + * {@link HasSessionDetails} * @return current content type. It depends on current context. If current context is * NATIVE_APP it will return * {@link io.appium.java_client.pagefactory.bys.ContentType#NATIVE_MOBILE_SPECIFIC}. @@ -93,20 +95,17 @@ public final class WebDriverUnpackUtility { if (HasSessionDetails.class.isAssignableFrom(driver.getClass())) { HasSessionDetails hasSessionDetails = HasSessionDetails.class.cast(driver); - if (hasSessionDetails.isBrowser()) { - return HTML_OR_DEFAULT; + if (!hasSessionDetails.isBrowser()) { + return NATIVE_MOBILE_SPECIFIC; } - return NATIVE_MOBILE_SPECIFIC; - } - - if (!ContextAware.class.isAssignableFrom(driver.getClass())) { //it is desktop browser - return HTML_OR_DEFAULT; } - ContextAware contextAware = ContextAware.class.cast(driver); - String currentContext = contextAware.getContext(); - if (currentContext.contains(NATIVE_APP_PATTERN)) { - return NATIVE_MOBILE_SPECIFIC; + if (ContextAware.class.isAssignableFrom(driver.getClass())) { //it is desktop browser + ContextAware contextAware = ContextAware.class.cast(driver); + String currentContext = contextAware.getContext(); + if (containsIgnoreCase(currentContext, NATIVE_APP_PATTERN)) { + return NATIVE_MOBILE_SPECIFIC; + } } return HTML_OR_DEFAULT;

['src/main/java/io/appium/java_client/internal/ElementMap.java', 'src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java', 'src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java', 'src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java', 'src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java', 'src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java', 'src/main/java/io/appium/java_client/pagefactory/bys/ContentMappedBy.java', 'src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java']

{'.java': 8}

Java

{'Java': 1674245, 'HTML': 80758}

Apache License 2.0

appium/java-client/733/732

appium

java-client

https://github.com/appium/java-client/issues/732

https://github.com/appium/java-client/pull/733

https://github.com/appium/java-client/pull/733

fix

Appium 1.7.0 crashes Java client 5.0.3 when testing iOS

## Description When attempting to use java-client 5.0.3 to test an iOS device with Appium 1.7.0, the java-client crashes with java.lang.NullPointerException: null value in entry: browserName=null ## Environment * java client build version or git revision if you use some shapshot: 5.0.3 * Appium server version or git revision if you use some shapshot: 1.7.0 * Desktop OS/version used to run Appium if necessary: macOS Sierra 10.12.6 * Node.js version (unless using Appium.app|exe) or Appium CLI or Appium.app|exe: Node.js v8.5.0, Appium 1.7.0 * Mobile platform/version under test: iOS * Real device or emulator/simulator: Real Device ## Details Using the same Appium Server, I can use appium-desktop using the custom server option to connect to the iOS device just fine. Android is unaffected. I believe this chunk of the logs are could relevant: ``` 2017-09-19 22:43:55:863 - info: [HTTP] <-- POST /wd/hub/session 200 23221 ms - 589 2017-09-19 22:43:55:908 - info: [HTTP] --> GET /wd/hub/session/c4c0364a-9a80-442e-b328-3dbb5d77418b {} 2017-09-19 22:43:55:909 - info: [debug] [MJSONWP] Calling AppiumDriver.getSession() with args: ["c4c0364a-9a80-442e-b328-3dbb5d77418b"] 2017-09-19 22:43:55:909 - info: [debug] [XCUITest] Executing command 'getSession' 2017-09-19 22:43:55:924 - info: [debug] [JSONWP Proxy] Proxying [GET /] to [GET http://localhost:8100/session/25E38EC3-E56F-44E4-806E-9B404F0A9D80] with no body 2017-09-19 22:43:56:103 - info: [debug] [JSONWP Proxy] Got response with status 200: "{\\n \\"value\\" : {\\n \\"sessionId\\" : \\"25E38EC3-E56F-44E4-806E-9B404F0A9D80\\",\\n \\"capabilities\\" : {\\n \\"device\\" : \\"iphone\\",\\n \\"browserName\\" : null,\\n \\"sdkVersion\\" : \\"10.3.2\\",\\n \\"CFBundleIdentifier\\" : \\"local.pid.53\\"\\n }\\n },\\n \\"sessionId\\" : \\"25E38EC3-E56F-44E4-806E-9B404F0A9D80\\",\\n \\"status\\" : 0\\n}" 2017-09-19 22:43:56:103 - info: [XCUITest] Merging WDA caps over Appium caps for session detail response 2017-09-19 22:43:56:104 - info: [debug] [MJSONWP] Responding to client with driver.getSession() result: {"udid":"67e44e99a952683ca27e8beccc50687bf4a71490","app":"/Users/nwelna/Documents/app-automation/appFiles/ios/app.ipa","xcodeOrgId":"UTURYJS693","automationName":"XCUITest","browserName":null,"platformName":"iOS","deviceName":"Test Device","xcodeSigningId":"iPhone Developer","usePrebuiltWDA":true,"device":"iphone","sdkVersion":"10.3.2","CFBundleIdentifier":"local.pid.53"} 2017-09-19 22:43:56:105 - info: [HTTP] <-- GET /wd/hub/session/c4c0364a-9a80-442e-b328-3dbb5d77418b 200 196 ms - 486 2017-09-19 22:43:56:196 - info: [Appium] Received SIGTERM - shutting down ``` ## Code To Reproduce Issue [ Good To Have ] Just attempt to connect to a real iOS device ## Ecxeption stacktraces [gist](https://gist.github.com/welnanick/2e553ea885185829c7e589dee45f71bd)

9e3946cfd22905841f9a1cb7d4a3750960e41106

89b22dddd55ab708d0ac923ad508b73bb1d1e5b6

https://github.com/appium/java-client/compare/9e3946cfd22905841f9a1cb7d4a3750960e41106...89b22dddd55ab708d0ac923ad508b73bb1d1e5b6

diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java index be4900a2..dc7df872 100644 --- a/src/main/java/io/appium/java_client/AppiumDriver.java +++ b/src/main/java/io/appium/java_client/AppiumDriver.java @@ -17,9 +17,8 @@ package io.appium.java_client; import static com.google.common.base.Preconditions.checkNotNull; -import static io.appium.java_client.remote.MobileCapabilityType.AUTOMATION_NAME; import static io.appium.java_client.remote.MobileCapabilityType.PLATFORM_NAME; -import static java.util.Optional.ofNullable; +import static org.apache.commons.lang3.StringUtils.containsIgnoreCase; import com.google.common.collect.ImmutableMap; @@ -72,9 +71,6 @@ public class AppiumDriver<T extends WebElement> private URL remoteAddress; private RemoteLocationContext locationContext; private ExecuteMethod executeMethod; - private final String platformName; - private final String automationName; - /** * @param executor is an instance of {@link org.openqa.selenium.remote.HttpCommandExecutor} @@ -89,20 +85,6 @@ public class AppiumDriver<T extends WebElement> locationContext = new RemoteLocationContext(executeMethod); super.setErrorHandler(errorHandler); this.remoteAddress = executor.getAddressOfRemoteServer(); - - Object capabilityPlatform1 = getCapabilities().getCapability(PLATFORM_NAME); - Object capabilityAutomation1 = getCapabilities().getCapability(AUTOMATION_NAME); - - Object capabilityPlatform2 = capabilities.getCapability(PLATFORM_NAME); - Object capabilityAutomation2 = capabilities.getCapability(AUTOMATION_NAME); - - platformName = ofNullable(ofNullable(super.getPlatformName()) - .orElse(capabilityPlatform1 != null ? String.valueOf(capabilityPlatform1) : null)) - .orElse(capabilityPlatform2 != null ? String.valueOf(capabilityPlatform2) : null); - automationName = ofNullable(ofNullable(super.getAutomationName()) - .orElse(capabilityAutomation1 != null ? String.valueOf(capabilityAutomation1) : null)) - .orElse(capabilityAutomation2 != null ? String.valueOf(capabilityAutomation2) : null); - this.setElementConverter(new JsonToMobileElementConverter(this, this)); } @@ -282,15 +264,8 @@ public class AppiumDriver<T extends WebElement> return remoteAddress; } - @Override public String getPlatformName() { - return platformName; - } - - @Override public String getAutomationName() { - return automationName; - } - @Override public boolean isBrowser() { - return !getContext().toLowerCase().contains("NATIVE_APP".toLowerCase()); + return super.isBrowser() + && !containsIgnoreCase(getContext(), "NATIVE_APP"); } } diff --git a/src/main/java/io/appium/java_client/HasSessionDetails.java b/src/main/java/io/appium/java_client/HasSessionDetails.java index 3106b290..cefdfdf3 100644 --- a/src/main/java/io/appium/java_client/HasSessionDetails.java +++ b/src/main/java/io/appium/java_client/HasSessionDetails.java @@ -18,6 +18,7 @@ package io.appium.java_client; import static io.appium.java_client.MobileCommand.GET_SESSION; import static java.util.Optional.ofNullable; +import static java.util.stream.Collectors.toMap; import static org.apache.commons.lang3.StringUtils.isBlank; import com.google.common.collect.ImmutableMap; @@ -25,6 +26,7 @@ import com.google.common.collect.ImmutableMap; import org.openqa.selenium.remote.Response; import java.util.Map; +import javax.annotation.Nullable; public interface HasSessionDetails extends ExecutesMethod { /** @@ -34,26 +36,47 @@ public interface HasSessionDetails extends ExecutesMethod { @SuppressWarnings("unchecked") default Map<String, Object> getSessionDetails() { Response response = execute(GET_SESSION); + Map<String, Object> resultMap = Map.class.cast(response.getValue()); + + //this filtering was added to clear returned result. + //results of further operations should be simply interpreted by users return ImmutableMap.<String, Object>builder() - .putAll(Map.class.cast(response.getValue())).build(); + .putAll(resultMap.entrySet() + .stream().filter(entry -> { + String key = entry.getKey(); + Object value = entry.getValue(); + return !isBlank(key) + && value != null + && !isBlank(String.valueOf(value)); + }).collect(toMap(Map.Entry::getKey, Map.Entry::getValue))).build(); } - default Object getSessionDetail(String detail) { + default @Nullable Object getSessionDetail(String detail) { return getSessionDetails().get(detail); } - default String getPlatformName() { - Object platformName = getSessionDetail("platformName"); - return ofNullable(platformName != null ? String.valueOf(platformName) : null).orElse(null); + /** + * @return name of the current mobile platform. + */ + default @Nullable String getPlatformName() { + Object platformName = ofNullable(getSessionDetail("platformName")) + .orElseGet(() -> getSessionDetail("platform")); + return ofNullable(platformName).map(String::valueOf).orElse(null); } - default String getAutomationName() { - Object automationName = getSessionDetail("automationName"); - return ofNullable(automationName != null ? String.valueOf(automationName) : null).orElse(null); + /** + * @return current automation name. + */ + default @Nullable String getAutomationName() { + return ofNullable(getSessionDetail("automationName")) + .map(String::valueOf).orElse(null); } /** * @return is focus on browser or on native content. */ - boolean isBrowser(); + default boolean isBrowser() { + return ofNullable(getSessionDetail("browserName")) + .orElse(null) != null; + } }

['src/main/java/io/appium/java_client/AppiumDriver.java', 'src/main/java/io/appium/java_client/HasSessionDetails.java']

{'.java': 2}

Java

{'Java': 1674245, 'HTML': 80758}

Apache License 2.0

appium/java-client/314/294

appium

java-client

https://github.com/appium/java-client/issues/294

https://github.com/appium/java-client/pull/314

https://github.com/appium/java-client/pull/314

fix

Not able to build project locally

@TikhomirovSergey i was unable to build the project locally. I cloned the java_client and ran the the command ``` mvn clean install -Dmaven.test.skip=true ``` Please check the gist for errors. https://gist.github.com/saikrishna321/03f85f7bfce8d2199f7d More Info: ``` Apache Maven 3.3.3 (7994120775791599e205a5524ec3e0dfe41d4a06; 2015-04-22T17:27:37+05:30) Maven home: /usr/local/Cellar/maven/3.3.3/libexec Java version: 1.8.0_51, vendor: Oracle Corporation Java home: /Library/Java/JavaVirtualMachines/jdk1.8.0_51.jdk/Contents/Home/jre Default locale: en_US, platform encoding: UTF-8 OS name: "mac os x", version: "10.10.4", arch: "x86_64", family: "mac" ```

138e2e8071c9346aeda51f995d506066b3b6ba41

53d4edee8763339bb6550f765057c28b6f3a5661

https://github.com/appium/java-client/compare/138e2e8071c9346aeda51f995d506066b3b6ba41...53d4edee8763339bb6550f765057c28b6f3a5661

diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java index 3b5c6b62..aad34a91 100644 --- a/src/main/java/io/appium/java_client/AppiumDriver.java +++ b/src/main/java/io/appium/java_client/AppiumDriver.java @@ -42,14 +42,13 @@ import static io.appium.java_client.MobileCommand.*; import org.openqa.selenium.remote.http.HttpClient; /** - * @param <RequiredElementType> means the required type from the list of allowed types below - * that implement {@link WebElement} Instances of the defined type will be - * returned via findElement* and findElements*. - * Warning (!!!). Allowed types:<br/> - * {@link WebElement}<br/> - * {@link TouchableElement}<br/> - * {@link RemoteWebElement}<br/> - * {@link MobileElement} and its subclasses that designed specifically for each target mobile OS (still Android and iOS) + * @param <RequiredElementType> the required type of class which implement {@link org.openqa.selenium.WebElement}. + * Instances of the defined type will be returned via findElement* and findElements*. + * Warning (!!!). Allowed types: + * {@link org.openqa.selenium.WebElement} + * {@link io.appium.java_client.TouchableElement} + * {@link org.openqa.selenium.remote.RemoteWebElement} + * {@link io.appium.java_client.MobileElement} and its subclasses that designed specifically for each target mobile OS (still Android and iOS) */ @SuppressWarnings("unchecked") public abstract class AppiumDriver<RequiredElementType extends WebElement> extends DefaultGenericMobileDriver<RequiredElementType> { diff --git a/src/main/java/io/appium/java_client/NetworkConnectionSetting.java b/src/main/java/io/appium/java_client/NetworkConnectionSetting.java index 4529d043..5f4c1d0f 100644 --- a/src/main/java/io/appium/java_client/NetworkConnectionSetting.java +++ b/src/main/java/io/appium/java_client/NetworkConnectionSetting.java @@ -44,7 +44,7 @@ public class NetworkConnectionSetting { /** * Instantiate Network Connection Settings with the straight-up bitmask. See the Mobile JSON Wire Protocol spec for details. - * @param bitmask + * @param bitmask a straight-up bitmask */ public NetworkConnectionSetting(int bitmask) { value = bitmask; diff --git a/src/main/java/io/appium/java_client/NoSuchContextException.java b/src/main/java/io/appium/java_client/NoSuchContextException.java index 0b9e2cf4..ae7217ad 100644 --- a/src/main/java/io/appium/java_client/NoSuchContextException.java +++ b/src/main/java/io/appium/java_client/NoSuchContextException.java @@ -18,10 +18,6 @@ package io.appium.java_client; import org.openqa.selenium.NotFoundException; -/** - * Thrown by {@link org.openqa.selenium.WebDriver.TargetLocator#context(String) WebDriver.switchTo().context(String - * name)}. - */ @SuppressWarnings("serial") public class NoSuchContextException extends NotFoundException { diff --git a/src/main/java/io/appium/java_client/ScrollsTo.java b/src/main/java/io/appium/java_client/ScrollsTo.java index 15a56ffd..dd37be11 100644 --- a/src/main/java/io/appium/java_client/ScrollsTo.java +++ b/src/main/java/io/appium/java_client/ScrollsTo.java @@ -22,13 +22,16 @@ public interface ScrollsTo<T extends WebElement> { /** * Scroll to an element which contains the given text. - * @param text + * @param text description or text of an element scroll to + * + * @return an element that matches */ T scrollTo(String text); /** * Scroll to an element with the given text. - * @param text + * @param text description or text of an element scroll to + * @return an element that matches */ T scrollToExact(String text); diff --git a/src/main/java/io/appium/java_client/TouchShortcuts.java b/src/main/java/io/appium/java_client/TouchShortcuts.java index e0359d01..92e4c715 100644 --- a/src/main/java/io/appium/java_client/TouchShortcuts.java +++ b/src/main/java/io/appium/java_client/TouchShortcuts.java @@ -54,7 +54,7 @@ public interface TouchShortcuts { * x coordinate * @param y * y coordinate - * @param duration + * @param duration how long between pressing down, and lifting fingers/appendages */ void tap(int fingers, int x, int y, int duration); diff --git a/src/main/java/io/appium/java_client/android/AndroidDriver.java b/src/main/java/io/appium/java_client/android/AndroidDriver.java index 15351b8f..558624bd 100644 --- a/src/main/java/io/appium/java_client/android/AndroidDriver.java +++ b/src/main/java/io/appium/java_client/android/AndroidDriver.java @@ -54,15 +54,14 @@ import static io.appium.java_client.remote.MobileCapabilityType.DONT_STOP_APP_ON import org.openqa.selenium.remote.http.HttpClient; /** - * @param <RequiredElementType> means the required type from the list of allowed types below - * that implement {@link WebElement} Instances of the defined type will be - * returned via findElement* and findElements*. - * Warning (!!!). Allowed types:<br/> - * {@link WebElement}<br/> - * {@link TouchableElement}<br/> - * {@link RemoteWebElement}<br/> - * {@link MobileElement} - * {@link AndroidElement} + * @param <RequiredElementType> the required type of class which implement {@link org.openqa.selenium.WebElement}. + * Instances of the defined type will be returned via findElement* and findElements*. + * Warning (!!!). Allowed types: + * {@link org.openqa.selenium.WebElement} + * {@link io.appium.java_client.TouchableElement} + * {@link org.openqa.selenium.remote.RemoteWebElement} + * {@link io.appium.java_client.MobileElement} + * {@link io.appium.java_client.android.AndroidElement} */ public class AndroidDriver<RequiredElementType extends WebElement> extends AppiumDriver<RequiredElementType> implements AndroidDeviceActionShortcuts, HasNetworkConnection, PushesFiles, @@ -126,11 +125,6 @@ public class AndroidDriver<RequiredElementType extends WebElement> extends Appiu this.setElementConverter(new JsonToAndroidElementConverter(this)); } - /** - * Scroll forward to the element which has a description or name which contains the input text. - * The scrolling is performed on the first scrollView present on the UI - * @param text - */ @Override public RequiredElementType scrollTo(String text) { String uiScrollables = UiScrollable("new UiSelector().descriptionContains(\\"" + text + "\\")") + @@ -138,11 +132,6 @@ public class AndroidDriver<RequiredElementType extends WebElement> extends Appiu return findElementByAndroidUIAutomator(uiScrollables); } - /** - * Scroll forward to the element which has a description or name which exactly matches the input text. - * The scrolling is performed on the first scrollView present on the UI - * @param text - */ @Override public RequiredElementType scrollToExact(String text) { String uiScrollables = UiScrollable("new UiSelector().description(\\"" + text + "\\")") + @@ -268,8 +257,6 @@ public class AndroidDriver<RequiredElementType extends WebElement> extends Appiu * Automation will begin after this activity starts. [Optional] * @param stopApp * If true, target app will be stopped. [Optional] - * @example driver.startActivity("com.foo.bar", ".MyActivity", null, null, true); - * * @see StartsActivity#startActivity(String, String, String, String) */ public void startActivity(String appPackage, String appActivity, @@ -303,8 +290,6 @@ public class AndroidDriver<RequiredElementType extends WebElement> extends Appiu * Automation will begin after this package starts. [Optional] * @param appWaitActivity * Automation will begin after this activity starts. [Optional] - * @example driver.startActivity("com.foo.bar", ".MyActivity", null, null); - * * @see StartsActivity#startActivity(String, String, String, String) */ public void startActivity(String appPackage, String appActivity, @@ -317,8 +302,6 @@ public class AndroidDriver<RequiredElementType extends WebElement> extends Appiu /** * @param appPackage The package containing the activity. [Required] * @param appActivity The activity to start. [Required] - * @example - * *.startActivity("com.foo.bar", ".MyActivity"); * @see StartsActivity#startActivity(String, String) */ @Override @@ -343,6 +326,7 @@ public class AndroidDriver<RequiredElementType extends WebElement> extends Appiu /** * Get the current activity being run on the mobile device + * @return a current activity being run on the mobile device */ public String currentActivity() { Response response = execute(CURRENT_ACTIVITY); diff --git a/src/main/java/io/appium/java_client/android/StartsActivity.java b/src/main/java/io/appium/java_client/android/StartsActivity.java index ebb0b211..c93e7498 100644 --- a/src/main/java/io/appium/java_client/android/StartsActivity.java +++ b/src/main/java/io/appium/java_client/android/StartsActivity.java @@ -26,8 +26,6 @@ public interface StartsActivity { * @param appWaitPackage Automation will begin after this package starts. [Optional] * @param appWaitActivity Automation will begin after this activity starts. [Optional] * @param stopApp If true, target app will be stopped. [Optional] - * @example - * *.startActivity("com.foo.bar", ".MyActivity", null, null, true); */ void startActivity(String appPackage, String appActivity, String appWaitPackage, String appWaitActivity, boolean stopApp) throws IllegalArgumentException; @@ -40,8 +38,6 @@ public interface StartsActivity { * @param appActivity The activity to start. [Required] * @param appWaitPackage Automation will begin after this package starts. [Optional] * @param appWaitActivity Automation will begin after this activity starts. [Optional] - * @example - * *.startActivity("com.foo.bar", ".MyActivity", null, null); */ void startActivity(String appPackage, String appActivity, String appWaitPackage, String appWaitActivity) throws IllegalArgumentException; @@ -52,8 +48,6 @@ public interface StartsActivity { * * @param appPackage The package containing the activity. [Required] * @param appActivity The activity to start. [Required] - * @example - * *.startActivity("com.foo.bar", ".MyActivity"); */ void startActivity(String appPackage, String appActivity) throws IllegalArgumentException; diff --git a/src/main/java/io/appium/java_client/ios/IOSDriver.java b/src/main/java/io/appium/java_client/ios/IOSDriver.java index 7d2adc26..5f0a48dd 100644 --- a/src/main/java/io/appium/java_client/ios/IOSDriver.java +++ b/src/main/java/io/appium/java_client/ios/IOSDriver.java @@ -38,15 +38,14 @@ import static io.appium.java_client.MobileCommand.*; import org.openqa.selenium.remote.http.HttpClient; /** - * @param <RequiredElementType> means the required type from the list of allowed types below - * that implement {@link WebElement} Instances of the defined type will be - * returned via findElement* and findElements*. - * Warning (!!!). Allowed types:<br/> - * {@link WebElement}<br/> - * {@link TouchableElement}<br/> - * {@link RemoteWebElement}<br/> - * {@link MobileElement} - * {@link IOSElement} + * @param <RequiredElementType> the required type of class which implement {@link org.openqa.selenium.WebElement}. + * Instances of the defined type will be returned via findElement* and findElements*. + * Warning (!!!). Allowed types: + * {@link org.openqa.selenium.WebElement} + * {@link io.appium.java_client.TouchableElement} + * {@link org.openqa.selenium.remote.RemoteWebElement} + * {@link io.appium.java_client.MobileElement} + * {@link io.appium.java_client.ios.IOSElement} */ public class IOSDriver<RequiredElementType extends WebElement> extends AppiumDriver<RequiredElementType> implements IOSDeviceActionShortcuts, GetsNamedTextField<RequiredElementType>, FindsByIosUIAutomation<RequiredElementType>{ diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java index e75901de..30ee14a8 100644 --- a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java +++ b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java @@ -47,7 +47,7 @@ import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.unp /** * Default decorator for use with PageFactory. Will decorate 1) all of the - * WebElement fields and 2) List<WebElement> fields that have + * WebElement fields and 2) List of WebElement that have * {@literal @AndroidFindBy}, {@literal @AndroidFindBys}, or * {@literal @iOSFindBy/@iOSFindBys} annotation with a proxy that locates the * elements using the passed in ElementLocatorFactory. diff --git a/src/main/java/io/appium/java_client/pagefactory/OverrideWidget.java b/src/main/java/io/appium/java_client/pagefactory/OverrideWidget.java index db48fbf6..44f25da5 100644 --- a/src/main/java/io/appium/java_client/pagefactory/OverrideWidget.java +++ b/src/main/java/io/appium/java_client/pagefactory/OverrideWidget.java @@ -39,6 +39,8 @@ public @interface OverrideWidget { * * A declared class should not be abstract. Declared class also should be a subclass * of an annotated class/class which is declared by an annotated field. + * + * @return a class which extends {@link io.appium.java_client.pagefactory.Widget} */ Class<? extends Widget> html() default Widget.class; /** @@ -46,6 +48,8 @@ public @interface OverrideWidget { * * A declared class should not be abstract. Declared class also should be a subclass * of an annotated class/class which is declared by an annotated field. + * + * @return a class which extends {@link io.appium.java_client.pagefactory.Widget} */ Class<? extends Widget> androidUIAutomator() default Widget.class; /** @@ -53,6 +57,8 @@ public @interface OverrideWidget { * * A declared class should not be abstract. Declared class also should be a subclass * of an annotated class/class which is declared by an annotated field. + * + * @return a class which extends {@link io.appium.java_client.pagefactory.Widget} */ Class<? extends Widget> iOSUIAutomation() default Widget.class; /** @@ -60,6 +66,8 @@ public @interface OverrideWidget { * * A declared class should not be abstract. Declared class also should be a subclass * of an annotated class/class which is declared by an annotated field. + * + * @return a class which extends {@link io.appium.java_client.pagefactory.Widget} */ Class<? extends Widget> selendroid() default Widget.class; } diff --git a/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java b/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java index 6e7b3ffa..f07c0178 100644 --- a/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java +++ b/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java @@ -155,6 +155,9 @@ public abstract class AppiumByBuilder extends AbstractAnnotations { * This method should be used for the setting up of * AnnotatedElement instances before the building of * By-locator strategies + * + * @param annotated is an instance of class which type extends + * {@link java.lang.reflect.AnnotatedElement} */ public void setAnnotated(AnnotatedElement annotated) { this.annotatedElementContainer.setAnnotated(annotated); diff --git a/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java b/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java index 09bd8ae5..01b0f431 100644 --- a/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java +++ b/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java @@ -38,8 +38,8 @@ public final class AppiumServiceBuilder extends DriverService.Builder<AppiumDriv /** * The environmental variable used to define - * the path to executable appium.js (node server v<=1.4.x) or - * main.js (node server v>=1.5.x) + * the path to executable appium.js (1.4.x and lower) or + * main.js (1.5.x and higher) */ public static final String APPIUM_PATH = "APPIUM_BINARY_PATH"; diff --git a/src/main/java/io/appium/java_client/service/local/flags/AndroidServerFlag.java b/src/main/java/io/appium/java_client/service/local/flags/AndroidServerFlag.java index 05d7fa13..1ae137be 100644 --- a/src/main/java/io/appium/java_client/service/local/flags/AndroidServerFlag.java +++ b/src/main/java/io/appium/java_client/service/local/flags/AndroidServerFlag.java @@ -19,147 +19,122 @@ package io.appium.java_client.service.local.flags; /** * Here is the list of Android specific server arguments. * All flags are optional, but some are required in conjunction with certain others. -* The full list is available here: {@link http://appium.io/slate/en/master/?ruby#appium-server-arguments} +* The full list is available here: http://appium.io/slate/en/master/?ruby#appium-server-arguments * Android specific arguments are marked by (Android-only) */ public enum AndroidServerFlag implements ServerArgument{ /** - * Port to use on device to talk to Appium<br/> - * Sample:<br/> + * Port to use on device to talk to Appium. Sample: * --bootstrap-port 4724 */ BOOTSTRAP_PORT_NUMBER("--bootstrap-port"), /** * Java package of the Android app you want to run (e.g., - * com.example.android.MyApp)<br/> - * Sample:<br/> + * com.example.android.MyApp). Sample: * --app-pkg com.example.android.MyApp */ PACKAGE("--app-pkg"), /** * Activity name for the Android activity you want to launch - * from your package (e.g., MainActivity)<br/> - * Sample:<br/> + * from your package (e.g., MainActivity). Sample: * --app-activity MainActivity */ ACTIVITY("--app-activity"), /** * Package name for the Android activity you want to wait for - * (e.g., com.example.android.MyApp)<br/> - * Sample:<br/> + * (e.g., com.example.android.MyApp). Sample: * --app-wait-package com.example.android.MyApp */ APP_WAIT_PACKAGE("--app-wait-package"), /** * Activity name for the Android activity you want to wait - * for (e.g., SplashActivity) - * Sample:<br/> + * for (e.g., SplashActivity). Sample: * --app-wait-activity SplashActivity */ APP_WAIT_ACTIVITY("--app-wait-activity"), /** * Fully qualified instrumentation class. - * Passed to -w in adb shell am instrument -e coverage true -w <br/> - * Sample: <br/> + * Passed to -w in adb shell am instrument -e coverage true -w. Sample: * --android-coverage com.my.Pkg/com.my.Pkg.instrumentation.MyInstrumentation */ ANDROID_COVERAGE("--android-coverage"), /** - * Name of the avd to launch<br/> - * Sample:<br/> + * Name of the avd to launch. Sample: * --avd @default */ AVD("--avd"), /** - * Additional emulator arguments to launch the avd<br/> - * Sample:<br/> + * Additional emulator arguments to launch the avd. Sample: * --avd-args -no-snapshot-load */ AVD_ARGS("--avd-args"), /** * Timeout in seconds while waiting for device to become - * ready<br/> - * Sample:<br/> + * ready. Sample: * --device-ready-timeout 5 */ DEVICE_READY_TIMEOUT("--device-ready-timeout"), /** - * Local port used for communication with Selendroid<br/> - * Sample:<br/> + * Local port used for communication with Selendroid. Sample: * --selendroid-port 8080 */ SELENDROID_PORT("--selendroid-port"), /** - * When set the keystore will be used to sign apks.<br/> - * Default: false + * When set the keystore will be used to sign apks. Default: false */ USE_KEY_STORE("--use-keystore"), /** - * Path to keystore<br/> - * Sample:<br/> + * Path to keystore. Sample: * --keystore-path /Users/user/.android/debug.keystore */ KEY_STORE_PATH("--keystore-path"), /** - * Password to keystore<br/> - * Default: android + * Password to keystore. Default: android */ KEY_STORE_PASSWORD("--keystore-password"), /** - * Key alias<br/> - * Default: androiddebugkey + * Key alias. Default: androiddebugkey */ KEY_ALIAS("--key-alias"), /** - * Key password<br/> - * Default: android + * Key password. Default: android */ KEY_PASSWORD("--key-password"), /** - * Intent action which will be used to start activity<br/> - * Default: android.intent.action.MAIN<br/> - * Sample:<br/> - * --intent-action android.intent.action.MAIN + * Intent action which will be used to start activity. Default: + * android.intent.action.MAIN. Sample: --intent-action android.intent.action.MAIN */ INTENT_ACTION("--intent-action"), /** - * Intent category which will be used to start activity<br/> - * Default: android.intent.category.LAUNCHER<br/> - * Sample:<br/> - * --intent-category android.intent.category.APP_CONTACTS + * Intent category which will be used to start activity. Default: android.intent.category.LAUNCHER. + * Sample:s --intent-category android.intent.category.APP_CONTACTS */ INTENT_CATEGORY("--intent-category"), /** - * Flags that will be used to start activity<br/> - * Default: 0x10200000<br/> - * Sample:<br/> - * --intent-flags 0x10200000 + * Flags that will be used to start activity. Default: 0x10200000. + * Sample: --intent-flags 0x10200000 */ INTENT_FLAGS("--intent-flags"), /** * Additional intent arguments that will be used to start - * activity<br/> - * Default: null<br/> - * Sample:<br/> - * --intent-args 0x10200000 + * activity. Default: null. + * Sample: --intent-args 0x10200000 */ INTENT_ARGUMENTS("--intent-args"), /** * When included, refrains from stopping the app before - * restart<br/> - * Default: false<br/> + * restart. Default: false */ DO_NOT_STOP_APP_ON_RESET("--dont-stop-app-on-reset"), /** * If set, prevents Appium from killing the adb server - * instance<br/> - * Default: false<br/> + * instance. Default: false */ SUPPRESS_ADB_KILL_SERVER("--suppress-adb-kill-server"); private final String arg; - private AndroidServerFlag(String arg) { + AndroidServerFlag(String arg) { this.arg = arg; } diff --git a/src/main/java/io/appium/java_client/service/local/flags/GeneralServerFlag.java b/src/main/java/io/appium/java_client/service/local/flags/GeneralServerFlag.java index 24e5e428..5c0aeb54 100644 --- a/src/main/java/io/appium/java_client/service/local/flags/GeneralServerFlag.java +++ b/src/main/java/io/appium/java_client/service/local/flags/GeneralServerFlag.java @@ -19,7 +19,7 @@ package io.appium.java_client.service.local.flags; /** * Here is the list of common Appium server arguments. * All flags are optional, but some are required in conjunction with certain others. - * The full list is available here: {@link http://appium.io/slate/en/master/?ruby#appium-server-arguments} + * The full list is available here: @link http://appium.io/slate/en/master/?ruby#appium-server-arguments */ public enum GeneralServerFlag implements ServerArgument{ /** @@ -27,135 +27,110 @@ public enum GeneralServerFlag implements ServerArgument{ */ SHELL("--shell"), /** - * IOS: abs path to simulator-compiled .app file or the bundle_id of the desired target on device; Android: abs path to .apk file<br/> - * Sample <br/> - * --app /abs/path/to/my.app + * IOS: abs path to simulator-compiled .app file or the bundle_id of the desired target on device; Android: abs path to .apk file. + * Sample: --app /abs/path/to/my.app */ APP("--app"), /** - * Unique device identifier of the connected physical device<br/> - * Sample <br/> + * Unique device identifier of the connected physical device. + * Sample: * --udid 1adsf-sdfas-asdf-123sdf */ UIID("--udid"), /** - * callback IP Address (default: same as address) <br/> - * Sample <br/> - * --callback-address 127.0.0.1 + * callback IP Address (default: same as address). + * Sample: --callback-address 127.0.0.1 */ CALLBACK_ADDRESS("--callback-address"), /** - * callback port (default: same as port)<br/> - * Sample <br/> - * --callback-port 4723 + * callback port (default: same as port). + * Sample: --callback-port 4723 */ CALLBACK_PORT("--callback-port"), /** - * Enables session override (clobbering) <br/> - * Default: false + * Enables session override (clobbering). Default: false */ SESSION_OVERRIDE("--session-override"), /** - * Don’t reset app state between sessions (IOS: don’t delete app plist files; Android: don’t uninstall app before new session)<br/> + * Don’t reset app state between sessions (IOS: don’t delete app plist files; Android: don’t uninstall app before new session). * Default: false */ NO_RESET("--no-reset"), /** - * Pre-launch the application before allowing the first session (Requires –app and, for Android, –app-pkg and –app-activity) <br/> + * Pre-launch the application before allowing the first session (Requires –app and, for Android, –app-pkg and –app-activity). * Default: false */ PRE_LAUNCH("--pre-launch"), /** - * The message log level to be shown <br/> - * Sample:<br/> - * --log-level debug + * The message log level to be shown. + * Sample: --log-level debug */ LOG_LEVEL("--log-level"), /** - * Show timestamps in console output <br/> + * Show timestamps in console output. * Default: false */ LOG_TIMESTAMP("--log-timestamp"), /** - * Use local timezone for timestamps <br/> + * Use local timezone for timestamps. * Default: false */ LOCAL_TIMEZONE("--local-timezone"), /** - * Don’t use colors in console output <br/> + * Don’t use colors in console output. * Default: false */ LOG_NO_COLORS("--log-no-colors"), /** - * Also send log output to this HTTP listener <br/> - * Sample: <br/> - * --webhook localhost:9876 + * Also send log output to this HTTP listener. + * Sample: --webhook localhost:9876 */ WEB_HOOK("--webhook"), /** - * Name of the mobile device to use<br/> - * Sample: <br/> - * --device-name iPhone Retina (4-inch), Android Emulator + * Name of the mobile device to use. + * Sample: --device-name iPhone Retina (4-inch), Android Emulator */ DEVICE_NAME("--device-name"), /** - * Name of the mobile platform: iOS, Android, or FirefoxOS <br/> - * Sample:<br/> - * --platform-name iOS + * Name of the mobile platform: iOS, Android, or FirefoxOS + * Sample: --platform-name iOS */ PLATFORM_NAME("--platform-name"), /** - * Version of the mobile platform <br/> - * Sample:<br/> - * --platform-version 7.1 + * Version of the mobile platform. Sample: --platform-version 7.1 */ PLATFORM_VERSION("--platform-version"), /** - * Name of the automation tool: Appium or Selendroid<br/> - * Sample:<br/> - * --automation-name Appium + * Name of the automation tool: Appium or Selendroid. Sample: --automation-name Appium */ AUTOMATION_NAME("--automation-name"), /** - * Name of the mobile browser: Safari or Chrome<br/> - * Sample: <br/> - * --browser-name Safari + * Name of the mobile browser: Safari or Chrome. Sample: --browser-name Safari */ BROWSER_NAME("--browser-name"), /** - * Language for the iOS simulator / Android Emulator <br/> - * Sample:<br/> - * --language en + * Language for the iOS simulator / Android Emulator. Sample: --language en */ LANGUAGE("--language"), /** - * Locale for the iOS simulator / Android Emulator<br/> - * Sample:<br/> - * --locale en_US + * Locale for the iOS simulator / Android Emulator. Sample: --locale en_US */ LOCALE("--locale"), /** - * Configuration JSON file to register Appium with selenium grid<br/> - * Sample:<br/> + * Configuration JSON file to register Appium with selenium grid. Sample: * --nodeconfig /abs/path/to/nodeconfig.json */ CONFIGURATION_FILE("--nodeconfig"), /** - * IP Address of robot<br/> - * Sample:<br/> - * --robot-address 0.0.0.0 + * IP Address of robot. Sample: --robot-address 0.0.0.0 */ ROBOT_ADDRESS("--robot-address"), /** - * Port for robot<br/> - * Sample: <br/> - * --robot-port 4242 + * Port for robot. Sample: --robot-port 4242 */ ROBOT_PORT("--robot-port"), /** - * Port upon which ChromeDriver will run<br/> - * Sample:<br/> - * --chromedriver-port 9515 + * Port upon which ChromeDriver will run. Sample: --chromedriver-port 9515 */ CHROME_DRIVER_PORT("--chromedriver-port"), /** @@ -163,39 +138,33 @@ public enum GeneralServerFlag implements ServerArgument{ */ CHROME_DRIVER_EXECUTABLE("--chromedriver-executable"), /** - * Show info about the Appium server configuration and exit<br/> - * Default: false + * Show info about the Appium server configuration and exit. Default: false */ SHOW_CONFIG("--show-config"), /** - * Bypass Appium’s checks to ensure we can read/write necessary files<br/> - * Default: false + * Bypass Appium’s checks to ensure we can read/write necessary files. Default: false */ NO_PERMS_CHECKS( "--no-perms-check"), /** * The default command timeout for the server to use for all sessions. Will - * still be overridden by newCommandTimeout cap<br/> - * Default: 60 + * still be overridden by newCommandTimeout cap. Default: 60 */ COMMAND_TIMEOUT("--command-timeout"), /** * Cause sessions to fail if desired caps are sent in that Appium does not - * recognize as valid for the selected device<br/> - * Default: false + * recognize as valid for the selected device. Default: false */ STRICT_CAPS("--strict-caps"), /** * Absolute path to directory Appium can use to manage temporary files, like * built-in iOS apps it needs to move around. On *nix/Mac defaults to /tmp, - * on Windows defaults to C:\\Windows\\Temp<br/> + * on Windows defaults to C:\\Windows\\Temp. */ TEMP_DIRECTORY("--tmp"), /** - * Add exaggerated spacing in logs to help with visual inspection<br/> - * Default: false + * Add exaggerated spacing in logs to help with visual inspection. Default: false */ DEBUG_LOG_SPACING("--debug-log-spacing"); - ; private final String arg; diff --git a/src/main/java/io/appium/java_client/service/local/flags/IOSServerFlag.java b/src/main/java/io/appium/java_client/service/local/flags/IOSServerFlag.java index d77f5e93..40d7a285 100644 --- a/src/main/java/io/appium/java_client/service/local/flags/IOSServerFlag.java +++ b/src/main/java/io/appium/java_client/service/local/flags/IOSServerFlag.java @@ -19,104 +19,81 @@ package io.appium.java_client.service.local.flags; /** * Here is the list of iOS specific server arguments. * All flags are optional, but some are required in conjunction with certain others. -* The full list is available here: {@link http://appium.io/slate/en/master/?ruby#appium-server-arguments} +* The full list is available here: http://appium.io/slate/en/master/?ruby#appium-server-arguments * iOS specific arguments are marked by (IOS-only) */ public enum IOSServerFlag implements ServerArgument{ /** * the relative path of the dir where Localizable.strings file - * resides<br/> - * Default: en.lproj<br/> - * Sample:<br/> - * --localizable-strings-dir en.lproj + * resides. Default: en.lproj. Sample: --localizable-strings-dir en.lproj */ LOCALIZABLE_STRING_PATH("--localizable-strings-dir"), /** - * absolute path to compiled .ipa file - * Sample:<br/> - * --ipa /abs/path/to/my.ipa + * absolute path to compiled .ipa file. Sample: --ipa /abs/path/to/my.ipa */ IPA_ABSOLUTE_PATH("--ipa"), /** * How many times to retry launching Instruments before saying it - * crashed or timed out<br/> - * Sample:<br/> - * --backend-retries 3 + * crashed or timed out. Sample: --backend-retries 3 */ BACK_END_RETRIES("--backend-retries"), /** - * how long in ms to wait for Instruments to launch<br/> - * Default: 90000 + * how long in ms to wait for Instruments to launch. Default: 90000 */ LAUNCH_TIMEOUT("--launch-timeout"), /** * IOS has a weird built-in unavoidable delay. We patch this in - * appium. If you do not want it patched, pass in this flag.<br/> - * Default: false + * appium. If you do not want it patched, pass in this flag. Default: false */ USE_NATIVE_INSTRUMENTS("--native-instruments-lib"), /** - * Use the safari app<br/> - * Default: false + * Use the safari app. Default: false */ SAFARI("--safari"), /** * use the default simulator that instruments launches - * on its own<br/> - * Default: false + * on its own. Default: false * */ DEFAULT_DEVICE("--default-device"), /** - * Use the iPhone Simulator no matter what the app wants<br/> - * Default: false + * Use the iPhone Simulator no matter what the app wants. Default: false */ FORCE_IPHONE_SIMULATOR("--force-iphone"), /** - * Use the iPad Simulator no matter what the app wants<br/> - * Default: false + * Use the iPad Simulator no matter what the app wants. Default: false */ FORCE_IPAD_SIMULATOR("--force-ipad"), /** - * Calendar format for the iOS simulator<br/> - * Default: null<br/> - * Sample:<br/> - * --calendar-format gregorian + * Calendar format for the iOS simulator. + * Default: null + * Sample: --calendar-format gregorian */ CALENDAR_FORMAT("--calendar-format"), /** * use LANDSCAPE or PORTRAIT to initialize all requests to this - * orientation<br/> - * Sample:<br/> - * --orientation LANDSCAPE + * orientation. Sample: --orientation LANDSCAPE */ ORIENTATION("--orientation"), /** - * .tracetemplate file to use with Instruments<br/> - * Sample:<br/> - * --tracetemplate /Users/me/Automation.tracetemplate + * .tracetemplate file to use with Instruments. Sample: --tracetemplate /Users/me/Automation.tracetemplate */ TRACE_TEMPLATE_FILE_PATH("--tracetemplate"), /** - * custom path to the instruments commandline tool<br/> - * Sample:<br/> - * --instruments /path/to/instruments + * custom path to the instruments commandline tool. Sample: --instruments /path/to/instruments */ CUSTOM_INSTRUMENTS_PATH("--instruments"), /** - * if set, the iOS simulator log will be written to the console<br/> - * Default: false + * if set, the iOS simulator log will be written to the console. Default: false */ SHOW_SIMULATOR_LOG("--show-sim-log"), /** - * if set, the iOS system log will be written to the console<br/> - * Default: false + * if set, the iOS system log will be written to the console. Default: false */ SHOW_IOS_LOG("--show-ios-log"), /** * Whether to keep keychains (Library/Keychains) when reset app - * between sessions<br/> - * Default: false + * between sessions. Default: false */ KEEP_KEYCHAINS("--keep-keychains"), /** @@ -125,20 +102,18 @@ public enum IOSServerFlag implements ServerArgument{ * This option causes Appium to delete all devices other than the one being * used by Appium. Note that this is a permanent deletion, and you are * responsible for using simctl or xcode to manage the categories of devices - * used with Appium<br/>. - * Default: false + * used with Appium. Default: false */ ISOLATE_SIM_DEVICE("--isolate-sim-device"), /** * Absolute path to directory Appium use to save ios instruments traces, - * defaults to /appium-instruments<br/> - * Default: null + * defaults to /appium-instruments. Default: null */ TRACE_DIRECTORY_ABSOLUTE_PATH("--trace-dir"); private final String arg; - private IOSServerFlag(String arg) { + IOSServerFlag(String arg) { this.arg = arg; }

['src/main/java/io/appium/java_client/android/StartsActivity.java', 'src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java', 'src/main/java/io/appium/java_client/service/local/flags/AndroidServerFlag.java', 'src/main/java/io/appium/java_client/service/local/flags/IOSServerFlag.java', 'src/main/java/io/appium/java_client/ios/IOSDriver.java', 'src/main/java/io/appium/java_client/android/AndroidDriver.java', 'src/main/java/io/appium/java_client/ScrollsTo.java', 'src/main/java/io/appium/java_client/pagefactory/OverrideWidget.java', 'src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java', 'src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java', 'src/main/java/io/appium/java_client/TouchShortcuts.java', 'src/main/java/io/appium/java_client/service/local/flags/GeneralServerFlag.java', 'src/main/java/io/appium/java_client/AppiumDriver.java', 'src/main/java/io/appium/java_client/NetworkConnectionSetting.java', 'src/main/java/io/appium/java_client/NoSuchContextException.java']

{'.java': 15}

Java

{'Java': 1674245, 'HTML': 80758}

Apache License 2.0

appium/java-client/705/704

appium

java-client

https://github.com/appium/java-client/issues/704

https://github.com/appium/java-client/pull/705

https://github.com/appium/java-client/pull/705

fix

5.0.0: Brokes iOS tests

## Description Move from 5.0.0-BETA9 -> 5.0.0 cause iOS tests fail to find any element ## Environment * java client build version or git revision if you use some shapshot: 5.0.0 * Appium server version or git revision if you use some shapshot: 1.6.6-beta.4 * Desktop OS/version used to run Appium if necessary: macOS 10.12.6 * Mobile platform/version under test: iOS Simulator ## Code To Reproduce Issue [ Good To Have ] ``` @iOSFindBy(id = "xxxxxx") private List<IOSElement> mainContainer; // .... !mainContainer.isEmpty(); ``` ## Ecxeption stacktraces org.openqa.selenium.WebDriverException: org.openqa.selenium.WebDriverException: Unrecognized platform: iOS Build info: version: '3.5.2', revision: '10229a9', time: '2017-08-21T17:29:55.15Z' System info: host: 'aleks.local', ip: '192.168.2.4', os.name: 'Mac OS X', os.arch: 'x86_64', os.version: '10.12.6', java.version: '1.8.0_131' Driver info: driver.version: AppiumDriver at io.appium.java_client.pagefactory.AppiumElementLocator$WaitingFunction.apply(AppiumElementLocator.java:187) at io.appium.java_client.pagefactory.AppiumElementLocator$WaitingFunction.apply(AppiumElementLocator.java:1) at org.openqa.selenium.support.ui.FluentWait.until(FluentWait.java:209) at io.appium.java_client.pagefactory.AppiumElementLocator.waitFor(AppiumElementLocator.java:91) at io.appium.java_client.pagefactory.AppiumElementLocator.findElements(AppiumElementLocator.java:133) at io.appium.java_client.pagefactory.interceptors.InterceptorOfAListOfElements.intercept(InterceptorOfAListOfElements.java:50) at $java.util.ArrayList$$EnhancerByCGLIB$$c0a2d785.isEmpty(<generated>) at com.xxxx.pages.ios.xxxx.xxxxxx(xxxxx.java:54) ## Link to Appium logs 2017-08-28 12:13:02:801 - [HTTP] --> POST /wd/hub/session/1de3a575-8506-4df8-95b9-9689c461c92a/timeouts {"type":"implicit","ms":0} 2017-08-28 12:13:02:802 - [debug] [MJSONWP] Calling AppiumDriver.timeouts() with args: ["implicit",0,"1de3a575-8506-4df8-95b9-9689c461c92a"] 2017-08-28 12:13:02:802 - [debug] [XCUITest] Executing command 'timeouts' 2017-08-28 12:13:02:804 - [debug] [BaseDriver] Set implicit wait to 0ms 2017-08-28 12:13:02:804 - [debug] [MJSONWP] Responding to client with driver.timeouts() result: null 2017-08-28 12:13:02:804 - [HTTP] <-- POST /wd/hub/session/1de3a575-8506-4df8-95b9-9689c461c92a/timeouts 200 3 ms - 76 2017-08-28 12:13:02:807 - [HTTP] --> GET /wd/hub/session/1de3a575-8506-4df8-95b9-9689c461c92a/context {} 2017-08-28 12:13:02:808 - [debug] [MJSONWP] Calling AppiumDriver.getCurrentContext() with args: ["1de3a575-8506-4df8-95b9-9689c461c92a"] 2017-08-28 12:13:02:808 - [debug] [XCUITest] Executing command 'getCurrentContext' 2017-08-28 12:13:02:810 - [debug] [MJSONWP] Responding to client with driver.getCurrentContext() result: "NATIVE_APP" 2017-08-28 12:13:02:811 - [HTTP] <-- GET /wd/hub/session/1de3a575-8506-4df8-95b9-9689c461c92a/context 200 3 ms - 84 2017-08-28 12:13:02:814 - [HTTP] --> POST /wd/hub/session/1de3a575-8506-4df8-95b9-9689c461c92a/elements {"using":"id","value":"xxxxxx"} 2017-08-28 12:13:02:814 - [debug] [MJSONWP] Calling AppiumDriver.findElements() with args: ["id","xxxxxx","1de3a575-8506-4df8-95b9-9689c461c92a"] 2017-08-28 12:13:02:814 - [debug] [XCUITest] Executing command 'findElements' 2017-08-28 12:13:02:816 - [debug] [BaseDriver] Valid locator strategies for this request: xpath, id, name, class name, -ios predicate string, -ios class chain, accessibility id 2017-08-28 12:13:02:817 - [debug] [BaseDriver] Waiting up to 0 ms for condition 2017-08-28 12:13:02:818 - [debug] [JSONWP Proxy] Proxying [POST /elements] to [POST http://localhost:8100/session/51967F2C-AC5B-46F0-BD61-3AD0F24FD06D/elements] with body: {"using":"id","value":"xxxxx"} 2017-08-28 12:13:02:957 - [debug] [JSONWP Proxy] Got response with status 200: {"value":[{"ELEMENT":"328606E0-86FD-40BF-A8CD-1A9BC18F3AAC"}],"sessionId":"51967F2C-AC5B-46F0-BD61-3AD0F24FD06D","status":0} 2017-08-28 12:13:02:958 - [debug] [MJSONWP] Responding to client with driver.findElements() result: [{"ELEMENT":"328606E0-86FD-40BF-A8CD-1A9BC18F3AAC"}] 2017-08-28 12:13:02:958 - [HTTP] <-- POST /wd/hub/session/1de3a575-8506-4df8-95b9-9689c461c92a/elements 200 144 ms - 124 2017-08-28 12:13:02:965 - [HTTP] --> POST /wd/hub/session/1de3a575-8506-4df8-95b9-9689c461c92a/timeouts {"type":"implicit","ms":1000} 2017-08-28 12:13:02:966 - [debug] [MJSONWP] Calling AppiumDriver.timeouts() with args: ["implicit",1000,"1de3a575-8506-4df8-95b9-9689c461c92a"] 2017-08-28 12:13:02:966 - [debug] [XCUITest] Executing command 'timeouts' 2017-08-28 12:13:02:968 - [debug] [BaseDriver] Set implicit wait to 1000ms 2017-08-28 12:13:02:968 - [debug] [MJSONWP] Responding to client with driver.timeouts() result: null 2017-08-28 12:13:02:968 - [HTTP] <-- POST /wd/hub/session/1de3a575-8506-4df8-95b9-9689c461c92a/timeouts 200 3 ms - 76

8f914fb2467e21368603bf76d98e97ed37e4fde3

4d87d9396d569fbf01c2e142e111b1091c06f63d

https://github.com/appium/java-client/compare/8f914fb2467e21368603bf76d98e97ed37e4fde3...4d87d9396d569fbf01c2e142e111b1091c06f63d

diff --git a/src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java b/src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java index e3a27cb9..23e188b2 100644 --- a/src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java +++ b/src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java @@ -150,4 +150,10 @@ abstract class DefaultGenericMobileDriver<T extends WebElement> extends RemoteWe @Deprecated public Mouse getMouse() { return super.getMouse(); } + + @Override + public String toString() { + return String.format("%s: %s", getPlatformName(), + getAutomationName()); + } }

['src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java']

{'.java': 1}

Java

{'Java': 1674245, 'HTML': 80758}

Apache License 2.0

appium/java-client/582/574

appium

java-client

https://github.com/appium/java-client/issues/574

https://github.com/appium/java-client/pull/582

https://github.com/appium/java-client/pull/582

fix

wait.until(ExpectedConditions.visibilityOf(elementName)) related issue

## Description I've below code `WebDriverWait wait = new WebDriverWait(AppiumController.instance.driver, timeout); wait.until(ExpectedConditions.visibilityOf(elementName));` Here I pass timeout value but observed that instead of waiting for timeout value, it waits for default time mentioned in `PageFactory.initElements(new AppiumFieldDecorator(driver, 30, TimeUnit.SECONDS), this);` ## Environment * java client build version or git revision if you use some shapshot: 5.0.0-BETA3 * Appium server version or git revision if you use some shapshot: 1.6.3 * Desktop OS/version used to run Appium if necessary: Mac * Node.js version (unless using Appium.app|exe) or Appium CLI or Appium.app|exe: * Mobile platform/version under test: iOS 10.2 * Real device or emulator/simulator: simulator ## Details 1. When I set wait , I expect element to wait for that time interval itself. 2. But value set for wait is ignored and element waits for default timeout mentioned in PageFactory.initElements 3. Later I tried `@WithTimeout(time = 3, unit = TimeUnit.SECONDS)` for this element but still it waits for defaulttime, my understanding is this particular tag overrides the default time. ## Code To Reproduce Issue [ Good To Have ] NA ## Ecxeption stacktraces NA ## Link to Appium logs https://gist.github.com/vikramvi/2eedd0643f89140fa3d6ffac8f347644

df7168b4c39fb0ea914150b89fb1a34d552468b5

615ef51b07a5a0fc471a278b7602146f83047706

https://github.com/appium/java-client/compare/df7168b4c39fb0ea914150b89fb1a34d552468b5...615ef51b07a5a0fc471a278b7602146f83047706

diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java index 1f1c9c0f..6ce4e3b1 100644 --- a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java +++ b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java @@ -151,6 +151,10 @@ class AppiumElementLocator implements CacheableLocator { return shouldCache; } + @Override public String toString() { + return String.format("Located by %s", by); + } + // This function waits for not empty element list using all defined by private static class WaitingFunction<T> implements Function<Supplier<T>, T> { diff --git a/src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java index 17d4a2a6..a95740af 100644 --- a/src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java +++ b/src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java @@ -16,6 +16,8 @@ package io.appium.java_client.pagefactory; +import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException; + import io.appium.java_client.pagefactory.interceptors.InterceptorOfASingleElement; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -37,7 +39,7 @@ class ElementInterceptor extends InterceptorOfASingleElement { try { return method.invoke(element, args); } catch (Throwable t) { - throw ThrowableUtil.extractReadableException(t); + throw extractReadableException(t); } } } diff --git a/src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java index 0c326c2f..08c58627 100644 --- a/src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java +++ b/src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java @@ -16,6 +16,8 @@ package io.appium.java_client.pagefactory; +import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException; + import io.appium.java_client.pagefactory.interceptors.InterceptorOfAListOfElements; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.pagefactory.ElementLocator; @@ -37,7 +39,7 @@ class ElementListInterceptor extends InterceptorOfAListOfElements { try { return method.invoke(elements, args); } catch (Throwable t) { - throw ThrowableUtil.extractReadableException(t); + throw extractReadableException(t); } } diff --git a/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java index 76823a5c..37fb1c21 100644 --- a/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java +++ b/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java @@ -16,6 +16,7 @@ package io.appium.java_client.pagefactory; +import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException; import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.getCurrentContentType; import io.appium.java_client.pagefactory.bys.ContentType; @@ -76,7 +77,7 @@ class WidgetInterceptor extends InterceptorOfASingleElement { method.setAccessible(true); return method.invoke(cachedInstances.get(type), args); } catch (Throwable t) { - throw ThrowableUtil.extractReadableException(t); + throw extractReadableException(t); } } diff --git a/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java index 86647f9a..ff4a9f74 100644 --- a/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java +++ b/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java @@ -16,6 +16,7 @@ package io.appium.java_client.pagefactory; +import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException; import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.getCurrentContentType; import io.appium.java_client.pagefactory.bys.ContentType; @@ -70,7 +71,7 @@ class WidgetListInterceptor extends InterceptorOfAListOfElements { try { return method.invoke(cachedWidgets, args); } catch (Throwable t) { - throw ThrowableUtil.extractReadableException(t); + throw extractReadableException(t); } } } diff --git a/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfASingleElement.java b/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfASingleElement.java index 1dca59a4..6322a3c0 100644 --- a/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfASingleElement.java +++ b/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfASingleElement.java @@ -23,7 +23,6 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.internal.WrapsDriver; import org.openqa.selenium.support.pagefactory.ElementLocator; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -37,7 +36,7 @@ public abstract class InterceptorOfASingleElement implements MethodInterceptor { } protected abstract Object getObject(WebElement element, Method method, Object[] args) - throws InvocationTargetException, IllegalAccessException, InstantiationException, Throwable; + throws Throwable; /** * Look at @@ -45,6 +44,11 @@ public abstract class InterceptorOfASingleElement implements MethodInterceptor { */ public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable { + + if (method.getName().equals("toString") && args.length == 0) { + return locator.toString(); + } + if (Object.class.equals(method.getDeclaringClass())) { return proxy.invokeSuper(obj, args); }

['src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java', 'src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java', 'src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java', 'src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java', 'src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java', 'src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfASingleElement.java']

{'.java': 6}

Java

{'Java': 1674245, 'HTML': 80758}

Apache License 2.0

appium/java-client/568/567

appium

java-client

https://github.com/appium/java-client/issues/567

https://github.com/appium/java-client/pull/568

https://github.com/appium/java-client/pull/568

fix

5.0.0-BETA2: ClassCastException: WebElement -> IOSElement

## Description Failed to cast WebElement into IOSElement. Worked with 5.0.0-BETA1. ## Environment * java client build version or git revision if you use some shapshot: 5.0.0-BETA2 * Appium server version or git revision if you use some shapshot: 1.6.4-beta * Mobile platform/version under test: iOS * Real device or emulator/simulator: Simulator ## Code To Reproduce Issue [ Good To Have ] `((IOSElement) driver.findElement(MobileBy.className("XCUIElementTypePickerWheel"))).setValue(countryName);` ## Ecxeption stacktraces java.lang.ClassCastException: org.openqa.selenium.remote.RemoteWebElement cannot be cast to io.appium.java_client.ios.IOSElement

1d3e9705527435c48005f0a50a60b1371e03bbd1

b3351034ac0eb7b814ecfcacb1b097b8fd547a55

https://github.com/appium/java-client/compare/1d3e9705527435c48005f0a50a60b1371e03bbd1...b3351034ac0eb7b814ecfcacb1b097b8fd547a55

diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java index a3adf2e9..fa9696cf 100644 --- a/src/main/java/io/appium/java_client/AppiumDriver.java +++ b/src/main/java/io/appium/java_client/AppiumDriver.java @@ -76,7 +76,6 @@ public class AppiumDriver<T extends WebElement> private ExecuteMethod executeMethod; private final String platformName; private final String automationName; - private String currentContext; /** @@ -92,19 +91,6 @@ public class AppiumDriver<T extends WebElement> locationContext = new RemoteLocationContext(executeMethod); super.setErrorHandler(errorHandler); this.remoteAddress = executor.getAddressOfRemoteServer(); - final AppiumDriver<?> driver = this; - - HasSessionDetails hasSessionDetails = new HasSessionDetails() { - @Override - public Response execute(String driverCommand, Map<String, ?> parameters) { - return driver.execute(driverCommand, parameters); - } - - @Override - public Response execute(String driverCommand) { - return driver.execute(driverCommand); - } - }; Object capabilityPlatform1 = getCapabilities().getCapability(PLATFORM_NAME); Object capabilityAutomation1 = getCapabilities().getCapability(AUTOMATION_NAME); @@ -112,15 +98,14 @@ public class AppiumDriver<T extends WebElement> Object capabilityPlatform2 = capabilities.getCapability(PLATFORM_NAME); Object capabilityAutomation2 = capabilities.getCapability(AUTOMATION_NAME); - platformName = ofNullable(ofNullable(hasSessionDetails.getPlatformName()) + platformName = ofNullable(ofNullable(super.getPlatformName()) .orElse(capabilityPlatform1 != null ? String.valueOf(capabilityPlatform1) : null)) .orElse(capabilityPlatform2 != null ? String.valueOf(capabilityPlatform2) : null); - automationName = ofNullable(ofNullable(hasSessionDetails.getAutomationName()) + automationName = ofNullable(ofNullable(super.getAutomationName()) .orElse(capabilityAutomation1 != null ? String.valueOf(capabilityAutomation1) : null)) .orElse(capabilityAutomation2 != null ? String.valueOf(capabilityAutomation2) : null); this.setElementConverter(new JsonToMobileElementConverter(this, this)); - currentContext = getContext(); } public AppiumDriver(URL remoteAddress, Capabilities desiredCapabilities) { @@ -352,7 +337,6 @@ public class AppiumDriver<T extends WebElement> @Override public WebDriver context(String name) { checkNotNull(name, "Must supply a context name"); execute(DriverCommand.SWITCH_TO_CONTEXT, ImmutableMap.of("name", name)); - currentContext = name; return this; } @@ -430,9 +414,6 @@ public class AppiumDriver<T extends WebElement> } @Override public boolean isBrowser() { - if (super.isBrowser()) { - return true; - } - return !currentContext.toLowerCase().contains("NATIVE_APP".toLowerCase()); + return !getContext().toLowerCase().contains("NATIVE_APP".toLowerCase()); } } diff --git a/src/main/java/io/appium/java_client/HasSessionDetails.java b/src/main/java/io/appium/java_client/HasSessionDetails.java index 2e91b7b8..3106b290 100644 --- a/src/main/java/io/appium/java_client/HasSessionDetails.java +++ b/src/main/java/io/appium/java_client/HasSessionDetails.java @@ -55,8 +55,5 @@ public interface HasSessionDetails extends ExecutesMethod { /** * @return is focus on browser or on native content. */ - default boolean isBrowser() { - Object browserName = getSessionDetail("browserName"); - return browserName != null && !isBlank(String.valueOf(browserName)); - } + boolean isBrowser(); } diff --git a/src/main/java/io/appium/java_client/internal/ElementMap.java b/src/main/java/io/appium/java_client/internal/ElementMap.java index 3dacc2ce..9435a7e7 100644 --- a/src/main/java/io/appium/java_client/internal/ElementMap.java +++ b/src/main/java/io/appium/java_client/internal/ElementMap.java @@ -18,6 +18,7 @@ package io.appium.java_client.internal; import com.google.common.collect.ImmutableMap; +import io.appium.java_client.HasSessionDetails; import io.appium.java_client.MobileElement; import io.appium.java_client.android.AndroidElement; import io.appium.java_client.ios.IOSElement; @@ -69,14 +70,17 @@ public enum ElementMap { } /** - * @param platform platform name. - * @param automation automation name. + * @param hasSessionDetails something that implements {@link io.appium.java_client.HasSessionDetails}. * @return subclass of {@link io.appium.java_client.MobileElement} that convenient to current session details. */ - public static Class<? extends RemoteWebElement> getElementClass(String platform, String automation) { + public static Class<? extends RemoteWebElement> getElementClass(HasSessionDetails hasSessionDetails) { + if (hasSessionDetails == null) { + return RemoteWebElement.class; + } ElementMap element = Optional.ofNullable(mobileElementMap.get(String - .valueOf(automation).toLowerCase().trim())) - .orElse(mobileElementMap.get(String.valueOf(platform).toLowerCase().trim())); + .valueOf(hasSessionDetails.getAutomationName()).toLowerCase().trim())) + .orElse(mobileElementMap + .get(String.valueOf(hasSessionDetails.getPlatformName()).toLowerCase().trim())); if (element == null) { return RemoteWebElement.class; } diff --git a/src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java b/src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java index a2bb0143..103963d1 100644 --- a/src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java +++ b/src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java @@ -87,13 +87,7 @@ public class JsonToMobileElementConverter extends JsonToWebElementConverter { protected RemoteWebElement newMobileElement() { Class<? extends RemoteWebElement> target; - if (hasSessionDetails.isBrowser()) { - target = getElementClass(null, null); - } else { - target = getElementClass(hasSessionDetails.getPlatformName(), - hasSessionDetails.getAutomationName()); - } - + target = getElementClass(hasSessionDetails); try { Constructor<? extends RemoteWebElement> constructor = target.getDeclaredConstructor(); constructor.setAccessible(true); diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java index 7ac6d1f0..0f7f3990 100644 --- a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java +++ b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java @@ -72,18 +72,8 @@ public class AppiumFieldDecorator implements FieldDecorator { private final String platform; private final String automation; private final TimeOutDuration timeOutDuration; + private final HasSessionDetails hasSessionDetails; - private static String extractSessionData(WebDriver driver, Supplier<String> dataSupplier) { - if (driver == null) { - return null; - } - - if (!(driver instanceof HasSessionDetails)) { - return null; - } - - return String.valueOf(dataSupplier.get()); - } public AppiumFieldDecorator(SearchContext context, long implicitlyWaitTimeOut, TimeUnit timeUnit) { @@ -100,10 +90,17 @@ public class AppiumFieldDecorator implements FieldDecorator { */ public AppiumFieldDecorator(SearchContext context, TimeOutDuration timeOutDuration) { this.originalDriver = unpackWebDriverFromSearchContext(context); - platform = extractSessionData(originalDriver, () -> - HasSessionDetails.class.cast(originalDriver).getPlatformName()); - automation = extractSessionData(originalDriver, () -> - HasSessionDetails.class.cast(originalDriver).getAutomationName()); + if (originalDriver == null + || !HasSessionDetails.class.isAssignableFrom(originalDriver.getClass())) { + hasSessionDetails = null; + platform = null; + automation = null; + } else { + hasSessionDetails = HasSessionDetails.class.cast(originalDriver); + platform = hasSessionDetails.getPlatformName(); + automation = hasSessionDetails.getAutomationName(); + } + this.timeOutDuration = timeOutDuration; defaultElementFieldDecoracor = new DefaultFieldDecorator( @@ -221,6 +218,6 @@ public class AppiumFieldDecorator implements FieldDecorator { private WebElement proxyForAnElement(ElementLocator locator) { ElementInterceptor elementInterceptor = new ElementInterceptor(locator, originalDriver); - return getEnhancedProxy(getElementClass(platform, automation), elementInterceptor); + return getEnhancedProxy(getElementClass(hasSessionDetails), elementInterceptor); } } diff --git a/src/test/java/io/appium/java_client/appium/element/generation/android/AndroidElementGeneratingTest.java b/src/test/java/io/appium/java_client/appium/element/generation/android/AndroidElementGeneratingTest.java index ae2d1112..dc1d8947 100644 --- a/src/test/java/io/appium/java_client/appium/element/generation/android/AndroidElementGeneratingTest.java +++ b/src/test/java/io/appium/java_client/appium/element/generation/android/AndroidElementGeneratingTest.java @@ -13,7 +13,6 @@ import io.appium.java_client.remote.MobileCapabilityType; import io.appium.java_client.remote.MobilePlatform; import org.junit.Test; import org.openqa.selenium.remote.DesiredCapabilities; -import org.openqa.selenium.remote.RemoteWebElement; import java.io.File; import java.util.function.Supplier; @@ -49,7 +48,7 @@ public class AndroidElementGeneratingTest extends BaseElementGenerationTest { }, (by, aClass) -> { driver.context("WEBVIEW_io.appium.android.apis"); return commonPredicate.test(by, aClass); - }, tagName("a"), RemoteWebElement.class)); + }, tagName("a"), AndroidElement.class)); } @Test public void whenAndroidBrowserIsLaunched() { @@ -65,6 +64,6 @@ public class AndroidElementGeneratingTest extends BaseElementGenerationTest { }, (by, aClass) -> { driver.get("https://www.google.com"); return commonPredicate.test(by, aClass); - }, className("gsfi"), RemoteWebElement.class)); + }, className("gsfi"), AndroidElement.class)); } } diff --git a/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java b/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java index 3c4cd9e7..3d0d995e 100644 --- a/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java +++ b/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java @@ -14,7 +14,6 @@ import io.appium.java_client.remote.MobilePlatform; import org.junit.Test; import org.openqa.selenium.Capabilities; import org.openqa.selenium.remote.DesiredCapabilities; -import org.openqa.selenium.remote.RemoteWebElement; import java.io.File; import java.util.function.Function; @@ -89,7 +88,7 @@ public class IOSElementGenerationTest extends BaseElementGenerationTest { } }); return commonPredicate.test(by, aClass); - }, className("gsfi"), RemoteWebElement.class)); + }, className("gsfi"), IOSElement.class)); } @Test public void whenIOSBrowserIsLaunched() { @@ -97,7 +96,7 @@ public class IOSElementGenerationTest extends BaseElementGenerationTest { clientBrowserCapabilitiesSupplier, (by, aClass) -> { driver.get("https://www.google.com"); return commonPredicate.test(by, aClass); - }, className("gsfi"), RemoteWebElement.class)); + }, className("gsfi"), IOSElement.class)); } @Test @@ -117,6 +116,6 @@ public class IOSElementGenerationTest extends BaseElementGenerationTest { }, clientBrowserCapabilitiesSupplier, (by, aClass) -> { driver.get("https://www.google.com"); return commonPredicate.test(by, aClass); - }, className("gsfi"), RemoteWebElement.class)); + }, className("gsfi"), IOSElement.class)); } }

['src/main/java/io/appium/java_client/internal/ElementMap.java', 'src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java', 'src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java', 'src/main/java/io/appium/java_client/AppiumDriver.java', 'src/test/java/io/appium/java_client/appium/element/generation/android/AndroidElementGeneratingTest.java', 'src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java', 'src/main/java/io/appium/java_client/HasSessionDetails.java']

{'.java': 7}

Java

{'Java': 1674245, 'HTML': 80758}

Apache License 2.0

appium/java-client/468/467

appium

java-client

https://github.com/appium/java-client/issues/467

https://github.com/appium/java-client/pull/468

https://github.com/appium/java-client/pull/468

fixes

page object pattern, field with "@WithTimeout" would change the global implicit wait time

## Description page object pattern, field with "@WithTimeout" would change the global implicit wait time ## Environment Always exists. see code analysis below ## Details in method [AppiumElementLocatorFactory#createLocator](https://github.com/appium/java-client/blob/master/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java#L47): - if the page object field contains annoation `WithTimeout`, it would create a new `TimeOutDuration` instance. - This instance would be passed to `AppiumElementLocator`. - When element tries to find the element. It would invoke method [AppiumElementLocator#waitFor](https://github.com/appium/java-client/blob/master/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java#L92). See the line in `finally` block. it would change the global implicit wait time using the `WithTimeout` value. So this would make the page object and global appium driver implicit wait both change to that value. It would mess the implicit timeout when there are many `WithTimeout` elements in page objects that contains `driver.findElement` methods. There is no getter for implicit wait by design. so it is not easy to fix this. Solution suggestion: IMO changing constructors that also passes original timeout duration as argument, in finally block it would set back to original timeout duration.

ef779eb9a72926fe0349f18e5fea3146d2995d5a

31ce398dc771455f42b4673973db150e6940ef7a

https://github.com/appium/java-client/compare/ef779eb9a72926fe0349f18e5fea3146d2995d5a...31ce398dc771455f42b4673973db150e6940ef7a

diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java index 5ccfdb09..eb11f441 100644 --- a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java +++ b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java @@ -42,6 +42,7 @@ class AppiumElementLocator implements CacheableLocator { final boolean shouldCache; final By by; final TimeOutDuration timeOutDuration; + private final TimeOutDuration originalTimeOutDuration; final WebDriver originalWebDriver; private final SearchContext searchContext; private final WaitingFunction waitingFunction; @@ -56,16 +57,18 @@ class AppiumElementLocator implements CacheableLocator { * @param by a By locator strategy * @param shouldCache is the flag that signalizes that elements which * are found once should be cached - * @param duration is a POJO which contains timeout parameters + * @param duration is a POJO which contains timeout parameters for the element to be searched + * @param originalDuration is a POJO which contains timeout parameters from page object which contains the element * @param originalWebDriver is an instance of WebDriver that is going to be * used by a proxied element */ public AppiumElementLocator(SearchContext searchContext, By by, boolean shouldCache, - TimeOutDuration duration, WebDriver originalWebDriver) { + TimeOutDuration duration, TimeOutDuration originalDuration, WebDriver originalWebDriver) { this.searchContext = searchContext; this.shouldCache = shouldCache; this.timeOutDuration = duration; + this.originalTimeOutDuration = originalDuration; this.by = by; this.originalWebDriver = originalWebDriver; waitingFunction = new WaitingFunction(this.searchContext); @@ -89,7 +92,7 @@ class AppiumElementLocator implements CacheableLocator { } catch (TimeoutException e) { return new ArrayList<>(); } finally { - changeImplicitlyWaitTimeOut(timeOutDuration.getTime(), timeOutDuration.getTimeUnit()); + changeImplicitlyWaitTimeOut(originalTimeOutDuration.getTime(), originalTimeOutDuration.getTimeUnit()); } } diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java index fa13938e..1b9c8ebe 100644 --- a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java +++ b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java @@ -57,7 +57,7 @@ class AppiumElementLocatorFactory implements CacheableElementLocatorFactory { By by = builder.buildBy(); if (by != null) { return new AppiumElementLocator(searchContext, by, builder.isLookupCached(), - customDuration, originalWebDriver); + customDuration, timeOutDuration, originalWebDriver); } return null; }

['src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java', 'src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java']

{'.java': 2}

Java

{'Java': 1674245, 'HTML': 80758}

Apache License 2.0

appium/java-client/451/450

appium

java-client

https://github.com/appium/java-client/issues/450

https://github.com/appium/java-client/pull/451

https://github.com/appium/java-client/pull/451

fix

java -client4.1 "EventFiringWebDriverFactory.getEventFiringWebDriver"capabilities turn to null

## Description use java-client 4.1 found :+1: capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, browser_Name); capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, platform_Name); capabilities.setCapability(MobileCapabilityType.DEVICE_NAME,device_Name); capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, platform_Version); ``` driver = new AndroidDriver(new URL(hubURL),capabilities); driver2= EventFiringWebDriverFactory.getEventFiringWebDriver(driver, new AlertListener(), new ElementListener()); ``` the driver2 is null!!!!! when i debug found when the code run into "EventFiringWebDriverFactory.getEventFiringWebDriver(driver, new AlertListener(), new ElementListener());" the capabilities turn to null; ## Environment jdk 1,7 java -client 4.1 selenium 2.53

bd19d78b0696aec602e4685b314e818af9b2dddb

a3065c24c338e7ecf266da9f155e60a32f1048ac

https://github.com/appium/java-client/compare/bd19d78b0696aec602e4685b314e818af9b2dddb...a3065c24c338e7ecf266da9f155e60a32f1048ac

diff --git a/src/main/java/io/appium/java_client/events/DefaultAspect.java b/src/main/java/io/appium/java_client/events/DefaultAspect.java index 3bec135a..652c17a8 100644 --- a/src/main/java/io/appium/java_client/events/DefaultAspect.java +++ b/src/main/java/io/appium/java_client/events/DefaultAspect.java @@ -156,7 +156,7 @@ class DefaultAspect { return null; } - Object result = null; + Object result = toBeTransformed; if (getClassForProxy(toBeTransformed.getClass()) != null) { result = context.getBean(DefaultBeanConfiguration.COMPONENT_BEAN, toBeTransformed); } diff --git a/src/main/java/io/appium/java_client/events/DefaultListener.java b/src/main/java/io/appium/java_client/events/DefaultListener.java index e665ad5e..e33b11eb 100644 --- a/src/main/java/io/appium/java_client/events/DefaultListener.java +++ b/src/main/java/io/appium/java_client/events/DefaultListener.java @@ -42,7 +42,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -public class DefaultListener implements Listener, AppiumWebDriverEventListener, ListensToException, +class DefaultListener implements Listener, AppiumWebDriverEventListener, ListensToException, SearchingEventListener, NavigationEventListener, JavaScriptEventListener, ElementEventListener, AlertEventListener, WindowEventListener, ContextEventListener, RotationEventListener { diff --git a/src/test/java/io/appium/java_client/events/DefaultEventListenerTest.java b/src/test/java/io/appium/java_client/events/DefaultEventListenerTest.java index 084b5918..a2dfc33a 100644 --- a/src/test/java/io/appium/java_client/events/DefaultEventListenerTest.java +++ b/src/test/java/io/appium/java_client/events/DefaultEventListenerTest.java @@ -1,6 +1,8 @@ package io.appium.java_client.events; import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import io.appium.java_client.events.listeners.AlertListener; @@ -18,6 +20,7 @@ import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; +import org.openqa.selenium.Capabilities; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class DefaultEventListenerTest extends BaseListenerTest { @@ -88,4 +91,11 @@ public class DefaultEventListenerTest extends BaseListenerTest { assertThat(super.assertThatWindowListenerWorks(driver, SingleListeners .listeners.get(WindowListener.class), StringUtils.EMPTY), is(true)); } + + @Test + public void whenNonListenableObjectIsReturned() { + Capabilities capabilities = driver.getCapabilities(); + assertNotNull(capabilities); + assertEquals(capabilities.asMap().size(), 2); + } } diff --git a/src/test/java/io/appium/java_client/events/EmptyWebDriver.java b/src/test/java/io/appium/java_client/events/EmptyWebDriver.java index b3763040..64e7c8f9 100644 --- a/src/test/java/io/appium/java_client/events/EmptyWebDriver.java +++ b/src/test/java/io/appium/java_client/events/EmptyWebDriver.java @@ -10,7 +10,9 @@ import org.apache.commons.lang3.StringUtils; import org.openqa.selenium.Alert; import org.openqa.selenium.By; import org.openqa.selenium.ContextAware; +import org.openqa.selenium.Capabilities; import org.openqa.selenium.Cookie; +import org.openqa.selenium.HasCapabilities; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.Rotatable; import org.openqa.selenium.ScreenOrientation; @@ -24,15 +26,18 @@ import org.openqa.selenium.internal.FindsByLinkText; import org.openqa.selenium.internal.FindsByTagName; import org.openqa.selenium.internal.FindsByXPath; import org.openqa.selenium.logging.Logs; +import org.openqa.selenium.remote.DesiredCapabilities; import java.net.URL; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; public class EmptyWebDriver implements WebDriver, ContextAware, Rotatable, FindsByClassName, FindsByCssSelector, FindsById, FindsByLinkText, FindsByTagName, FindsByXPath, FindsByAccessibilityId<StubWebElement>, FindsByAndroidUIAutomator<StubWebElement>, - FindsByIosUIAutomation<StubWebElement>, JavascriptExecutor { + FindsByIosUIAutomation<StubWebElement>, JavascriptExecutor, HasCapabilities { private static List<StubWebElement> createStubList() { return ImmutableList.of(new StubWebElement(), new StubWebElement()); @@ -198,6 +203,13 @@ public class EmptyWebDriver implements WebDriver, ContextAware, Rotatable, Finds return null; } + @Override public Capabilities getCapabilities() { + Map<String, Object> map = new HashMap<>(); + map.put("0",StringUtils.EMPTY); + map.put("1",StringUtils.EMPTY); + return new DesiredCapabilities(map); + } + private class StubTargetLocator implements TargetLocator { private final WebDriver driver;

['src/main/java/io/appium/java_client/events/DefaultListener.java', 'src/test/java/io/appium/java_client/events/EmptyWebDriver.java', 'src/test/java/io/appium/java_client/events/DefaultEventListenerTest.java', 'src/main/java/io/appium/java_client/events/DefaultAspect.java']

{'.java': 4}

Java

{'Java': 1674245, 'HTML': 80758}

Apache License 2.0

appium/java-client/317/311

appium

java-client

https://github.com/appium/java-client/issues/311

https://github.com/appium/java-client/pull/317

https://github.com/appium/java-client/pull/317

fix

Update page object features. Server node 1.5.x

These things should be done: - mark _name_ parameter _Decrecated_ as _By.name_ selector is not supported by native app automation - _By.id_ selector should be used by default (native content) when not any selector strategy defined. - _org.openqa.selenium.InvalidSelectorException_ should be handled.

8f88f67ff6a8c63b5d37d93864600e63455f6889

5ed8b9e5ac3b4eda1ee20788cba31c0899220dea

https://github.com/appium/java-client/compare/8f88f67ff6a8c63b5d37d93864600e63455f6889...5ed8b9e5ac3b4eda1ee20788cba31c0899220dea

diff --git a/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java b/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java index 1dd3e485..5569fe83 100644 --- a/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java +++ b/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java @@ -35,7 +35,11 @@ public @interface AndroidFindBy { String uiAutomator() default ""; String accessibility() default ""; String id() default ""; - String name() default ""; + @Deprecated + /** + * By.name selector is not supported by Appium server node since 1.5.x. + * So this option is going to be removed further. Be careful. + */String name() default ""; String className() default ""; String tagName() default ""; String xpath() default ""; diff --git a/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java b/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java index a9825902..3e581a0e 100644 --- a/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java +++ b/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java @@ -16,9 +16,6 @@ package io.appium.java_client.pagefactory; -import static io.appium.java_client.remote.MobilePlatform.*; -import static io.appium.java_client.remote.AutomationName.*; - import java.lang.annotation.Annotation; import java.lang.reflect.*; import java.util.HashMap; @@ -117,8 +114,7 @@ class DefaultElementByBuilder extends AppiumByBuilder { @Override protected By buildMobileNativeBy() { AnnotatedElement annotatedElement = annotatedElementContainer.getAnnotated(); - if (ANDROID.toUpperCase().equals(platform) - && SELENDROID.toUpperCase().equals(automation)) { + if (isSelendroidAutomation()) { SelendroidFindBy selendroidFindBy = annotatedElement.getAnnotation(SelendroidFindBy.class); SelendroidFindBys selendroidFindBys = annotatedElement.getAnnotation(SelendroidFindBys.class); SelendroidFindAll selendroidFindByAll = annotatedElement.getAnnotation(SelendroidFindAll.class); @@ -136,7 +132,7 @@ class DefaultElementByBuilder extends AppiumByBuilder { } } - if (ANDROID.toUpperCase().equals(platform)) { + if (isAndroid()) { AndroidFindBy androidFindBy = annotatedElement.getAnnotation(AndroidFindBy.class); AndroidFindBys androidFindBys= annotatedElement.getAnnotation(AndroidFindBys.class); AndroidFindAll androidFindAll = annotatedElement.getAnnotation(AndroidFindAll.class); @@ -154,7 +150,7 @@ class DefaultElementByBuilder extends AppiumByBuilder { } } - if (IOS.toUpperCase().equals(platform)) { + if (isIOS()) { iOSFindBy iOSFindBy = annotatedElement.getAnnotation(iOSFindBy.class); iOSFindBys iOSFindBys= annotatedElement.getAnnotation(iOSFindBys.class); iOSFindAll iOSFindAll = annotatedElement.getAnnotation(iOSFindAll.class); @@ -181,6 +177,13 @@ class DefaultElementByBuilder extends AppiumByBuilder { return (annotatedElement.getAnnotation(CacheLookup.class) != null); } + private By returnMappedBy(By byDefault, By nativeAppBy) { + Map<ContentType, By> contentMap = new HashMap<>(); + contentMap.put(ContentType.HTML_OR_DEFAULT, byDefault); + contentMap.put(ContentType.NATIVE_MOBILE_SPECIFIC, nativeAppBy); + return new ContentMappedBy(contentMap); + } + @Override public By buildBy() { assertValidAnnotations(); @@ -188,18 +191,24 @@ class DefaultElementByBuilder extends AppiumByBuilder { By defaultBy = buildDefaultBy(); By mobileNativeBy = buildMobileNativeBy(); - if (defaultBy == null) { + String idOrName = ((Field) annotatedElementContainer.getAnnotated()).getName(); + + if (defaultBy == null && mobileNativeBy == null) { defaultBy = new ByIdOrName(((Field) annotatedElementContainer.getAnnotated()).getName()); + mobileNativeBy = new By.ById(idOrName); + return returnMappedBy(defaultBy, mobileNativeBy); } + if (defaultBy == null) { + defaultBy = new ByIdOrName(((Field) annotatedElementContainer.getAnnotated()).getName()); + return returnMappedBy(defaultBy, mobileNativeBy); + } if (mobileNativeBy == null) { mobileNativeBy = defaultBy; + return returnMappedBy(defaultBy, mobileNativeBy); } - Map<ContentType, By> contentMap = new HashMap<>(); - contentMap.put(ContentType.HTML_OR_DEFAULT, defaultBy); - contentMap.put(ContentType.NATIVE_MOBILE_SPECIFIC, mobileNativeBy); - return new ContentMappedBy(contentMap); + return returnMappedBy(defaultBy, mobileNativeBy); } } diff --git a/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java b/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java index b7c71fe9..bcfb18bf 100644 --- a/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java +++ b/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java @@ -16,6 +16,7 @@ package io.appium.java_client.pagefactory; +import org.openqa.selenium.InvalidSelectorException; import org.openqa.selenium.StaleElementReferenceException; import java.lang.reflect.InvocationTargetException; @@ -28,7 +29,11 @@ class ThrowableUtil { return false; } - if (String.valueOf(e.getMessage()).contains(INVALID_SELECTOR_PATTERN)) { + if (InvalidSelectorException.class.isAssignableFrom(e.getClass())) { + return true; + } + + if (String.valueOf(e.getMessage()).contains(INVALID_SELECTOR_PATTERN) || String.valueOf(e.getMessage()).contains("Locator Strategy \\\\w+ is not supported")) { return true; } diff --git a/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java b/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java index f07c0178..5602331a 100644 --- a/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java +++ b/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java @@ -24,6 +24,10 @@ import java.lang.reflect.*; import java.util.ArrayList; import java.util.List; +import static io.appium.java_client.remote.AutomationName.SELENDROID; +import static io.appium.java_client.remote.MobilePlatform.ANDROID; +import static io.appium.java_client.remote.MobilePlatform.IOS; + /** * It is the basic handler of Appium-specific page object annotations * About the Page Object design pattern please read these documents: @@ -163,6 +167,18 @@ public abstract class AppiumByBuilder extends AbstractAnnotations { this.annotatedElementContainer.setAnnotated(annotated); } + protected boolean isAndroid() { + return ANDROID.toUpperCase().equals(platform); + } + + protected boolean isSelendroidAutomation() { + return isAndroid() && SELENDROID.toUpperCase().equals(automation); + } + + protected boolean isIOS() { + return IOS.toUpperCase().equals(platform); + } + /** * Defines how to transform given object (field, class, etc) * into {@link org.openqa.selenium.By} class used by webdriver to locate elements. diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java b/src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java index b666df94..6f38ed2a 100644 --- a/src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java +++ b/src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java @@ -35,7 +35,11 @@ public @interface iOSFindBy { String uiAutomator() default ""; String accessibility() default ""; String id() default ""; - String name() default ""; + @Deprecated + /** + * By.name selector is not supported by Appium server node since 1.5.x. + * So this option is going to be removed further. Be careful. + */String name() default ""; String className() default ""; String tagName() default ""; String xpath() default ""; diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/MobileBrowserCompatibilityTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/MobileBrowserCompatibilityTest.java index dee99a56..3fe6773b 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/MobileBrowserCompatibilityTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/MobileBrowserCompatibilityTest.java @@ -41,18 +41,18 @@ import java.util.concurrent.TimeUnit; public class MobileBrowserCompatibilityTest { private WebDriver driver; - - @FindBy(name = "q") - @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\\"android:id/someId\\")") - private WebElement searchTextField; + private AppiumDriverLocalService service; @AndroidFindBys({ @AndroidFindBy(className = "someClass"), @AndroidFindBy(xpath = "//someTag")}) - @FindBy(name="btnG") - private RemoteWebElement searchButton; - + private RemoteWebElement btnG; //this element should be found by id = 'btnG' or name = 'btnG' + + @FindBy(name = "q") + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\\"android:id/someId\\")") + private WebElement searchTextField; + @AndroidFindBy(className = "someClass") @FindBys({@FindBy(className = "r"), @FindBy(tagName = "a")}) private List<WebElement> foundLinks; @@ -84,7 +84,7 @@ public class MobileBrowserCompatibilityTest { driver.get("https://www.google.com"); searchTextField.sendKeys("Hello"); - searchButton.click(); + btnG.click(); Assert.assertNotEquals(0, foundLinks.size()); } diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/SelendroidModeTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/SelendroidModeTest.java index b3129e67..fd15db3f 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/SelendroidModeTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/SelendroidModeTest.java @@ -17,6 +17,7 @@ package io.appium.java_client.pagefactory_tests; import io.appium.java_client.android.AndroidDriver; +import io.appium.java_client.android.AndroidElement; import io.appium.java_client.pagefactory.*; import io.appium.java_client.remote.AutomationName; import io.appium.java_client.remote.MobileCapabilityType; @@ -37,7 +38,7 @@ import java.util.concurrent.TimeUnit; import static org.junit.Assert.*; public class SelendroidModeTest { - private static int SELENDROID_PORT = 9999; + private static int SELENDROID_PORT = 9999; private static WebDriver driver; private static AppiumDriverLocalService service; @@ -63,15 +64,15 @@ public class SelendroidModeTest { private WebElement textXpath; @SelendroidFindBys({ - @SelendroidFindBy(id = "text1")}) + @SelendroidFindBy(id = "text1")}) private WebElement textIds; @SelendroidFindAll({ - @SelendroidFindBy(id = "text1")}) + @SelendroidFindBy(id = "text1")}) private WebElement textAll; @SelendroidFindAll({ - @SelendroidFindBy(id = "text1")}) + @SelendroidFindBy(id = "text1")}) private List<WebElement> textsAll; @SelendroidFindBy(className = "android.widget.TextView") @@ -79,14 +80,14 @@ public class SelendroidModeTest { @SelendroidFindBy(tagName = "TextView") private WebElement textTag; - + @SelendroidFindBy(linkText = "Accessibility") private WebElement textLink; - + @SelendroidFindBy(partialLinkText = "ccessibilit") private WebElement textPartialLink; - @BeforeClass + @BeforeClass public static void beforeClass() throws Exception { AppiumServiceBuilder builder = new AppiumServiceBuilder().withArgument(GeneralServerFlag.AUTOMATION_NAME, AutomationName.SELENDROID); service = builder.build(); @@ -123,8 +124,8 @@ public class SelendroidModeTest { public void findByIdElementTest() { assertNotEquals(null, textId.getAttribute("text")); } - - @Test + + @Test public void findBySelendroidSelectorTest() { assertNotEquals(null, textSelendroidId.getAttribute("text")); } @@ -173,15 +174,15 @@ public class SelendroidModeTest { public void findByElementByTagTest() { assertNotEquals(null, textTag.getAttribute("text")); } - + @Test public void findBySelendroidAnnotationOnlyTest() { assertNotEquals(null, textSelendroidId.getAttribute("text")); } - + @Test public void findBySelendroidLinkTextTest() { assertEquals("Accessibility", textLink.getText()); } -} +} \\ No newline at end of file diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java index ac7c04d1..5805b736 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java @@ -37,9 +37,9 @@ import java.util.List; public class iOSPageObjectTest { - private static WebDriver driver; - private static AppiumDriverLocalService service; - private boolean populated = false; + private static WebDriver driver; + private static AppiumDriverLocalService service; + private boolean populated = false; @FindBy(className = "UIAButton") private List<WebElement> uiButtons; @@ -67,9 +67,9 @@ public class iOSPageObjectTest { private List<RemoteWebElement> remoteElementViews; @AndroidFindBys({ - @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\\"android:id/list\\")"), - @AndroidFindBy(className = "android.widget.TextView") - }) + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\\"android:id/list\\")"), + @AndroidFindBy(className = "android.widget.TextView") + }) private List<WebElement> chainElementViews; @@ -92,11 +92,11 @@ public class iOSPageObjectTest { @iOSFindBy(uiAutomator = ".elements()[0]") private MobileElement mobileButton; - @iOSFindBy(uiAutomator = ".elements()[0]") - private TouchableElement touchableButton; + @iOSFindBy(uiAutomator = ".elements()[0]") + private TouchableElement touchableButton; - @iOSFindBy(uiAutomator = ".elements()[0]") - private List<TouchableElement> touchableButtons; + @iOSFindBy(uiAutomator = ".elements()[0]") + private List<TouchableElement> touchableButtons; @FindBy(className = "UIAButton") private MobileElement mobiletFindBy_Button; @@ -105,69 +105,70 @@ public class iOSPageObjectTest { private RemoteWebElement remotetextVieW; @AndroidFindBys({ - @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\\"android:id/list\\")"), - @AndroidFindBy(className = "android.widget.TextView") - }) + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\\"android:id/list\\")"), + @AndroidFindBy(className = "android.widget.TextView") + }) private WebElement chainElementView; - + @iOSFindBy(uiAutomator = ".elements()[0]") private IOSElement iosButton; - + @iOSFindBy(uiAutomator = ".elements()[0]") private List<IOSElement> iosButtons; - + @iOSFindAll({ - @iOSFindBy(xpath = "ComputeSumButton_Test"), - @iOSFindBy(name = "ComputeSumButton") //it is real locator + @iOSFindBy(id = "ComputeSumButton_Test"), + @iOSFindBy(xpath = "//*[@name = \\"ComputeSumButton\\"]") //it is real locator }) private WebElement findAllElement; - + @iOSFindAll({ - @iOSFindBy(xpath = "ComputeSumButton_Test"), - @iOSFindBy(name = "ComputeSumButton") //it is real locator + @iOSFindBy(id = "ComputeSumButton_Test"), + @iOSFindBy(xpath = "//*[@name = \\"ComputeSumButton\\"]") //it is real locator }) private List<WebElement> findAllElements; - @AndroidFindBy(className = "android.widget.TextView") - @FindBy(css = "e.e1.e2") - private List<WebElement> elementsWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy; - - @AndroidFindBy(className = "android.widget.TextView") - @FindBy(css = "e.e1.e2") - private WebElement elementWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy; - - - @BeforeClass - public static void beforeClass() throws Exception { - service = AppiumDriverLocalService.buildDefaultService(); - service.start(); + @AndroidFindBy(className = "android.widget.TextView") + @FindBy(css = "e.e1.e2") + private List<WebElement> elementsWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy; - File appDir = new File("src/test/java/io/appium/java_client"); - File app = new File(appDir, "TestApp.app.zip"); - DesiredCapabilities capabilities = new DesiredCapabilities(); - capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); - capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "8.4"); - capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator"); - capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); - driver = new IOSDriver<>(service.getUrl(), capabilities); - } + @AndroidFindBy(className = "android.widget.TextView") + @FindBy(css = "e.e1.e2") + private WebElement elementWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy; + + + @BeforeClass + public static void beforeClass() throws Exception { + service = AppiumDriverLocalService.buildDefaultService(); + service.start(); + + File appDir = new File("src/test/java/io/appium/java_client"); + File app = new File(appDir, "TestApp.app.zip"); + DesiredCapabilities capabilities = new DesiredCapabilities(); + capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); + capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1"); + capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator"); + capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); + driver = new IOSDriver(service.getUrl(), capabilities); + } + @SuppressWarnings("rawtypes") @Before public void setUp() throws Exception { - if (!populated) - PageFactory.initElements(new AppiumFieldDecorator(driver), this); + if (!populated) + PageFactory.initElements(new AppiumFieldDecorator(driver), this); - populated = true; + populated = true; } - @AfterClass - public static void afterClass() throws Exception { - if (driver != null) - driver.quit(); + @AfterClass + public static void afterClass() throws Exception { + if (driver != null) + driver.quit(); - if (service != null) - service.stop(); - } + if (service != null) + service.stop(); + } @Test public void findByElementsTest() { @@ -273,7 +274,7 @@ public class iOSPageObjectTest { } Assert.assertNotNull(nsee); } - + @Test public void isIOSElementTest(){ Assert.assertNotEquals(null, iosButton.getText()); @@ -294,38 +295,38 @@ public class iOSPageObjectTest { Assert.assertNotEquals(null, findAllElement.getText()); } - @Test - public void isTouchAbleElement(){ - Assert.assertNotEquals(null, touchableButton.getText()); - } + @Test + public void isTouchAbleElement(){ + Assert.assertNotEquals(null, touchableButton.getText()); + } - @Test - public void areTouchAbleElements(){ - Assert.assertNotEquals(0, touchableButtons.size()); - } + @Test + public void areTouchAbleElements(){ + Assert.assertNotEquals(0, touchableButtons.size()); + } - @Test - @SuppressWarnings("unused") - public void isTheFieldIOSElement(){ + @Test + public void isTheFieldIOSElement(){ + @SuppressWarnings("unused") IOSElement iOSElement = (IOSElement) mobileButton; //declared as MobileElement - iOSElement = (IOSElement) iosUIAutomatorButton; //declared as WebElement - iOSElement = (IOSElement) remotetextVieW; //declared as RemoteWebElement - iOSElement = (IOSElement) touchableButton; //declared as TouchABLEElement - } - - @Test - public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy(){ - try { - Assert.assertNotEquals(null, elementWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.getAttribute("text")); - } - catch (NoSuchElementException ignored){ - return; - } - throw new RuntimeException(NoSuchElementException.class.getName() + " has been expected."); - } - - @Test - public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy_List(){ - Assert.assertEquals(0, elementsWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.size()); - } -} + iOSElement = (IOSElement) iosUIAutomatorButton; //declared as WebElement + iOSElement = (IOSElement) remotetextVieW; //declared as RemoteWebElement + iOSElement = (IOSElement) touchableButton; //declared as TouchABLEElement + } + + @Test + public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy(){ + try { + Assert.assertNotEquals(null, elementWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.getAttribute("text")); + } + catch (NoSuchElementException ignored){ + return; + } + throw new RuntimeException(NoSuchElementException.class.getName() + " has been expected."); + } + + @Test + public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy_List(){ + Assert.assertEquals(0, elementsWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.size()); + } +} \\ No newline at end of file

['src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java', 'src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java', 'src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java', 'src/test/java/io/appium/java_client/pagefactory_tests/SelendroidModeTest.java', 'src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java', 'src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java', 'src/test/java/io/appium/java_client/pagefactory_tests/MobileBrowserCompatibilityTest.java', 'src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java']

{'.java': 8}

Java

{'Java': 1674245, 'HTML': 80758}

Apache License 2.0

javers/javers/541/455

javers

javers

https://github.com/javers/javers/issues/455

https://github.com/javers/javers/pull/541

https://github.com/javers/javers/pull/541

fix

MySQL error: Specified key was too long; max key length is 767 bytes

Hi, I'm initializing repository this way: ``` JaversSqlRepository sqlRepository = SqlRepositoryBuilder.sqlRepository() .withConnectionProvider(connectionProvider) .withDialect(DialectName.MYSQL) .build(); Javers javers = JaversBuilder.javers().registerJaversRepository(sqlRepository).build(); ``` however I get an error in the application: ``` 13:22:18,689 INFO SqlRepositoryBuilder:55 - starting up SQL repository module ... 13:22:18,719 INFO Java8AddOns:13 - loading Java8 add-ons ... 13:22:18,738 INFO ScannerModule:28 - using FIELD mappingStyle 13:22:18,753 INFO JaversSchemaManager:244 - creating javers table jv_commit_property ... 13:22:18,753 INFO SchemaManagerImpl:51 - creating entity with name jv_commit_property using ddl: CREATE TABLE jv_commit_property ( property_name VARCHAR(200), property_value VARCHAR(200), commit_fk BIGINT, CONSTRAINT jv_commit_property_pk PRIMARY KEY(commit_fk, property_name), CONSTRAINT jv_commit_property_commit_fk FOREIGN KEY(commit_fk) REFERENCES jv_commit(commit_pk) ) ENGINE = InnoDB 13:22:18,755 WARN RequestCycleExtra:346 - ******************************** 13:22:18,755 WARN RequestCycleExtra:347 - Handling the following exception org.polyjdbc.core.exception.SchemaManagerException: [DDL_ERROR] Failed to run DDL: CREATE TABLE jv_commit_property ( property_name VARCHAR(200), property_value VARCHAR(200), commit_fk BIGINT, CONSTRAINT jv_commit_property_pk PRIMARY KEY(commit_fk, property_name), CONSTRAINT jv_commit_property_commit_fk FOREIGN KEY(commit_fk) REFERENCES jv_commit(commit_pk) ) ENGINE = InnoDB at org.polyjdbc.core.schema.SchemaManagerImpl.ddl(SchemaManagerImpl.java:91) at org.polyjdbc.core.schema.SchemaManagerImpl.create(SchemaManagerImpl.java:52) at org.javers.repository.sql.schema.JaversSchemaManager.ensureTable(JaversSchemaManager.java:245) at org.javers.repository.sql.schema.JaversSchemaManager.ensureSchema(JaversSchemaManager.java:42) at org.javers.repository.sql.JaversSqlRepository.ensureSchema(JaversSqlRepository.java:81) at org.javers.core.JaversBuilder.build(JaversBuilder.java:107) at cz.jaclean.pages.TestPage.onInitialize(TestPage.java:56) at org.apache.wicket.Component.fireInitialize(Component.java:891) at org.apache.wicket.MarkupContainer.internalInitialize(MarkupContainer.java:1081) at org.apache.wicket.Page.isPageStateless(Page.java:465) at org.apache.wicket.request.handler.render.WebPageRenderer.isPageStateless(WebPageRenderer.java:287) at org.apache.wicket.request.handler.render.WebPageRenderer.shouldRenderPageAndWriteResponse(WebPageRenderer.java:329) at org.apache.wicket.request.handler.render.WebPageRenderer.respond(WebPageRenderer.java:193) at org.apache.wicket.core.request.handler.RenderPageRequestHandler.respond(RenderPageRequestHandler.java:175) at org.apache.wicket.request.cycle.RequestCycle$HandlerExecutor.respond(RequestCycle.java:895) at org.apache.wicket.request.RequestHandlerStack.execute(RequestHandlerStack.java:64) at org.apache.wicket.request.cycle.RequestCycle.execute(RequestCycle.java:265) at org.apache.wicket.request.cycle.RequestCycle.processRequest(RequestCycle.java:222) at org.apache.wicket.request.cycle.RequestCycle.processRequestAndDetach(RequestCycle.java:293) at org.apache.wicket.protocol.http.WicketFilter.processRequestCycle(WicketFilter.java:261) at org.apache.wicket.protocol.http.WicketFilter.processRequest(WicketFilter.java:203) at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:284) at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1668) at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:581) at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:143) at org.eclipse.jetty.security.SecurityHandler.handle(SecurityHandler.java:548) at org.eclipse.jetty.server.session.SessionHandler.doHandle(SessionHandler.java:226) at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:1180) at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:511) at org.eclipse.jetty.server.session.SessionHandler.doScope(SessionHandler.java:185) at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:1112) at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:141) at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:134) at org.eclipse.jetty.server.Server.handle(Server.java:523) at org.eclipse.jetty.server.HttpChannel.handle(HttpChannel.java:320) at org.eclipse.jetty.server.HttpConnection.onFillable(HttpConnection.java:251) at org.eclipse.jetty.io.AbstractConnection$ReadCallback.succeeded(AbstractConnection.java:273) at org.eclipse.jetty.io.FillInterest.fillable(FillInterest.java:95) at org.eclipse.jetty.io.SelectChannelEndPoint$2.run(SelectChannelEndPoint.java:93) at org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume.executeProduceConsume(ExecuteProduceConsume.java:303) at org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume.produceConsume(ExecuteProduceConsume.java:148) at org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume.run(ExecuteProduceConsume.java:136) at org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:671) at org.eclipse.jetty.util.thread.QueuedThreadPool$2.run(QueuedThreadPool.java:589) at java.lang.Thread.run(Thread.java:745) Caused by: java.sql.SQLSyntaxErrorException: Specified key was too long; max key length is 767 bytes at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:560) at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:537) at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:527) at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:115) at com.mysql.cj.jdbc.ConnectionImpl.execSQL(ConnectionImpl.java:2011) at com.mysql.cj.jdbc.ConnectionImpl.execSQL(ConnectionImpl.java:1964) at com.mysql.cj.jdbc.StatementImpl.executeInternal(StatementImpl.java:891) at com.mysql.cj.jdbc.StatementImpl.execute(StatementImpl.java:795) at com.mchange.v2.c3p0.impl.NewProxyStatement.execute(NewProxyStatement.java:75) at org.polyjdbc.core.schema.SchemaManagerImpl.ddl(SchemaManagerImpl.java:88) ... 44 more 13:22:18,757 WARN RequestCycleExtra:348 - ******************************** 13:22:18,758 ERROR DefaultExceptionMapper:170 - Unexpected error occurred org.polyjdbc.core.exception.SchemaManagerException: [DDL_ERROR] Failed to run DDL: CREATE TABLE jv_commit_property ( property_name VARCHAR(200), property_value VARCHAR(200), commit_fk BIGINT, CONSTRAINT jv_commit_property_pk PRIMARY KEY(commit_fk, property_name), CONSTRAINT jv_commit_property_commit_fk FOREIGN KEY(commit_fk) REFERENCES jv_commit(commit_pk) ) ENGINE = InnoDB at org.polyjdbc.core.schema.SchemaManagerImpl.ddl(SchemaManagerImpl.java:91) at org.polyjdbc.core.schema.SchemaManagerImpl.create(SchemaManagerImpl.java:52) at org.javers.repository.sql.schema.JaversSchemaManager.ensureTable(JaversSchemaManager.java:245) at org.javers.repository.sql.schema.JaversSchemaManager.ensureSchema(JaversSchemaManager.java:42) at org.javers.repository.sql.JaversSqlRepository.ensureSchema(JaversSqlRepository.java:81) at org.javers.core.JaversBuilder.build(JaversBuilder.java:107) at cz.jaclean.pages.TestPage.onInitialize(TestPage.java:56) at org.apache.wicket.Component.fireInitialize(Component.java:891) at org.apache.wicket.MarkupContainer.internalInitialize(MarkupContainer.java:1081) at org.apache.wicket.Page.isPageStateless(Page.java:465) at org.apache.wicket.request.handler.render.WebPageRenderer.isPageStateless(WebPageRenderer.java:287) at org.apache.wicket.request.handler.render.WebPageRenderer.shouldRenderPageAndWriteResponse(WebPageRenderer.java:329) at org.apache.wicket.request.handler.render.WebPageRenderer.respond(WebPageRenderer.java:193) at org.apache.wicket.core.request.handler.RenderPageRequestHandler.respond(RenderPageRequestHandler.java:175) at org.apache.wicket.request.cycle.RequestCycle$HandlerExecutor.respond(RequestCycle.java:895) at org.apache.wicket.request.RequestHandlerStack.execute(RequestHandlerStack.java:64) at org.apache.wicket.request.cycle.RequestCycle.execute(RequestCycle.java:265) at org.apache.wicket.request.cycle.RequestCycle.processRequest(RequestCycle.java:222) at org.apache.wicket.request.cycle.RequestCycle.processRequestAndDetach(RequestCycle.java:293) at org.apache.wicket.protocol.http.WicketFilter.processRequestCycle(WicketFilter.java:261) at org.apache.wicket.protocol.http.WicketFilter.processRequest(WicketFilter.java:203) at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:284) at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1668) at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:581) at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:143) at org.eclipse.jetty.security.SecurityHandler.handle(SecurityHandler.java:548) at org.eclipse.jetty.server.session.SessionHandler.doHandle(SessionHandler.java:226) at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:1180) at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:511) at org.eclipse.jetty.server.session.SessionHandler.doScope(SessionHandler.java:185) at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:1112) at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:141) at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:134) at org.eclipse.jetty.server.Server.handle(Server.java:523) at org.eclipse.jetty.server.HttpChannel.handle(HttpChannel.java:320) at org.eclipse.jetty.server.HttpConnection.onFillable(HttpConnection.java:251) at org.eclipse.jetty.io.AbstractConnection$ReadCallback.succeeded(AbstractConnection.java:273) at org.eclipse.jetty.io.FillInterest.fillable(FillInterest.java:95) at org.eclipse.jetty.io.SelectChannelEndPoint$2.run(SelectChannelEndPoint.java:93) at org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume.executeProduceConsume(ExecuteProduceConsume.java:303) at org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume.produceConsume(ExecuteProduceConsume.java:148) at org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume.run(ExecuteProduceConsume.java:136) at org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:671) at org.eclipse.jetty.util.thread.QueuedThreadPool$2.run(QueuedThreadPool.java:589) at java.lang.Thread.run(Thread.java:745) Caused by: java.sql.SQLSyntaxErrorException: Specified key was too long; max key length is 767 bytes at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:560) at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:537) at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:527) at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:115) at com.mysql.cj.jdbc.ConnectionImpl.execSQL(ConnectionImpl.java:2011) at com.mysql.cj.jdbc.ConnectionImpl.execSQL(ConnectionImpl.java:1964) at com.mysql.cj.jdbc.StatementImpl.executeInternal(StatementImpl.java:891) at com.mysql.cj.jdbc.StatementImpl.execute(StatementImpl.java:795) at com.mchange.v2.c3p0.impl.NewProxyStatement.execute(NewProxyStatement.java:75) at org.polyjdbc.core.schema.SchemaManagerImpl.ddl(SchemaManagerImpl.java:88) ... 44 more ``` When I try to run DDL separately in the database: ``` CREATE TABLE jv_commit_property ( property_name VARCHAR(200), property_value VARCHAR(200), commit_fk BIGINT, CONSTRAINT jv_commit_property_pk PRIMARY KEY(commit_fk, property_name), CONSTRAINT jv_commit_property_commit_fk FOREIGN KEY(commit_fk) REFERENCES jv_commit(commit_pk) ) ENGINE = InnoDB ``` I get the same error.. As you do not specify encoding and my database used utf16_czech_ci collation, this maxed out allowed 767 bytes for a key size. After setting it to utf8_czech_ci, the problem went away. Either it would be good to specify encoding or check encoding first and then set a limit on a key. Related discussions: [#1071 - Specified key was too long; max key length is 767 bytes](http://stackoverflow.com/questions/1814532/1071-specified-key-was-too-long-max-key-length-is-767-bytes) [UTF8, UTF16, and UTF32](http://stackoverflow.com/questions/496321/utf8-utf16-and-utf32)

174c15278998eb1ba17809c40c2199eb7f411da4

36fae3ed1f9822be9eba4afc2c0ee7490fff6684

https://github.com/javers/javers/compare/174c15278998eb1ba17809c40c2199eb7f411da4...36fae3ed1f9822be9eba4afc2c0ee7490fff6684

diff --git a/javers-persistence-sql/src/main/java/org/javers/repository/sql/schema/FixedSchemaFactory.java b/javers-persistence-sql/src/main/java/org/javers/repository/sql/schema/FixedSchemaFactory.java index 7aac9530..f3d77fc0 100644 --- a/javers-persistence-sql/src/main/java/org/javers/repository/sql/schema/FixedSchemaFactory.java +++ b/javers-persistence-sql/src/main/java/org/javers/repository/sql/schema/FixedSchemaFactory.java @@ -110,7 +110,7 @@ public class FixedSchemaFactory extends SchemaNameAware { RelationBuilder relationBuilder = schema.addRelation(tableName.nameWithSchema()); relationBuilder .primaryKey(tableName.localName() + "_pk").using(COMMIT_PROPERTY_COMMIT_FK, COMMIT_PROPERTY_NAME).and() - .withAttribute().string(COMMIT_PROPERTY_NAME).withMaxLength(200).and() + .withAttribute().string(COMMIT_PROPERTY_NAME).withMaxLength(190).and() .withAttribute().string(COMMIT_PROPERTY_VALUE).withMaxLength(600).and(); foreignKey(tableName, COMMIT_PROPERTY_COMMIT_FK, getCommitTableNameWithSchema(), COMMIT_PK, relationBuilder); relationBuilder.build(); @@ -136,7 +136,7 @@ public class FixedSchemaFactory extends SchemaNameAware { RelationBuilder relationBuilder = schema.addRelation(tableName.nameWithSchema()); primaryKey(GLOBAL_ID_PK, schema,relationBuilder); relationBuilder - .withAttribute().string(GLOBAL_ID_LOCAL_ID).withMaxLength(200).and() + .withAttribute().string(GLOBAL_ID_LOCAL_ID).withMaxLength(190).and() .withAttribute().string(GLOBAL_ID_FRAGMENT).withMaxLength(200).and() .withAttribute().string(GLOBAL_ID_TYPE_NAME).withMaxLength(200).and(); foreignKey(tableName, GLOBAL_ID_OWNER_ID_FK, getGlobalIdTableNameWithSchema(), GLOBAL_ID_PK, relationBuilder);

['javers-persistence-sql/src/main/java/org/javers/repository/sql/schema/FixedSchemaFactory.java']

{'.java': 1}

Java

{'Java': 1158177, 'Groovy': 842390, 'Shell': 608}

Apache License 2.0

javers/javers/598/597

javers

javers

https://github.com/javers/javers/issues/597

https://github.com/javers/javers/pull/598

https://github.com/javers/javers/pull/598

fix

Again: MySQL error: Specified key was too long; max key length is 767 bytes

#455 is back in 3.6.0 (or earlier?) affecting mysql <= 4.6.. mysql <= 4.6 has a max key length of 767 bytes (whereas >= 4.7 has a limit of 3072 bytes) ``` Caused by: org.polyjdbc.core.exception.SchemaManagerException: [DDL_ERROR] Failed to run DDL: CREATE INDEX jv_commit_property_property_name_property_value_idx ON jv_commit_property(property_name,property_value(200)) at org.polyjdbc.core.schema.SchemaManagerImpl.ddl(SchemaManagerImpl.java:91) at org.polyjdbc.core.schema.SchemaManagerImpl.create(SchemaManagerImpl.java:52) Caused by: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Specified key was too long; max key length is 767 bytes ``` The property value index has a length of 200 [here](https://github.com/javers/javers/blob/master/javers-persistence-sql/src/main/java/org/javers/repository/sql/schema/FixedSchemaFactory.java#L124). Should it be 191 instead? ```java RelationBuilder relationBuilder = schema.addRelation(tableName.nameWithSchema()); relationBuilder .primaryKey(tableName.localName() + "_pk").using(COMMIT_PROPERTY_COMMIT_FK, COMMIT_PROPERTY_NAME).and() .withAttribute().string(COMMIT_PROPERTY_NAME).withMaxLength(190).and() /// <------- .withAttribute().string(COMMIT_PROPERTY_VALUE).withMaxLength(600).and(); /// <------ foreignKey(tableName, COMMIT_PROPERTY_COMMIT_FK, getCommitTableNameWithSchema(), COMMIT_PK, relationBuilder); relationBuilder.build(); columnsIndex(tableName, schema, COMMIT_PROPERTY_COMMIT_FK); // Add index prefix length for MySql if (dialect instanceof MysqlDialect) { columnsIndex(tableName, schema, new IndexedCols( new String[]{COMMIT_PROPERTY_NAME, COMMIT_PROPERTY_VALUE}, new int[]{0, 200})); // <-------------- } else { columnsIndex(tableName, schema, COMMIT_PROPERTY_NAME, COMMIT_PROPERTY_VALUE); } ``` 1. The col COMMIT_PROPERTY_NAME has max length of 190, and a prefix length of 0 for the index 2. The col COMMIT_PROPERTY_VALUE has a max length of 600, and a prefix length of 200 for the index. Why is the prefix length 0 for PROPERTY_NAME? This effectively makes the index useless? Or does 0 mean it indexes the entire length. But for COMMIT_PROPERTY_VALUE the maximum prefix length is `767 / 4 = 191` in mysql 4.6 and `3072 / 4 = 768` in mysql 4.7

89e68859667afc5908d4eb5fb514ff9c3eb3a7bd

0b923c46d61e01b192d2ead3a6d20bddaef2bad6

https://github.com/javers/javers/compare/89e68859667afc5908d4eb5fb514ff9c3eb3a7bd...0b923c46d61e01b192d2ead3a6d20bddaef2bad6

diff --git a/javers-persistence-sql/src/main/java/org/javers/repository/sql/schema/FixedSchemaFactory.java b/javers-persistence-sql/src/main/java/org/javers/repository/sql/schema/FixedSchemaFactory.java index f3d77fc0..354ab67b 100644 --- a/javers-persistence-sql/src/main/java/org/javers/repository/sql/schema/FixedSchemaFactory.java +++ b/javers-persistence-sql/src/main/java/org/javers/repository/sql/schema/FixedSchemaFactory.java @@ -16,6 +16,7 @@ import java.util.TreeMap; * @author bartosz walacik */ public class FixedSchemaFactory extends SchemaNameAware { + private static final int MAX_INDEX_KEY_LEN_IN_MYSQL = 191; public static final String GLOBAL_ID_TABLE_NAME = "jv_global_id"; public static final String GLOBAL_ID_PK = "global_id_pk"; @@ -110,7 +111,7 @@ public class FixedSchemaFactory extends SchemaNameAware { RelationBuilder relationBuilder = schema.addRelation(tableName.nameWithSchema()); relationBuilder .primaryKey(tableName.localName() + "_pk").using(COMMIT_PROPERTY_COMMIT_FK, COMMIT_PROPERTY_NAME).and() - .withAttribute().string(COMMIT_PROPERTY_NAME).withMaxLength(190).and() + .withAttribute().string(COMMIT_PROPERTY_NAME).withMaxLength(MAX_INDEX_KEY_LEN_IN_MYSQL).and() .withAttribute().string(COMMIT_PROPERTY_VALUE).withMaxLength(600).and(); foreignKey(tableName, COMMIT_PROPERTY_COMMIT_FK, getCommitTableNameWithSchema(), COMMIT_PK, relationBuilder); relationBuilder.build(); @@ -121,7 +122,7 @@ public class FixedSchemaFactory extends SchemaNameAware { if (dialect instanceof MysqlDialect) { columnsIndex(tableName, schema, new IndexedCols( new String[]{COMMIT_PROPERTY_NAME, COMMIT_PROPERTY_VALUE}, - new int[]{0, 200})); + new int[]{0, MAX_INDEX_KEY_LEN_IN_MYSQL})); } else { columnsIndex(tableName, schema, COMMIT_PROPERTY_NAME, COMMIT_PROPERTY_VALUE); @@ -136,7 +137,7 @@ public class FixedSchemaFactory extends SchemaNameAware { RelationBuilder relationBuilder = schema.addRelation(tableName.nameWithSchema()); primaryKey(GLOBAL_ID_PK, schema,relationBuilder); relationBuilder - .withAttribute().string(GLOBAL_ID_LOCAL_ID).withMaxLength(190).and() + .withAttribute().string(GLOBAL_ID_LOCAL_ID).withMaxLength(MAX_INDEX_KEY_LEN_IN_MYSQL).and() .withAttribute().string(GLOBAL_ID_FRAGMENT).withMaxLength(200).and() .withAttribute().string(GLOBAL_ID_TYPE_NAME).withMaxLength(200).and(); foreignKey(tableName, GLOBAL_ID_OWNER_ID_FK, getGlobalIdTableNameWithSchema(), GLOBAL_ID_PK, relationBuilder);

['javers-persistence-sql/src/main/java/org/javers/repository/sql/schema/FixedSchemaFactory.java']

{'.java': 1}

Java

{'Java': 1158177, 'Groovy': 842390, 'Shell': 608}

Apache License 2.0

javers/javers/696/692

javers

javers

https://github.com/javers/javers/issues/692

https://github.com/javers/javers/pull/696

https://github.com/javers/javers/pull/696

fixes

JaVers dependency on Google Guava

As documented I just ran the below code to view the diff. It seems that Google Guava is required as a runtime dependency for the below code to work. ```java Javers javers = JaversBuilder.javers().build(); Person tommyOld = new Person("tommy", "Tommy Smart"); Person tommyNew = new Person("tommy", "Tommy C. Smart"); Diff diff = javers.compare(tommyOld, tommyNew); System.out.println(diff.prettyPrint()); ``` The code above throws an exception as shown below: ``` Exception in thread "main" java.lang.NoClassDefFoundError: com/google/common/collect/ImmutableMap at org.javers.core.Changes.<init>(Changes.java:35) at org.javers.core.diff.Diff.groupByObject(Diff.java:88) at org.javers.core.diff.Diff.toString(Diff.java:129) at org.javers.core.diff.Diff.prettyPrint(Diff.java:120) ... Caused by: java.lang.ClassNotFoundException: com.google.common.collect.ImmutableMap at java.net.URLClassLoader.findClass(URLClassLoader.java:381) at java.lang.ClassLoader.loadClass(ClassLoader.java:424) at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:349) at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ... 5 more ``` Not sure how the below line of code is used in [org.javers.core.Changes.java](https://github.com/javers/javers/blob/d5ac085c94b5459d464a14ab3e489f31e3c7c110/javers-core/src/main/java/org/javers/core/Changes.java#L35) There are 3 more references in other classes HibernateConfig.java, JaversSpringJpaApplicationConfig.java and JaversSpringMongoApplicationConfig.java The above code can be easily replaced with standard Java code to remove dependency on Goolge Guava. Do let me know if these changes can be done. I will submit a PR.

ecaa45ed4965f6c243c05ffa85248e2ab9209f77

9cdedbe0c836af2af84d7b58fe85961d9ff76339

https://github.com/javers/javers/compare/ecaa45ed4965f6c243c05ffa85248e2ab9209f77...9cdedbe0c836af2af84d7b58fe85961d9ff76339

diff --git a/javers-core/src/main/java/org/javers/common/collections/Primitives.java b/javers-core/src/main/java/org/javers/common/collections/Primitives.java index eee8a3c4..c9ff294d 100644 --- a/javers-core/src/main/java/org/javers/common/collections/Primitives.java +++ b/javers-core/src/main/java/org/javers/common/collections/Primitives.java @@ -1,10 +1,10 @@ package org.javers.common.collections; -import com.google.common.collect.Streams; import org.javers.common.reflection.ReflectionUtil; import java.util.List; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * @author bartosz walacik @@ -27,7 +27,7 @@ public class Primitives { public static List<Class<?>> getPrimitiveAndBoxTypes() { return java.util.Collections.unmodifiableList( - Streams.concat(PRIMITIVE_NUMBER_TYPES.stream(), + Stream.concat(PRIMITIVE_NUMBER_TYPES.stream(), PRIMITIVE_TYPES.stream()).collect(Collectors.toList())); }

['javers-core/src/main/java/org/javers/common/collections/Primitives.java']

{'.java': 1}

Java

{'Java': 1158177, 'Groovy': 842390, 'Shell': 608}

Apache License 2.0

javers/javers/1222/1183

javers

javers

https://github.com/javers/javers/issues/1183

https://github.com/javers/javers/pull/1222

https://github.com/javers/javers/pull/1222

fixes

Possible issue with skip value check

While reading the code, I found this snippet on`master`: https://github.com/javers/javers/blob/f49b0aea4c371b90ada54144843e3e1eae81fe65/javers-core/src/main/java/org/javers/repository/api/QueryParamsBuilder.java#L111 ``` public QueryParamsBuilder skip(int skip) { Validate.argumentCheck(limit >= 0, "Skip is not a non-negative number."); this.skip = skip; return this; } ``` Shouldn't it be ` Validate.argumentCheck(skip >= 0, "Skip is not a non-negative number.");` ?

c92044c41f3bfb8ee30879a73f880f470b26ef06

3e504dd5494f339fd497d354f9b5eed8f403e89b

https://github.com/javers/javers/compare/c92044c41f3bfb8ee30879a73f880f470b26ef06...3e504dd5494f339fd497d354f9b5eed8f403e89b

diff --git a/javers-core/src/main/java/org/javers/repository/api/QueryParamsBuilder.java b/javers-core/src/main/java/org/javers/repository/api/QueryParamsBuilder.java index 24122e34..a46ad839 100644 --- a/javers-core/src/main/java/org/javers/repository/api/QueryParamsBuilder.java +++ b/javers-core/src/main/java/org/javers/repository/api/QueryParamsBuilder.java @@ -108,7 +108,7 @@ public class QueryParamsBuilder { * @see QueryBuilder#skip(int) */ public QueryParamsBuilder skip(int skip) { - Validate.argumentCheck(limit >= 0, "Skip is not a non-negative number."); + Validate.argumentCheck(skip >= 0, "Skip is not a non-negative number."); this.skip = skip; return this; }

['javers-core/src/main/java/org/javers/repository/api/QueryParamsBuilder.java']

{'.java': 1}