fix sonar

src/main/java/com/viettel/campaign/job/CampaignJob.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Slf4j
 public class CampaignJob {
 
-    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss");
+    private SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss");
     private static final String CUSTOMER_INACTIVE_DUARATION =  "CUSTOMER_INACTIVE_DUARATION";
     private static final String CRON_EXPRESSION_CHECK_START =  "CRON_EXPRESSION_CHECK_START";
     private static final String CRON_EXPRESSION_CHECK_END =  "CRON_EXPRESSION_CHECK_END";

src/main/java/com/viettel/campaign/model/ccms_full/CustomerContact.java

@@ -15,7 +15,7 @@ import java.util.Date;
 public class CustomerContact implements Serializable {
     @Id
     @Basic(optional = false)
-    @GeneratedValue(generator = "customer_contact_seq", strategy = GenerationType.IDENTITY)
+    @GeneratedValue(generator = "customer_contact_seq")
     @SequenceGenerator(name = "customer_contact_seq", sequenceName = "customer_contact_seq", allocationSize = 1)
     @NotNull
     @Column(name = "CONTACT_ID")

src/main/java/com/viettel/campaign/model/ccms_full/CustomizeFields.java

 package com.viettel.campaign.model.ccms_full;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
@@ -67,8 +64,10 @@ public class CustomizeFields implements Serializable {
     @Column(name = "ACTIVE")
     private Long active;
 
-    public CustomizeFields(String type, String title) {
+    public CustomizeFields(@NotNull String type, @NotNull String title) {
         this.type = type;
         this.title = title;
     }
+
+
 }

src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignExecuteRepositoryImp.java

@@ -301,9 +301,9 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 if (!"AGENT".equals(dto.getRoleUser())) { // ko phải nhân viên
                     ContactCustResultDTO.setEnableEdit(true);
                 } else {
-                    if ("2".equals(ContactCustResultDTO.getRecordStatus())) {// là nhân viên thường
+                    if (2 == ContactCustResultDTO.getRecordStatus()) {// là nhân viên thường
                         ContactCustResultDTO.setEnableEdit(true);
-                    } else if ("1".equals(ContactCustResultDTO.getRecordStatus()) && isLower24Hour(ContactCustResultDTO.getCreateTime())) {
+                    } else if (1 == ContactCustResultDTO.getRecordStatus() && isLower24Hour(ContactCustResultDTO.getCreateTime())) {
                         ContactCustResultDTO.setEnableEdit(true);
                     } else {
                         ContactCustResultDTO.setEnableEdit(false);
@@ -439,8 +439,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
             logger.error(e.getMessage(), e);
         } finally {
             session.close();
-            return list;
         }
+        return list;
     }
 
     @Override

src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignRepositoryImpl.java

@@ -57,8 +57,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         ResultDTO result = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+        Session session = null;
 
         if (DataUtil.isNullOrEmpty(requestDto.getCompanySiteId())) {
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -66,6 +65,9 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             return result;
         }
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
+
             StringBuilder sb = new StringBuilder();
 
             sb.append(" SELECT");
@@ -256,8 +258,10 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             result.setDescription(Constants.ApiErrorDesc.ERROR);
             logger.error(ex.getMessage(), ex);
         } finally {
+            if(null != session) {
                 session.close();
             }
+        }
         return result;
     }
 
@@ -267,8 +271,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         ResultDTO result = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+        Session session = null;
 
         if (DataUtil.isNullOrEmpty(requestDto.getCompanySiteId())) {
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -276,6 +279,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             return result;
         }
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
             StringBuilder sb = new StringBuilder();
 //            sb.append(" SELECT CAMPAIGN_ID campaignId, " +
 //                    "       CAMPAIGN_CODE campaignCode, " +
@@ -343,7 +348,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
             result.setDescription(Constants.ApiErrorDesc.ERROR);
         } finally {
-            session.close();
+            if(session != null) session.close();
         }
         return result;
     }
@@ -353,9 +358,10 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         logger.info("Start search max campaign code index::");
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+        Session session = null;
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
             //StringBuilder sb = new StringBuilder();
             //sb.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "get-max-campaign-code-index"));
             StringBuilder sb = new StringBuilder();
@@ -373,6 +379,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             }
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
+        }finally {
+            if(session != null) session.close();
         }
         return null;
     }
@@ -779,8 +787,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
         } finally {
             session.close();
-            return resultDTO;
         }
+        return resultDTO;
     }
 
     @Override