summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Arrastia <MArrasti@amdocs.com>2018-06-18 16:13:27 +0100
committerMichael Arrastia <MArrasti@amdocs.com>2018-06-18 16:13:27 +0100
commit68cd3355674d66f8feee3d067960c081581a3911 (patch)
treef5021c82bb3fa7d4109b01a74947895ca6a2778f
parentb348af8ed2c4192f88169b37bf53fa25b8a7a681 (diff)
Fix Fortify scan violation
Change-Id: Ia99b0a9b60b1b4eebfb47640c410f6c684393599 Issue-ID: AAI-1196 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
-rw-r--r--src/main/java/org/onap/crud/dao/champ/ChampDao.java6
-rw-r--r--src/main/java/org/onap/crud/util/CrudJaxbTransformation.java89
2 files changed, 3 insertions, 92 deletions
diff --git a/src/main/java/org/onap/crud/dao/champ/ChampDao.java b/src/main/java/org/onap/crud/dao/champ/ChampDao.java
index c8488ba..65d1d99 100644
--- a/src/main/java/org/onap/crud/dao/champ/ChampDao.java
+++ b/src/main/java/org/onap/crud/dao/champ/ChampDao.java
@@ -132,7 +132,7 @@ public class ChampDao implements GraphDao {
if (!vert.getType().equalsIgnoreCase(type)) {
// We didn't find a vertex with the supplied type, so just throw an
// exception.
- throw new CrudException("No vertex with id " + id + "and type " + type + " found in graph",
+ throw new CrudException("No vertex with id " + id + " and type " + type + " found in graph",
javax.ws.rs.core.Response.Status.NOT_FOUND);
}
return getResult;
@@ -579,10 +579,10 @@ public class ChampDao implements GraphDao {
}
// https://stackoverflow.com/questions/26942330/convert-mapstring-string-to-listnamevaluepair-is-this-the-most-efficient
- private List<NameValuePair> convertToNameValuePair(String key, HashSet<String> values) {
+ private List<NameValuePair> convertToNameValuePair(String k, HashSet<String> values) {
List<NameValuePair> nvpList = new ArrayList<>(values.size());
- values.forEach((value) -> nvpList.add(new BasicNameValuePair(key, value)));
+ values.forEach((v) -> nvpList.add(new BasicNameValuePair(k, v)));
return nvpList;
}
diff --git a/src/main/java/org/onap/crud/util/CrudJaxbTransformation.java b/src/main/java/org/onap/crud/util/CrudJaxbTransformation.java
deleted file mode 100644
index 5e72534..0000000
--- a/src/main/java/org/onap/crud/util/CrudJaxbTransformation.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 Amdocs
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.onap.crud.util;
-
-import org.eclipse.persistence.dynamic.DynamicEntity;
-import org.eclipse.persistence.jaxb.JAXBMarshaller;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.UnmarshallerProperties;
-import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-import javax.ws.rs.core.MediaType;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.transform.stream.StreamSource;
-
-public class CrudJaxbTransformation {
- /**
- * Marshal a dynamic entity into a string.
- *
- * @param entity the dynamic entity
- * @param jaxbContext the dynamic jaxb context
- * @return the marshaled entity
- * @throws RouterException on error
- */
- public static String marshal(MediaType mediaType, final DynamicEntity entity,
- final DynamicJAXBContext jaxbContext) throws JAXBException {
-
- final JAXBMarshaller marshaller = jaxbContext.createMarshaller();
- marshaller.setProperty(JAXBMarshaller.JAXB_FORMATTED_OUTPUT, false);
-
- if (MediaType.APPLICATION_JSON_TYPE.isCompatible(mediaType)) {
- marshaller.setProperty("eclipselink.media-type", "application/json");
- marshaller.setProperty("eclipselink.json.include-root", false);
- marshaller.setProperty(MarshallerProperties.JSON_MARSHAL_EMPTY_COLLECTIONS, Boolean.FALSE);
- }
-
- final StringWriter writer = new StringWriter();
- marshaller.marshal(entity, writer);
- return writer.toString();
-
- }
-
- /**
- * @param type
- * @param json
- * @param mediaType
- * @return
- * @throws JAXBException
- * @throws Exception
- */
- public static Object unmarshal(String javaClass, String content, MediaType mediaType,
- final DynamicJAXBContext jaxbContext) throws JAXBException {
- Object clazz = null;
- Unmarshaller unmarshaller = null;
-
- clazz = jaxbContext.newDynamicEntity(javaClass);
-
- unmarshaller = jaxbContext.createUnmarshaller();
- if (mediaType.equals(MediaType.APPLICATION_JSON_TYPE)) {
- unmarshaller.setProperty(UnmarshallerProperties.MEDIA_TYPE, "application/json");
- unmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
- unmarshaller.setProperty(UnmarshallerProperties.JSON_WRAPPER_AS_ARRAY_NAME, true);
- }
-
- return unmarshaller.unmarshal(new StreamSource(new StringReader(content)),
- clazz.getClass()).getValue();
- }
-
-}