Adding controller exception handling

and fixing code smells

Change-Id: Icd5c64b910eeae0a063466f3f996e0292d02a2f9
Issue-ID: SO-4068
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>

1 files changed, 3 insertions, 2 deletions

diff --git a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-application/src/main/java/org/onap/so/cnfm/lcm/app/DefaultToShortClassNameBeanNameGenerator.java b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-application/src/main/java/org/onap/so/cnfm/lcm/app/DefaultToShortClassNameBeanNameGenerator.java
index 2683b03..b260fc3 100644
--- a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-application/src/main/java/org/onap/so/cnfm/lcm/app/DefaultToShortClassNameBeanNameGenerator.java
+++ b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-application/src/main/java/org/onap/so/cnfm/lcm/app/DefaultToShortClassNameBeanNameGenerator.java
@@ -34,8 +34,9 @@ public class DefaultToShortClassNameBeanNameGenerator extends AnnotationBeanName
 
     @Override
     protected String buildDefaultBeanName(final BeanDefinition definition) {
-        if (definition.getBeanClassName() != null) {
-            return ClassUtils.getShortName(definition.getBeanClassName());
+        final String beanClassName = definition.getBeanClassName();
+        if (beanClassName != null) {
+            return ClassUtils.getShortName(beanClassName);
         }
         logger.warn("Bean class name is not specified...");
         return null;