You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by mm...@apache.org on 2018/07/20 17:41:53 UTC
[40/53] [abbrv] calcite git commit: [CALCITE-2376] License header for
XML file and javadoc (Andrei Sereda)
[CALCITE-2376] License header for XML file and javadoc (Andrei Sereda)
Close apache/calcite#758
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/6c34c6b9
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/6c34c6b9
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/6c34c6b9
Branch: refs/heads/site
Commit: 6c34c6b94a849447ba72911f0e09f876ce61628a
Parents: 6a2af65
Author: Andrei Sereda <an...@nospam.com>
Authored: Wed Jul 11 20:11:53 2018 -0400
Committer: Julian Hyde <jh...@apache.org>
Committed: Fri Jul 13 11:21:29 2018 -0700
----------------------------------------------------------------------
.../EmbeddedElasticsearchNode.java | 6 ++--
.../EmbeddedElasticsearchPolicy.java | 10 +++---
elasticsearch/src/test/resources/log4j2.xml | 36 +++++++++-----------
3 files changed, 24 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/6c34c6b9/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
index 5dfb1f6..54f06c0 100644
--- a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
+++ b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
@@ -38,7 +38,8 @@ import java.util.Objects;
/**
* Represents a single elastic search node which can run embedded in a java application.
- * Intended for unit and integration tests. Settings and plugins are crafted for Calcite.
+ *
+ * <p>Intended for unit and integration tests. Settings and plugins are crafted for Calcite.
*/
class EmbeddedElasticsearchNode implements AutoCloseable {
@@ -49,7 +50,6 @@ class EmbeddedElasticsearchNode implements AutoCloseable {
this.node = Objects.requireNonNull(node, "node");
}
-
/**
* Creates an instance with existing settings
* @param settings configuration parameters of ES instance
@@ -116,8 +116,8 @@ class EmbeddedElasticsearchNode implements AutoCloseable {
/**
* Exposes elastic
* <a href="https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/transport-client.html">transport client</a>
- *
* (use of HTTP client is preferred).
+ *
* @return current elastic search client
*/
public Client client() {
http://git-wip-us.apache.org/repos/asf/calcite/blob/6c34c6b9/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchPolicy.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchPolicy.java b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchPolicy.java
index 1ef9175..9a2f69e 100644
--- a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchPolicy.java
+++ b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchPolicy.java
@@ -32,7 +32,7 @@ import java.util.Objects;
* Used to initialize a single elastic node. For performance reasons (node startup costs),
* same instance is usually shared across multiple tests.
*
- * This rule should be used as follows:
+ * <p>This rule should be used as follows:
* <pre>
* public class MyTest {
* @ClassRule
@@ -45,7 +45,7 @@ import java.util.Objects;
*
* @Test
* public void myTest() {
- * TransportAddress address = RULE.httpAddress();
+ * RestClient client = RULE.restClient();
* // ....
* }
* }
@@ -91,8 +91,8 @@ class EmbeddedElasticsearchPolicy extends ExternalResource {
}
/**
- * Low-level http rest client to elastic search
- * @return current ES rest client
+ * Low-level http rest client connected to current embedded elastic search instance.
+ * @return http client connected to ES cluster
*/
RestClient restClient() {
if (client != null) {
@@ -110,7 +110,7 @@ class EmbeddedElasticsearchPolicy extends ExternalResource {
* HTTP address for rest clients (can be ES native or any other).
* @return http address to connect to
*/
- TransportAddress httpAddress() {
+ private TransportAddress httpAddress() {
return node.httpAddress();
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/6c34c6b9/elasticsearch/src/test/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/elasticsearch/src/test/resources/log4j2.xml b/elasticsearch/src/test/resources/log4j2.xml
index c8d70aa..3e28263 100644
--- a/elasticsearch/src/test/resources/log4j2.xml
+++ b/elasticsearch/src/test/resources/log4j2.xml
@@ -1,26 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ /*
- ~ * Licensed to the Apache Software Foundation (ASF) under one or more
- ~ * contributor license agreements. See the NOTICE file distributed with
- ~ * this work for additional information regarding copyright ownership.
- ~ * The ASF licenses this file to you under the Apache License, Version 2.0
- ~ * (the "License"); you may not use this file except in compliance with
- ~ * the License. You may obtain a copy of the License at
- ~ *
- ~ * http://www.apache.org/licenses/LICENSE-2.0
- ~ *
- ~ * Unless required by applicable law or agreed to in writing, software
- ~ * distributed under the License is distributed on an "AS IS" BASIS,
- ~ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ * See the License for the specific language governing permissions and
- ~ * limitations under the License.
- ~ */
- ~
- -->
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
-<Configuration status="WARN">
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Configuration status="WARN">
<Appenders>
<Console name="console" target="SYSTEM_OUT">
<PatternLayout
@@ -33,4 +29,4 @@
<AppenderRef ref="console" />
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>