From 280f8015d06af1f41a3ef12e8300801c7a5e0d54 Mon Sep 17 00:00:00 2001 From: AviZi Date: Fri, 9 Jun 2017 02:39:56 +0300 Subject: [SDC-29] Amdocs OnBoard 1707 initial commit. Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370 Signed-off-by: AviZi --- .../openecomp-facade-api/pom.xml | 16 +++++----- .../openecomp-facade-api/pom.xml.versionsBackup | 35 ++++++++++++++++++++++ .../core/factory/api/AbstractFactory.java | 2 +- .../core/factory/impl/AbstractFactoryBase.java | 25 ++++------------ 4 files changed, 49 insertions(+), 29 deletions(-) create mode 100644 openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml.versionsBackup (limited to 'openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api') diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml index b71c0b957e..4e15df1202 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml @@ -2,29 +2,29 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + openecomp-facade-api + openecomp-facade-api + org.openecomp.core + org.openecomp.sdc openecomp-sdc-lib 1.1.0-SNAPSHOT - ../../.. + ../../../ - openecomp-facade-api - openecomp-facade-api - - - org.openecomp.sdc + org.openecomp.core openecomp-utilities-lib ${project.version} - org.openecomp.sdc + org.openecomp.core openecomp-common-lib ${project.version} - \ No newline at end of file + diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml.versionsBackup b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml.versionsBackup new file mode 100644 index 0000000000..be88b2799a --- /dev/null +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml.versionsBackup @@ -0,0 +1,35 @@ + + 4.0.0 + + openecomp-facade-api + openecomp-facade-api + org.openecomp.core + + + org.openecomp.sdc + openecomp-sdc-lib + 1.0-SNAPSHOT + ../../.. + + + + + + org.openecomp.core + openecomp-utilities-lib + ${project.version} + + + org.openecomp.core + openecomp-common-lib + ${project.version} + + + org.openecomp.core + openecomp-utilities-lib + 1.0-SNAPSHOT + + + + \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/src/main/java/org/openecomp/core/factory/api/AbstractFactory.java b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/src/main/java/org/openecomp/core/factory/api/AbstractFactory.java index 53b8f00fc0..12956417dd 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/src/main/java/org/openecomp/core/factory/api/AbstractFactory.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/src/main/java/org/openecomp/core/factory/api/AbstractFactory.java @@ -54,7 +54,7 @@ import org.openecomp.core.factory.impl.AbstractFactoryBase; * static { * registerFactory(ConcreteFactory.class, BaselineFactoryImpl.class); * } - * public static ConcreteFactory getInstance() { + * public static ConcreteFactory getInstance() { * return AbstractFactory.<IUnknown, ConcreteFactory.class>getInstance(ConcreteFactory.class); * } * } 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 e19d9e972f..9353de662b 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 @@ -20,6 +20,7 @@ package org.openecomp.core.factory.impl; + import static org.openecomp.core.utilities.CommonMethods.isEmpty; import static org.openecomp.core.utilities.CommonMethods.newInstance; @@ -27,20 +28,16 @@ import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; - import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -/** - * The type Abstract factory base. - */ 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. + * types to allow unloading of those classes from memory by garbage collector if factory is not + * actually used. */ private static Map registry = new ConcurrentHashMap(); @@ -51,8 +48,8 @@ public abstract class AbstractFactoryBase { new ConcurrentHashMap(); /** - * Registers implementor for an abstract factory. The method accepts Java classes rather - * then class names to ensure type safety at compilation time. + * Registers implementor for an abstract factory. The method accepts Java classes rather then + * class names to ensure type safety at compilation time. * * @param Java interface type instantiated by abstract factory * @param Type specific abstract factory for concrete Java interface @@ -78,12 +75,6 @@ public abstract class AbstractFactoryBase { registry.put(factory.getName(), impl.getName()); } // registerFactory - /** - * Register factory. - * - * @param factoryName the factory name - * @param implName the impl name - */ // TODO: Remove protected static void registerFactory(String factoryName, String implName) { registry.put(factoryName, implName); @@ -197,15 +188,9 @@ public abstract class AbstractFactoryBase { } } - /** - * Init. - */ protected void init() { } - /** - * Stop. - */ protected void stop() { } -- cgit 1.2.3-korg