diff --git a/ClusterManager.cfc b/ClusterManager.cfc index 66b170c..543fee4 100644 --- a/ClusterManager.cfc +++ b/ClusterManager.cfc @@ -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 = "", @@ -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; } diff --git a/ElasticSearchClient.cfc b/ElasticSearchClient.cfc index 63dd0ab..8b252fd 100644 --- a/ElasticSearchClient.cfc +++ b/ElasticSearchClient.cfc @@ -5,31 +5,31 @@ 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); @@ -37,7 +37,7 @@ component accessors="true" extends="Base" { 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); @@ -45,15 +45,15 @@ component accessors="true" extends="Base" { 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); @@ -61,7 +61,7 @@ component accessors="true" extends="Base" { 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); @@ -69,7 +69,7 @@ component accessors="true" extends="Base" { 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); diff --git a/NodeConfig.cfc b/NodeConfig.cfc index 78e0ae4..3ba06b8 100644 --- a/NodeConfig.cfc +++ b/NodeConfig.cfc @@ -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; diff --git a/OutputUtils.cfc b/OutputUtils.cfc index ed5aa7c..258976a 100644 --- a/OutputUtils.cfc +++ b/OutputUtils.cfc @@ -1,6 +1,6 @@ component{ - public OutputUtils function init(){ + public ElasticSearchMapping.OutputUtils function init(){ return this; } diff --git a/requests/BulkRequest.cfc b/requests/BulkRequest.cfc index 62f00ce..e61e7a2 100644 --- a/requests/BulkRequest.cfc +++ b/requests/BulkRequest.cfc @@ -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; @@ -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(); } diff --git a/requests/DeleteRequest.cfc b/requests/DeleteRequest.cfc index 00525ad..5fee2cf 100644 --- a/requests/DeleteRequest.cfc +++ b/requests/DeleteRequest.cfc @@ -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() != "") diff --git a/requests/GenericRequest.cfc b/requests/GenericRequest.cfc index 0660fb7..0f5723e 100644 --- a/requests/GenericRequest.cfc +++ b/requests/GenericRequest.cfc @@ -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(), diff --git a/requests/GetRequest.cfc b/requests/GetRequest.cfc index c3be97b..c2d955c 100644 --- a/requests/GetRequest.cfc +++ b/requests/GetRequest.cfc @@ -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()){ diff --git a/requests/IndexRequest.cfc b/requests/IndexRequest.cfc index 472f543..0164d47 100644 --- a/requests/IndexRequest.cfc +++ b/requests/IndexRequest.cfc @@ -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(), diff --git a/requests/MappingRequest.cfc b/requests/MappingRequest.cfc index 25f0645..32a20cf 100644 --- a/requests/MappingRequest.cfc +++ b/requests/MappingRequest.cfc @@ -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(), diff --git a/requests/MultiGetRequest.cfc b/requests/MultiGetRequest.cfc index 644a3b6..a33f7d9 100644 --- a/requests/MultiGetRequest.cfc +++ b/requests/MultiGetRequest.cfc @@ -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", diff --git a/requests/SearchRequest.cfc b/requests/SearchRequest.cfc index c6affe9..521bd7a 100644 --- a/requests/SearchRequest.cfc +++ b/requests/SearchRequest.cfc @@ -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 = []; @@ -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{ @@ -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()) & "/" : ""; diff --git a/responses/BulkResponse.cfc b/responses/BulkResponse.cfc index 1e5631f..94db0aa 100644 --- a/responses/BulkResponse.cfc +++ b/responses/BulkResponse.cfc @@ -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; diff --git a/responses/GetResponse.cfc b/responses/GetResponse.cfc index df4523e..a6f0da5 100644 --- a/responses/GetResponse.cfc +++ b/responses/GetResponse.cfc @@ -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; } diff --git a/responses/IndexResponse.cfc b/responses/IndexResponse.cfc index 1a7d14f..8d1edf6 100644 --- a/responses/IndexResponse.cfc +++ b/responses/IndexResponse.cfc @@ -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; } diff --git a/responses/MultiGetResponse.cfc b/responses/MultiGetResponse.cfc index d920f53..e1c456e 100644 --- a/responses/MultiGetResponse.cfc +++ b/responses/MultiGetResponse.cfc @@ -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; diff --git a/responses/SearchHit.cfc b/responses/SearchHit.cfc index 8bcc213..4abe13d 100644 --- a/responses/SearchHit.cfc +++ b/responses/SearchHit.cfc @@ -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; } diff --git a/responses/SearchHits.cfc b/responses/SearchHits.cfc index 97ba544..0da0895 100644 --- a/responses/SearchHits.cfc +++ b/responses/SearchHits.cfc @@ -4,12 +4,12 @@ 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{ @@ -17,7 +17,7 @@ component accessors="true" { } } - public void function addHit(required SearchHit SearchHit){ + public void function addHit(required ElasticSearchMapping.responses.SearchHit SearchHit){ arrayAppend(getHits(), arguments.SearchHit); } } \ No newline at end of file diff --git a/responses/SearchResponse.cfc b/responses/SearchResponse.cfc index 0b98e3c..a459222 100644 --- a/responses/SearchResponse.cfc +++ b/responses/SearchResponse.cfc @@ -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; } diff --git a/search/facets/FacetBuilder.cfc b/search/facets/FacetBuilder.cfc index 0f9265e..379962c 100644 --- a/search/facets/FacetBuilder.cfc +++ b/search/facets/FacetBuilder.cfc @@ -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; } diff --git a/search/filters/FilterBuilder.cfc b/search/filters/FilterBuilder.cfc index a65bde4..2c00f4b 100644 --- a/search/filters/FilterBuilder.cfc +++ b/search/filters/FilterBuilder.cfc @@ -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; } @@ -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); } diff --git a/search/queries/BoolQuery.cfc b/search/queries/BoolQuery.cfc index 2f03d6f..ddb2fe4 100644 --- a/search/queries/BoolQuery.cfc +++ b/search/queries/BoolQuery.cfc @@ -6,21 +6,21 @@ component accessors="true" extends="BaseQuery" implements="IQuery"{ property name="minMatch" type="numeric"; property name="boost" type="numeric"; - public BoolQuery function init(){ + public ElasticSearchMapping.search.queries.BoolQuery function init(){ variables.must = []; variables.mustNot = []; variables.should = []; return this; } - public BoolQuery function must(required IQuery Query){ + public ElasticSearchMapping.search.queries.BoolQuery function must(required ElasticSearchMapping.search.queries.IQuery Query){ arrayAppend(variables.must,arguments.Query); return this; } - public BoolQuery function mustNot(required IQuery Query){ + public ElasticSearchMapping.search.queries.BoolQuery function mustNot(required ElasticSearchMapping.search.queries.IQuery Query){ arrayAppend(variables.mustNot,arguments.Query); return this; } - public BoolQuery function should(required IQuery Query){ + public ElasticSearchMapping.search.queries.BoolQuery function should(required ElasticSearchMapping.search.queries.IQuery Query){ arrayAppend(variables.should,arguments.Query); return this; } diff --git a/search/queries/NestedQuery.cfc b/search/queries/NestedQuery.cfc index 06ba065..6a1167a 100644 --- a/search/queries/NestedQuery.cfc +++ b/search/queries/NestedQuery.cfc @@ -8,7 +8,7 @@ component accessors="true" extends="BaseQuery" implements="IQuery"{ property name="scoreMode" type="string" default="avg"; // valid options avg, total, max, none public function init(string path="", - IQuery query=""){ + ElasticSearchMapping.search.queries.IQuery query=""){ super.init(argumentCollection=Arguments); return this; } diff --git a/search/queries/QueryBuilder.cfc b/search/queries/QueryBuilder.cfc index 146eefc..3132898 100644 --- a/search/queries/QueryBuilder.cfc +++ b/search/queries/QueryBuilder.cfc @@ -2,7 +2,7 @@ component accessors="true" { property name="queries"; - public QueryBuilder function init(){ + public ElasticSearchMapping.search.queries.QueryBuilder function init(){ variables.queries = []; return this; }