import java.io.UnsupportedEncodingException;
import java.nio.file.Files;
import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
LOGGER.debug("Reading from " + globalAuthFileName);
String authFile = new String(Files.readAllBytes(Paths.get(globalAuthFileName)));
- JsonParser parser = new JsonParser();
- JsonObject authObject = parser.parse(authFile).getAsJsonObject();
+ JsonObject authObject = JsonParser.parseString(authFile).getAsJsonObject();
if (authObject.has("roles")) {
JsonArray roles = authObject.getAsJsonArray("roles");
for (JsonElement role : roles) {
Method extension = clazz.getMethod(methodName, new Class[] {AAIExtensionMap.class});
if (extension != null) {
- Object ret = extension.invoke(clazz.newInstance(), aaiExtMap);
+ Object ret = extension.invoke(clazz.getDeclaredConstructor().newInstance(), aaiExtMap);
if (ret instanceof Integer) {
Exception e = null;
}
if (errorCallback != null) {
- errorCallback.invoke(clazz.newInstance(), aaiExtMap);
+ errorCallback.invoke(clazz.getDeclaredConstructor().newInstance(), aaiExtMap);
} else {
Method defaultErrorCallbackExtension =
clazz.getMethod(defaultErrorCallback, new Class[] {AAIExtensionMap.class});
- defaultErrorCallbackExtension.invoke(clazz.newInstance(), aaiExtMap);
+ defaultErrorCallbackExtension.invoke(clazz.getDeclaredConstructor().newInstance(),
+ aaiExtMap);
}
}
}
Class<?> clazz = this.getClass(name);
if (this.isListType(name) && result == null) {
try {
- this.set(convertedName, clazz.newInstance());
+ this.set(convertedName, clazz.getDeclaredConstructor().newInstance());
result = this.get(convertedName);
- } catch (DynamicException | InstantiationException | IllegalAccessException e) {
+ } catch (DynamicException | InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {
LOGGER.warn(e.getMessage(), e);
}
}
Class<?> clazz = this.getClass(name);
if (this.isListType(name) && value == null) {
try {
- this.set(convertedName, clazz.newInstance());
+ this.set(convertedName, clazz.getDeclaredConstructor().newInstance());
value = this.get(convertedName);
- } catch (DynamicException | InstantiationException | IllegalAccessException e) {
+ } catch (DynamicException | InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {
LOGGER.warn(e.getMessage(), e);
}
}
Class<?> clazz = this.getClass(name);
if (isListType && value == null) {
try {
- this.set(convertedName, clazz.newInstance());
+ this.set(convertedName, clazz.getDeclaredConstructor().newInstance());
value = this.get(convertedName);
- } catch (DynamicException | InstantiationException | IllegalAccessException e) {
+ } catch (DynamicException | InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {
LOGGER.warn(e.getMessage(), e);
}
}
package org.onap.aai.introspection;
import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
import java.util.List;
import java.util.Map;
import java.util.Set;
@Override
public Object newInstanceOfProperty(String name) {
try {
- return this.getClass(name).newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
+ return this.getClass(name).getDeclaredConstructor().newInstance();
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
+ | NoSuchMethodException | SecurityException e) {
return null;
}
}
@Override
public Object newInstanceOfNestedProperty(String name) {
try {
- return this.getGenericTypeClass(name).newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
+ return this.getGenericTypeClass(name).getDeclaredConstructor().newInstance();
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
+ | NoSuchMethodException | SecurityException e) {
return null;
}
}
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
if (val != null) {
// this is because the index is registered as an Integer
if (val.getClass().equals(Long.class)) {
- this.vertexHas(key, new Integer(val.toString()));
+ this.vertexHas(key, Integer.valueOf(val.toString()));
} else {
this.vertexHas(key, val);
}
}
// this is because the index is registered as an Integer
if (val.getClass().equals(Long.class)) {
- this.vertexHas(prop, new Integer(val.toString()));
+ this.vertexHas(prop, Integer.valueOf(val.toString()));
} else {
this.vertexHas(prop, val);
}
protected Object correctObjectType(Object obj) {
if (obj != null && obj.getClass().equals(Long.class)) {
- return new Integer(obj.toString());
+ return Integer.valueOf(obj.toString());
}
return obj;
if (value != null) {
if (!value.equals(oldValue)) {
if (propertyType.toLowerCase().contains(".long")) {
- v.property(dbProperty, new Integer(((Long) value).toString()));
+ v.property(dbProperty, Integer.valueOf(((Long) value).toString()));
} else {
v.property(dbProperty, value);
}
package org.onap.aai.serialization.queryformats;
-import com.google.gson.*;
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
import java.io.UnsupportedEncodingException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
public class Aggregate extends MultiFormatMapper {
private static final Logger LOGGER = LoggerFactory.getLogger(LifecycleFormat.class);
- protected JsonParser parser = new JsonParser();
protected final DBSerializer serializer;
protected final Loader loader;
protected final UrlBuilder urlBuilder;
}
final String json = obj.marshal(false);
- return Optional.of(parser.parse(json).getAsJsonObject());
+ return Optional.of(JsonParser.parseString(json).getAsJsonObject());
} catch (AAIUnknownObjectException e) {
return Optional.empty();
}
private final GraphSONMapper mapper =
GraphSONMapper.build().addRegistry(JanusGraphIoRegistry.getInstance()).create();
private final GraphSONWriter writer = GraphSONWriter.build().mapper(mapper).create();
- protected JsonParser parser = new JsonParser();
@Override
public Optional<JsonObject> formatObject(Object v) {
logger.debug("GraphSON writeVertex error : {}", e.getMessage());
}
- JsonObject jsonObject = parser.parse(result).getAsJsonObject();
+ JsonObject jsonObject = JsonParser.parseString(result).getAsJsonObject();
if (jsonObject != null) {
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.onap.aai.db.props.AAIProperties;
import org.onap.aai.introspection.Loader;
import org.onap.aai.serialization.db.DBSerializer;
protected static final String RELATED_TO = "related-to";
protected static final String NODE_ACTIONS = "node-actions";
- protected JsonParser parser = new JsonParser();
protected final DBSerializer serializer;
protected final Loader loader;
protected final UrlBuilder urlBuilder;
public class IdURL extends MultiFormatMapper {
private final UrlBuilder urlBuilder;
- private final JsonParser parser;
private final Loader loader;
public IdURL(Loader loader, UrlBuilder urlBuilder) throws AAIException {
this.urlBuilder = urlBuilder;
- this.parser = new JsonParser();
this.loader = loader;
}
public IdURL(Builder builder) throws AAIException {
this.urlBuilder = builder.getUrlBuilder();
- this.parser = new JsonParser();
this.loader = builder.getLoader();
this.isTree = builder.isTree();
}
final String json = searchResult.marshal(false);
- return Optional.of(parser.parse(json).getAsJsonObject());
+ return Optional.of(JsonParser.parseString(json).getAsJsonObject());
} catch (AAIUnknownObjectException e) {
throw new RuntimeException("Fatal error - result-data object does not exist!");
public final class PathedURL extends MultiFormatMapper {
private final UrlBuilder urlBuilder;
- private final JsonParser parser;
private final Loader loader;
private boolean includeUrl = false;
public PathedURL(Loader loader, UrlBuilder urlBuilder) throws AAIException {
this.urlBuilder = urlBuilder;
- this.parser = new JsonParser();
this.loader = loader;
}
public PathedURL(Builder builder) {
this.urlBuilder = builder.getUrlBuilder();
- this.parser = new JsonParser();
this.loader = builder.getLoader();
this.isTree = builder.isTree();
this.includeUrl = builder.isIncludeUrl();
searchResult.setValue("resource-version", v.value(AAIProperties.RESOURCE_VERSION));
final String json = searchResult.marshal(false);
- return Optional.of(this.parser.parse(json).getAsJsonObject());
+ return Optional.of(JsonParser.parseString(json).getAsJsonObject());
} catch (AAIUnknownObjectException e) {
throw new RuntimeException("Fatal error - result-data does not exist!", e);
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
import java.util.Collections;
import java.util.Iterator;
import org.onap.aai.serialization.queryformats.utils.UrlBuilder;
public class RawFormat extends MultiFormatMapper {
- protected JsonParser parser = new JsonParser();
protected final DBSerializer serializer;
protected final Loader loader;
protected final UrlBuilder urlBuilder;
private final Loader loader;
private final DBSerializer serializer;
- private final JsonParser parser;
private final UrlBuilder urlBuilder;
private final boolean includeUrl;
private final boolean nodesOnly;
private final boolean isSkipRelatedTo;
public Resource(Builder builder) {
- this.parser = new JsonParser();
this.loader = builder.getLoader();
this.serializer = builder.getSerializer();
this.urlBuilder = builder.getUrlBuilder();
final String json = obj.marshal(false);
- return Optional.of(getParser().parse(json).getAsJsonObject());
+ return Optional.of(JsonParser.parseString(json).getAsJsonObject());
} catch (AAIUnknownObjectException e) {
return Optional.empty();
}
return serializer;
}
- private JsonParser getParser() {
- return parser;
- }
-
public static class Builder implements NodesOnly<Builder>, Depth<Builder>, AsTree<Builder> {
private final Loader loader;
package org.onap.aai.serialization.queryformats;
import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
import java.util.List;
import java.util.Map;
import org.onap.aai.util.AAIConfig;
public class ResourceWithSoT extends MultiFormatMapper {
- protected JsonParser parser = new JsonParser();
protected final DBSerializer serializer;
protected final Loader loader;
protected final UrlBuilder urlBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
}
final String json = obj.marshal(false);
- return Optional.of(parser.parse(json).getAsJsonObject());
+ return Optional.of(JsonParser.parseString(json).getAsJsonObject());
} catch (AAIUnknownObjectException e) {
return Optional.empty();
}
import com.google.gson.JsonParser;
import java.io.UnsupportedEncodingException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
public class TreeFormat extends MultiFormatMapper {
private static final EELFLogger TREE_FORMAT_LOGGER = EELFManager.getInstance().getLogger(TreeFormat.class);
- protected JsonParser parser = new JsonParser();
protected final DBSerializer serializer;
protected final Loader loader;
protected final UrlBuilder urlBuilder;
final String json = obj.marshal(false);
- return Optional.of(getParser().parse(json).getAsJsonObject());
+ return Optional.of(JsonParser.parseString(json).getAsJsonObject());
} catch (AAIUnknownObjectException e) {
return Optional.empty();
}
return serializer;
}
- private JsonParser getParser() {
- return parser;
- }
-
@Override
protected Optional<JsonObject> getJsonFromVertex(Vertex input, Map<String, List<String>> properties)
throws AAIFormatVertexException {
import com.sun.jersey.api.client.ClientResponse;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.security.KeyManagementException;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
* @return single instance of RestController
* @throws IllegalAccessException the illegal access exception
* @throws InstantiationException the instantiation exception
+ * @throws SecurityException
+ * @throws NoSuchMethodException
+ * @throws InvocationTargetException
+ * @throws IllegalArgumentException
*/
- public <T> T getInstance(Class<T> clazz) throws IllegalAccessException, InstantiationException {
- return clazz.newInstance();
+ public <T> T getInstance(Class<T> clazz) throws IllegalAccessException, InstantiationException,
+ IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
+ return clazz.getDeclaredConstructor().newInstance();
}
/**
package org.onap.aai.util;
+import java.lang.reflect.InvocationTargetException;
+
import org.onap.aai.exceptions.AAIException;
public interface RestControllerInterface {
public void Delete(String sourceID, String transId, String path) throws AAIException;
- public <T> T getInstance(Class<T> clazz) throws IllegalAccessException, InstantiationException;
+ public <T> T getInstance(Class<T> clazz) throws IllegalAccessException, InstantiationException,
+ IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException;
public <T> T DoesResourceExist(String resourcePath, String resourceClassName, String fromAppId, String transId);
}
package org.onap.aai;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
import java.io.UnsupportedEncodingException;
import java.net.URI;
-import java.util.*;
-
-import javax.ws.rs.core.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
import org.javatuples.Pair;
import org.mockito.Mockito;
when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
when(uriInfo.getQueryParameters(false)).thenReturn(queryParameters);
- doReturn(null).when(queryParameters).remove(anyObject());
+ doReturn(null).when(queryParameters).remove(any());
when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON);
try {
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
String message = String.format("Unable to find the %s in src/test/resources", fileName);
assertNotNull(message, inputStream);
- String resource = IOUtils.toString(inputStream);
+ String resource = IOUtils.toString(inputStream, Charset.defaultCharset());
inputStream.close();
return resource;
String message = String.format("Unable to find the %s in src/test/resources", fileName);
assertNotNull(message, inputStream);
- String resource = IOUtils.toString(inputStream);
+ String resource = IOUtils.toString(inputStream, Charset.defaultCharset());
inputStream.close();
return resource;
if (cache.containsKey(fileName)) {
resource = cache.get(fileName);
} else {
- resource = IOUtils.toString(inputStream);
+ resource = IOUtils.toString(inputStream, Charset.defaultCharset());
cache.put(fileName, resource);
}
package org.onap.aai.rest;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.junit.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import javax.ws.rs.core.Response;
UEBNotification notification = Mockito.spy(new UEBNotification(ModelType.MOXY, loaderFactory, schemaVersions));
HttpTestUtil httpTestUtil = new HttpTestUtil(queryStyle);
- JsonObject paylaods = new JsonParser().parse(PayloadUtil.getResourcePayload(
- "customer_with_children_and_generic-vnf_with_children_and_edge_between_service-instance_vlan.json"))
- .getAsJsonObject();
- String gvnfPaylaod = paylaods.get("generic-vnf").toString();
- String custPaylaod = paylaods.get("customer").toString();
+ String json = PayloadUtil.getResourcePayload(
+ "customer_with_children_and_generic-vnf_with_children_and_edge_between_service-instance_vlan.json");
+ JsonObject payloads = JsonParser.parseString(json).getAsJsonObject();
+ String gvnfPaylaod = payloads.get("generic-vnf").toString();
+ String custPaylaod = payloads.get("customer").toString();
String gvnfUri = "/aai/v14/network/generic-vnfs/generic-vnf/gvnf";
String custUri = "/aai/v14/business/customers/customer/cust";
String vlanUri = "/aai/v14/network/generic-vnfs/generic-vnf/gvnf/l-interfaces/l-interface/lint/vlans/vlan/vlan";
UEBNotification notification = Mockito.spy(new UEBNotification(ModelType.MOXY, loaderFactory, schemaVersions));
HttpTestUtil httpTestUtil = new HttpTestUtil(queryStyle, notification, AAIProperties.MAXIMUM_DEPTH);
- JsonObject paylaods = new JsonParser()
- .parse(PayloadUtil.getResourcePayload("complex_pserver_with_relation.json")).getAsJsonObject();
- String complexPaylaod = paylaods.get("complex").toString();
- String pserverPaylaod = paylaods.get("pserver").toString();
+ JsonObject payloads = JsonParser
+ .parseString(PayloadUtil.getResourcePayload("complex_pserver_with_relation.json")).getAsJsonObject();
+ String complexPaylaod = payloads.get("complex").toString();
+ String pserverPaylaod = payloads.get("pserver").toString();
String complexUri = "/aai/v14/cloud-infrastructure/complexes/complex/complex-1";
String pserverUri = "/aai/v14/cloud-infrastructure/pservers/pserver/pserver-1";
UEBNotification notification = Mockito.spy(new UEBNotification(ModelType.MOXY, loaderFactory, schemaVersions));
HttpTestUtil httpTestUtil = new HttpTestUtil(queryStyle);
- JsonObject paylaods = new JsonParser().parse(PayloadUtil.getResourcePayload(
- "customer_with_children_and_generic-vnf_with_children_and_edge_between_service-instance_vlan.json"))
- .getAsJsonObject();
- String gvnfPaylaod = paylaods.get("generic-vnf").toString();
- String custPaylaod = paylaods.get("customer").toString();
+ String json = PayloadUtil.getResourcePayload(
+ "customer_with_children_and_generic-vnf_with_children_and_edge_between_service-instance_vlan.json");
+ JsonObject payloads = JsonParser.parseString(json).getAsJsonObject();
+ String gvnfPayload = payloads.get("generic-vnf").toString();
+ String custPayload = payloads.get("customer").toString();
String custUri = "/aai/v14/business/customers/customer/cust";
String ssUri = custUri + "/service-subscriptions/service-subscription/ss";
String siUri = ssUri + "/service-instances/service-instance/si";
// Setup generic vnf
Response response = httpTestUtil.doGet(gvnfUri);
assertEquals("Expecting the generic-vnf to be not found", 404, response.getStatus());
- response = httpTestUtil.doPut(gvnfUri, gvnfPaylaod);
+ response = httpTestUtil.doPut(gvnfUri, gvnfPayload);
assertEquals("Expecting the generic-vnf to be created", 201, response.getStatus());
response = httpTestUtil.doGet(gvnfUri, "all");
assertEquals("Expecting the generic-vnf to be found", 200, response.getStatus());
// Setup customer with service instance relation to vlan
response = httpTestUtil.doGet(custUri);
assertEquals("Expecting the customer to be not found", 404, response.getStatus());
- response = httpTestUtil.doPut(custUri, custPaylaod);
+ response = httpTestUtil.doPut(custUri, custPayload);
assertEquals("Expecting the customer to be created", 201, response.getStatus());
response = httpTestUtil.doGet(custUri, "all");
assertEquals("Expecting the customer to be found", 200, response.getStatus());
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.when;
import java.io.UnsupportedEncodingException;
import java.net.URI;
-import java.util.*;
-
-import javax.ws.rs.core.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
import org.javatuples.Pair;
import org.json.JSONArray;
when(uriInfo.getQueryParameters(false)).thenReturn(queryParameters);
// TODO - Check if this is valid since RemoveDME2QueryParameters seems to be very unreasonable
- Mockito.doReturn(null).when(queryParameters).remove(anyObject());
+ Mockito.doReturn(null).when(queryParameters).remove(any());
when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON);
}
Response response = doRequest(traversalHttpEntry, loader, dbEngine, HttpMethod.GET, uri, content);
dbEngine.commit();
String msg = response.getEntity().toString();
- JsonObject jsonObj = new JsonParser().parse(msg).getAsJsonObject();
+ JsonObject jsonObj = JsonParser.parseString(msg).getAsJsonObject();
String resourceVersion = "";
if (jsonObj.isJsonObject()) {
resourceVersion = jsonObj.get("resource-version").getAsString();
Response response = doRequest(traversalHttpEntry, loader, dbEngine, HttpMethod.GET, uri, content);
dbEngine.commit();
String msg = response.getEntity().toString();
- JsonObject jsonObj = new JsonParser().parse(msg).getAsJsonObject();
+ JsonObject jsonObj = JsonParser.parseString(msg).getAsJsonObject();
String resourceVersion = "";
if (jsonObj.isJsonObject()) {
resourceVersion = jsonObj.get("resource-version").getAsString();
Mockito.when(mockQueryEngine.findDeletable(Mockito.anyList())).thenReturn(vertices);
- Mockito.when(mockSerializer.getLatestVersionView(Mockito.anyObject())).thenReturn(mockIntrospector);
+ Mockito.when(mockSerializer.getLatestVersionView(Mockito.any())).thenReturn(mockIntrospector);
Mockito.when(mockIntrospector.marshal(false)).thenReturn("{\"volume-id\":\"volume-1\"}")
.thenReturn("{\"volume-id\":\"volume-2\"}").thenReturn("{\"volume-id\":\"volume-3\"}")
Mockito.when(mockQueryEngine.findDeletable(Mockito.anyList())).thenReturn(vertices);
- Mockito.when(mockSerializer.getLatestVersionView(Mockito.anyObject()))
+ Mockito.when(mockSerializer.getLatestVersionView(Mockito.any()))
.thenThrow(new RuntimeException("Unable to find node"));
impliedDelete.execute(vserver.id(), "SDNC", "vserver", vertices);
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
private Tree<?> resultTree;
private Path resultPath;
private SchemaVersion version;
- private JsonObject expectedTreeIdFormat = new JsonParser().parse(
+ private JsonObject expectedTreeIdFormat = JsonParser.parseString(
"{\"nodes\":[{\"resource-type\":\"generic-vnf\",\"nodes\":[{\"resource-type\":\"vserver\",\"nodes\":[{\"resource-type\":\"pserver\"}]},{\"resource-type\":\"pserver\",\"nodes\":[{\"resource-type\":\"complex\"}]}]}]}")
.getAsJsonObject();
- private JsonObject expectedPathIdFormat = new JsonParser().parse(
+ private JsonObject expectedPathIdFormat = JsonParser.parseString(
"{\"path\":[{\"resource-type\":\"generic-vnf\"},{\"resource-type\":\"vserver\"},{\"resource-type\":\"pserver\"},{\"resource-type\":\"complex\"}]}")
.getAsJsonObject();
- private JsonObject expectedAsTreeWithResourceFormat = new JsonParser().parse(
+ private JsonObject expectedAsTreeWithResourceFormat = JsonParser.parseString(
"{\"results\":[{\"generic-vnf\":{\"vnf-id\":\"vnf-id-1\",\"vnf-name\":\"vnf-name-1\",\"related-nodes\":[{\"vserver\":{\"vserver-id\":\"vserver-id-1\",\"vserver-name\":\"vserver-name-1\",\"related-nodes\":[{\"pserver\":{\"hostname\":\"hostname-1\"}}]}},{\"pserver\":{\"hostname\":\"hostname-2\",\"related-nodes\":[{\"complex\":{\"physical-location-id\":\"physical-location-id-2\",\"country\":\"US\"}}]}}]}}]}")
.getAsJsonObject();
- private JsonObject expectedAsTreeWithSimpleFormat = new JsonParser().parse(
+ private JsonObject expectedAsTreeWithSimpleFormat = JsonParser.parseString(
"{\"results\":[{\"id\":\"0\",\"node-type\":\"generic-vnf\",\"url\":null,\"properties\":{\"vnf-id\":\"vnf-id-1\",\"vnf-name\":\"vnf-name-1\"},\"related-to\":[{\"id\":\"1\",\"relationship-label\":\"tosca.relationships.HostedOn\",\"node-type\":\"vserver\",\"url\":null},{\"id\":\"5\",\"relationship-label\":\"tosca.relationships.HostedOn\",\"node-type\":\"pserver\",\"url\":null}],\"related-nodes\":[{\"id\":\"1\",\"node-type\":\"vserver\",\"url\":null,\"properties\":{\"vserver-id\":\"vserver-id-1\",\"vserver-name\":\"vserver-name-1\"},\"related-to\":[{\"id\":\"0\",\"relationship-label\":\"tosca.relationships.HostedOn\",\"node-type\":\"generic-vnf\",\"url\":null},{\"id\":\"2\",\"relationship-label\":\"tosca.relationships.HostedOn\",\"node-type\":\"pserver\",\"url\":null}],\"related-nodes\":[{\"id\":\"2\",\"node-type\":\"pserver\",\"url\":null,\"properties\":{\"hostname\":\"hostname-1\"},\"related-to\":[{\"id\":\"1\",\"relationship-label\":\"tosca.relationships.HostedOn\",\"node-type\":\"vserver\",\"url\":null},{\"id\":\"3\",\"relationship-label\":\"org.onap.relationships.inventory.LocatedIn\",\"node-type\":\"complex\",\"url\":null}]}]},{\"id\":\"5\",\"node-type\":\"pserver\",\"url\":null,\"properties\":{\"hostname\":\"hostname-2\"},\"related-to\":[{\"id\":\"0\",\"relationship-label\":\"tosca.relationships.HostedOn\",\"node-type\":\"generic-vnf\",\"url\":null},{\"id\":\"6\",\"relationship-label\":\"org.onap.relationships.inventory.LocatedIn\",\"node-type\":\"complex\",\"url\":null}],\"related-nodes\":[{\"id\":\"6\",\"node-type\":\"complex\",\"url\":null,\"properties\":{\"physical-location-id\":\"physical-location-id-2\",\"country\":\"US\"},\"related-to\":[{\"id\":\"5\",\"relationship-label\":\"org.onap.relationships.inventory.LocatedIn\",\"node-type\":\"pserver\",\"url\":null}]}]}]}]}")
.getAsJsonObject();
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
simpleFormat = new RawFormat.Builder(loader, serializer, urlBuilder).nodesOnly(true).depth(0).build();
- when(serializer.dbToObject(anyObject(), anyObject(), anyInt(), anyBoolean(), anyString()))
+ when(serializer.dbToObject(any(), any(), anyInt(), anyBoolean(), anyString()))
.thenThrow(new AAIException("Test Exception"));
simpleFormat.createPropertiesObject(vfModule);
private Vertex v;
private static final String uri = "/test/uri";
- private static final Object vId = new Long(123);
+ private static final Object vId = Long.valueOf(123);
private static final String protocolAndHost = "http://localhost/aai/";
@Before
private static final String ERROR_DISPOSITION = "5";
private static final String ERROR_SEVERITY = "ERROR";
private static final String ERROR_CATEGORY = "4";
- private static final Integer ERROR_HTTP_RESPONSE_CODE = new Integer(401);
+ private static final Integer ERROR_HTTP_RESPONSE_CODE = Integer.valueOf(401);
private static final String ERROR_REST_CODE = "3300";
private static final String ERROR_CODE = "4000";
private static final String ERROR_TEXT = "Test data error";
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.Charset;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
if (passwordStream != null) {
String keystorePassword = null;
- keystorePassword = IOUtils.toString(passwordStream);
+ keystorePassword = IOUtils.toString(passwordStream, Charset.defaultCharset());
if (keystorePassword != null) {
keystorePassword = keystorePassword.trim();
}
public JsonObject getPayload(String filename) throws IOException {
InputStream inputStream = getClass().getClassLoader().getResourceAsStream(filename);
- // InputStream inputStream = new FileInputStream(filename);
-
String result = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
String message = String.format("Unable to find the %s in src/test/resources", filename);
assertNotNull(message, inputStream);
- JsonParser parser = new JsonParser();
- JsonObject payload = parser.parse(result).getAsJsonObject();
+ JsonObject payload = JsonParser.parseString(result).getAsJsonObject();
return payload;
}
Code Review / aai / aai-common.git / commitdiff