From 054dea4806c2d9a37b4f3cf72510dfbe6d47c6f9 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Mon, 13 Aug 2018 22:09:54 +0530 Subject: Fortify SDC issue Fortify SDC issue Change-Id: I7acf3420080ed4c7045aeda1cb1ff0d31d9b5228 Issue-ID: SDC-1644 Signed-off-by: siddharth0905 --- .../core/factory/impl/AbstractFactoryBase.java | 30 +++++++++++----------- .../configuration/ImplementationConfiguration.java | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'openecomp-be/lib') diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/src/main/java/org/openecomp/core/factory/impl/AbstractFactoryBase.java b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/src/main/java/org/openecomp/core/factory/impl/AbstractFactoryBase.java index cff9da0d5c..9d25a09758 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/src/main/java/org/openecomp/core/factory/impl/AbstractFactoryBase.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/src/main/java/org/openecomp/core/factory/impl/AbstractFactoryBase.java @@ -16,21 +16,20 @@ package org.openecomp.core.factory.impl; - -import org.apache.commons.lang3.StringUtils; -import org.openecomp.sdc.common.errors.CoreException; -import org.openecomp.sdc.common.errors.ErrorCategory; -import org.openecomp.sdc.common.errors.ErrorCode; +import static org.openecomp.core.utilities.CommonMethods.newInstance; import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static org.openecomp.core.utilities.CommonMethods.newInstance; +import org.apache.commons.lang3.StringUtils; +import org.openecomp.sdc.common.errors.CoreException; +import org.openecomp.sdc.common.errors.ErrorCategory; +import org.openecomp.sdc.common.errors.ErrorCode; public abstract class AbstractFactoryBase { - /** + /** * Temporary registry of default implementations. The map keeps class names rather then class * types to allow unloading of those classes from memory by garbage collector if factory is not * actually used. @@ -41,8 +40,9 @@ public abstract class AbstractFactoryBase { * Cached factory instances. */ private static final Map FACTORY_MAP = new ConcurrentHashMap<>(); + public static final String E0001 = "E0001"; - /** + /** * Registers implementor for an abstract factory. The method accepts Java classes rather then * class names to ensure type safety at compilation time. * @@ -55,13 +55,13 @@ public abstract class AbstractFactoryBase { Class impl) { if (factory == null) { throw new CoreException( - new ErrorCode.ErrorCodeBuilder().withId("E0001").withMessage("Mandatory input factory.") + new ErrorCode.ErrorCodeBuilder().withId(E0001).withMessage("Mandatory input factory.") .withCategory(ErrorCategory.SYSTEM).build()); } if (impl == null) { throw new CoreException( - new ErrorCode.ErrorCodeBuilder().withId("E0001").withMessage("Mandatory input impl.") + new ErrorCode.ErrorCodeBuilder().withId(E0001).withMessage("Mandatory input impl.") .withCategory(ErrorCategory.SYSTEM).build()); } if (FACTORY_MAP.containsKey(factory.getName())) { @@ -84,7 +84,7 @@ public abstract class AbstractFactoryBase { public static void unregisterFactory(Class factory) { if (factory == null) { throw new CoreException( - new ErrorCode.ErrorCodeBuilder().withId("E0001").withMessage("Mandatory input factory.") + new ErrorCode.ErrorCodeBuilder().withId(E0001).withMessage("Mandatory input factory.") .withCategory(ErrorCategory.SYSTEM).build()); } @@ -103,7 +103,7 @@ public abstract class AbstractFactoryBase { public static F getInstance(Class factoryType) { if (factoryType == null) { throw new CoreException( - new ErrorCode.ErrorCodeBuilder().withId("E0001") + new ErrorCode.ErrorCodeBuilder().withId(E0001) .withMessage("Mandatory input factory type.").withCategory(ErrorCategory.SYSTEM) .build()); @@ -113,7 +113,7 @@ public abstract class AbstractFactoryBase { // Check for the first time access if (factory == null) { // Synchronize factory instantiation - synchronized (factoryType) { + synchronized (FACTORY_MAP) { // Re-check the factory instance factory = (F) FACTORY_MAP.get(factoryType.getName()); if (factory == null) { @@ -122,7 +122,7 @@ public abstract class AbstractFactoryBase { if (StringUtils.isEmpty(implName)) { throw new CoreException( - new ErrorCode.ErrorCodeBuilder().withId("E0001") + new ErrorCode.ErrorCodeBuilder().withId(E0001) .withMessage("Mandatory input factory implementation.") .withCategory(ErrorCategory.SYSTEM).build()); } @@ -153,7 +153,7 @@ public abstract class AbstractFactoryBase { boolean isFactoryRegistered = false; if (factoryType == null) { throw new CoreException( - new ErrorCode.ErrorCodeBuilder().withId("E0001") + new ErrorCode.ErrorCodeBuilder().withId(E0001) .withMessage("Mandatory input factory type.").withCategory(ErrorCategory.SYSTEM) .build()); } diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/configuration/ImplementationConfiguration.java b/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/configuration/ImplementationConfiguration.java index d95b648bcd..a9a01fe6dd 100644 --- a/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/configuration/ImplementationConfiguration.java +++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/configuration/ImplementationConfiguration.java @@ -28,7 +28,7 @@ import java.util.Map; * @author shiria * @since November 30, 2016. */ -@Config +@Config(key = "") public class ImplementationConfiguration { @Config(key = "enable") Boolean enable = true; -- cgit 1.2.3-korg