honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor util.xcontent to common.xcontent in groovy cliet

This commit is contained in:
kimchy 2010-06-20 08:53:45 +03:00
parent e846ed6465
commit abde45bb82
6 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/client/groovy/src/main/groovy/org/elasticsearch/groovy/client/GClient.groovy
View File

@ -48,7 +48,7 @@ import org.elasticsearch.client.action.terms.TermsRequestBuilder
import org.elasticsearch.client.internal.InternalClient
import org.elasticsearch.common.xcontent.XContentType
import org.elasticsearch.groovy.client.action.GActionFuture
import org.elasticsearch.groovy.util.xcontent.GXContentBuilder
import org.elasticsearch.groovy.common.xcontent.GXContentBuilder
/**
* @author kimchy (shay.banon)

2
plugins/client/groovy/src/main/groovy/org/elasticsearch/groovy/client/GIndicesAdminClient.groovy
View File

@ -43,7 +43,7 @@ import org.elasticsearch.action.admin.indices.status.IndicesStatusResponse
import org.elasticsearch.client.IndicesAdminClient
import org.elasticsearch.client.internal.InternalClient
import org.elasticsearch.groovy.client.action.GActionFuture
import org.elasticsearch.groovy.util.xcontent.GXContentBuilder
import org.elasticsearch.groovy.common.xcontent.GXContentBuilder
/**
* @author kimchy (shay.banon)

2
plugins/client/groovy/src/main/groovy/org/elasticsearch/groovy/util/xcontent/GXContentBuilder.groovy → plugins/client/groovy/src/main/groovy/org/elasticsearch/groovy/common/xcontent/GXContentBuilder.groovy
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.groovy.util.xcontent
package org.elasticsearch.groovy.common.xcontent
import org.elasticsearch.common.xcontent.XContentFactory
import org.elasticsearch.common.xcontent.XContentType

4
plugins/client/groovy/src/main/groovy/org/elasticsearch/groovy/node/GNodeBuilder.groovy
View File

@ -22,12 +22,12 @@ package org.elasticsearch.groovy.node
import org.elasticsearch.common.settings.ImmutableSettings
import org.elasticsearch.common.settings.Settings
import org.elasticsearch.common.settings.loader.JsonSettingsLoader
import org.elasticsearch.groovy.util.xcontent.GXContentBuilder
import org.elasticsearch.groovy.common.xcontent.GXContentBuilder
import org.elasticsearch.node.Node
import org.elasticsearch.node.internal.InternalNode
/**
* The node builder allow to build a {@link GNode} instance.
* The node builder allow to build a {@link GNode} instance.
*
* @author kimchy (shay.banon)
*/

32
plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/util/xcontent/GXContentBuilderTests.groovy → plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/common/xcontent/GXContentBuilderTests.groovy
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.groovy.util.xcontent
package org.elasticsearch.groovy.common.xcontent
/**
* @author kimchy (shay.banon)
@ -95,42 +95,12 @@ class GXContentBuilderTests extends GroovyTestCase {
assertEquals '{"foo":[{"bar":"hello"}]}', result.toString()
}
void testRootElementList() {
def builder = new GXContentBuilder()
def results = ['one', 'two', 'three']
def result = builder.buildAsString {
for (b in results) {
element b
}
}
assertEquals '["one","two","three"]', result.toString()
result = builder.buildAsString {
results
}
assertEquals '["one","two","three"]', result.toString()
}
void testExampleFromReferenceGuide() {
def builder = new GXContentBuilder()
def results = ['one', 'two', 'three']
def result = builder.buildAsString {
for (b in results) {
element title: b
}
}
assertEquals '[{"title":"one"},{"title":"two"},{"title":"three"}]', result.toString()
result = builder.buildAsString {
books = results.collect {
[title: it]
}

2
plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/SimpleActionsTests.groovy
View File

@ -54,7 +54,7 @@ class SimpleActionsTests {
@Test
void testSimpleOperations() {
def value1 = new org.elasticsearch.groovy.util.xcontent.GXContentBuilder().buildAsString {
def value1 = new org.elasticsearch.groovy.common.xcontent.GXContentBuilder().buildAsString {
something = "test"
}
println value1