Skip to content

added support for namespacing with mapping #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wellercs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added support for namespacing with mapping #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ClusterManager.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ component accessors="true"{
property name="inactive" type="struct";
property name="ClusterName" type="string";

public ClusterManager function init(any nodeConfig=""){
public ElasticSearchMapping.ClusterManager function init(any nodeConfig=""){
variables.active = {};
variables.inactive = {};
loadConfigFromString(arguments.nodeConfig);
return this;
}

private ClusterManager function loadConfigFromString(required any nodeConfig){
private ElasticSearchMapping.ClusterManager function loadConfigFromString(required any nodeConfig){
/*
config = [{
host = "",
Expand Down Expand Up @@ -42,13 +42,13 @@ component accessors="true"{
return this;
}

public ClusterManager function addNode(required NodeConfig NodeConfig){
public ElasticSearchMapping.ClusterManager function addNode(required NodeConfig NodeConfig){
variables.active[arguments.NodeConfig.getServerId()] = arguments.NodeConfig;
updateServerList();
return this;
}

public ClusterManager function updateServerList(){
public ElasticSearchMapping.ClusterManager function updateServerList(){
variables.serverList = {active = structKeyList(getActive()), inactive = structKeyList(getInactive())};
return this;
}
Expand Down
24 changes: 12 additions & 12 deletions ElasticSearchClient.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,71 +5,71 @@ component accessors="true" extends="Base" {
property name="LoggingUtil";
property name="ClusterManager" type="ClusterManager";

public ElasticSearchClient function init(required ClusterManager ClusterManager){
public ElasticSearchMapping.ElasticSearchClient function init(required ElasticSearchMapping.ClusterManager ClusterManager){
variables.ClusterManager = arguments.ClusterManager;
variables.OutputUtils = new OutputUtils();
return this;
}

public FilterBuilder function filterBuilder(){
public ElasticSearchMapping.search.filters.FilterBuilder function filterBuilder(){
return new search.filters.FilterBuilder();
}

public QueryBuilder function queryBuilder(){
public ElasticSearchMapping.search.queries.QueryBuilder function queryBuilder(){
return new search.queries.QueryBuilder();
}

public FacetBuilder function facetBuilder(){
public ElasticSearchMapping.search.facets.FacetBuilder function facetBuilder(){
return new search.facets.FacetBuilder();
}

public SearchRequest function prepareSearch(){
public ElasticSearchMapping.requests.SearchRequest function prepareSearch(){
var search = new requests.SearchRequest(argumentCollection=arguments);
search.setClusterManager(getClusterManager());
return search;
}

public IndexRequest function prepareIndex(string index="", string type="", string id=""){
public ElasticSearchMapping.requests.IndexRequest function prepareIndex(string index="", string type="", string id=""){
var index = new requests.IndexRequest(ClusterManager=getClusterManager());
index.setIndex(arguments.index);
index.setType(arguments.type);
index.setId(arguments.id);
return index;
}

public MappingRequest function prepareMapping(required string index, required string type, required elasticsearch.indexing.TypeMapping typeMapping){
public ElasticSearchMapping.requests.MappingRequest function prepareMapping(required string index, required string type, required ElasticSearchMapping.indexing.TypeMapping typeMapping){
var index = new requests.MappingRequest(ClusterManager=getClusterManager());
index.setIndex(arguments.index);
index.setType(arguments.type);
index.setBody(typeMapping.getJson());
return index;
}

public BulkRequest function prepareBulk(boolean Transactional=false){
public ElasticSearchMapping.requests.BulkRequest function prepareBulk(boolean Transactional=false){
return new requests.BulkRequest(Transactional=Arguments.Transactional, ClusterManager=getClusterManager(), OutputUtils=getOutputUtils(), ElasticSearchClient=this);
}

public MultiGetRequest function prepareMultiGet(){
public ElasticSearchMapping.requests.MultiGetRequest function prepareMultiGet(){
return new requests.MultiGetRequest(ClusterManager=getClusterManager(), OutputUtils=getOutputUtils());
}

public GetRequest function prepareGet(string index="", string type="_all", string id=""){
public ElasticSearchMapping.requests.GetRequest function prepareGet(string index="", string type="_all", string id=""){
var get = new requests.GetRequest(ClusterManager=getClusterManager());
get.setIndex(arguments.index);
get.setType(arguments.type);
get.setId(arguments.id);
return get;
}

public DeleteRequest function prepareDelete(required string index, string type="", string id=""){
public ElasticSearchMapping.requests.DeleteRequest function prepareDelete(required string index, string type="", string id=""){
var delete = new requests.DeleteRequest(ClusterManager=getClusterManager());
delete.setIndex(arguments.index);
delete.setType(arguments.type);
delete.setId(arguments.id);
return delete;
}

public GenericRequest function prepareRequest(required string uri, required string method, required string body){
public ElasticSearchMapping.requests.GenericRequest function prepareRequest(required string uri, required string method, required string body){
var genericRequest = new requests.GenericRequest(ClusterManager=getClusterManager());
genericRequest.setUri(arguments.uri);
genericRequest.setMethod(arguments.method);
Expand Down
2 changes: 1 addition & 1 deletion NodeConfig.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ component accessors="true" {
property name="password" type="string";
property name="health" type="string" default="ok";

public NodeConfig function init(string host="", numeric port=0, string path="", boolean secure=false, string username="", string password=""){
public ElasticSearchMapping.NodeConfig function init(string host="", numeric port=0, string path="", boolean secure=false, string username="", string password=""){
variables.host = arguments.host;
variables.port = arguments.port;
variables.path = arguments.path;
Expand Down
2 changes: 1 addition & 1 deletion OutputUtils.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component{

public OutputUtils function init(){
public ElasticSearchMapping.OutputUtils function init(){
return this;
}

Expand Down
6 changes: 3 additions & 3 deletions requests/BulkRequest.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ component accessors="true" {
property name="OutputUtils" type="OutputUtils";
property name="Transactional" type="boolean" default="false" getter="false" setter="false";

public BulkRequest function init(boolean Transactional=false, required ClusterManager ClusterManager, required OutputUtils OutputUtils, required ElasticSearchClient ElasticSearchClient){
public ElasticSearchMapping.requests.BulkRequest function init(boolean Transactional=false, required ElasticSearchMapping.ClusterManager ClusterManager, required ElasticSearchMapping.OutputUtils OutputUtils, required ElasticSearchMapping.ElasticSearchClient ElasticSearchClient){
variables.BulkItems = [];
variables.ClusterManager = arguments.ClusterManager;
variables.OutputUtils = arguments.OutputUtils;
Expand All @@ -20,12 +20,12 @@ component accessors="true" {
return variables.Transactional;
}

public BulkRequest function add(required IndexRequest IndexRequest){
public ElasticSearchMapping.requests.BulkRequest function add(required ElasticSearchMapping.requests.IndexRequest IndexRequest){
arrayAppend(getBulkItems(), arguments.IndexRequest);
return this;
}

public BulkResponse function execute(){
public ElasticSearchMapping.responses.BulkResponse function execute(){
var Response = "";
// prior to sending the bulk request, if this is transactional, let's pull up the current state of all the docs that are going to be updated...
if(isTransactional()){ loadPreUpdateData(); }
Expand Down
4 changes: 2 additions & 2 deletions requests/DeleteRequest.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ component accessors="true" {

property name="ClusterManager" type="ClusterManager";

public DeleteRequest function init(required ClusterManager ClusterManager){
public ElasticSearchMapping.requests.DeleteRequest function init(required ElasticSearchMapping.ClusterManager ClusterManager){
variables.ClusterManager = arguments.ClusterManager
return this;
}

public Response function execute(){
public ElasticSearchMapping.responses.Response function execute(){
var _url = "#getIndex()#/";

if(getType() != "")
Expand Down
4 changes: 2 additions & 2 deletions requests/GenericRequest.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ component accessors="true" {

property name="ClusterManager" type="ClusterManager";

public GenericRequest function init(required ClusterManager ClusterManager){
public ElasticSearchMapping.requests.GenericRequest function init(required ElasticSearchMapping.ClusterManager ClusterManager){
variables.ClusterManager = arguments.ClusterManager
return this;
}

public Response function execute(){
public ElasticSearchMapping.responses.Response function execute(){
return getClusterManager().doRequest(resource = getUri(),
method=getMethod(),
body=getBody(),
Expand Down
6 changes: 3 additions & 3 deletions requests/GetRequest.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ component accessors="true" {

property name="ClusterManager" type="ClusterManager";

public GetRequest function init(required ClusterManager ClusterManager){
variables.ClusterManager = arguments.ClusterManager
public ElasticSearchMapping.requests.GetRequest function init(required ElasticSearchMapping.ClusterManager ClusterManager){
variables.ClusterManager = arguments.ClusterManager;
return this;
}

public GetResponse function execute(){
public ElasticSearchMapping.responses.GetResponse function execute(){
var _url = "/#getIndex()#/#getType()#/#getId()#";

if(getSourceOnly()){
Expand Down
4 changes: 2 additions & 2 deletions requests/IndexRequest.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ component accessors="true" {

property name="ClusterManager" type="ClusterManager";

public IndexRequest function init(required ClusterManager ClusterManager){
public ElasticSearchMapping.requests.IndexRequest function init(required ElasticSearchMapping.ClusterManager ClusterManager){
variables.ClusterManager = arguments.ClusterManager
return this;
}

public IndexResponse function execute(){
public ElasticSearchMapping.responses.IndexResponse function execute(){
return getClusterManager().doRequest(resource = "/#getIndex()#/#getType()#/#getId()#",
method="PUT",
body=getBody(),
Expand Down
4 changes: 2 additions & 2 deletions requests/MappingRequest.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ component accessors="true" {

property name="ClusterManager" type="ClusterManager";

public MappingRequest function init(required ClusterManager ClusterManager){
public ElasticSearchMapping.requests.MappingRequest function init(required ElasticSearchMapping.ClusterManager ClusterManager){
variables.ClusterManager = arguments.ClusterManager
return this;
}

public Response function execute(){
public ElasticSearchMapping.responses.Response function execute(){
return getClusterManager().doRequest(resource = "/#getIndex()#/#getType()#/_mapping",
method="PUT",
body=getBody(),
Expand Down
6 changes: 3 additions & 3 deletions requests/MultiGetRequest.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ component accessors="true" {
property name="ClusterManager" type="ClusterManager";
property name="OutputUtils" type="OutputUtils";

public MultiGetRequest function init(required ClusterManager ClusterManager, required OutputUtils OutputUtils){
public ElasticSearchMapping.requests.MultiGetRequest function init(required ElasticSearchMapping.ClusterManager ClusterManager, required ElasticSearchMapping.OutputUtils OutputUtils){
variables.Items = [];
variables.ClusterManager = arguments.ClusterManager;
variables.OutputUtils = arguments.OutputUtils;
return this;
}

public MultiGetRequest function add(required string index, required string type, required string id){
public ElasticSearchMapping.requests.MultiGetRequest function add(required string index, required string type, required string id){
arrayAppend(getItems(), arguments);
return this;
}

public MultiGetResponse function execute(){
public ElasticSearchMapping.responses.MultiGetResponse function execute(){

var MultiGetResponse = getClusterManager().doRequest(resource = "/_mget",
method="POST",
Expand Down
8 changes: 4 additions & 4 deletions requests/SearchRequest.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ component accessors="true" {

property name="ClusterManager" type="ClusterManager";

public SearchRequest function init(){
public ElasticSearchMapping.requests.SearchRequest function init(){
variables.Types = [];
variables.Indexes = [];
variables.Filters = [];
Expand All @@ -30,14 +30,14 @@ component accessors="true" {
return this;
}

public SearchRequest function setTypes(){
public ElasticSearchMapping.requests.SearchRequest function setTypes(){
for(var i IN arguments){
arrayAppend(variables.Types, Arguments[i]);
}
return this;
}

public SearchRequest function setSearchType(required string SearchType){
public ElasticSearchMapping.requests.SearchRequest function setSearchType(required string SearchType){
if(listFindNoCase(this.SEARCH_TYPES, arguments.SearchType)){
variables.SearchType = arguments.SearchType;
}else{
Expand Down Expand Up @@ -82,7 +82,7 @@ component accessors="true" {
}


public SearchResponse function execute(){
public ElasticSearchMapping.responses.SearchResponse function execute(){
var urlIndexes = Len(getIndexes()[1]) > 0 ? ArrayToList(getIndexes()) & "/" : "";
var urlTypes = Len(getTypes()[1]) > 0 ? ArrayToList(getTypes()) & "/" : "";

Expand Down
2 changes: 1 addition & 1 deletion responses/BulkResponse.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ component extends="Response" accessors="true" implements="IResponse" {
property name="successes";
property name="failures";

public BulkResponse function init(){
public ElasticSearchMapping.responses.BulkResponse function init(){
variables.successes = [];
variables.failures = [];
return this;
Expand Down
2 changes: 1 addition & 1 deletion responses/GetResponse.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ component extends="Response" accessors="true" implements="IResponse" {
property name="Source";
property name="Exists" type="boolean" default="true";

public GetResponse function init(){
public ElasticSearchMapping.responses.GetResponse function init(){
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion responses/IndexResponse.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ component extends="Response" accessors="true" implements="IResponse" {
property name="Exists" type="boolean" default="true";
property name="ok" type="boolean" default="true";

public IndexResponse function init(){
public ElasticSearchMapping.responses.IndexResponse function init(){
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion responses/MultiGetResponse.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ component extends="Response" accessors="true" implements="IResponse" {
property name="docs" type="array";
property name="docsPointers" type="struct";

public MultiGetResponse function init(){
public ElasticSearchMapping.responses.MultiGetResponse function init(){
variables.docs = [];
variables.docsPointers = {};
return this;
Expand Down
2 changes: 1 addition & 1 deletion responses/SearchHit.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ component accessors="true"{
property name="Source" type="struct";
property name="Highlight" type="struct";

public SearchHit function init(){
public ElasticSearchMapping.responses.SearchHit function init(){
return this;
}

Expand Down
6 changes: 3 additions & 3 deletions responses/SearchHits.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ component accessors="true" {
property name="TotalHits" type="numeric";
property name="Hits" type="array";

public SearchHits function init(){
public ElasticSearchMapping.responses.SearchHits function init(){
variables.Hits = [];
return this;
}

public SearchHit function getAt(required numeric position){
public ElasticSearchMapping.responses.SearchHit function getAt(required numeric position){
if(arrayLen(getHits()) <= arguments.position){
return variables.Hits[arguments.position];
}else{
throw(message="There are only #arrayLen(getHits())# hits so #arguments.position# is out of bounds.");
}
}

public void function addHit(required SearchHit SearchHit){
public void function addHit(required ElasticSearchMapping.responses.SearchHit SearchHit){
arrayAppend(getHits(), arguments.SearchHit);
}
}
2 changes: 1 addition & 1 deletion responses/SearchResponse.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ component extends="Response" accessors="true" {
property name="TotalShards";
property name="FailedShards";

public SearchResponse function init(){
public ElasticSearchMapping.responses.SearchResponse function init(){
setHits(new SearchHits());
return this;
}
Expand Down
2 changes: 1 addition & 1 deletion search/facets/FacetBuilder.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ component accessors="true" {

property name="facets" type="array";

public FacetBuilder function init(){
public ElasticSearchMapping.search.facets.FacetBuilder function init(){
variables.facets = [];
return this;
}
Expand Down
4 changes: 2 additions & 2 deletions search/filters/FilterBuilder.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ component accessors="true" {

property name="filters";

public FilterBuilder function init(){
public ElasticSearchMapping.search.filters.FilterBuilder function init(){
variables.filters = [];
return this;
}
Expand All @@ -12,7 +12,7 @@ component accessors="true" {
return this;
}

public IFilter function buildFilter(required string MissingMethodName, required array MissingMethodArguments){
public ElasticSearchMapping.search.filters.IFilter function buildFilter(required string MissingMethodName, required array MissingMethodArguments){
return onMissingMethod(MissingMethodName, MissingMethodArguments);
}

Expand Down
Loading