Fixing sonar qube issues

Fixed minor issue and updated license header in MappingBase file. One major issue warning of converting MappingBase from abstract class to interface has not fixed because it involes changes in lot of other files whereever MappingBase is used or referred.

Change-Id: I5c2fe8d0ec1a21ea0fd931b45f2f9804d81de498
Issue-ID: SDC-343
Signed-off-by: shrikantawachar <shrikant.awachar@amdocs.com>

1 files changed, 6 insertions, 13 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/mapping/MappingBase.java b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/mapping/MappingBase.java
index 25c2be9158..8ae3d30846 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/mapping/MappingBase.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/mapping/MappingBase.java
@@ -1,21 +1,17 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
  * 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.openecomp.sdcrests.mapping;
@@ -53,9 +49,7 @@ public abstract class MappingBase<S, T> {
 
   public final T applyMapping(final S source, Class<T> clazz) {
     T target = (T) instantiateTarget(clazz);
-    if (source == null || target == null) {
-      //TODO: what what?
-    } else {
+    if (source != null && target != null) {
       preMapping(source, target);
       doMapping(source, target);
       postMapping(source, target);
@@ -102,7 +96,6 @@ public abstract class MappingBase<S, T> {
       object = clazz.newInstance();
 
     } catch (InstantiationException | IllegalAccessException exception ) {
-      //TODO: what what?
       MdcDataErrorMessage.createErrorMessageAndUpdateMdc(
           LoggerConstants.TARGET_ENTITY,
           LoggerServiceName.Create_LIMIT.toString(), ErrorLevel.ERROR.name(),