Skip to content

Commit

Permalink
Running spotless for samples
Browse files Browse the repository at this point in the history 
Signed-off-by: Vacha Shah <vachshah@amazon.com>
  • Loading branch information
@VachaShah
VachaShah committed Oct 3, 2023
1 parent 68fe1c3 commit 0fd00e0
Show file tree
Hide file tree
Showing 13 changed files with 279 additions and 411 deletions.
52 changes: 19 additions & 33 deletions samples/src/main/java/org/opensearch/client/samples/Bulk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import java.util.ArrayList;
import java.util.List;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.opensearch.client.opensearch._types.Refresh;
Expand Down Expand Up @@ -46,51 +45,38 @@ public static void main(String[] args) {

if (!client.indices().exists(r -> r.index(indexName)).value()) {
LOGGER.info("Creating index {}", indexName);
IndexSettings settings = new IndexSettings.Builder()
.numberOfShards("2")
.numberOfReplicas("1")
.build();
TypeMapping mapping = new TypeMapping.Builder()
.properties("age", new Property.Builder().integer(new IntegerNumberProperty.Builder().build()).build())
.build();
CreateIndexRequest createIndexRequest = new CreateIndexRequest.Builder()
.index(indexName)
.settings(settings)
.mappings(mapping)
.build();
IndexSettings settings = new IndexSettings.Builder().numberOfShards("2").numberOfReplicas("1").build();
TypeMapping mapping = new TypeMapping.Builder().properties(
"age",
new Property.Builder().integer(new IntegerNumberProperty.Builder().build()).build()
).build();
CreateIndexRequest createIndexRequest = new CreateIndexRequest.Builder().index(indexName)
.settings(settings)
.mappings(mapping)
.build();
client.indices().create(createIndexRequest);
}

LOGGER.info("Bulk indexing documents");
ArrayList<BulkOperation> ops = new ArrayList<>();
IndexData doc1 = new IndexData("Document 1", "The text of document 1");
ops.add(new BulkOperation.Builder().index(
IndexOperation.of(io -> io.index(indexName).id("id1").document(doc1))
).build());
ops.add(new BulkOperation.Builder().index(IndexOperation.of(io -> io.index(indexName).id("id1").document(doc1))).build());
IndexData doc2 = new IndexData("Document 2", "The text of document 2");
ops.add(new BulkOperation.Builder().index(
IndexOperation.of(io -> io.index(indexName).id("id2").document(doc2))
).build());
ops.add(new BulkOperation.Builder().index(IndexOperation.of(io -> io.index(indexName).id("id2").document(doc2))).build());
IndexData doc3 = new IndexData("Document 3", "The text of document 3");
ops.add(new BulkOperation.Builder().index(
IndexOperation.of(io -> io.index(indexName).id("id3").document(doc3))
).build());
ops.add(new BulkOperation.Builder().index(IndexOperation.of(io -> io.index(indexName).id("id3").document(doc3))).build());

BulkRequest.Builder bulkReq = new BulkRequest.Builder()
.index(indexName)
.operations(ops)
.refresh(Refresh.WaitFor);
BulkRequest.Builder bulkReq = new BulkRequest.Builder().index(indexName).operations(ops).refresh(Refresh.WaitFor);
BulkResponse bulkResponse = client.bulk(bulkReq.build());
LOGGER.info("Bulk response items: {}", bulkResponse.items().size());

Query query = Query.of(qb -> qb.match(mb -> mb.field("title").query(fv -> fv.stringValue("Document"))));
final SearchRequest.Builder searchReq = new SearchRequest.Builder()
.allowPartialSearchResults(false)
.index(List.of(indexName))
.size(10)
.source(sc -> sc.fetch(false))
.ignoreThrottled(false)
.query(query);
final SearchRequest.Builder searchReq = new SearchRequest.Builder().allowPartialSearchResults(false)
.index(List.of(indexName))
.size(10)
.source(sc -> sc.fetch(false))
.ignoreThrottled(false)
.query(query);
SearchResponse<IndexData> searchResponse = client.search(searchReq.build(), IndexData.class);
LOGGER.info("Found {} documents", searchResponse.hits().hits().size());

Expand Down
13 changes: 5 additions & 8 deletions samples/src/main/java/org/opensearch/client/samples/DataStreamBasics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,12 @@ public static void main(String[] args) {
String dataStreamName = "sample-data-stream-1";

// Create an index template which configures data stream
PutIndexTemplateRequest putIndexTemplateRequest = new PutIndexTemplateRequest.Builder()
.name(dataStreamIndexTemplateName)
.indexPatterns(namePattern)
.dataStream(new DataStream.Builder()
.timestampField(t -> t.name(timestampFieldName))
.build())
.build();
PutIndexTemplateRequest putIndexTemplateRequest = new PutIndexTemplateRequest.Builder().name(dataStreamIndexTemplateName)
.indexPatterns(namePattern)
.dataStream(new DataStream.Builder().timestampField(t -> t.name(timestampFieldName)).build())
.build();
client.indices().putIndexTemplate(putIndexTemplateRequest);

// Create a data stream
CreateDataStreamRequest createDataStreamRequest = new CreateDataStreamRequest.Builder().name(dataStreamName).build();
client.indices().createDataStream(createDataStreamRequest);
Expand Down
40 changes: 15 additions & 25 deletions samples/src/main/java/org/opensearch/client/samples/IndexingBasics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
package org.opensearch.client.samples;

import java.util.ArrayList;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.opensearch.client.json.JsonData;
Expand Down Expand Up @@ -47,27 +46,24 @@ public static void main(String[] args) {

if (!client.indices().exists(r -> r.index(indexName)).value()) {
LOGGER.info("Creating index {}", indexName);
IndexSettings settings = new IndexSettings.Builder()
.numberOfShards("2")
.numberOfReplicas("1")
.build();
TypeMapping mapping = new TypeMapping.Builder()
.properties("age", new Property.Builder().integer(new IntegerNumberProperty.Builder().build()).build())
.build();
CreateIndexRequest createIndexRequest = new CreateIndexRequest.Builder()
.index(indexName)
.settings(settings)
.mappings(mapping)
.build();
IndexSettings settings = new IndexSettings.Builder().numberOfShards("2").numberOfReplicas("1").build();
TypeMapping mapping = new TypeMapping.Builder().properties(
"age",
new Property.Builder().integer(new IntegerNumberProperty.Builder().build()).build()
).build();
CreateIndexRequest createIndexRequest = new CreateIndexRequest.Builder().index(indexName)
.settings(settings)
.mappings(mapping)
.build();
client.indices().create(createIndexRequest);
}

LOGGER.info("Indexing documents");
IndexData indexData = new IndexData("Document 1", "Text for document 1");
IndexRequest<IndexData> indexRequest = new IndexRequest.Builder<IndexData>().index(indexName)
.id("1")
.document(indexData)
.build();
.id("1")
.document(indexData)
.build();
client.index(indexRequest);

indexData = new IndexData("Document 2", "Text for document 2");
Expand All @@ -84,14 +80,8 @@ public static void main(String[] args) {

LOGGER.info("Adding a new mapping to index {}", indexName);
PutMappingRequest.Builder mappingsRequestBuilder = new PutMappingRequest.Builder().index(indexName)
.source(
new SourceField.Builder()
.enabled(true)
.build())
.routing(
new RoutingField.Builder()
.required(false)
.build())
.source(new SourceField.Builder().enabled(true).build())
.routing(new RoutingField.Builder().required(false).build())
.dynamic(DynamicMapping.Strict)
.meta("key", JsonData.of("key value"))
.fieldNames(new FieldNamesField.Builder().enabled(false).build())
Expand All @@ -100,7 +90,7 @@ public static void main(String[] args) {
.dynamicTemplates(new ArrayList<>())
.numericDetection(false);
client.indices().putMapping(mappingsRequestBuilder.build());

GetMappingRequest mappingsRequest = new GetMappingRequest.Builder().index(indexName).build();
GetMappingResponse getMappingResponse = client.indices().getMapping(mappingsRequest);
LOGGER.info("Mappings {} found for index {}", getMappingResponse.result().get(indexName).mappings(), indexName);
Expand Down
33 changes: 15 additions & 18 deletions samples/src/main/java/org/opensearch/client/samples/PointInTime.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,36 +41,33 @@ public static void main(String[] args) {

if (!client.indices().exists(r -> r.index(indexName)).value()) {
LOGGER.info("Creating index {}", indexName);
IndexSettings settings = new IndexSettings.Builder()
.numberOfShards("2")
.numberOfReplicas("1")
.build();
TypeMapping mapping = new TypeMapping.Builder()
.properties("age", new Property.Builder().integer(new IntegerNumberProperty.Builder().build()).build())
.build();
CreateIndexRequest createIndexRequest = new CreateIndexRequest.Builder()
.index(indexName)
.settings(settings)
.mappings(mapping)
.build();
IndexSettings settings = new IndexSettings.Builder().numberOfShards("2").numberOfReplicas("1").build();
TypeMapping mapping = new TypeMapping.Builder().properties(
"age",
new Property.Builder().integer(new IntegerNumberProperty.Builder().build()).build()
).build();
CreateIndexRequest createIndexRequest = new CreateIndexRequest.Builder().index(indexName)
.settings(settings)
.mappings(mapping)
.build();
client.indices().create(createIndexRequest);
}

CreatePitRequest createPitRequest = new CreatePitRequest.Builder()
.targetIndexes(Collections.singletonList(indexName))
.keepAlive(new Time.Builder().time("100m").build()).build();
CreatePitRequest createPitRequest = new CreatePitRequest.Builder().targetIndexes(Collections.singletonList(indexName))
.keepAlive(new Time.Builder().time("100m").build())
.build();

CreatePitResponse createPitResponse = client.createPit(createPitRequest);
LOGGER.info("PIT created with id: {}", createPitResponse.pitId());

ListAllPitResponse listAllPitResponse = client.listAllPit();
LOGGER.info("Found {} PITs", listAllPitResponse.pits().size());

DeletePitRequest deletePitRequest = new DeletePitRequest.Builder()
.pitId(Collections.singletonList(createPitResponse.pitId())).build();
DeletePitRequest deletePitRequest = new DeletePitRequest.Builder().pitId(Collections.singletonList(createPitResponse.pitId()))
.build();
DeletePitResponse deletePitResponse = client.deletePit(deletePitRequest);
LOGGER.info("Deleting PIT: {}", deletePitResponse.pits());

LOGGER.info("Deleting index {}", indexName);
DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest.Builder().index(indexName).build();
client.indices().delete(deleteIndexRequest);
Expand Down
47 changes: 18 additions & 29 deletions samples/src/main/java/org/opensearch/client/samples/SampleClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,40 +32,29 @@ public static OpenSearchClient create() throws NoSuchAlgorithmException, KeyStor
var user = env.getOrDefault("USERNAME", "admin");
var pass = env.getOrDefault("PASSWORD", "admin");

final var hosts = new HttpHost[]{
new HttpHost(https ? "https" : "http", hostname, port)
};
final var hosts = new HttpHost[] { new HttpHost(https ? "https" : "http", hostname, port) };

final var sslContext = SSLContextBuilder.create()
.loadTrustMaterial(null, (chains, authType) -> true)
.build();
final var sslContext = SSLContextBuilder.create().loadTrustMaterial(null, (chains, authType) -> true).build();

final var transport = ApacheHttpClient5TransportBuilder
.builder(hosts)
.setMapper(new JacksonJsonpMapper())
.setHttpClientConfigCallback(httpClientBuilder -> {
final var credentialsProvider = new BasicCredentialsProvider();
for (final var host : hosts) {
credentialsProvider.setCredentials(
new AuthScope(host),
new UsernamePasswordCredentials(user, pass.toCharArray()));
}
final var transport = ApacheHttpClient5TransportBuilder.builder(hosts)
.setMapper(new JacksonJsonpMapper())
.setHttpClientConfigCallback(httpClientBuilder -> {
final var credentialsProvider = new BasicCredentialsProvider();
for (final var host : hosts) {
credentialsProvider.setCredentials(new AuthScope(host), new UsernamePasswordCredentials(user, pass.toCharArray()));
}

// Disable SSL/TLS verification as our local testing clusters use self-signed certificates
final var tlsStrategy = ClientTlsStrategyBuilder.create()
.setSslContext(sslContext)
.setHostnameVerifier(NoopHostnameVerifier.INSTANCE)
.build();
// Disable SSL/TLS verification as our local testing clusters use self-signed certificates
final var tlsStrategy = ClientTlsStrategyBuilder.create()
.setSslContext(sslContext)
.setHostnameVerifier(NoopHostnameVerifier.INSTANCE)
.build();

final var connectionManager = PoolingAsyncClientConnectionManagerBuilder.create()
.setTlsStrategy(tlsStrategy)
.build();
final var connectionManager = PoolingAsyncClientConnectionManagerBuilder.create().setTlsStrategy(tlsStrategy).build();

return httpClientBuilder
.setDefaultCredentialsProvider(credentialsProvider)
.setConnectionManager(connectionManager);
})
.build();
return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider).setConnectionManager(connectionManager);
})
.build();
return new OpenSearchClient(transport);
}
}
Loading

0 comments on commit 0fd00e0

Please sign in to comment.