From c593dfe4c59d37d5d4ea14e3ac31da3318029562 Mon Sep 17 00:00:00 2001 From: "Arul.Nambi" Date: Tue, 26 Sep 2017 14:00:57 -0400 Subject: Renaming openecomp to onap Issue-ID: AAI-208 Change-Id: I2bd02287bed376111156aca0100e2b7b74e368e3 Signed-off-by: Arul.Nambi --- .../dal/elasticsearch/ElasticSearchConfigTest.java | 272 --------------------- .../entity/AutoSuggestDocumentEntity.java | 44 ---- .../entity/AutoSuggestDocumentEntityFields.java | 81 ------ .../entity/AutoSuggestElasticHitEntity.java | 87 ------- .../entity/AutoSuggestElasticHitsEntity.java | 50 ---- .../entity/AutoSuggestElasticSearchResponse.java | 85 ------- .../dal/elasticsearch/entity/BucketEntity.java | 61 ----- .../dal/elasticsearch/entity/ElasticHit.java | 29 --- .../elasticsearch/entity/ElasticHitsEntity.java | 74 ------ .../entity/ElasticSearchAggegrationResponse.java | 109 --------- .../entity/ElasticSearchAggregation.java | 74 ------ .../entity/ElasticSearchCountResponse.java | 60 ----- .../dal/elasticsearch/entity/PayloadEntity.java | 32 --- 13 files changed, 1058 deletions(-) delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchConfigTest.java delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/BucketEntity.java delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHit.java delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java delete mode 100644 src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/PayloadEntity.java (limited to 'src/test/java/org/openecomp/sparky/dal/elasticsearch') diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchConfigTest.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchConfigTest.java deleted file mode 100644 index c9d071f..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchConfigTest.java +++ /dev/null @@ -1,272 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (AAI UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ - -package org.openecomp.sparky.dal.elasticsearch; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.File; -import java.io.IOException; - -import javax.servlet.ServletException; - -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.mockito.Mockito; -import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig; -import org.openecomp.sparky.dal.exception.ElasticSearchOperationException; - - -import ch.qos.logback.classic.Level; - -/** - * The Class ElasticSearchConfigTest. - */ -public class ElasticSearchConfigTest { - - private static final String GOOD_MAPPINGS_FILE = - "{" + "\"properties\": {" + "\"entityType\": {" + "\"type\": \"string\"" + "}," - + "\"edgeTagQueryEntityFieldName\": {" + "\"type\": \"string\"," + "\"index\": \"no\"" - + "}," + "\"edgeTagQueryEntityFieldValue\": {" + "\"type\": \"string\"," - + "\"index\": \"no\"" + "}," + "\"searchTagIDs\" : {" + "\"type\" : \"string\"" + "}," - + "\"searchTags\": {" + "\"type\": \"string\"," + "\"analyzer\": \"nGram_analyzer\"," - + "\"search_analyzer\": \"whitespace_analyzer\"}" + "}" + "}"; - - private static final String GOOD_SETTINGS_FILE = "{\"analysis\": {" + "\"filter\": {" - + "\"nGram_filter\": {" + "\"type\": \"nGram\"," + "\"min_gram\": 1," + "\"max_gram\": 50," - + "\"token_chars\": [" + "\"letter\"," + "\"digit\"," + "\"punctuation\"," + "\"symbol\"" - + "]}}," + "\"analyzer\": {" + "\"nGram_analyzer\": {" + "\"type\": \"custom\"," - + "\"tokenizer\": \"whitespace\"," + "\"filter\": [" + "\"lowercase\"," + "\"asciifolding\"," - + "\"nGram_filter\"]}," + "\"whitespace_analyzer\": {" + "\"type\": \"custom\"," - + "\"tokenizer\": \"whitespace\"," + "\"filter\": [" + "\"lowercase\"," - + "\"asciifolding\"]}}}}"; - - private static final String BAD_SETTINGS_FILE = "{\"analysis\": {" + "\"filter\": {" - + "\"nGram_filter\": {" + "\"type\": \"nGram\"," + "\"min_gram\": 1," + "\"max_gram\": 50," - + "\"token_chars\": [" + "\"letter\"," + "\"digit\"," + "\"punctuation\"," + "\"symbol\"" - + "]}}," + "\"analyzer\": {" + "\"nGram_analyzer\": {" + "\"type\": \"custom\"," - + "\"tokenizer\": \"whitespace\"," + "\"filter\": [" + "\"lowercase\"," + "\"asciifolding\"," - + "\"nGram_filter\"]}," + "\"whitespace_analyzer\": {" + "\"type\": \"custom\"," - + "\"tokenizer\": \"whitespace\"," + "\"filter\": [" + "\"lowercase\"," - + "\"asciifolding\"]}}"; - - /** - * Inits the. - * - * @throws Exception the exception - */ - @Before - public void init() throws Exception { - } - - /** - * Failure to initialize properties results in config defaults. - */ - @Test - public void failureToInitializePropertiesResultsInConfigDefaults() { - try { - ElasticSearchConfig config = ElasticSearchConfig.getConfig(); - - /* - * Now verify that all the internal members have been set to default values - */ - - assertEquals(config.getIpAddress(), "localhost"); - assertEquals(config.getHttpPort(), "" + 9200); - assertEquals(config.getJavaApiPort(), "" + 9300); - assertEquals(config.getIndexName(), "entitySearchIndex"); - assertEquals(config.getType(), "aaiEntities"); - assertEquals(config.getClusterName(), "elasticsearch"); - assertEquals(config.getMappingsFileName(), null); - assertEquals(config.getSettingsFileName(), null); - assertEquals(config.getAuditIndexName(), "auditdataindex"); - - } catch (Exception exc) { - assertEquals("null", exc.getLocalizedMessage()); - } - } - - - /** - * Validate accessors. - * - * @throws IOException Signals that an I/O exception has occurred. - * @throws ServletException the servlet exception - * @throws Exception the exception - */ - @Test - public void validateAccessors() throws IOException, ServletException, Exception { - - ElasticSearchConfig esConfig = new ElasticSearchConfig(); - - esConfig.setIpAddress("47.248.10.127"); - esConfig.setHttpPort("8123"); - esConfig.setJavaApiPort("9123"); - esConfig.setIndexName("myIndexName"); - esConfig.setType("myIndexTableType"); - esConfig.setClusterName("ES_AAI_DEV"); - esConfig.setMappingsFileName("d:\\1\\mappings.json"); - esConfig.setSettingsFileName("d:\\1\\settings.json"); - esConfig.setAuditIndexName("auditIndexName"); - - ElasticSearchConfig.setConfig(esConfig); - - assertEquals(esConfig.getIpAddress(), "47.248.10.127"); - assertEquals(esConfig.getHttpPort(), "8123"); - assertEquals(esConfig.getJavaApiPort(), "9123"); - assertEquals(esConfig.getIndexName(), "myIndexName"); - assertEquals(esConfig.getType(), "myIndexTableType"); - assertEquals(esConfig.getClusterName(), "ES_AAI_DEV"); - assertEquals(esConfig.getMappingsFileName(), "d:\\1\\mappings.json"); - assertEquals(esConfig.getSettingsFileName(), "d:\\1\\settings.json"); - assertEquals(esConfig.getAuditIndexName(), "auditIndexName"); - - String output = esConfig.toString(); - - assertNotEquals(output, null); - - } - - /** - * Gets the elastic search settings expect valid config. - * - * @return the elastic search settings expect valid config - * @throws IOException Signals that an I/O exception has occurred. - * @throws ElasticSearchOperationException the elastic search operation exception - * Need to revisit this test case and change the way this class works - */ - @Ignore - public void getElasticSearchSettings_expectValidConfig() - throws IOException, ElasticSearchOperationException { - System.setProperty("AJSC_HOME", new File(".").getCanonicalPath().replace('\\', '/')); - - ElasticSearchConfig esConfig = new ElasticSearchConfig(); - - esConfig.setSettingsFileName("src/main/config/es_settings.json"); - - assertNotNull(esConfig.getElasticSearchSettings()); - } - - /** - * Gets the elastic search settings expect file not found exception. - * - * @return the elastic search settings expect file not found exception - * @throws IOException Signals that an I/O exception has occurred. - * @throws ElasticSearchOperationException the elastic search operation exception - * - * Need to revisit this test case and change the way this class works - */ - @Ignore - public void getElasticSearchSettings_expectFileNotFoundException() - throws IOException, ElasticSearchOperationException { - System.setProperty("AJSC_HOME", new File(".").getCanonicalPath().replace('\\', '/')); - - ElasticSearchConfig esConfig = new ElasticSearchConfig(); - - esConfig.setSettingsFileName("src/main/config/es_setting.json"); - - esConfig.getElasticSearchSettings(); - - } - - /** - * Gets the elastic search mappings expect valid config. - * - * @return the elastic search mappings expect valid config - * @throws IOException Signals that an I/O exception has occurred. - * @throws ElasticSearchOperationException the elastic search operation exception - * - * Need to revisit this test case and change the way this class works - */ - @Ignore - public void getElasticSearchMappings_expectValidConfig() - throws IOException, ElasticSearchOperationException { - System.setProperty("AJSC_HOME", new File(".").getCanonicalPath().replace('\\', '/')); - - ElasticSearchConfig esConfig = new ElasticSearchConfig(); - - esConfig.setMappingsFileName("src/main/config/es_mappings.json"); - - assertNotNull(esConfig.getElasticSearchMappings()); - } - - /** - * Gets the elastic search mappings expect file not found exception. - * - * @return the elastic search mappings expect file not found exception - * @throws IOException Signals that an I/O exception has occurred. - * @throws ElasticSearchOperationException the elastic search operation exception - */ - @Test(expected = ElasticSearchOperationException.class) - public void getElasticSearchMappings_expectFileNotFoundException() - throws IOException, ElasticSearchOperationException { - System.setProperty("AJSC_HOME", new File(".").getCanonicalPath().replace('\\', '/')); - - ElasticSearchConfig esConfig = new ElasticSearchConfig(); - - esConfig.setSettingsFileName("src/main/config/es_setting.json"); - - esConfig.getElasticSearchMappings(); - - } - - /** - * Builds the elastic search table config expect valid result. - * - * @throws ElasticSearchOperationException the elastic search operation exception - * @throws IOException Signals that an I/O exception has occurred. - */ - @Test - public void buildElasticSearchTableConfig_expectValidResult() - throws ElasticSearchOperationException, IOException { - ElasticSearchConfig spyEsConfig = Mockito.spy(new ElasticSearchConfig()); - Mockito.doReturn(GOOD_MAPPINGS_FILE).when(spyEsConfig).getElasticSearchMappings(); - Mockito.doReturn(GOOD_SETTINGS_FILE).when(spyEsConfig).getElasticSearchSettings(); - Mockito.doReturn("myIndexTableType").when(spyEsConfig).getType(); - - assertNotNull(spyEsConfig.buildElasticSearchTableConfig()); - } - - /** - * Builds the elastic search table config expect exception. - * - * @throws ElasticSearchOperationException the elastic search operation exception - * @throws IOException Signals that an I/O exception has occurred. - */ - @Test(expected = ElasticSearchOperationException.class) - public void buildElasticSearchTableConfig_expectException() - throws ElasticSearchOperationException, IOException { - ElasticSearchConfig spyEsConfig = Mockito.spy(new ElasticSearchConfig()); - Mockito.doReturn(GOOD_MAPPINGS_FILE).when(spyEsConfig).getElasticSearchMappings(); - Mockito.doReturn(BAD_SETTINGS_FILE).when(spyEsConfig).getElasticSearchSettings(); - Mockito.doReturn("myIndexTableType").when(spyEsConfig).getType(); - - spyEsConfig.buildElasticSearchTableConfig(); - } - -} diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java deleted file mode 100644 index b3abd14..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java +++ /dev/null @@ -1,44 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (inventory UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ -package org.openecomp.sparky.dal.elasticsearch.entity; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class AutoSuggestDocumentEntity { - - @JsonProperty("entity_suggest") - AutoSuggestDocumentEntityFields fields; - - public AutoSuggestDocumentEntityFields getFields() { - return fields; - } - - public void setFields(AutoSuggestDocumentEntityFields fields) { - this.fields = fields; - } - - - -} diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java deleted file mode 100644 index db0dc8c..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java +++ /dev/null @@ -1,81 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (inventory UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ -package org.openecomp.sparky.dal.elasticsearch.entity; - -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; - -@JsonInclude(Include.NON_NULL) -public class AutoSuggestDocumentEntityFields { - - private String output; - private List input; - private PayloadEntity payload; - private int weight; - - public AutoSuggestDocumentEntityFields() { - input = new ArrayList(); - } - - public String getOutput() { - return output; - } - - public void setOutput(String output) { - this.output = output; - } - - public List getInput() { - return input; - } - - public void setInput(List input) { - this.input = input; - } - - public PayloadEntity getPayload() { - return payload; - } - - public void setPayload(PayloadEntity payload) { - this.payload = payload; - } - - public int getWeight() { - return weight; - } - - public void setWeight(int weight) { - this.weight = weight; - } - - public void addInput(String input) { - this.input.add(input); - } - -} diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java deleted file mode 100644 index 60ac538..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java +++ /dev/null @@ -1,87 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (inventory UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ -package org.openecomp.sparky.dal.elasticsearch.entity; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class AutoSuggestElasticHitEntity { - - @JsonProperty("_index") - private String index; - - @JsonProperty("_type") - private String type; - - @JsonProperty("_id") - private String id; - - @JsonProperty("_score") - private String score; - - @JsonProperty("_source") - private AutoSuggestDocumentEntity source; - - public String getIndex() { - return index; - } - - public void setIndex(String index) { - this.index = index; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getScore() { - return score; - } - - public void setScore(String score) { - this.score = score; - } - - public AutoSuggestDocumentEntity getSource() { - return source; - } - - public void setSource(AutoSuggestDocumentEntity source) { - this.source = source; - } - - -} diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java deleted file mode 100644 index af74485..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java +++ /dev/null @@ -1,50 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (inventory UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ -package org.openecomp.sparky.dal.elasticsearch.entity; - -import java.util.ArrayList; -import java.util.List; - -public class AutoSuggestElasticHitsEntity { - - private List hits; - - public AutoSuggestElasticHitsEntity() { - hits = new ArrayList(); - } - - public List getHits() { - return hits; - } - - public void setHits(List hits) { - this.hits = hits; - } - - public void addHit(AutoSuggestElasticHitEntity hit) { - this.hits.add(hit); - } - -} diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java deleted file mode 100644 index 9b6c9f5..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java +++ /dev/null @@ -1,85 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (inventory UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ -package org.openecomp.sparky.dal.elasticsearch.entity; - -import java.util.HashMap; -import java.util.Map; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class AutoSuggestElasticSearchResponse { - - private int took; - - @JsonProperty("timed_out") - private boolean timedOut; - - @JsonProperty("_shards") - private Map shards; - - private AutoSuggestElasticHitsEntity hits; - - public AutoSuggestElasticSearchResponse(){ - this.shards = new HashMap(); - } - - public int getTook() { - return took; - } - - public void setTook(int took) { - this.took = took; - } - - public boolean isTimedOut() { - return timedOut; - } - - public void setTimedOut(boolean timedOut) { - this.timedOut = timedOut; - } - - public Map getShards() { - return shards; - } - - public void setShards(Map shards) { - this.shards = shards; - } - - public void addShard(String name, String value) { - shards.put(name, value); - } - - public AutoSuggestElasticHitsEntity getHits() { - return hits; - } - - public void setHits(AutoSuggestElasticHitsEntity hits) { - this.hits = hits; - } - - -} diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/BucketEntity.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/BucketEntity.java deleted file mode 100644 index 0a1a133..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/BucketEntity.java +++ /dev/null @@ -1,61 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (inventory UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ -package org.openecomp.sparky.dal.elasticsearch.entity; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class BucketEntity { - private String key; - - @JsonProperty("doc_count") - private int docCount; - - public BucketEntity() { - - } - - public BucketEntity(String name, int value) { - this.key = name; - this.docCount = value; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public int getDocCount() { - return docCount; - } - - public void setDocCount(int docCount) { - this.docCount = docCount; - } - - -} diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHit.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHit.java deleted file mode 100644 index 32dc17a..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHit.java +++ /dev/null @@ -1,29 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (inventory UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ -package org.openecomp.sparky.dal.elasticsearch.entity; - -public class ElasticHit { - -} diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java deleted file mode 100644 index b10532e..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java +++ /dev/null @@ -1,74 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (inventory UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ -package org.openecomp.sparky.dal.elasticsearch.entity; - -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class ElasticHitsEntity { - - private int total; - @JsonProperty("max_score") - private int maxScore; - - private List hits; - - public ElasticHitsEntity() { - this.hits = new ArrayList(); - } - - public void addHit(ElasticHit hit) { - this.hits.add(hit); - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public int getMaxScore() { - return maxScore; - } - - public void setMaxScore(int maxScore) { - this.maxScore = maxScore; - } - - public List getHits() { - return hits; - } - - public void setHits(List hits) { - this.hits = hits; - } - - - -} diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java deleted file mode 100644 index 54c9278..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java +++ /dev/null @@ -1,109 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (inventory UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ -package org.openecomp.sparky.dal.elasticsearch.entity; - -import java.util.HashMap; -import java.util.Map; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class ElasticSearchAggegrationResponse { - - private int took; - - @JsonProperty("timed_out") - private boolean timedOut; - - @JsonProperty("_shards") - private Map shards; - - private ElasticHitsEntity hits; - - private Map aggregations; - - public ElasticSearchAggegrationResponse() { - this.shards = new HashMap(); - this.aggregations = new HashMap(); - } - - - public int getTook() { - return took; - } - - - public void setTook(int took) { - this.took = took; - } - - - public boolean isTimedOut() { - return timedOut; - } - - - public void setTimedOut(boolean timedOut) { - this.timedOut = timedOut; - } - - - public Map getShards() { - return shards; - } - - - public void setShards(Map shards) { - this.shards = shards; - } - - - public ElasticHitsEntity getHits() { - return hits; - } - - - public void setHits(ElasticHitsEntity hits) { - this.hits = hits; - } - - public void addShard(String key, String value) { - this.shards.put(key,value); - } - - - public Map getAggregations() { - return aggregations; - } - - - public void setAggregations(Map aggregations) { - this.aggregations = aggregations; - } - - public void addAggregation(String key, ElasticSearchAggregation agg) { - this.aggregations.put(key, agg); - } - -} diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java deleted file mode 100644 index ea954d9..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java +++ /dev/null @@ -1,74 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (inventory UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ -package org.openecomp.sparky.dal.elasticsearch.entity; - -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class ElasticSearchAggregation { - - @JsonProperty("doc_count_error_upper_bound") - private int docCountErrorUpperBound; - - @JsonProperty("sum_other_doc_count") - private int sumOtherDocCount; - - private List buckets; - - public ElasticSearchAggregation() { - buckets = new ArrayList(); - } - - public int getDocCountErrorUpperBound() { - return docCountErrorUpperBound; - } - - public void setDocCountErrorUpperBound(int docCountErrorUpperBound) { - this.docCountErrorUpperBound = docCountErrorUpperBound; - } - - public int getSumOtherDocCount() { - return sumOtherDocCount; - } - - public void setSumOtherDocCount(int sumOtherDocCount) { - this.sumOtherDocCount = sumOtherDocCount; - } - - public List getBuckets() { - return buckets; - } - - public void setBuckets(List buckets) { - this.buckets = buckets; - } - - public void addBucket(BucketEntity bucket) { - buckets.add(bucket); - } - -} diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java deleted file mode 100644 index 4b11f8c..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java +++ /dev/null @@ -1,60 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (inventory UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ -package org.openecomp.sparky.dal.elasticsearch.entity; - -import java.util.HashMap; -import java.util.Map; - -public class ElasticSearchCountResponse { - - private int count; - private Map shards; - - public ElasticSearchCountResponse() { - this.shards = new HashMap(); - } - - public int getCount() { - return count; - } - - public void setCount(int count) { - this.count = count; - } - - public Map getShards() { - return shards; - } - - public void setShards(Map shards) { - this.shards = shards; - } - - public void addShard(String key, String value) { - this.shards.put(key, value); - } - - -} diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/PayloadEntity.java b/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/PayloadEntity.java deleted file mode 100644 index 360abdf..0000000 --- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/PayloadEntity.java +++ /dev/null @@ -1,32 +0,0 @@ -/* -* ============LICENSE_START======================================================= -* SPARKY (inventory UI service) -* ================================================================================ -* Copyright © 2017 AT&T Intellectual Property. -* Copyright © 2017 Amdocs -* All rights reserved. -* ================================================================================ -* Licensed 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. -* ============LICENSE_END========================================================= -* -* ECOMP and OpenECOMP are trademarks -* and service marks of AT&T Intellectual Property. -*/ -package org.openecomp.sparky.dal.elasticsearch.entity; - -public class PayloadEntity { - - public PayloadEntity() { - } - -} -- cgit 1.2.3-korg