From: Arul.Nambi Date: Tue, 10 Oct 2017 21:05:00 +0000 (-0400) Subject: Increase junit coverage X-Git-Tag: v1.1.0~13 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=57ebc748b30fc61ea3bee40abf0fd8b41b785088;p=aai%2Fsparky-be.git Increase junit coverage Issue-ID: AAI-429 Change-Id: I8e9c8a7a04fa2433e888a48dd09c5424e9986e07 Signed-off-by: Arul.Nambi --- diff --git a/src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoader.java b/src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoader.java index 9f370c8..6841121 100644 --- a/src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoader.java +++ b/src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoader.java @@ -504,24 +504,4 @@ public class OxmModelLoader { return suggestionSearchEntityDescriptors; } - /** - * The main method. - * - * @param args the arguments - */ - public static void main(String[] args) { - try { - System.setProperty("AJSC_HOME", new File(".").getCanonicalPath().replace('\\', '/')); - - } catch (IOException exc) { - // TODO Auto-generated catch block - exc.printStackTrace(); - } - Map temp = - OxmModelLoader.getInstance().getSearchableEntityDescriptors(); - Map temp2 = OxmModelLoader.getInstance().getEntityDescriptors(); - - System.out.println("Completed"); - } - } diff --git a/src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryAdapter.java b/src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryAdapter.java index b81619a..41bf467 100644 --- a/src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryAdapter.java +++ b/src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryAdapter.java @@ -132,32 +132,6 @@ public class ActiveInventoryAdapter extends RestfulDataAccessor return builder; } - /** - * The main method. - * - * @param args the arguments - */ - public static void main(String[] args) { - - // TODO Auto-generated method stub - RestClientBuilder builder = new RestClientBuilder(); - RestfulDataAccessor accessor; - try { - accessor = new ActiveInventoryAdapter(builder); - OperationResult or = - accessor.doGet("/cloud-infrastructure/pservers/pserver/SQLTEST006", "application/json"); - String jsonPatch = "{ \"hostname\" : \"SQLTEST006\", \"prov-status\" : \"PREPROV\"," - + " \"in-maint\" : \"false\", \"is-closed-loop\" : \"false\" }"; - or = accessor.doPatch("/cloud-infrastructure/pservers/pserver/SQLTEST006", jsonPatch, - "application/json"); - // System.out.println("PATCH or = " + or.getResultCode() + " : " + or.toString()); - } catch (ElasticSearchOperationException | IOException exc) { - // TODO Auto-generated catch block - exc.printStackTrace(); - } - - } - /** * Gets the full url. * diff --git a/src/main/java/org/onap/aai/sparky/inventory/EntityHistoryQueryBuilder.java b/src/main/java/org/onap/aai/sparky/inventory/EntityHistoryQueryBuilder.java deleted file mode 100644 index 388fb2c..0000000 --- a/src/main/java/org/onap/aai/sparky/inventory/EntityHistoryQueryBuilder.java +++ /dev/null @@ -1,141 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.aai - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs - * ================================================================================ - * 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 is a trademark and service mark of AT&T Intellectual Property. - */ -package org.onap.aai.sparky.inventory; - -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; - -/** - * The Class EntityHistoryQueryBuilder. - */ -public class EntityHistoryQueryBuilder { - - private static final String TABLE = "table"; - private static final String GRAPH = "graph"; - - /** - * Gets the query. - * - * @param type the type - * @return the query - */ - public static JsonObject getQuery(String type) { - if (type.equalsIgnoreCase(TABLE)) { - return createTableQuery(); - } else if (type.equalsIgnoreCase(GRAPH)) { - return createGraphQuery(); - } else { - return null; - } - } - - /** - * Creates the graph query. - * - * @return the json object - */ - public static JsonObject createGraphQuery() { - JsonObjectBuilder jsonBuilder = Json.createObjectBuilder(); - - jsonBuilder.add("aggs", - Json.createObjectBuilder().add("group_by_entityType", - Json.createObjectBuilder() - .add("terms", Json.createObjectBuilder().add("field", "entityType").add("size", 0)) - .add("aggs", Json.createObjectBuilder().add("group_by_date", - Json.createObjectBuilder().add("date_histogram", createDateHistogram()) - .add("aggs", Json.createObjectBuilder().add("sort_by_date", - Json.createObjectBuilder().add("top_hits", createTopHitsBlob()))))))); - jsonBuilder.add("size", 0); - - return jsonBuilder.build(); - } - - /** - * Creates the table query. - * - * @return the json object - */ - public static JsonObject createTableQuery() { - JsonObjectBuilder jsonBuilder = Json.createObjectBuilder(); - - jsonBuilder.add("aggs", - Json.createObjectBuilder().add("group_by_entityType", - Json.createObjectBuilder() - .add("terms", Json.createObjectBuilder().add("field", "entityType").add("size", 0)) - .add("aggs", Json.createObjectBuilder().add("sort_by_date", - Json.createObjectBuilder().add("top_hits", createTopHitsBlob()))))); - jsonBuilder.add("size", 0); - - return jsonBuilder.build(); - } - - /** - * Creates the date histogram. - * - * @return the json object - */ - private static JsonObject createDateHistogram() { - JsonObjectBuilder jsonBuilder = Json.createObjectBuilder(); - - jsonBuilder.add("field", "timestamp"); - jsonBuilder.add("min_doc_count", 1); - jsonBuilder.add("interval", "day"); - jsonBuilder.add("format", "epoch_millis"); - - return jsonBuilder.build(); - } - - /** - * Creates the top hits blob. - * - * @return the json object - */ - private static JsonObject createTopHitsBlob() { - JsonObjectBuilder builder = Json.createObjectBuilder(); - builder.add("size", 1); - builder.add("sort", getSortCriteria()); - return builder.build(); - } - - public static JsonArray getSortCriteria() { - JsonArrayBuilder jsonBuilder = Json.createArrayBuilder(); - jsonBuilder.add(Json.createObjectBuilder().add("timestamp", - Json.createObjectBuilder().add("order", "desc"))); - - return jsonBuilder.build(); - } - - /** - * The main method. - * - * @param args the arguments - */ - public static void main(String[] args) { - System.out.println("TABLE-QUERY: " + createTableQuery().toString()); - System.out.println("GRAPH_QUERY: " + createGraphQuery().toString()); - } - -} diff --git a/src/main/java/org/onap/aai/sparky/inventory/entity/GeoIndexDocument.java b/src/main/java/org/onap/aai/sparky/inventory/entity/GeoIndexDocument.java deleted file mode 100644 index 665d95b..0000000 --- a/src/main/java/org/onap/aai/sparky/inventory/entity/GeoIndexDocument.java +++ /dev/null @@ -1,319 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.aai - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs - * ================================================================================ - * 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 is a trademark and service mark of AT&T Intellectual Property. - */ -package org.onap.aai.sparky.inventory.entity; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; - -import java.io.Serializable; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.List; - -import javax.json.Json; -import javax.json.JsonObject; - -import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor; -import org.onap.aai.sparky.config.oxm.OxmModelLoader; -import org.onap.aai.sparky.synchronizer.entity.IndexDocument; -import org.onap.aai.sparky.util.NodeUtils; - -/** - * The Class GeoIndexDocument. - */ -public class GeoIndexDocument implements Serializable, IndexDocument { - - private static final long serialVersionUID = -5188479658230319058L; - - protected String entityType; - protected String entityPrimaryKeyValue; - protected String entityPrimaryKeyName; - protected String latitude; - protected String longitude; - protected String selfLink; - protected OxmModelLoader loader; - protected ObjectMapper mapper = new ObjectMapper(); - // generated, SHA-256 digest - protected String id; - - /** - * Instantiates a new geo index document. - * - * @param loader the loader - */ - public GeoIndexDocument(OxmModelLoader loader) { - this(); - this.loader = loader; - } - - /** - * Convert bytes to hex string. - * - * @param bytesToConvert the bytes to convert - * @return the string - */ - private static String convertBytesToHexString(byte[] bytesToConvert) { - StringBuffer hexString = new StringBuffer(); - for (int i = 0; i < bytesToConvert.length; i++) { - hexString.append(Integer.toHexString(0xFF & bytesToConvert[i])); - } - return hexString.toString(); - } - - - - public boolean isValidGeoDocument() { - - boolean isValid = true; - - isValid &= (this.getEntityType() != null); - isValid &= (this.getLatitude() != null); - isValid &= (this.getLongitude() != null); - isValid &= (this.getId() != null); - isValid &= (this.getSelfLink() != null); - - isValid &= NodeUtils.isNumeric(this.getLatitude()); - isValid &= NodeUtils.isNumeric(this.getLongitude()); - - return isValid; - } - - /** - * Concat array. - * - * @param list the list - * @param delimiter the delimiter - * @return the string - */ - private static String concatArray(List list, char delimiter) { - - if (list == null || list.size() == 0) { - return ""; - } - - StringBuilder result = new StringBuilder(64); - - int listSize = list.size(); - boolean firstValue = true; - - for (String item : list) { - - if (firstValue) { - result.append(item); - firstValue = false; - } else { - result.append(delimiter).append(item); - } - - } - - return result.toString(); - - } - - /* - * We'll try and create a unique identity key that we can use for differencing the previously - * imported record sets as we won't have granular control of what is created/removed and when. The - * best we can hope for is identification of resources by generated Id until the Identity-Service - * UUID is tagged against all resources, then we can use that instead. - */ - - /** - * Generate unique sha digest. - * - * @param entityType the entity type - * @param fieldName the field name - * @param fieldValue the field value - * @return the string - * @throws NoSuchAlgorithmException the no such algorithm exception - */ - public static String generateUniqueShaDigest(String entityType, String fieldName, - String fieldValue) throws NoSuchAlgorithmException { - - /* - * Basically SHA-256 will result in an identity with a guaranteed uniqueness compared to just a - * java hashcode value. - */ - MessageDigest digest = MessageDigest.getInstance("SHA-256"); - digest.update(String.format("%s.%s.%s", entityType, fieldName, fieldValue).getBytes()); - return convertBytesToHexString(digest.digest()); - } - - /** - * Instantiates a new geo index document. - */ - public GeoIndexDocument() {} - - /* - * (non-Javadoc) - * - * @see com.att.queryrouter.dao.DocumentStoreDataEntity#getAsJson() - */ - @Override - public String getIndexDocumentJson() { - - JsonObject obj = null; - - if (latitude != null && longitude != null) { - obj = - Json.createObjectBuilder().add("entityType", entityType) - .add("pkey", entityPrimaryKeyValue) - .add("location", - Json.createObjectBuilder().add("lat", latitude).add("lon", longitude)) - .add("selfLink", selfLink).build(); - - } else { - obj = Json.createObjectBuilder().add("entityType", entityType) - .add("pkey", entityPrimaryKeyValue).add("selfLink", selfLink).build(); - } - - return obj.toString(); - } - - /* (non-Javadoc) - * @see org.onap.aai.sparky.synchronizer.entity.IndexDocument#deriveFields() - */ - @Override - public void deriveFields() { - - /* - * We'll try and create a unique identity key that we can use for differencing the previously - * imported record sets as we won't have granular control of what is created/removed and when. - * The best we can hope for is identification of resources by generated Id until the - * Identity-Service UUID is tagged against all resources, then we can use that instead. - */ - - OxmEntityDescriptor descriptor = loader.getEntityDescriptor(entityType); - String entityPrimaryKeyName = NodeUtils.concatArray( - descriptor.getPrimaryKeyAttributeName(), "/"); - - this.id = - NodeUtils.generateUniqueShaDigest(entityType, entityPrimaryKeyName, entityPrimaryKeyValue); - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "TopographicalEntity [" + ("entityType=" + entityType + ", ") - + ("entityPrimaryKeyValue=" + entityPrimaryKeyValue + ", ") - + ("latitude=" + latitude + ", ") + ("longitude=" + longitude + ", ") + ("ID=" + id + ", ") - + ("selfLink=" + selfLink) + "]"; - } - - @Override - public String getId() { - return this.id; - } - - public String getEntityType() { - return entityType; - } - - public void setEntityType(String entityType) { - this.entityType = entityType; - } - - public String getEntityPrimaryKeyValue() { - return entityPrimaryKeyValue; - } - - public void setEntityPrimaryKeyValue(String entityPrimaryKeyValue) { - this.entityPrimaryKeyValue = entityPrimaryKeyValue; - } - - public String getEntityPrimaryKeyName() { - return entityPrimaryKeyName; - } - - public void setEntityPrimaryKeyName(String entityPrimaryKeyName) { - this.entityPrimaryKeyName = entityPrimaryKeyName; - } - - public String getLatitude() { - return latitude; - } - - public void setLatitude(String latitude) { - this.latitude = latitude; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - public String getSelfLink() { - return selfLink; - } - - public void setSelfLink(String selfLink) { - this.selfLink = selfLink; - } - - public static long getSerialversionuid() { - return serialVersionUID; - } - - public void setId(String id) { - this.id = id; - } - - @Override - public ObjectNode getBulkImportEntity() { - // TODO Auto-generated method stub - return buildImportDataObject(this.entityType, this.entityPrimaryKeyValue, this.selfLink, - this.latitude, this.longitude); - } - - /** - * Builds the import data object. - * - * @param entityType the entity type - * @param entityPrimaryKeyValue the entity primary key value - * @param selfLink the self link - * @param latitude the latitude - * @param longitude the longitude - * @return the object node - */ - @SuppressWarnings("deprecation") - protected ObjectNode buildImportDataObject(String entityType, String entityPrimaryKeyValue, - String selfLink, String latitude, String longitude) { - ObjectNode childNode = mapper.createObjectNode(); - childNode.put("lat", latitude); - childNode.put("lon", longitude); - ObjectNode parentNode = mapper.createObjectNode(); - - parentNode.put("entityType", entityType); - parentNode.put("pkey", entityPrimaryKeyValue); - parentNode.put("selfLink", selfLink); - parentNode.put("location", childNode); - - return parentNode; - } - -} diff --git a/src/main/java/org/onap/aai/sparky/inventory/entity/TopographicalEntity.java b/src/main/java/org/onap/aai/sparky/inventory/entity/TopographicalEntity.java deleted file mode 100644 index 5467238..0000000 --- a/src/main/java/org/onap/aai/sparky/inventory/entity/TopographicalEntity.java +++ /dev/null @@ -1,218 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.aai - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs - * ================================================================================ - * 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 is a trademark and service mark of AT&T Intellectual Property. - */ -package org.onap.aai.sparky.inventory.entity; - -import java.io.IOException; -import java.io.Serializable; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.List; - -import javax.json.Json; -import javax.json.JsonObject; - -/** - * The Class TopographicalEntity. - */ -public class TopographicalEntity implements Serializable { - - private static final long serialVersionUID = -5188479658230319058L; - - protected String entityType; - protected String entityPrimaryKeyValue; - protected String entityPrimaryKeyName; - protected String latitude; - protected String longitude; - protected String selfLink; - - // generated, SHA-256 digest - protected String id; - - /** - * Convert bytes to hex string. - * - * @param bytesToConvert the bytes to convert - * @return the string - */ - private static String convertBytesToHexString(byte[] bytesToConvert) { - StringBuffer hexString = new StringBuffer(); - for (int i = 0; i < bytesToConvert.length; i++) { - hexString.append(Integer.toHexString(0xFF & bytesToConvert[i])); - } - return hexString.toString(); - } - - /** - * Concat array. - * - * @param list the list - * @param delimiter the delimiter - * @return the string - */ - private static String concatArray(List list, char delimiter) { - - if (list == null || list.size() == 0) { - return ""; - } - - StringBuilder result = new StringBuilder(64); - - int listSize = list.size(); - boolean firstValue = true; - - for (String item : list) { - - if (firstValue) { - result.append(item); - firstValue = false; - } else { - result.append(delimiter).append(item); - } - - } - - return result.toString(); - - } - - /* - * We'll try and create a unique identity key that we can use for differencing the previously - * imported record sets as we won't have granular control of what is created/removed and when. The - * best we can hope for is identification of resources by generated Id until the Identity-Service - * UUID is tagged against all resources, then we can use that instead. - */ - - /** - * Generate unique sha digest. - * - * @param entityType the entity type - * @param fieldName the field name - * @param fieldValue the field value - * @return the string - * @throws NoSuchAlgorithmException the no such algorithm exception - */ - public static String generateUniqueShaDigest(String entityType, String fieldName, - String fieldValue) throws NoSuchAlgorithmException { - - /* - * Basically SHA-256 will result in an identity with a guaranteed uniqueness compared to just a - * java hashcode value. - */ - MessageDigest digest = MessageDigest.getInstance("SHA-256"); - digest.update(String.format("%s.%s.%s", entityType, fieldName, fieldValue).getBytes()); - return convertBytesToHexString(digest.digest()); - } - - /** - * Instantiates a new topographical entity. - */ - public TopographicalEntity() {} - - /* - * (non-Javadoc) - * - * @see com.att.queryrouter.dao.DocumentStoreDataEntity#getAsJson() - */ - public String getAsJson() throws IOException { - - JsonObject obj = - Json.createObjectBuilder().add("entityType", entityType).add("pkey", entityPrimaryKeyValue) - .add("location", Json.createObjectBuilder().add("lat", latitude).add("lon", longitude)) - .add("selfLink", selfLink).build(); - - return obj.toString(); - } - - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "TopographicalEntity [" + ("entityType=" + entityType + ", ") - + ("entityPrimaryKeyValue=" + entityPrimaryKeyValue + ", ") - + ("latitude=" + latitude + ", ") + ("longitude=" + longitude + ", ") + ("ID=" + id + ", ") - + ("selfLink=" + selfLink) + "]"; - } - - public String getId() { - return this.id; - } - - public String getEntityType() { - return entityType; - } - - public void setEntityType(String entityType) { - this.entityType = entityType; - } - - public String getEntityPrimaryKeyValue() { - return entityPrimaryKeyValue; - } - - public void setEntityPrimaryKeyValue(String entityPrimaryKeyValue) { - this.entityPrimaryKeyValue = entityPrimaryKeyValue; - } - - public String getEntityPrimaryKeyName() { - return entityPrimaryKeyName; - } - - public void setEntityPrimaryKeyName(String entityPrimaryKeyName) { - this.entityPrimaryKeyName = entityPrimaryKeyName; - } - - public String getLatitude() { - return latitude; - } - - public void setLatitude(String latitude) { - this.latitude = latitude; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - public String getSelfLink() { - return selfLink; - } - - public void setSelfLink(String selfLink) { - this.selfLink = selfLink; - } - - public static long getSerialversionuid() { - return serialVersionUID; - } - - public void setId(String id) { - this.id = id; - } - -} diff --git a/src/main/java/org/onap/aai/sparky/inventory/servlet/EntityCountHistoryServlet.java b/src/main/java/org/onap/aai/sparky/inventory/servlet/EntityCountHistoryServlet.java deleted file mode 100644 index c5d3a80..0000000 --- a/src/main/java/org/onap/aai/sparky/inventory/servlet/EntityCountHistoryServlet.java +++ /dev/null @@ -1,373 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.aai - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs - * ================================================================================ - * 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 is a trademark and service mark of AT&T Intellectual Property. - */ -package org.onap.aai.sparky.inventory.servlet; - -import org.onap.aai.cl.mdc.MdcContext; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; - -import java.io.IOException; -import java.io.PrintWriter; -import java.nio.ByteBuffer; -import java.security.SecureRandom; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.TreeMap; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.onap.aai.cl.api.Logger; -import org.onap.aai.cl.eelf.LoggerFactory; -import org.json.JSONArray; -import org.json.JSONObject; -import org.onap.aai.sparky.dal.elasticsearch.SearchAdapter; -import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig; -import org.onap.aai.sparky.dal.rest.OperationResult; -import org.onap.aai.sparky.dal.rest.RestClientBuilder; -import org.onap.aai.sparky.inventory.EntityHistoryQueryBuilder; -import org.onap.aai.sparky.logging.AaiUiMsgs; -import org.onap.aai.sparky.util.NodeUtils; -import org.onap.aai.sparky.util.ServletUtils; -import org.onap.aai.sparky.viewandinspect.config.VisualizationConfig; - -/** - * The Class EntityCountHistoryServlet. - */ -public class EntityCountHistoryServlet extends HttpServlet { - - private static final Logger LOG = LoggerFactory.getInstance().getLogger(EntityCountHistoryServlet.class); - - private static final long serialVersionUID = 1L; - - private SearchAdapter search = null; - private ElasticSearchConfig elasticConfig = null; - private VisualizationConfig visualConfig = null; - private ObjectMapper mapper; - - private static final String SEARCH_STRING = "_search"; - private static final String TABLE = "table"; - private static final String GRAPH = "graph"; - - private List vnfEntityTypesToSummarize; - private boolean summarizevnf = false; - - /** - * Instantiates a new entity count history servlet. - * - * @throws ServletException the servlet exception - */ - public EntityCountHistoryServlet() throws ServletException { - init(); - } - - /* (non-Javadoc) - * @see javax.servlet.GenericServlet#init() - */ - @Override - public void init() throws ServletException { - super.init(); - try { - if (elasticConfig == null) { - elasticConfig = ElasticSearchConfig.getConfig(); - } - if (visualConfig == null) { - visualConfig = VisualizationConfig.getConfig(); - vnfEntityTypesToSummarize = - Arrays.asList(visualConfig.getVnfEntityTypes().toLowerCase().split("[\\s,]+")); - summarizevnf = visualConfig.getEntityTypesToSummarize().toLowerCase().contains("vnf"); - } - if (search == null) { - search = new SearchAdapter(); - } - this.mapper = new ObjectMapper(); - this.mapper.configure(SerializationFeature.INDENT_OUTPUT, true); - } catch (Exception exc) { - new ServletException( - "Caught an exception while getting an instance of servlet configuration.", exc); - } - } - - public void setSearch(SearchAdapter search) { - this.search = search; - } - - public void setElasticConfig(ElasticSearchConfig elasticConfig) { - this.elasticConfig = elasticConfig; - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - String txnID = request.getHeader("X-TransactionId"); - if (txnID == null){ - txnID = NodeUtils.getRandomTxnId(); - } - - String partnerName = request.getHeader("X-FromAppId"); - if ( partnerName == null) - partnerName = "Browser"; - - MdcContext.initialize(txnID, "AAI-UI", "", partnerName, - request.getRemoteAddr()); - - @SuppressWarnings("unused") - OperationResult operationResult = null; - if (request.getParameter("type") != null - && (request.getParameter("type").equalsIgnoreCase(TABLE) - || request.getParameter("type").equalsIgnoreCase(GRAPH))) { - try { - operationResult = getResults(response, request.getParameter("type")); - } catch (Exception exc) { - LOG.error(AaiUiMsgs.ERROR_SERVLET_PROCESSSING, exc); - } - } else { - ServletUtils.setServletResponse(LOG, true, 501, response, - ServletUtils.generateJsonErrorResponse("Unsupported request")); - } - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException { - - } - - /** - * Gets the results. - * - * @param response the response - * @param type the type - * @return the results - * @throws Exception the exception - */ - private OperationResult getResults(HttpServletResponse response, String type) throws Exception { - OperationResult operationResult = new OperationResult(); - - String requestString = - String.format("/%s/%s?pretty", elasticConfig.getEntityCountHistoryIndex(), SEARCH_STRING); - - String reqPayload = EntityHistoryQueryBuilder.getQuery(type).toString(); - - try { - final String fullUrlStr = ServletUtils.getFullUrl(elasticConfig, requestString); - OperationResult opResult = - ServletUtils.executePostQuery(LOG, search, response, fullUrlStr, reqPayload); - - JSONObject finalOutput = null; - if (type.equalsIgnoreCase(TABLE)) { - finalOutput = formatTableOutput(opResult.getResult()); - } else if (type.equalsIgnoreCase(GRAPH)) { - finalOutput = formatLineGraphOutput(opResult.getResult()); - } - - if (finalOutput != null) { - response.setContentType("application/json"); - PrintWriter out = response.getWriter(); - out.println(finalOutput); - out.close(); - } - - } catch (JsonProcessingException exc) { - ServletUtils.handleSearchServletErrors(LOG, "Unable to map JSONpayload", exc, response); - } - - return operationResult; - } - - /** - * Format table output. - * - * @param results the results - * @return the JSON object - * @throws JsonProcessingException the json processing exception - */ - private JSONObject formatTableOutput(String results) throws JsonProcessingException { - JsonNode resultNode = null; - - JSONObject finalResult = new JSONObject(); - JSONArray entitiesArr = new JSONArray(); - - Map entityCountInTable = initializeEntityMap(); - - long vnfCount = 0; - - try { - resultNode = mapper.readTree(results); - - final JsonNode bucketsNode = getBucketsNode(resultNode); - if (bucketsNode.isArray()) { - - for (final JsonNode entityNode : bucketsNode) { - String entityType = entityNode.get("key").asText(); - boolean isAVnf = vnfEntityTypesToSummarize.contains(entityType); - long countValue = 0; - - if (isAVnf || entityCountInTable.get(entityType) != null) { - final JsonNode hitsBucketNode = entityNode.get("sort_by_date").get("hits").get("hits"); - if (hitsBucketNode.isArray()) { - // the first bucket will be the latest - final JsonNode hitNode = hitsBucketNode.get(0); - - countValue = hitNode.get("_source").get("count").asLong(); - - /* - * Special case: Add all the VNF types together to get aggregate count - */ - if (summarizevnf && isAVnf) { - vnfCount += countValue; - countValue = vnfCount; - entityType = "vnf"; - } - - entityCountInTable.replace(entityType, countValue); - } - } - - } - } - for (Entry entry : entityCountInTable.entrySet()) { - JSONObject entityType = new JSONObject(); - entityType.put("key", entry.getKey()); - entityType.put("doc_count", entry.getValue()); - entitiesArr.put(entityType); - } - - finalResult.put("result", entitiesArr); - - } catch (Exception exc) { - LOG.warn(AaiUiMsgs.ERROR_BUILDING_RESPONSE_FOR_TABLE_QUERY, exc.getLocalizedMessage()); - } - - return finalResult; - } - - - /** - * Format line graph output. - * - * @param results the results - * @return the JSON object - * @throws JsonProcessingException the json processing exception - */ - private JSONObject formatLineGraphOutput(String results) throws JsonProcessingException { - Map countByDateMap = new HashMap(); - - JsonNode resultNode = null; - - JSONObject finalResult = new JSONObject(); - JSONArray finalResultArr = new JSONArray(); - - try { - resultNode = mapper.readTree(results); - - final JsonNode bucketsNode = getBucketsNode(resultNode); - - if (bucketsNode.isArray()) { - - for (final JsonNode entityNode : bucketsNode) { - final JsonNode dateBucketNode = entityNode.get("group_by_date").get("buckets"); - if (dateBucketNode.isArray()) { - for (final JsonNode dateBucket : dateBucketNode) { - Long date = dateBucket.get("key").asLong(); - final JsonNode countBucketNode = - dateBucket.get("sort_by_date").get("hits").get("hits"); - - if (countBucketNode.isArray()) { - final JsonNode latestEntityNode = countBucketNode.get(0); - - long currentCount = latestEntityNode.get("_source").get("count").asLong(); - if (countByDateMap.containsKey(date)) { - // add to the value if map already contains this date - currentCount += countByDateMap.get(date); - } - - countByDateMap.put(date, currentCount); - } - } - - } - } - } - /* - * Sort the map by epoch timestamp - */ - Map sortedMap = new TreeMap(countByDateMap); - for (Entry entry : sortedMap.entrySet()) { - JSONObject dateEntry = new JSONObject(); - dateEntry.put("date", entry.getKey()); - dateEntry.put("count", entry.getValue()); - finalResultArr.put(dateEntry); - } - - } catch (Exception exc) { - LOG.warn(AaiUiMsgs.ERROR_BUILDING_SEARCH_RESPONSE, exc.getLocalizedMessage()); - } - - return finalResult.put("result", finalResultArr); - } - - /** - * Gets the buckets node. - * - * @param node the node - * @return the buckets node - * @throws Exception the exception - */ - private JsonNode getBucketsNode(JsonNode node) throws Exception { - if (node.get("aggregations").get("group_by_entityType").get("buckets") != null) { - return node.get("aggregations").get("group_by_entityType").get("buckets"); - } else { - throw new Exception("Failed to map JSON response"); - } - } - - /** - * Initialize entity map. - * - * @return the map - */ - private Map initializeEntityMap() { - Map entityMap = new HashMap(); - String[] entityTypes = visualConfig.getEntityTypesToSummarize().split(","); - for (String entity : entityTypes) { - entityMap.put(entity, (long) 0); - } - - return entityMap; - } - -} diff --git a/src/main/java/org/onap/aai/sparky/search/VnfSearchQueryBuilder.java b/src/main/java/org/onap/aai/sparky/search/VnfSearchQueryBuilder.java index 946a2ac..8fe1d00 100644 --- a/src/main/java/org/onap/aai/sparky/search/VnfSearchQueryBuilder.java +++ b/src/main/java/org/onap/aai/sparky/search/VnfSearchQueryBuilder.java @@ -171,28 +171,4 @@ public class VnfSearchQueryBuilder { return jsonBuilder.build(); } - - /** - * The main method. - * - * @param args the arguments - */ - public static void main(String[] args) { - Date start = new Date(System.currentTimeMillis() - Integer.MAX_VALUE); - Date end = new Date(); - String timezone = "-05:00"; - // JsonObject arr = createDateHistogramQuery(start, end, timezone); - - // System.out.println(arr.toString()); - - - // JsonObject table = createTableQuery(start, end, timezone, 0, 25); - // JsonObject aggre = createAuditQuery(start, end, timezone, "entityType", null, null); - - // System.out.println(arr.toString()); - // System.out.println(table.toString()); - // System.out.println(aggre.toString()); - - - } } diff --git a/src/main/java/org/onap/aai/sparky/search/VnfSearchService.java b/src/main/java/org/onap/aai/sparky/search/VnfSearchService.java index b8ab56a..904dc69 100644 --- a/src/main/java/org/onap/aai/sparky/search/VnfSearchService.java +++ b/src/main/java/org/onap/aai/sparky/search/VnfSearchService.java @@ -336,11 +336,4 @@ public class VnfSearchService { public static void setEsConfig(ElasticSearchConfig esConfig) { VnfSearchService.esConfig = esConfig; } - - public static void main(String agrs[]) { - VnfSearchService vnfs = new VnfSearchService(); - Date start = new Date(); - Date end = start; - } - } diff --git a/src/main/java/org/onap/aai/sparky/util/Encryptor.java b/src/main/java/org/onap/aai/sparky/util/Encryptor.java index 1587cca..a9b2929 100644 --- a/src/main/java/org/onap/aai/sparky/util/Encryptor.java +++ b/src/main/java/org/onap/aai/sparky/util/Encryptor.java @@ -81,54 +81,4 @@ public class Encryptor { System.exit(1); } - /** - * The main method. - * - * @param args the arguments - */ - public static void main(String[] args) { - - Options options = new Options(); - options.addOption("d", true, "value to decrypt"); - options.addOption("h", false, "show help"); - options.addOption("?", false, "show help"); - - String value = null; - boolean encrypt = false; - boolean decrypt = false; - - CommandLineParser parser = new BasicParser(); - CommandLine cmd = null; - - try { - cmd = parser.parse(options, args); - - if (cmd.hasOption("d")) { - value = cmd.getOptionValue("d"); - decrypt = true; - } - - if (cmd.hasOption("?") || cmd.hasOption("h")) { - usage(); - System.exit(0); - } - - if ((encrypt && decrypt) || (!encrypt && !decrypt)) { - usage("Must specify one (and only one) of the -e or -d options"); - } - - Encryptor encryptor = new Encryptor(); - - if (decrypt) { - String out = encryptor.decryptValue(value); - System.out.println(out); - } - } catch (ParseException exc) { - System.out.println("Failed to parse command line properties: " + exc.toString()); - } catch (Exception exc) { - System.out.println("Failure: " + exc.toString()); - } - - System.exit(0); - } } diff --git a/src/main/java/org/onap/aai/sparky/util/KeystoreBuilder.java b/src/main/java/org/onap/aai/sparky/util/KeystoreBuilder.java index d7863c0..54474db 100644 --- a/src/main/java/org/onap/aai/sparky/util/KeystoreBuilder.java +++ b/src/main/java/org/onap/aai/sparky/util/KeystoreBuilder.java @@ -108,6 +108,20 @@ public class KeystoreBuilder { private List endpoints = new ArrayList(); + /** + * @return the endpoints + */ + public List getEndpoints() { + return endpoints; + } + + /** + * @param endpoints the endpoints to set + */ + public void setEndpoints(List endpoints) { + this.endpoints = endpoints; + } + /** * Initialize end points list. * diff --git a/src/main/java/org/onap/aai/sparky/util/NodeUtils.java b/src/main/java/org/onap/aai/sparky/util/NodeUtils.java index 092afd1..d15b7ba 100644 --- a/src/main/java/org/onap/aai/sparky/util/NodeUtils.java +++ b/src/main/java/org/onap/aai/sparky/util/NodeUtils.java @@ -690,22 +690,4 @@ public class NodeUtils { body = stringBuilder.toString(); return body; } - - /** - * The main method. - * - * @param args the arguments - * @throws ParseException the parse exception - */ - public static void main(String[] args) throws ParseException { - String date = "20170110T112312Z"; - SimpleDateFormat originalFormat = new SimpleDateFormat("yyyyMMdd'T'hhmmss'Z'"); - Date toDate = originalFormat.parse(date); - SimpleDateFormat newFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss'Z'"); - System.out.println(newFormat.format(toDate)); - - } - - - } diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java b/src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java index bf851a8..33f6a7ab 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java @@ -57,36 +57,4 @@ public class EntityTypeAggregation { public ConcurrentHashMap getCounters() { return counters; } - - /** - * The main method. - * - * @param args the arguments - * @throws JsonProcessingException the json processing exception - */ - public static void main(String[] args) throws JsonProcessingException { - // TODO Auto-generated method stub - - EntityTypeAggregation eta = new EntityTypeAggregation(); - - eta.pegCounter("c1"); - eta.pegCounter("c1"); - eta.pegCounter("c1"); - - eta.pegCounter("x2"); - eta.pegCounter("x2"); - eta.pegCounter("x2"); - eta.pegCounter("x2"); - - eta.pegCounter("z2"); - eta.pegCounter("z2"); - eta.pegCounter("z2"); - eta.pegCounter("z2"); - eta.pegCounter("z2"); - eta.pegCounter("z2"); - - System.out.println(NodeUtils.convertObjectToJson(eta, true)); - - } - } diff --git a/src/test/java/org/onap/aai/sparky/inventory/GeoIndexDocumentTest.java b/src/test/java/org/onap/aai/sparky/inventory/GeoIndexDocumentTest.java deleted file mode 100644 index d2cddcb..0000000 --- a/src/test/java/org/onap/aai/sparky/inventory/GeoIndexDocumentTest.java +++ /dev/null @@ -1,121 +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.onap.aai.sparky.inventory; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; -import org.onap.aai.sparky.inventory.entity.GeoIndexDocument; - -/** - * The Class GeoIndexDocumentTest. - */ -@RunWith(MockitoJUnitRunner.class) -public class GeoIndexDocumentTest { - - /** - * Inits the. - * - * @throws Exception the exception - */ - @Before - public void init() throws Exception {} - - /** - * Checks if is valid geo index document success path. - */ - @Test - public void isValidGeoIndexDocument_successPath() { - - GeoIndexDocument geoDoc = new GeoIndexDocument(); - - geoDoc.setEntityPrimaryKeyName("pkeyName"); - geoDoc.setEntityPrimaryKeyValue("pkeyValue"); - geoDoc.setEntityType("type"); - geoDoc.setId("12312"); - geoDoc.setLatitude("-45.123"); - geoDoc.setLongitude("181.321"); - geoDoc.setSelfLink("https://server.somewhere.com:8443/aai/v7/id"); - - assertTrue(geoDoc.isValidGeoDocument()); - - } - - /** - * Checks if is valid geo index document fail no geo coordinates. - */ - @Test - public void isValidGeoIndexDocument_fail_no_geoCoordinates() { - - GeoIndexDocument geoIndexDoc = new GeoIndexDocument(); - - geoIndexDoc.setEntityPrimaryKeyName("pkeyName"); - geoIndexDoc.setEntityPrimaryKeyValue("pkeyValue"); - geoIndexDoc.setEntityType("type"); - geoIndexDoc.setId("12312"); - geoIndexDoc.setSelfLink("https://server.somewhere.com:8443/aai/v7/id"); - - assertFalse(geoIndexDoc.isValidGeoDocument()); - - } - - /** - * Checks if is valid geo index document fail invalid geo coordinates. - */ - @Test - public void isValidGeoIndexDocument_fail_invalid_geoCoordinates() { - - GeoIndexDocument geoIndexDoc = new GeoIndexDocument(); - - geoIndexDoc.setEntityPrimaryKeyName("pkeyName"); - geoIndexDoc.setEntityPrimaryKeyValue("pkeyValue"); - geoIndexDoc.setEntityType("type"); - geoIndexDoc.setId("12312"); - geoIndexDoc.setLatitude("not_a_valid"); - geoIndexDoc.setLongitude("geo point"); - - geoIndexDoc.setSelfLink("https://server.somewhere.com:8443/aai/v7/id"); - - assertFalse(geoIndexDoc.isValidGeoDocument()); - - } - - /** - * Checks if is valid geo index document fail nothing set. - */ - @Test - public void isValidGeoIndexDocument_fail_nothing_set() { - - GeoIndexDocument geoIndexDoc = new GeoIndexDocument(); - - assertFalse(geoIndexDoc.isValidGeoDocument()); - - } -} diff --git a/src/test/java/org/onap/aai/sparky/synchronizer/SyncControllerBuilder.java b/src/test/java/org/onap/aai/sparky/synchronizer/SyncControllerBuilder.java index bcd0c9a..e97da4f 100644 --- a/src/test/java/org/onap/aai/sparky/synchronizer/SyncControllerBuilder.java +++ b/src/test/java/org/onap/aai/sparky/synchronizer/SyncControllerBuilder.java @@ -522,49 +522,4 @@ public class SyncControllerBuilder { } } - - /** - * The main method. - * - * @param args the arguments - */ - public static void main(String[] args) { - boolean runSearchableEntitySync = false; - boolean runGeoEntitySync = true; - - System.setProperty("AJSC_HOME", "e:\\dev"); - // System.getProperties().setProperty("AJSC_HOME", - // "c:\\rpo\\tier-support-ui\\target\\swm\\package\\nix\\" - // + "dist_files\\opt\\app\\ajsc-tier-support-ui"); - System.setProperty("AJSC_HOME", "d:\\AAI\\tier_support_ui\\tier-support-ui\\target\\swm\\package\\nix\\dist_files\\appl\\inventory-ui-service\\1.0-SNAPSHOT"); - - ch.qos.logback.classic.Logger root = (ch.qos.logback.classic.Logger) LoggerFactory - .getLogger(ch.qos.logback.classic.Logger.ROOT_LOGGER_NAME); - // root.detachAndStopAllAppenders(); - // logger = new CaptureLoggerAppender(); - root.setLevel(Level.INFO); - // root.addAppender(logger); - - - SyncControllerBuilder syncBuilder = new SyncControllerBuilder(); - - /* - * if (runSearchableEntitySync) syncBuilder.doSearchableEntitysync(); - */ - - //syncBuilder.doSearchableEntitysync(); - // syncBuilder.doCrossEntityReferenceSync(); - // syncBuilder.doHistoricalEntitySync(); - // syncBuilder.doGeoEntitySync(); - syncBuilder.doSuggestionEntitySync(); - - // syncBuilder.testElasticSearchUpdateAPI(); - - /* - * if (runGeoEntitySync) { syncBuilder.doGeoEntitySync(); } - */ - - - - } } diff --git a/src/test/java/org/onap/aai/sparky/synchronizer/SyncHelperTest.java b/src/test/java/org/onap/aai/sparky/synchronizer/SyncHelperTest.java index b4305cb..4f52361 100644 --- a/src/test/java/org/onap/aai/sparky/synchronizer/SyncHelperTest.java +++ b/src/test/java/org/onap/aai/sparky/synchronizer/SyncHelperTest.java @@ -15,21 +15,23 @@ import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants; @RunWith(MockitoJUnitRunner.class) public class SyncHelperTest { - private SyncHelper syncHelper; + private SyncHelper syncHelper; + @BeforeClass public static void initBeforeClass() throws IOException { - String configHomePath = (new File(".").getCanonicalPath() + "/src/test/resources/sync").replace('\\', '/'); + String configHomePath = + (new File(".").getCanonicalPath() + "/src/test/resources/sync").replace('\\', '/'); TierSupportUiConstants.AJSC_HOME = configHomePath; TierSupportUiConstants.CONFIG_HOME = configHomePath; } -@Test -public void testGetOxmModelLoader() throws Exception { - syncHelper = new SyncHelper(new OxmModelLoader()); - OxmModelLoader oxmLoader = new OxmModelLoader(); - syncHelper.setOxmModelLoader(oxmLoader); - assertEquals(oxmLoader, syncHelper.getOxmModelLoader()); -} + @Test + public void testGetOxmModelLoader() throws Exception { + syncHelper = new SyncHelper(new OxmModelLoader()); + OxmModelLoader oxmLoader = new OxmModelLoader(); + syncHelper.setOxmModelLoader(oxmLoader); + assertEquals(oxmLoader, syncHelper.getOxmModelLoader()); + } } diff --git a/src/test/java/org/onap/aai/sparky/util/ElasticEntitySummarizer.java b/src/test/java/org/onap/aai/sparky/util/ElasticEntitySummarizer.java index 171c163..7538c1b 100644 --- a/src/test/java/org/onap/aai/sparky/util/ElasticEntitySummarizer.java +++ b/src/test/java/org/onap/aai/sparky/util/ElasticEntitySummarizer.java @@ -44,6 +44,49 @@ import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig; public class ElasticEntitySummarizer { private RestDataProvider syncAdapter; + /** + * @return the syncAdapter + */ + public RestDataProvider getSyncAdapter() { + return syncAdapter; + } + + /** + * @param syncAdapter the syncAdapter to set + */ + public void setSyncAdapter(RestDataProvider syncAdapter) { + this.syncAdapter = syncAdapter; + } + + /** + * @return the elasticConfig + */ + public ElasticSearchConfig getElasticConfig() { + return elasticConfig; + } + + /** + * @param elasticConfig the elasticConfig to set + */ + public void setElasticConfig(ElasticSearchConfig elasticConfig) { + this.elasticConfig = elasticConfig; + } + + /** + * @return the entityCounters + */ + public Map getEntityCounters() { + return entityCounters; + } + + /** + * @param entityCounters the entityCounters to set + */ + public void setEntityCounters(Map entityCounters) { + this.entityCounters = entityCounters; + } + + private ElasticSearchConfig elasticConfig; private Map entityCounters; @@ -150,24 +193,4 @@ public class ElasticEntitySummarizer { } - - - /** - * The main method. - * - * @param args the arguments - * @throws ElasticSearchOperationException the elastic search operation exception - */ - public static void main(String[] args) throws ElasticSearchOperationException { - - - // ElasticEntitySummarizer summarizer = new ElasticEntitySummarizer(); - // summarizer.enumerateEntities(); - - - - } - - - } diff --git a/src/test/java/org/onap/aai/sparky/util/LogValidator.java b/src/test/java/org/onap/aai/sparky/util/LogValidator.java index a16a586..3ef8278 100644 --- a/src/test/java/org/onap/aai/sparky/util/LogValidator.java +++ b/src/test/java/org/onap/aai/sparky/util/LogValidator.java @@ -58,6 +58,13 @@ public class LogValidator { return logger; } + /** + * @param logger the logger to set + */ + public void setLogger(CaptureLoggerAppender logger) { + this.logger = logger; + } + /** * Dump and count logs. * diff --git a/src/test/java/org/onap/aai/sparky/util/ModelLoaderTester.java b/src/test/java/org/onap/aai/sparky/util/ModelLoaderTester.java deleted file mode 100644 index ecad636..0000000 --- a/src/test/java/org/onap/aai/sparky/util/ModelLoaderTester.java +++ /dev/null @@ -1,46 +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.onap.aai.sparky.util; - -import org.onap.aai.sparky.config.oxm.OxmModelLoader; - -/** - * The Class ModelLoaderTester. - */ -public class ModelLoaderTester { - - /** - * The main method. - * - * @param args the arguments - */ - public static void main(String[] args) { - System.getProperties().put("AJSC_HOME", "d:\\oxm\\"); - - OxmModelLoader loader = OxmModelLoader.getInstance(); - } - -} diff --git a/src/test/java/org/onap/aai/sparky/util/UtilPojoTest.java b/src/test/java/org/onap/aai/sparky/util/UtilPojoTest.java new file mode 100644 index 0000000..52e1f52 --- /dev/null +++ b/src/test/java/org/onap/aai/sparky/util/UtilPojoTest.java @@ -0,0 +1,43 @@ +package org.onap.aai.sparky.util; + +import java.util.List; + +import org.junit.Before; +import org.junit.Test; + +import com.openpojo.reflection.PojoClass; +import com.openpojo.reflection.filters.FilterChain; +import com.openpojo.reflection.filters.FilterClassName; +import com.openpojo.reflection.impl.PojoClassFactory; +import com.openpojo.validation.Validator; +import com.openpojo.validation.ValidatorBuilder; +import com.openpojo.validation.rule.impl.GetterMustExistRule; +import com.openpojo.validation.rule.impl.SetterMustExistRule; +import com.openpojo.validation.test.impl.GetterTester; +import com.openpojo.validation.test.impl.SetterTester; + +public class UtilPojoTest { + private String packageName = "org.onap.aai.sparky.util"; + private List pojoClasses; + + @Before + public void setup() { + // Get all classes recursively under package + FilterChain filterChainByClassName = + new FilterChain(new FilterClassName("\\w*KeystoreBuilder$"), new FilterClassName("\\w*savingTrustManager$")); + + pojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName, filterChainByClassName); + } + + @Test + public void validate() { + Validator validator = ValidatorBuilder.create() + .with(new SetterMustExistRule(), + new GetterMustExistRule()) + .with(new SetterTester(), + new GetterTester()) + .build(); + validator.validate(pojoClasses); + } + +} diff --git a/src/test/java/org/onap/aai/sparky/viewandinspect/ActiveInventoryNodeTester.java b/src/test/java/org/onap/aai/sparky/viewandinspect/ActiveInventoryNodeTester.java index 911de51..9dd23b5 100644 --- a/src/test/java/org/onap/aai/sparky/viewandinspect/ActiveInventoryNodeTester.java +++ b/src/test/java/org/onap/aai/sparky/viewandinspect/ActiveInventoryNodeTester.java @@ -352,28 +352,4 @@ public class ActiveInventoryNodeTester { // } } - - - - /** - * The main method. - * - * @param args the arguments - * @throws JsonProcessingException the json processing exception - * @throws IOException Signals that an I/O exception has occurred. - */ - public static void main(String[] args) throws JsonProcessingException, IOException { - - System.getProperties().setProperty("AJSC_HOME", "d:\\3\\"); - ActiveInventoryNodeTester tester = new ActiveInventoryNodeTester(); - // tester.doTest2(true); - - tester.parseDirectSelfLinkJsonResponse(DIRECT_COMPLEX_SELF_LINK_JSON_RESPONSE); - System.out.println("---"); - tester.parseDirectSelfLinkJsonResponse(DIRECT_PSERVER_SELF_LINK_JSON_RESPONSE); - - - - } - } diff --git a/src/test/java/org/onap/aai/sparky/viewandinspect/SelfLinkNodeCollectorTester.java b/src/test/java/org/onap/aai/sparky/viewandinspect/SelfLinkNodeCollectorTester.java deleted file mode 100644 index 41efbab..0000000 --- a/src/test/java/org/onap/aai/sparky/viewandinspect/SelfLinkNodeCollectorTester.java +++ /dev/null @@ -1,69 +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.onap.aai.sparky.viewandinspect; - -import org.onap.aai.sparky.config.oxm.OxmModelLoader; -import org.onap.aai.sparky.viewandinspect.entity.ActiveInventoryNode; -import org.onap.aai.sparky.viewandinspect.services.VisualizationContext; - -/** - * The Class SelfLinkNodeCollectorTester. - */ -public class SelfLinkNodeCollectorTester { - - /** - * The main method. - * - * @param args the arguments - * @throws Exception the exception - */ - public static void main(String[] args) throws Exception { - // TODO Auto-generated method stub - - System.getProperties().setProperty("AJSC_HOME", "d:\\3\\"); - //VisualizationContext collector = new VisualizationContext(OxmModelLoader.getInstance()); - - /* - * This is a good test of the LinkResolverServer when we are ready - */ - - ActiveInventoryNode ain = new ActiveInventoryNode(); - ain.setSelfLink( - "https://localhost:9292/aai/v7/network/generic-vnfs/generic-vnf/d2f661e7-d6a0-43b5-979f-720803396a70/"); - ain.setEntityType("generic-vnf"); - - /* - * collector.collectSelfLinks(ain, 1, "generic-vnf", - * "generic-vnf.d2f661e7-d6a0-43b5-979f-720803396a70"); - */ - - // collector.shutdown(); - - ain.dumpNodeTree(true); - - } - -}