From 71b9e84b987f2b1bb8981ddc4270bf15d5d5675b Mon Sep 17 00:00:00 2001 From: vasraz Date: Fri, 28 Feb 2020 09:42:16 +0000 Subject: Fix broken unit tests in catalog-be Change-Id: I9a90a219a6eaec832660e01a359f034060e803c3 Signed-off-by: Vasyl Razinkov Issue-ID: SDC-2783 --- .../openecomp/sdc/be/components/impl/ResponseFormatManager.java | 8 -------- .../sdc/be/components/impl/aaf/RoleAuthorizationHandler.java | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'catalog-be/src/main/java/org/openecomp') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResponseFormatManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResponseFormatManager.java index 27adf93516..2cb03fe2ed 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResponseFormatManager.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResponseFormatManager.java @@ -38,14 +38,6 @@ public class ResponseFormatManager { private static final Logger log = Logger.getLogger(ResponseFormatManager.class); public static ResponseFormatManager getInstance() { - if (instance == null) { - - instance = init(); - } - return instance; - } - - private static synchronized ResponseFormatManager init() { if (instance == null) { instance = new ResponseFormatManager(); configurationManager = ConfigurationManager.getConfigurationManager(); diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/RoleAuthorizationHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/RoleAuthorizationHandler.java index 859872f5f3..b963cf6135 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/RoleAuthorizationHandler.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/RoleAuthorizationHandler.java @@ -39,7 +39,7 @@ public class RoleAuthorizationHandler { private static final Logger log = Logger.getLogger(RoleAuthorizationHandler.class); - private ConfigurationManager configurationManager = ConfigurationManager.getConfigurationManager(); + private final ConfigurationManager configurationManager = ConfigurationManager.getConfigurationManager(); @Before("@annotation(permissions)") public void authorizeRole(JoinPoint joinPoint, PermissionAllowed permissions) { -- cgit 1.2.3-korg