import org.onap.aai.edges.EdgeIngestor;
import org.onap.aai.introspection.LoaderFactory;
-import org.onap.aai.rest.dsl.v1.DslListener;
-import org.onap.aai.rest.dsl.DslQueryProcessor;
import org.onap.aai.rest.search.CQConfig;
import org.onap.aai.rest.search.GremlinServerSingleton;
import org.onap.aai.rest.search.LocalCQConfig;
import org.onap.aai.rest.search.SchemaServiceCQConfig;
import org.onap.aai.setup.SchemaVersions;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.Scope;
@Configuration
@PropertySource(value = "classpath:schema-ingest.properties", ignoreResourceNotFound = true)
public class SearchConfiguration {
- private static final String CONFIG_TRANSLATOR = "config";
private static final String SCHEMA_SERVICE_TRANSLATOR = "schema-service";
@Value("${schema.translator.list}")
@Bean
public SearchGraph searchGraph(LoaderFactory loaderFactory, EdgeIngestor edgeIngestor, SchemaVersions schemaVersions) {
- SearchGraph searchGraph = new SearchGraph(loaderFactory, edgeIngestor, schemaVersions);
- return searchGraph;
+ return new SearchGraph(loaderFactory, edgeIngestor, schemaVersions);
}
@Bean
import org.onap.aai.logging.ErrorLogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.att.eelf.configuration.EELFManager;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import com.google.common.util.concurrent.SimpleTimeLimiter;
import org.onap.aai.introspection.Introspector;
import org.onap.aai.introspection.Loader;
import org.onap.aai.introspection.exceptions.AAIUnknownObjectException;
-import org.onap.aai.logging.LogFormatTools;
import org.onap.aai.query.builder.QueryBuilder;
import org.onap.aai.schema.enums.PropertyMetadata;
import org.onap.aai.serialization.db.DBSerializer;
import org.onap.aai.config.SpringContextAware;
import java.util.*;
-import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
/**
*/
public class ModelBasedProcessing {
- private Logger LOGGER = LoggerFactory.getLogger(ModelBasedProcessing.class);
- private final int MAX_LEVELS = 50; // max depth allowed for our model - to protect against infinite loop problems
+ private static Logger logger = LoggerFactory.getLogger(ModelBasedProcessing.class);
+ private static final int MAX_LEVELS = 50; // max depth allowed for our model - to protect against infinite loop problems
private TransactionalGraphEngine engine;
private Loader loader;
* @param transId the trans id
* @param fromAppId the from app id
* @param passedModelVersionId the passed model-version-id -- optional (unique id for a model-ver)
- * @param passedModelId the passed model-invariant-id -- optional
+ * @param passedModelInvId the passed model-invariant-id -- optional
* @param passedModelName the passed model-name -- optional
* @param passedTopNodeType the passed top node type -- optional (needed if neither model=invariant-id nor model-version-id is passed)
* @param startNodeFilterArrayOfHashes the start node filter array of hashes -- optional (used to locate the first node(s) of instance data)
// Now we can look up instances that match this model's info
Iterator<Vertex> tmpStartIter = this.engine.asAdmin().getReadOnlyTraversalSource().V().has(addDBAliasedSuffix("model-invariant-id"),calcModInvId).has(addDBAliasedSuffix("model-version-id"),calcModVerId);
while( tmpStartIter.hasNext() ){
- Vertex tmpStartVert = (Vertex) tmpStartIter.next();
+ Vertex tmpStartVert = tmpStartIter.next();
startVtxList.add(tmpStartVert);
}
}
if( startVerts != null ){
while( startVerts.hasNext() ){
- Vertex tmpStartVert = (Vertex) startVerts.next();
+ Vertex tmpStartVert = startVerts.next();
String vid = tmpStartVert.id().toString();
- String tmpModId = tmpStartVert.<String>property(addDBAliasedSuffix("model-invariant-id")).orElse(null);
+ //String tmpModId = tmpStartVert.<String>property(addDBAliasedSuffix("model-invariant-id")).orElse(null);
String tmpModVerId = tmpStartVert.<String>property(addDBAliasedSuffix("model-version-id")).orElse(null);
startVertInfo.put(vid, tmpModVerId);
}
* @param modelInvariantId the model-invariant-id (unique id in model)
* @param modelName the model name
* @param topNodeType the top node type
- * @param startNodeFilterArrayOfHashes the start node filter array of hashes
+ * @param startNodeFilterArrayOfHashesVal the start node filter array of hashes
* @param apiVer the api ver
* @return the array list
* @throws AAIException the AAI exception
// Sorry to do this, but code that gets called with an empty hash as the first array element was causing errors
- List<Map<String,Object>> startNodeFilterArrayOfHashes = new ArrayList <Map<String,Object>>();
+ List<Map<String,Object>> startNodeFilterArrayOfHashes = new ArrayList <>();
if( !startNodeFilterArrayOfHashesVal.isEmpty() ){
Map<String,Object> tmpH = startNodeFilterArrayOfHashesVal.get(0);
if( !tmpH.isEmpty() ){
Set <String> snKeySet = startNode2ModelVerHash.keySet();
Iterator<String> startNodeIterator = snKeySet.iterator();
while( startNodeIterator.hasNext() ){
- String modVerIdKey = (String) startNodeIterator.next();
+ String modVerIdKey = startNodeIterator.next();
String modVerId = startNode2ModelVerHash.get(modVerIdKey);
if( !distinctModelVersHash.containsKey(modVerId) ){
// First time seeing this model-version-id
Set <String> keySet = distinctModelVersHash.keySet();
Iterator<String> modelVerIterator = keySet.iterator();
while( modelVerIterator.hasNext() ){
- String modVerKey = (String) modelVerIterator.next();
+ String modVerKey = modelVerIterator.next();
if( ! skipModelVerIdList.contains(modVerKey) ){
- Vertex modelVerVtx = (Vertex)distinctModelVersHash.get(modVerKey);
+ Vertex modelVerVtx = distinctModelVersHash.get(modVerKey);
Multimap<String, String> tmpTopoMap = genTopoMap4ModelVer( transId, fromAppId,
modelVerVtx, modVerKey);
validNextStepHash.put(modVerKey, tmpTopoMap);
snKeySet = startNode2ModelVerHash.keySet();
startNodeIterator = snKeySet.iterator();
while( startNodeIterator.hasNext() ){
- String vtxKey = (String) startNodeIterator.next();
+ String vtxKey = startNodeIterator.next();
firstStepInfoHash.put(vtxKey,startNodeType);
}
}
snKeySet = startNode2ModelVerHash.keySet();
startNodeIterator = snKeySet.iterator();
while( startNodeIterator.hasNext() ){
- String vtxKey = (String) startNodeIterator.next();
+ String vtxKey = startNodeIterator.next();
Iterator<Vertex> vtxIterator = this.engine.asAdmin().getReadOnlyTraversalSource().V(vtxKey);
- Vertex tmpVtx = (Vertex)vtxIterator.next();
+ Vertex tmpVtx = vtxIterator.next();
String thisVtxModelVerId = startNode2ModelVerHash.get(vtxKey);
if( skipModelVerIdList.contains(thisVtxModelVerId) ){
// Skip this vertex because it uses a model-ver that is bad
continue;
}
- Vertex modelVerVtx = (Vertex)distinctModelVersHash.get(thisVtxModelVerId);
+ Vertex modelVerVtx = distinctModelVersHash.get(thisVtxModelVerId);
Vertex modelVtx = getModelGivenModelVer( modelVerVtx, "" );
String modInvId = modelVtx.<String>property("model-invariant-id").orElse(null);
String personaModInvId = tmpVtx.<String>property(addDBAliasedSuffix("model-invariant-id")).orElse(null);
snKeySet = startNode2ModelVerHash.keySet();
startNodeIterator = snKeySet.iterator();
while( startNodeIterator.hasNext() ){
- String topNodeVtxId = (String) startNodeIterator.next();
- if( failedPersonaCheckVids.contains(topNodeVtxId) ){
+ String topNodeVtxId = startNodeIterator.next();
+ if( failedPersonaCheckVids.contains(topNodeVtxId) || skipStartVertVerIdList.contains(topNodeVtxId) ){
// Skip this vertex because it failed it's persona-data check above
- continue;
- }
- if( skipStartVertVerIdList.contains(topNodeVtxId) ){
// Skip this vertex because it uses a model-ver that is bad
continue;
}
Iterator<Vertex> vtxIterator = this.engine.asAdmin().getReadOnlyTraversalSource().V(topNodeVtxId);
- Vertex tmpStartVtx = (Vertex)vtxIterator.next();
+ Vertex tmpStartVtx = vtxIterator.next();
String elementLocationTrail = firstStepInfoHash.get(topNodeVtxId);
String modelVerId = startNode2ModelVerHash.get(topNodeVtxId);
Multimap<String, String> validNextStepMap = validNextStepHash.get(modelVerId);
// Sometimes things have already been deleted by the time we get to them - just log it.
AAIException aaiException = new AAIException("AAI_6154", thisGuyStr + ". msg = " + ex.getMessage());
ErrorLogHelper.logException(aaiException);
+
}
if( !gotVtxOK ){
}
else {
if( resSet.getNewDataDelFlag() != null && resSet.getNewDataDelFlag().equals("T") ){
- LOGGER.debug(">> will try to delete this one >> " + thisGuyStr);
+ logger.debug(">> will try to delete this one >> " + thisGuyStr);
try {
Boolean requireResourceVersion = false;
ErrorLogHelper.logException(ae);
String errText = ae.getErrorObject().getErrorText();
String errDetail = ae.getMessage();
- LOGGER.debug("Exception when deleting " + thisGuyStr + ". ErrorCode = " + errorCode +
- ", errorText = " + errText + ", details = " + errDetail);
+ logger.debug("Exception when deleting " + thisGuyStr + ". ErrorCode = " + errorCode +
+ ", errorText = " + errText + ", details = " + errDetail);
}
}
catch( Exception e ){
// Ignore the exception - but log it so we can see what happened.
AAIException aaiException = new AAIException("AAI_6154", thisGuyStr + ". msg = " + e.getMessage());
ErrorLogHelper.logException(aaiException);
+
}
// We can't depend on a thrown exception to tell us if a node was deleted since it may
*/
public List<ResultSet> queryByNamedQuery(String transId, String fromAppId,
String namedQueryUuid,
- ArrayList <Map<String,Object>> startNodeFilterArrayOfHashes,
+ List <Map<String,Object>> startNodeFilterArrayOfHashes,
String apiVer )
throws AAIException {
* @param namedQueryUuid the named query uuid
* @param startNodeFilterArrayOfHashes the start node filter array of hashes --used to locate the first nodes of instance data
* @param apiVer the api ver
- * @param secondaryCutPoint nodeType where we will prune if secondary filter is not met
+ * @param secondaryFilterCutPoint nodeType where we will prune if secondary filter is not met
* @param secondaryFilterHash secondary filter params
* @return resultSet
* @throws AAIException the AAI exception
if( startNodeFilterArrayOfHashes.size() == 1 ){
// If there is only one set of startFilter info given, then allow it to possibly not be
// defining just one start node.
- Map<String, Object> cleanHash = new HashMap<>();
Map<String, Object> tmpHash = startNodeFilterArrayOfHashes.get(0);
Set <String> propKeySet = tmpHash.keySet();
Iterator<String> propIter = propKeySet.iterator();
boolean foundIndexedField = false;
int propertiesSet = 0;
while( propIter.hasNext() ){
- String oldVtxKey = (String) propIter.next();
+ String oldVtxKey = propIter.next();
String newKey = oldVtxKey;
String [] parts = oldVtxKey.split("\\.");
if( parts.length == 2 ){
* Prune a result set as per a secondary filter.
*
* @param resSetVal the res set val
- * @param cutPoint the nodeType where the trim will happen
+ * @param cutPointType the nodeType where the trim will happen
* @param secFilterHash hash of properties and values to use as the secondary filter
* @return pruned result set
* @throws AAIException the AAI exception
String propNodeTypeDotName = (filtEntry.getKey()).toString();
String fpv = (filtEntry.getValue()).toString();
- int periodLoc = propNodeTypeDotName.indexOf(".");
+ int periodLoc = propNodeTypeDotName.indexOf('.');
if( periodLoc <= 0 ){
String emsg = "Bad filter param key passed in: [" + propNodeTypeDotName + "]. Expected format = [nodeName.paramName]\n";
throw new AAIException("AAI_6120", emsg);
if( resSetVal.getDoNotOutputFlag().equals("true") ){
// This ResultSet isn't to be displayed, so replace it with it's sub-ResultSets
- List<ResultSet> subResList = (ArrayList<ResultSet>) resSetVal.getSubResultSet();
+ List<ResultSet> subResList = resSetVal.getSubResultSet();
for( int k = 0; k < subResList.size(); k++ ){
List<ResultSet> newSubResList = collapseForDoNotOutput(subResList.get(k));
colResultSet.addAll(newSubResList);
// For each result set now at this level, call this same routine to collapse their sub-resultSets
for( int i = 0; i < colResultSet.size(); i++ ){
List<ResultSet> newSubSet = new ArrayList<>();
- List<ResultSet> subResList = (ArrayList<ResultSet>) colResultSet.get(i).getSubResultSet();
+ List<ResultSet> subResList = colResultSet.get(i).getSubResultSet();
for( int n = 0; n < subResList.size(); n++ ){
List<ResultSet> newSubResList = collapseForDoNotOutput(subResList.get(n));
newSubSet.addAll(newSubResList);
* @param fromAppId the from app id
* @param thisLevelElemVtx the element vtx at this level
* @param thisVertsTrail the this verts trail
- * @param elementLocationTrail -- trail of nodeTypes that got us here (this element vertex) from the top
* @param validNextStepMap the valid next step map -- hash of valid next steps (node types) for this model
* @param vidsTraversed the vids traversed -- ArrayList of vertexId's that we traversed to get to this point
* @param levelCounter the level counter
}
else {
while( modPipe.hasNext() ){
- Vertex tmpVert = (Vertex) modPipe.next();
+ Vertex tmpVert = modPipe.next();
String tmpVid = tmpVert.id().toString();
String tmpTrail = thisVertsTrail + "|" + targetStep;
if( !vidsTraversed.contains(tmpVid) ){
* @param fromAppId the from app id
* @param modelVerVertex the model-ver vertex
* @param modelVerId the model-version-id
- * @param loader the db maps
* @return MultiMap of valid next steps for each potential model-element
* @throws AAIException the AAI exception
*/
+ modelVerId);
}
- Multimap<String, String> collectedMap = collectTopology4ModelVer( transId, fromAppId,
+ return collectTopology4ModelVer( transId, fromAppId,
firstElementVertex, "", initialEmptyMap, vidsTraversed, 0, null, firstModelInvId, firstModelVersion );
-
- return collectedMap;
-
} // End of genTopoMap4ModelVer()
// Seems to be how they're defined in OXM - whether they use a "xml-wrapper" or not
// Need to translate them into ArrayLists sometimes...
- List<String> retArrList = new ArrayList<String>();
+ List<String> retArrList = new ArrayList<>();
String listString = listStringVal;
listString = listString.replace(" ", "");
listString = listString.replace("\"", "");
listString = listString.replace("[", "");
listString = listString.replace("]", "");
String [] pieces = listString.split(",");
- if( pieces != null && pieces.length > 0 ){
- for( int i = 0; i < pieces.length; i++ ){
- retArrList.add(pieces[i]);
- }
+ if(pieces.length > 0){
+ retArrList.addAll(Arrays.asList(pieces));
}
-
return retArrList;
}
}
while( constrPipe.hasNext() ){
- Vertex constrVtx = (Vertex) constrPipe.next();
+ Vertex constrVtx = constrPipe.next();
// We found a property constraint that we will need to check
String conType = constrVtx.<String>property("constraint-type").orElse(null);
if( (conType == null) || conType.equals("")){
}
while( lookPipe.hasNext() ){
- Vertex relLookupVtx = (Vertex) lookPipe.next();
+ Vertex relLookupVtx = lookPipe.next();
// We found a related-lookup record to try and use
String srcProp = relLookupVtx.<String>property("source-node-property").orElse(null);
String srcNodeType = relLookupVtx.<String>property("source-node-type").orElse(null);
if( valFromInstance == null ){
// if there is no key to use to go look up something, we should end it here and just
// note what happened - no need to try to look something up by an empty key
- LOGGER.debug("WARNING - the instance data node of type [" + srcNodeType
+ logger.debug("WARNING - the instance data node of type [" + srcNodeType
+ "] did not have a value for property [" + srcProp
+ "], so related-lookup is being abandoned.");
return retHash;
}
- Map<String,Object> propHash = new HashMap<String,Object>();
+ Map<String,Object> propHash = new HashMap<>();
propHash.put(targetProp, valFromInstance);
Optional<Vertex> result = dbMethHelper.locateUniqueVertex(targetNodeType, propHash);
if (!result.isPresent()) {
// If it can't find the lookup node, don't fail, just log that it couldn't be found ---
- LOGGER.debug("WARNING - Could not find lookup node that corresponds to nodeType ["
+ logger.debug("WARNING - Could not find lookup node that corresponds to nodeType ["
+ targetNodeType + "] propertyName = [" + srcProp
+ "], propVal = [" + valFromInstance
+ "] so related-lookup is being abandoned.");
* @param thisLevelElemVtx the element verrtx for this level
* @param incomingTrail the incoming trail -- trail of nodeTypes that got us here (this nq-element vertex) from the top
* @param currentHash the current hash
- * @param Map that got us to this point (that we will use as the base of the map we will return)
* @param vidsTraversed the vids traversed -- ArrayList of vertexId's that we traversed to get to this point
* @param levelCounter the level counter
* @return HashMap of all widget-points on a namedQuery topology with the value being the "named-query-element-uuid" for that spot.
*/
public Map<String, String> collectNQElementHash(String transId, String fromAppId,
Vertex thisLevelElemVtx, String incomingTrail,
- Map<String,String> currentHash, ArrayList <String> vidsTraversed,
+ Map<String,String> currentHash, List <String> vidsTraversed,
int levelCounter ) throws AAIException {
levelCounter++;
while( vertI != null && vertI.hasNext() ){
Vertex tmpVert = vertI.next();
String vid = tmpVert.id().toString();
- Map<String,Object> elementHash = new HashMap<String, Object>();
+ Map<String,Object> elementHash = new HashMap();
String connectToType = tmpVert.<String>property(AAIProperties.NODE_TYPE).orElse(null);
if( connectToType != null && connectToType.equals("named-query-element") ){
* @param thisLevelElemVtx the element vertex at this level
* @param incomingTrail the incoming trail -- trail of nodeTypes that got us here (this vertex) from the top
* @param currentHash the current hash
- * @param Map that got us to this point (that we will use as the base of the map we will return)
* @param vidsTraversed the vids traversed ---- ArrayList of vertexId's that we traversed to get to this point
* @param levelCounter the level counter
- * @param loader the db maps
* @param modConstraintHash the mod constraint hash
* @param overRideModelId the over ride model id
* @param overRideModelVersionId the over ride model version id
*/
public Map<String, String> collectDeleteKeyHash(String transId, String fromAppId,
Vertex thisLevelElemVtx, String incomingTrail,
- Map<String,String> currentHash, ArrayList <String> vidsTraversed,
+ Map<String,String> currentHash, List <String> vidsTraversed,
int levelCounter, Map<String, Vertex> modConstraintHash,
String overRideModelId, String overRideModelVersionId )
throws AAIException {
while( vertI != null && vertI.hasNext() ){
Vertex tmpVert = vertI.next();
String vid = tmpVert.id().toString();
- Map<String,Object> elementHash = new HashMap<String, Object>();
+ Map<String,Object> elementHash = new HashMap<>();
String connectToType = tmpVert.<String>property(AAIProperties.NODE_TYPE).orElse(null);
if( connectToType != null && connectToType.equals("model-element") ){
*
* @param transId the trans id
* @param fromAppId the from app id
- * @param modelElement vertex to collect for
+ * @param thisLevelElemVtx vertex to collect for
* @param incomingTrail the incoming trail -- trail of nodeTypes/personaInfo that got us here (this vertex) from the top
* @param currentMap the current map -- map that got us to this point (that we will use as the base of the map we will return)
* @param vidsTraversed the vids traversed -- ArrayList of vertexId's that we traversed to get to this point
* @param levelCounter the level counter
- * @param loader the db maps
* @param modConstraintHash the mod constraint hash
* @param overRideModelInvId the override model-invariant-id
* @param overRideModelVersionId the override model-version-id
// It could show up on other branches in the case where it is a sub-model which is being
// used in more than one place.
//
- List<String> thisTrailsVidsTraversed = new ArrayList <String>();
- thisTrailsVidsTraversed.addAll(vidsTraversed);
+ List<String> thisTrailsVidsTraversed = new ArrayList<>(vidsTraversed);
thisTrailsVidsTraversed.add(thisElemVid);
// Look at the elements pointed to at this level and add on their data
while( vertI != null && vertI.hasNext() ){
Vertex tmpVert = vertI.next();
String vid = tmpVert.id().toString();
- Map<String,Object> elementHash = new HashMap<String, Object>();
+ Map<String,Object> elementHash = new HashMap<>();
String connectToType = tmpVert.<String>property(AAIProperties.NODE_TYPE).orElse(null);
if( connectToType != null && connectToType.equals("model-element") ){
// A nice, regular old model-element
String tmpElNT = getModElementWidgetType( elVert, thisGuysTrail );
String tmpElStepName = getModelElementStepName( elVert, thisGuysTrail);
- List<String> linkagePtList = new ArrayList <String>();
+ List<String> linkagePtList = new ArrayList <>();
Iterator <VertexProperty<Object>> vpI = elVert.properties("linkage-points");
// I am not sure why, but since "linkage-points" is an xml-element-wrapper in the OXM definition,
*
* @param nodeTypeA the node type A
* @param nodeTypeB the node type B
- * @param loader the db maps
* @throws AAIException the AAI exception
*/
public void check4EdgeRule( String nodeTypeA, String nodeTypeB) throws AAIException {
*
* @param transId the trans id
* @param fromAppId the from app id
- * @param linkagePointStr -- Note it is in reverse order from where we connect to it.
+ * @param linkagePointStrVal -- Note it is in reverse order from where we connect to it.
* @param incomingTrail -- trail of nodeTypes that got us here (this vertex) from the top
* @param currentMap the current map -- that got us to this point (that we will use as the base of the map we will return)
- * @param loader the db maps
* @return Map of the topology
* @throws AAIException the AAI exception
*/
// before any commas (if there are any).
String [] trailSteps = thisGuysTrail.split("\\|");
- if( trailSteps == null || trailSteps.length == 0 ){
+ if(trailSteps.length == 0){
throw new AAIException("AAI_6125", "Bad incomingTrail passed to collectTopology4LinkagePoint(): [" + incomingTrail + "] ");
}
String lastStepString = trailSteps[trailSteps.length - 1];
lastStepNT = stepPieces[0];
String thisStepNT = "";
String [] linkageSteps = linkage[x].split("\\|");
- if( linkageSteps == null || linkageSteps.length == 0 ){
+ if(linkageSteps.length == 0){
throw new AAIException("AAI_6125", "Bad linkagePointStr passed to collectTopology4LinkagePoint(): [" + linkagePointStr + "] ");
}
for( int i=(linkageSteps.length - 1); i >= 0; i-- ){
// Take a constrained-element-set and figure out the total set of all the possible elements that it
// represents and return them as a Hash.
- Map<String,Object> retElementHash = new HashMap<String, Object>();
+ Map<String,Object> retElementHash = new HashMap<>();
if( constrElemSetVtx == null ){
String msg = " getNextStepElementsFromSet() called with null constrElemSetVtx ";
throw new AAIException("AAI_6125", msg);
}
- ArrayList <Vertex> choiceSetVertArray = new ArrayList<Vertex>();
+ ArrayList <Vertex> choiceSetVertArray = new ArrayList<>();
Iterator<Vertex> vertI = this.traverseIncidentEdges(EdgeType.TREE, constrElemSetVtx, "element-choice-set");
int setCount = 0;
while( vertI != null && vertI.hasNext() ){
throw new AAIException("AAI_6133", "Bad Named Query Definition: First element must correspond to a widget type model. Named Query UUID = "
+ namedQueryUuid);
}
-
- Multimap<String, String> collectedMap = collectTopology4NamedQ( transId, fromAppId,
+
+ return collectTopology4NamedQ( transId, fromAppId,
firstElementVertex, "",
initialEmptyMap, vidsTraversed, 0);
-
- return collectedMap;
-
} // End of genTopoMap4NamedQ()
throw new AAIException("AAI_6132", msg);
}
- String nodeType = modVtx.<String>property(AAIProperties.NODE_TYPE).orElse(null);;
+ String nodeType = modVtx.<String>property(AAIProperties.NODE_TYPE).orElse(null);
if( (nodeType != null) && nodeType.equals("model") ){
// Found what we were looking for.
return modVtx;
*
* @param elementVtx the model-element vtx
* @param elementTrail the element trail
- * @param loader the db maps
* @return the element step name
* @throws AAIException the AAI exception
*/
* Node type supports persona.
*
* @param nodeType the node type
- * @param loader the db maps
* @return the boolean
* @throws AAIException the AAI exception
*/
if( nodeType == null || nodeType.equals("") ){
return false;
}
- Introspector obj = null;
+ Introspector introspector = null;
try {
- obj = loader.introspectorFromName(nodeType);
+ introspector = loader.introspectorFromName(nodeType);
} catch (AAIUnknownObjectException e) {
String emsg = " Unrecognized nodeType [" + nodeType + "]\n";
throw new AAIException("AAI_6115", emsg);
}
- Collection <String> props4ThisNT = loader.introspectorFromName(nodeType).getProperties();
- if( !props4ThisNT.contains(addDBAliasedSuffix("model-invariant-id")) || !props4ThisNT.contains(addDBAliasedSuffix("model-version-id")) ){
- return false;
- }
- else {
- return true;
- }
+ Collection <String> props4ThisNT = introspector.getProperties();
+ return props4ThisNT.contains(addDBAliasedSuffix("model-invariant-id")) && props4ThisNT.contains(addDBAliasedSuffix("model-version-id"));
}// nodeTypeSupportsPersona()
// NOTE -- if the element points to a resource or service model, then we'll return the
// widget-type of the first element (crown widget) for that model.
Vertex modVerVtx = getModelVerThatElementRepresents( elementVtx, elementTrail );
- String thisElementNodeType = getModelVerTopWidgetType( modVerVtx, elementTrail );
- return thisElementNodeType;
-
+ return getModelVerTopWidgetType( modVerVtx, elementTrail );
+
}// End getModElementWidgetType()
}
else {
while( modVertsIter.hasNext() ){
- Vertex tmpModelVerVtx = (Vertex) modVertsIter.next();
+ Vertex tmpModelVerVtx = modVertsIter.next();
retVtxArr.add(tmpModelVerVtx);
}
}
*
* @param transId the trans id
* @param fromAppId the from app id
- * @param model-invariant-id (uniquely identifies a model)
- * @return the model-ver's defined for the corresponding model
+ * @param modelInvId-invariant-id (uniquely identifies a model)
+ * @return the model-ver's defined for the corresponding model
* @throws AAIException the AAI exception
*/
public Iterator<Vertex> getModVersUsingModelInvId(String transId, String fromAppId,
*
* @param transId the trans id
* @param fromAppId the from app id
- * @param model vertex
+ * @param modVtx vertex
* @return the model-ver's defined for the corresponding model
* @throws AAIException the AAI exception
*/
}
else {
while( modVerVertsIter.hasNext() ){
- Vertex tmpModelVtx = (Vertex) modVerVertsIter.next();
+ Vertex tmpModelVtx = modVerVertsIter.next();
retVtxArr.add(tmpModelVtx);
}
}
}
else {
while( modVerVertsIter.hasNext() ){
- Vertex modelVerVtx = (Vertex) modVerVertsIter.next();
+ Vertex modelVerVtx = modVerVertsIter.next();
String tmpUuid = modelVerVtx.<String>property("model-version-id").orElse(null);
if( (tmpUuid != null) && !tmpUuid.equals("") && !retArr.contains(tmpUuid) ){
retArr.add(tmpUuid);
throw new AAIException("AAI_6114", emsg);
}
while( modVerVertsIter.hasNext() ){
- Vertex tmpModVerVtx = (Vertex) modVerVertsIter.next();
+ Vertex tmpModVerVtx = modVerVertsIter.next();
String tmpNT = getModelVerTopWidgetType( tmpModVerVtx, "" );
if( lastNT != null && !lastNT.equals("") ){
if( !lastNT.equals(tmpNT) ){
*
* @param transId the trans id
* @param fromAppId the from app id
- * @param modelNameVersionId the model name version id
+ * @param modelVersionIdVal the model name version id
* @param apiVersion the api version
* @throws AAIException the AAI exception
*/
String msg = " modelVer [" + modelVersionIdVal + "] topo multiMap looks like: \n[" + topoMap + "]";
System.out.println("INFO -- " + msg );
}
- return;
-
}// End validateModel()
}
else {
//Multimap<String, String> topoMap = genTopoMap4NamedQ( "junkTransId", "junkFromAppId",
- // graph, nqVtx, namedQueryUuid );
+ // graph, nqVtx, namedQueryUuid );
//System.out.println("DEBUG -- for test only : --- ");
//System.out.println("DEBUG -- topomap = [" + topoMap + "]");
}
- return;
-
+
}// End validateNamedQuery()
}
System.out.println( propsStr );
- LOGGER.info(propsStr);
+ logger.info(propsStr);
if( !resSet.getSubResultSet().isEmpty() ){
ListIterator<ResultSet> listItr = resSet.getSubResultSet().listIterator();
}// end of showResultSet()
- private Iterator<Vertex> traverseIncidentEdges(EdgeType treeType, Vertex startV, String connectedNodeType) throws AAIUnknownObjectException, AAIException {
- QueryBuilder builder = this.engine.getQueryBuilder(startV).createEdgeTraversal(treeType, startV, loader.introspectorFromName(connectedNodeType));
- return builder;
+ private Iterator<Vertex> traverseIncidentEdges(EdgeType treeType, Vertex startV, String connectedNodeType) throws AAIException {
+ return this.engine.getQueryBuilder(startV).createEdgeTraversal(treeType, startV, loader.introspectorFromName(connectedNodeType));
}
- private Iterator<Vertex> traverseIncidentEdges(EdgeType treeType, Vertex startV, String... connectedNodeType) throws AAIUnknownObjectException, AAIException {
+ private Iterator<Vertex> traverseIncidentEdges(EdgeType treeType, Vertex startV, String... connectedNodeType) throws AAIException {
QueryBuilder[] builders = new QueryBuilder[connectedNodeType.length];
for (int i = 0; i < connectedNodeType.length; i++) {
builders[i] = this.engine.getQueryBuilder(startV).createEdgeTraversal(EdgeType.TREE, startV, loader.introspectorFromName(connectedNodeType[i]));
}
- QueryBuilder builder = this.engine.getQueryBuilder(startV).union(builders);
- return builder;
+ return this.engine.getQueryBuilder(startV).union(builders);
}
private String addDBAliasedSuffix(String propName) {
package org.onap.aai.dbgraphmap;
import com.google.common.base.CaseFormat;
-import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import edu.emory.mathcs.backport.java.util.Collections;
import org.apache.commons.lang3.StringUtils;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriBuilderException;
import javax.xml.bind.JAXBException;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.util.*;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
+
/**
* Database Mapping class which acts as the middle man between the REST interface objects for the
* Search namespace
QueryBuilder builder = genericQueryBuilder.getDbEngine().getQueryBuilder()
.getVerticesByIndexedProperty(AAIProperties.NODE_TYPE, "service-instance");
for (String keyData : genericQueryBuilder.getStartNodeKeyParams()) {
- int colonIndex = keyData.indexOf(":");
+ int colonIndex = keyData.indexOf(':');
if (colonIndex <= 0) {
throw new AAIException("AAI_6120", "Bad key param passed in: [" + keyData + "]");
} else {
}
private URI craftUriFromQueryParams(Loader loader, String startNodeType, List<String> startNodeKeyParams)
- throws UnsupportedEncodingException, IllegalArgumentException, UriBuilderException, AAIException {
+ throws UnsupportedEncodingException, AAIException {
Introspector relationship = loader.introspectorFromName("relationship");
relationship.setValue("related-to", startNodeType);
List<Object> relationshipDataList = relationship.getValue("relationship-data");
for (String keyData : startNodeKeyParams) {
- int colonIndex = keyData.indexOf(":");
+ int colonIndex = keyData.indexOf(':');
if (colonIndex <= 0) {
throw new AAIException("AAI_6120", "Bad key param passed in: [" + keyData + "]");
} else {
* @param targetNodeType the target node type
* @param nodeType the node type
* @return the edge label
- * @throws AAIException the AAI exception
- * @throws EdgeRuleNotFoundException
+ * @throws EdgeRuleNotFoundException The Edge Rule Not Found Exception
*/
public String[] getEdgeLabel(String targetNodeType, String nodeType)
- throws AAIException, EdgeRuleNotFoundException {
+ throws EdgeRuleNotFoundException {
EdgeRuleQuery query = new EdgeRuleQuery.Builder(targetNodeType, nodeType).build();
- Multimap<String, EdgeRule> edgeRules = ArrayListMultimap.create();
- edgeRules = edgeIngestor.getRules(query);
+ Multimap<String, EdgeRule> edgeRules = edgeIngestor.getRules(query);
- // Map<String, EdgeRule> rules = EdgeRules.getInstance().getEdgeRules(targetNodeType, nodeType);
- String[] results = edgeRules.values().stream().map(rule -> rule.getLabel()).collect(Collectors.toList())
- .toArray(new String[0]);
- return results;
+ return edgeRules.values().stream().map(EdgeRule::getLabel).toArray(String[]::new);
}
*/
public Response executeModelOperation(String fromAppId, String transId, String queryParameters,
boolean isDelete, AAIExtensionMap aaiExtMap)
- throws AAIException, DynamicException {
+ throws AAIException {
Response response;
boolean success = true;
TransactionalGraphEngine dbEngine = null;
throw new AAIException("AAI_5105");
}
+
String modelVersionId = null;
String modelName = null;
String modelInvariantId = null;
List<Map<String, Object>> startNodeFilterHash = new ArrayList<>();
- String resourceVersion = mapInstanceFilters((DynamicEntity) modelAndNamedQuerySearch.get("instanceFilters"),
+ String resourceVersion = mapInstanceFilters( modelAndNamedQuerySearch.get("instanceFilters"),
startNodeFilterHash, jaxbContext);
if (isDelete) {
for (Map.Entry<String, String> ent : delResult.entrySet()) {
resultStr += "v[" + ent.getKey() + "] " + ent.getValue() + ",\n";
}
- resultStr.trim();
// Note - notifications are now done down in the individual "remove" calls done in
// runDeleteByModel() above.
- response = Response.ok(resultStr).build();
+ response = Response.ok(resultStr.trim()).build();
} else {
List<ResultSet> resultSet = processor.queryByModel(transId, fromAppId, modelVersionId, modelInvariantId,
for (DynamicEntity instFilt : instanceFilter) {
List<DynamicEntity> any = instFilt.get("any");
- HashMap<String, Object> thisNodeFilterHash = new HashMap<String, Object>();
+ HashMap<String, Object> thisNodeFilterHash = new HashMap<>();
for (DynamicEntity anyEnt : any) {
String clazz = anyEnt.getClass().getCanonicalName();
String simpleClazz = anyEnt.getClass().getSimpleName();
vertexId = objectToVertMap.get(item);
}
- if (includeTheseVertices.containsKey(vertexId)) {
- if (invResultItem.isSet("inventoryResponseItems")) {
- List<DynamicEntity> invItemList = new ArrayList<DynamicEntity>();
- DynamicEntity inventoryItems = jaxbContext.newDynamicEntity(
- "inventory.aai.att.com." + aaiExtMap.getApiVersion() + ".InventoryResponseItems");
- DynamicEntity subInventoryResponseItems = invResultItem.get("inventoryResponseItems");
- List<DynamicEntity> subInventoryResponseItemList =
- subInventoryResponseItems.get("inventoryResponseItem");
- for (DynamicEntity ent : subInventoryResponseItemList) {
- DynamicEntity invItem =
- remapInventoryItems(ent, jaxbContext, includeTheseVertices, objectToVertMap, aaiExtMap);
- if (invItem != null) {
- invItemList.add(invItem);
- }
+ if (includeTheseVertices.containsKey(vertexId) && invResultItem.isSet("inventoryResponseItems")) {
+ List<DynamicEntity> invItemList = new ArrayList<>();
+ DynamicEntity inventoryItems = jaxbContext.newDynamicEntity(
+ "inventory.aai.att.com." + aaiExtMap.getApiVersion() + ".InventoryResponseItems");
+ DynamicEntity subInventoryResponseItems = invResultItem.get("inventoryResponseItems");
+ List<DynamicEntity> subInventoryResponseItemList =
+ subInventoryResponseItems.get("inventoryResponseItem");
+ for (DynamicEntity ent : subInventoryResponseItemList) {
+ DynamicEntity invItem =
+ remapInventoryItems(ent, jaxbContext, includeTheseVertices, objectToVertMap, aaiExtMap);
+ if (invItem != null) {
+ invItemList.add(invItem);
}
- inventoryItems.set("inventoryResponseItem", invItemList);
- inventoryItem.set("inventoryResponseItems", inventoryItems);
}
+ inventoryItems.set("inventoryResponseItem", invItemList);
+ inventoryItem.set("inventoryResponseItems", inventoryItems);
}
return inventoryItem;
}
/**
* Unpack result set.
*
- * @param g the g
- * @param resultSetList the result set list
- * @param jaxbContext the jaxb context
- * @param aaiResources the aai resources
- * @param objectToVertMap the object to vert map
- * @param aaiExtMap the aai ext map
- * @return the array list
- * @throws AAIException the AAI exception
+ * @param resultSetList The result set list
+ * @param engine The engine
+ * @param loader The loader
+ * @param serializer The database serializer
+ * @return the array list - should return list of inventoryItems
+ * @throws AAIException The AAI Exception
*/
- // this should return an inventoryItem
private List<Object> unpackResultSet(List<ResultSet> resultSetList, TransactionalGraphEngine engine, Loader loader,
DBSerializer serializer) throws AAIException {
if (propertyLimitDesc != null) {
if (PropertyLimitDesc.SHOW_NONE.equals(propertyLimitDesc)) {
- HashMap<String, Object> emptyPropertyOverRideHash = new HashMap<String, Object>();
+ HashMap<String, Object> emptyPropertyOverRideHash = new HashMap<>();
for (String key : thisObj.getAllKeys()) {
emptyPropertyOverRideHash.put(key, null);
}
} else if (PropertyLimitDesc.SHOW_ALL.equals(propertyLimitDesc)) {
// keep everything
} else if (PropertyLimitDesc.SHOW_NAME_AND_KEYS_ONLY.equals(propertyLimitDesc)) {
- HashMap<String, Object> keysAndNamesPropHash = new HashMap<String, Object>();
+ HashMap<String, Object> keysAndNamesPropHash = new HashMap<>();
for (String key : thisObj.getAllKeys()) {
keysAndNamesPropHash.put(key, null);
try {
// Try to get the modelName if we can. Otherwise, do not fail, just return what we have already.
String modelInvariantIdLocal =
- (String) vert.<String>property("model-invariant-id-local").orElse(null); // this one
+ vert.<String>property("model-invariant-id-local").orElse(null); // this one
// points at a
// model
String modelVersionIdLocal =
- (String) vert.<String>property("model-version-id-local").orElse(null); // this one
+ vert.<String>property("model-version-id-local").orElse(null); // this one
// points at a
// model-ver
}
}
}
- } catch (DynamicException e) {
- ; // it's ok, dynamic object might not have these fields
} catch (Exception e) {
- ; // it's ok, couldn't find a matching model
+ // it's ok, dynamic object might not have these fields
+ // it's ok, couldn't find a matching model
}
if (resultSet.getSubResultSet() != null) {
List<ResultSet> subResultSet = resultSet.getSubResultSet();
- if (subResultSet != null && subResultSet.size() > 0) {
+ if (subResultSet != null && !subResultSet.isEmpty()) {
List<Object> res = unpackResultSet(subResultSet, engine, loader, serializer);
- if (res.size() > 0) {
+ if (!res.isEmpty()) {
inventoryItems.setValue("inventory-response-item", res);
inventoryItem.setValue("inventory-response-items",
inventoryItems.getUnderlyingObject());
private void filterProperties(Introspector thisObj, Map<String, Object> override) {
- thisObj.getProperties().stream().filter(x -> {
- return !override.containsKey(x);
- }).forEach(prop -> {
+ thisObj.getProperties().stream().filter(x -> !override.containsKey(x)).forEach(prop -> {
if (thisObj.isSimpleType(prop)) {
thisObj.setValue(prop, null);
}
package org.onap.aai.interceptors;
public final class AAIHeaderProperties {
-
- private AAIHeaderProperties(){}
-
+
public static final String REQUEST_CONTEXT = "aai-request-context";
-
+
public static final String HTTP_METHOD_OVERRIDE = "X-HTTP-Method-Override";
-
+
public static final String TRANSACTION_ID = "X-TransactionId";
-
+
public static final String FROM_APP_ID = "X-FromAppId";
-
+
public static final String AAI_TX_ID = "X-AAI-TXID";
-
+
public static final String AAI_REQUEST = "X-REQUEST";
-
+
public static final String AAI_REQUEST_TS = "X-REQUEST-TS";
+
+ private AAIHeaderProperties(){}
+
}
@Provider
public class ExceptionHandler implements ExceptionMapper<Exception> {
+ private static final String AAI_4007 = "AAI_4007";
+
@Context
private HttpServletRequest request;
@Context
private HttpHeaders headers;
- /**
- * @{inheritDoc}
- */
@Override
public Response toResponse(Exception exception) {
Response response = null;
- ArrayList<String> templateVars = new ArrayList<String>();
+ ArrayList<String> templateVars = new ArrayList<>();
//the general case is that cxf will give us a WebApplicationException
//with a linked exception
if (exception instanceof WebApplicationException) {
WebApplicationException e = (WebApplicationException) exception;
- if (e.getCause() != null) {
- if (e.getCause() instanceof SAXParseException2) {
- templateVars.add("UnmarshalException");
- AAIException ex = new AAIException("AAI_4007", exception);
- response = Response
- .status(400)
- .entity(ErrorLogHelper.getRESTAPIErrorResponse(headers.getAcceptableMediaTypes(), ex, templateVars))
- .build();
- }
+ if (e.getCause() instanceof SAXParseException2) {
+ templateVars.add("UnmarshalException");
+ AAIException ex = new AAIException(AAI_4007, exception);
+ response = Response
+ .status(400)
+ .entity(ErrorLogHelper.getRESTAPIErrorResponse(headers.getAcceptableMediaTypes(), ex, templateVars))
+ .build();
+
}
} else if (exception instanceof JsonParseException) {
//jackson does it differently so we get the direct JsonParseException
templateVars.add("JsonParseException");
- AAIException ex = new AAIException("AAI_4007", exception);
+ AAIException ex = new AAIException(AAI_4007, exception);
response = Response
.status(400)
.entity(ErrorLogHelper.getRESTAPIErrorResponse(headers.getAcceptableMediaTypes(), ex, templateVars))
} else if (exception instanceof JsonMappingException) {
//jackson does it differently so we get the direct JsonParseException
templateVars.add("JsonMappingException");
- AAIException ex = new AAIException("AAI_4007", exception);
+ AAIException ex = new AAIException(AAI_4007, exception);
response = Response
.status(400)
.entity(ErrorLogHelper.getRESTAPIErrorResponse(headers.getAcceptableMediaTypes(), ex, templateVars))
import org.onap.aai.setup.SchemaVersion;
import org.onap.aai.setup.SchemaVersions;
import org.onap.aai.transforms.XmlFormatTransformer;
+
import org.onap.aai.util.TraversalConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
String sourceOfTruth = headers.getRequestHeaders().getFirst("X-FromAppId");
String queryProcessor = headers.getRequestHeaders().getFirst("QueryProcessor");
QueryProcessorType processorType = this.processorType;
+
Response response;
TransactionalGraphEngine dbEngine = null;
return( createMessageMissingQueryRequiredParameters( missingRequiredQueryParameters, headers));
}
- List<String> invalidQueryParameters = checkForInvalidQueryParameters( customQueryConfig, URITools.getQueryMap(queryURIObj));
+ List<String> invalidQueryParameters = checkForInvalidQueryParameters( customQueryConfig, URITools.getQueryMap(queryURIObj));
if ( !invalidQueryParameters.isEmpty() ) {
return( createMessageInvalidQueryParameters( invalidQueryParameters, headers));
.entity(ErrorLogHelper.getRESTAPIErrorResponse(headers.getAcceptableMediaTypes(), e,
templateVars)).build();
}
-
+
private Response createMessageInvalidQuerySection(String invalidQuery, HttpHeaders headers) {
AAIException e = new AAIException("AAI_3014");
templateVars)).build();
}
-
private List<String> checkForInvalidQueryParameters( CustomQueryConfig customQueryConfig, MultivaluedMap<String, String> queryParams) {
List<String> allParameters = new ArrayList<>();
return queryParams.keySet().stream()
.filter(param -> !allParameters.contains(param))
.collect(Collectors.toList());
+
}
private Response createMessageInvalidQueryParameters(List<String> invalidQueryParams, HttpHeaders headers) {
@Path("/recents/{version: v[1-9][0-9]*|latest}")
public class RecentAPIConsumer extends RESTAPI {
+ private static final String AAI_3021 = "AAI_3021";
+
/** The introspector factory type. */
private ModelType introspectorFactoryType = ModelType.MOXY;
private void checkVersion(SchemaVersion version) throws AAIException {
if(!schemaVersions.getVersions().contains(version)){
- throw new AAIException("AAI_3021", "Schema Version is not valid");
+ throw new AAIException(AAI_3021, "Schema Version is not valid");
}
}
hours = Long.parseLong(params.getFirst("hours"));
}
catch(NumberFormatException ex){
- throw new AAIException("AAI_3021", " Invalid Hours. Valid values for hours are 1 to " + AAIConstants.HISTORY_MAX_HOURS);
+ throw new AAIException(AAI_3021, " Invalid Hours. Valid values for hours are 1 to " + AAIConstants.HISTORY_MAX_HOURS);
}
if (hours < 1 || hours > AAIConstants.HISTORY_MAX_HOURS) {
- throw new AAIException("AAI_3021", " Valid values for hours are 1 to " + AAIConstants.HISTORY_MAX_HOURS);
+ throw new AAIException(AAI_3021, " Valid values for hours are 1 to " + AAIConstants.HISTORY_MAX_HOURS);
}
}
if (params != null && params.containsKey("date-time") && params.getFirst("date-time").matches("-?\\d+")) {
startTime = Long.parseLong(params.getFirst("date-time"));
}
catch(NumberFormatException ex){
- throw new AAIException("AAI_3021", " Invalid Data-time. Valid values for date-time are "+minStartTime+" to " + System.currentTimeMillis() );
+ throw new AAIException(AAI_3021, " Invalid Data-time. Valid values for date-time are "+minStartTime+" to " + System.currentTimeMillis() );
}
if (startTime < minStartTime) {
- throw new AAIException("AAI_3021", " Valid values for date-time are "+minStartTime+" to " + System.currentTimeMillis() );
+ throw new AAIException(AAI_3021, " Valid values for date-time are "+minStartTime+" to " + System.currentTimeMillis() );
}
}
if(!isHoursParameter && !isDateTimeParameter){
- throw new AAIException("AAI_3021", "Send valid hours or date-time to specify the timebounds");
+ throw new AAIException(AAI_3021, "Send valid hours or date-time to specify the timebounds");
}
if(isHoursParameter && isDateTimeParameter){
- throw new AAIException("AAI_3021", "Send either hours or date-time and not both to specify the timebounds");
+ throw new AAIException(AAI_3021, "Send either hours or date-time and not both to specify the timebounds");
}
protected GraphTraversalSource getTraversalSource(TransactionalGraphEngine dbEngine, Format format, UriInfo info) throws AAIException {
if (isHistory(format)) {
- long startTime = this.getStartTime(format, info.getQueryParameters());
- long endTime = this.getEndTime(info.getQueryParameters());
- return dbEngine.asAdmin().getTraversalSource().withStrategies(getSubgraphStrategy(startTime, endTime, format));
+ long localStartTime = this.getStartTime(format, info.getQueryParameters());
+ long localEndTime = this.getEndTime(info.getQueryParameters());
+ return dbEngine.asAdmin().getTraversalSource().withStrategies(getSubgraphStrategy(localStartTime, localEndTime, format));
}
return dbEngine.asAdmin().getTraversalSource();
}
*/
package org.onap.aai.rest.search;
-/*-
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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=========================================================
- */
-
-import java.io.IOException;
import java.lang.reflect.Type;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
-import org.onap.aai.util.AAIConstants;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
private CustomQueryConfig customQueryConfig;
- private final static String QUERY_CONFIG = "query";
- private final static String REQUIRED_CONFIG = "required-properties";
- private final static String OPTIONAL_CONFIG = "optional-properties";
- private final static String STORED_QUERIES_CONFIG = "stored-queries";
- private final static String STORED_QUERY_CONFIG = "stored-query";
+ private static final String QUERY_CONFIG = "query";
+ private static final String REQUIRED_CONFIG = "required-properties";
+ private static final String OPTIONAL_CONFIG = "optional-properties";
+ private static final String STORED_QUERIES_CONFIG = "stored-queries";
+ private static final String STORED_QUERY_CONFIG = "stored-query";
-// public static final String AAI_HOME_ETC_QUERY_JSON = AAIConstants.AAI_HOME_ETC + "query" + AAIConstants.AAI_FILESEP + "stored-queries.json";
-
public GetCustomQueryConfig(String customQueryJson ) {
init(customQueryJson);
}
return toStringList(null);
}
- private String getPropertyString(JsonObject configObject, String config) {
- JsonElement subqueryConfig;
-
- if ( configObject.has(config)) {
- subqueryConfig = configObject.get(config);
- if ( subqueryConfig != null && !subqueryConfig.isJsonNull() ) {
- return subqueryConfig.getAsString();
- }
- }
- return null;
- }
-
private void getStoredQueryBlock( JsonObject configObject, String config ) {
if ( !configObject.has(config)) {
- customQueryConfig.setQueryRequiredProperties( new ArrayList<String>() );
- customQueryConfig.setQueryOptionalProperties( new ArrayList<String>() );
+ customQueryConfig.setQueryRequiredProperties( new ArrayList<>() );
+ customQueryConfig.setQueryOptionalProperties( new ArrayList<>() );
return;
}
JsonElement queryConfig;
JsonObject subObject;
- String multipleStartNodes;
List<String> propertyList;
queryConfig = configObject.get(config);
subObject = queryConfig.getAsJsonObject();
propertyList = getPropertyList(subObject, REQUIRED_CONFIG);
if ( propertyList == null ) {
- propertyList = new ArrayList<String>();
+ propertyList = new ArrayList<>();
}
customQueryConfig.setQueryRequiredProperties( propertyList );
propertyList = getPropertyList(subObject, OPTIONAL_CONFIG);
if ( propertyList == null ) {
- propertyList = new ArrayList<String>();
+ propertyList = new ArrayList<>();
}
customQueryConfig.setQueryOptionalProperties( propertyList );
JsonObject configObject;
JsonElement query;
JsonElement queryConfig;
- String queryString;
for (JsonElement storedQuery : storedQueries) {
if (storedQuery.isJsonObject()) {
Response response;
String fromAppId;
String transId;
- ArrayList<String> templateVars = new ArrayList<String>();
- try {
+
+ ArrayList<String> templateVars = new ArrayList<>();
+ try {
fromAppId = getFromAppId(headers);
transId = getTransId(headers);
response = searchGraph.runNamedQuery(fromAppId, transId, queryParameters, aaiExtMap);
metricLog.post();
- //LOGGER.info ("Completed");
} catch (AAIException e) {
// send error response
Response response;
String fromAppId;
String transId;
-
ArrayList<String> templateVars = new ArrayList<>();
try {
fromAppId = getFromAppId(headers);
response = searchGraph.executeModelOperation(fromAppId, transId, inboundPayload, false, aaiExtMap);
}
metricLog.post();
- //LOGGER.info ("Completed");
} catch (AAIException e) {
// send error response
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.att.eelf.configuration.EELFManager;
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
public class NodeQueryProcessor extends GroovyShellImpl {
- private static Logger LOGGER = LoggerFactory.getLogger(NodeQueryProcessor.class);
+ private static Logger logger = LoggerFactory.getLogger(NodeQueryProcessor.class);
protected String nodeType;
- private MultivaluedMap<String, String> nodeQueryParams = new MultivaluedHashMap<String, String>();
+ private MultivaluedMap<String, String> nodeQueryParams = new MultivaluedHashMap<>();
protected final Optional<Collection<Vertex>> vertices;
protected static Pattern p = Pattern.compile("query/(.*+)");
protected Optional<String> gremlin;
protected final TransactionalGraphEngine dbEngine;
- protected GroovyQueryBuilder queryBuilder = new GroovyQueryBuilder();;
+ protected GroovyQueryBuilder queryBuilder = new GroovyQueryBuilder();
protected NodeQueryProcessor(Builder builder) {
super(builder);
this.nodeQueryParams = builder.uriParams;
- if(builder.getNodeType().isPresent())
- this.nodeType = builder.getNodeType().get();
+ if(builder.getNodeType().isPresent()) {
+ this.nodeType = builder.getNodeType().get();
+ }
this.dbEngine = builder.getDbEngine();
this.vertices = builder.getVertices();
query = startPrefix + query;
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Converted to gremlin query without the start vertices \n {}", query);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Converted to gremlin query without the start vertices \n {}", query);
}
return new Pair<>(query, params);
metricLog.post();
- //LOGGER.info("Completed");
-
} catch (AAIException e) {
// send error response
ex = e;
fromAppId = getFromAppId(headers);
getTransId(headers);
- String realTime = headers.getRequestHeaders().getFirst("Real-Time");
+
// only consider header value for search
final SchemaVersion version = new SchemaVersion(versionParam);
.setDbEngine(dbEngine).setLoader(loader).setUrlBuilder(urlBuilder));
metricLog.post();
- //LOGGER.info("Completed");
} catch (AAIException e) {
// send error response
*/
package org.onap.aai.rest.util;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
-
-import org.onap.aai.util.AAIConstants;
-
public class ConvertQueryPropertiesToJson {
- private final static int maxfilesize = 256000;
+ private static final int MAX_FILE_SIZE = 256000;
private void addStart( StringBuilder sb ) {
sb.append("{\n \"stored-queries\":[{\n");
private List<String> findRqdProperties( String query) {
String[] parts = query.split("getVerticesByProperty");
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
if ( parts.length == 1 )
return result;
int count = 0;
public String convertProperties( Properties props ) {
Enumeration<?> e = props.propertyNames();
- StringBuilder sb = new StringBuilder(maxfilesize);
+ StringBuilder sb = new StringBuilder(MAX_FILE_SIZE);
String queryName;
String query;
addStart( sb );
protected static String authPolicyFunctionName = "util";
- public static final String echoPath = "/echo";
+ public static final String ECHO_PATH = "/echo";
/**
* Simple health-check API that echos back the X-FromAppId and X-TransactionId to clients.
*/
@GET
@Produces( { MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
- @Path(echoPath)
+ @Path(ECHO_PATH)
public Response echoResult(@Context HttpHeaders headers, @Context HttpServletRequest req,
@QueryParam("action") String myAction) {
- Response response = null;
-
AAIException ex = null;
- String fromAppId = null;
- String transId = null;
+ Response response;
+ String fromAppId;
+ String transId;
try {
fromAppId = getFromAppId(headers );
transId = getTransId(headers);
} catch (AAIException e) {
- ArrayList<String> templateVars = new ArrayList<String>();
+ ArrayList<String> templateVars = new ArrayList<>();
templateVars.add("PUT uebProvider");
templateVars.add("addTopic");
return Response
try {
- HashMap<AAIException, ArrayList<String>> exceptionList = new HashMap<AAIException, ArrayList<String>>();
+ HashMap<AAIException, ArrayList<String>> exceptionList = new HashMap<>();
- ArrayList<String> templateVars = new ArrayList<String>();
+ ArrayList<String> templateVars = new ArrayList<>();
templateVars.add(fromAppId);
templateVars.add(transId);
} catch (Exception e) {
ex = new AAIException("AAI_4000", e);
- ArrayList<String> templateVars = new ArrayList<String>();
+ ArrayList<String> templateVars = new ArrayList<>();
templateVars.add(Action.GET.name());
templateVars.add(fromAppId +" "+transId);
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.att.eelf.configuration.EELFManager;
import org.eclipse.jetty.util.security.Password;
import org.onap.aai.Profiles;
import org.onap.aai.util.AAIConstants;
import javax.annotation.PostConstruct;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Base64;
String usernamePassword = null;
String accessType = null;
- try {
- String [] userAccessType = str.split(",");
+ String [] userAccessType = str.split(",");
- if(userAccessType == null || userAccessType.length != 2){
- throw new RuntimeException("Please check the realm.properties file as it is not conforming to the basic auth");
- }
+ if(userAccessType.length != 2){
+ throw new RuntimeException("Please check the realm.properties file as it is not conforming to the basic auth");
+ }
- usernamePassword = userAccessType[0];
- accessType = userAccessType[1];
+ usernamePassword = userAccessType[0];
+ accessType = userAccessType[1];
- String[] usernamePasswordArray = usernamePassword.split(":");
+ String[] usernamePasswordArray = usernamePassword.split(":");
- if(usernamePasswordArray == null || usernamePasswordArray.length != 3){
- throw new RuntimeException("This username / pwd is not a valid entry in realm.properties");
- }
+ if(usernamePasswordArray.length != 3){
+ throw new RuntimeException("This username / pwd is not a valid entry in realm.properties");
+ }
- String username = usernamePasswordArray[0];
- String password = null;
+ String username = usernamePasswordArray[0];
+ String password = null;
- if(str.contains("OBF:")){
- password = usernamePasswordArray[1] + ":" + usernamePasswordArray[2];
- password = Password.deobfuscate(password);
- }
+ if(str.contains("OBF:")){
+ password = usernamePasswordArray[1] + ":" + usernamePasswordArray[2];
+ password = Password.deobfuscate(password);
+ }
- bytes = ENCODER.encode((username + ":" + password).getBytes("UTF-8"));
+ bytes = ENCODER.encode((username + ":" + password).getBytes(StandardCharsets.UTF_8));
- authorizedUsers.put(new String(bytes), accessType);
+ authorizedUsers.put(new String(bytes), accessType);
- } catch (UnsupportedEncodingException e)
- {
- logger.error("Unable to support the encoding of the file" + basicAuthFile);
- }
authorizedUsers.put(new String(ENCODER.encode(bytes)), accessType);
});
Objects.ensureNotNull(map);
- Map<String, Object> modifiedMap = new HashMap<String, Object>();
+ Map<String, Object> modifiedMap = new HashMap<>();
convertKeys(map, modifiedMap);
return modifiedMap;
key = converter.convert(key);
Object value = entry.getValue();
if(value instanceof Map){
- modified.put(key, convertKeys((Map<String, Object>)value, new HashMap<String, Object>()));
+ modified.put(key, convertKeys((Map<String, Object>) value, new HashMap<>()));
} else if(value instanceof List){
modified.put(key, convertKeys((List<Object>) value));
} else {
public List<Object> convertKeys(List<Object> list){
- List<Object> modifiedList = new ArrayList<Object>();
- if(list != null && list.size() > 0){
+ List<Object> modifiedList = new ArrayList<>();
+ if(list != null && !list.isEmpty()){
for(Object o : list){
if(o instanceof Map){
package org.onap.aai.util;
import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.nio.charset.Charset;
+import java.util.*;
import java.util.Map.Entry;
-import java.util.UUID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
HashMap<String, List<Introspector>> widgetToRelationship = new HashMap<>();
for (Entry<String, Introspector> aaiResEnt : loader.getAllObjects().entrySet()) {
- Introspector meObject = loader.introspectorFromName("model");
+ Introspector meObject;
// no need for a ModelVers DynamicEntity
Introspector aaiRes = aaiResEnt.getValue();
File f = new File(filePathString);
if (f.exists()) {
System.out.println(f.toString());
- String json = FileUtils.readFileToString(f);
+ String json = FileUtils.readFileToString(f, Charset.defaultCharset());
meObject = loader.unmarshal("Model", json);
String modelInvariantId = meObject.getValue("model-invariant-id");
if (meObject.hasProperty("model-vers")) {
Introspector modelVers = meObject.getWrappedValue("model-vers");
- List<Introspector> modelVerList = (List<Introspector>) modelVers.getWrappedListValue("model-ver");
+ List<Introspector> modelVerList = modelVers.getWrappedListValue("model-ver");
for (Introspector modelVer : modelVerList) {
- List<Introspector> relList = new ArrayList<Introspector>();
+ List<Introspector> relList = new ArrayList<>();
Introspector widgetRelationship = makeWidgetRelationship(loader, modelInvariantId,
modelVer.getValue("model-version-id").toString());
relList.add(widgetRelationship);
//source vnf-id, related service-instance-id, all related vnfs in this service-instance-id
//this should be abstracted and moved to a file
- HashMap<String, List<Introspector>> relationshipMap = new HashMap<String, List<Introspector>>();
-
List<Introspector> genericVnfRelationship = widgetToRelationship.get("generic-vnf");
List<Introspector> vserverRelationship = widgetToRelationship.get("vserver");
List<Introspector> tenantRelationship = widgetToRelationship.get("tenant");
System.exit(0);
- }
- private static List<Introspector> getRels(String widgetName, HashMap<String, Introspector> widgetToRelationship) {
- List<Introspector> relList = new ArrayList<Introspector>();
- Introspector genericVnfRelationship = widgetToRelationship.get(widgetName);
- relList.add(genericVnfRelationship);
- return relList;
}
private static Introspector setupNQElements (Introspector nqeObj, List<Introspector> listOfRelationships) {
} else {
newNQElements = nqeObj.newIntrospectorInstanceOfProperty("named-query-elements");
nqeObj.setValue("named-query-elements", newNQElements.getUnderlyingObject());
- nqElementList = (List<Object>)newNQElements.getValue("named-query-element");
+ nqElementList = newNQElements.getValue("named-query-element");
}
newNQElement = loadNQElement(newNQElements, listOfRelationships);
- nqElementList.add(newNQElement.getUnderlyingObject());
+ if (newNQElement != null) {
+ nqElementList.add(newNQElement.getUnderlyingObject());
+ }
} catch (AAIUnknownObjectException e) {
logger.info("AAIUnknownObjectException in MakeNamedQuery.setupNQElements() "+e);
Introspector newNqElement = null;
try {
newNqElement = nqElements.getLoader().introspectorFromName("named-query-element");
-
+
//newNqElement.setValue("named-query-element-uuid", UUID.randomUUID().toString());
Introspector newRelationshipList = newNqElement.getLoader().introspectorFromName("relationship-list");
newNqElement.setValue("relationship-list", newRelationshipList.getUnderlyingObject());
- List<Object> newRelationshipListList = (List<Object>)newRelationshipList.getValue("relationship");
+ List<Object> newRelationshipListList = newRelationshipList.getValue("relationship");
for (Introspector rel : listOfRelationships) {
newRelationshipListList.add(rel.getUnderlyingObject());
try {
newRelationship = loader.introspectorFromName("relationship");
- List<Object> newRelationshipData = (List<Object>)newRelationship.getValue("relationship-data");
+ List<Object> newRelationshipData = newRelationship.getValue("relationship-data");
newRelationship.setValue("related-to", "model");
Code Review / aai / traversal.git / commitdiff