ETL Delete Sensible Data Tested

src/main/java/com/bytesw/bytebot/controller/AgentController.java

@@ -7,14 +7,12 @@ import com.bytesw.bytebot.http.FileValidationResponse;
 import com.bytesw.bytebot.service.AgentService;
 import com.bytesw.bytebot.service.FileManagementService;
 import com.bytesw.xdf.annotation.ProgramSecurity;
-import com.bytesw.xdf.multitenant.core.ThreadLocalStorage;
 import com.bytesw.xdf.sql.beans.Pagination;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import io.swagger.annotations.ApiParam;
 
 import java.security.Principal;
-import java.time.LocalDate;
 import java.util.UUID;
 
 import lombok.extern.log4j.Log4j2;

src/main/java/com/bytesw/bytebot/controller/ProviderController.java

 package com.bytesw.bytebot.controller;
 
 import com.bytesw.bytebot.service.provider.TwilioService;
-import com.bytesw.xdf.exception.BusinessExceptionHandler;
 import com.bytesw.xdf.exception.NotFoundException;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang.NullArgumentException;
 import com.twilio.exception.AuthenticationException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.bind.annotation.*;
 import com.google.gson.Gson;
-import org.springframework.web.context.request.WebRequest;
 
-import javax.management.ObjectName;
 import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/com/bytesw/bytebot/etl/batch/factory/reader/DataBaseItemReaderFactory.java

@@ -53,7 +53,6 @@ public class DataBaseItemReaderFactory implements ItemReaderFactory<DynaBean, Ro
         databaseReader.setRowMapper(mapper);
         databaseReader.setSql(query);
 
-        log.debug("DATASOURCE: "+databaseReader.getDataSource());
         return databaseReader;
     }
 

src/main/java/com/bytesw/bytebot/etl/batch/service/ScheduleService.java

 package com.bytesw.bytebot.etl.batch.service;
 
-import com.bytesw.bytebot.etl.batch.beans.*;
+import com.bytesw.bytebot.etl.batch.beans.DeleteDataSensBean;
+import com.bytesw.bytebot.etl.batch.beans.DeleteDataSensControlBean;
+import com.bytesw.bytebot.etl.batch.beans.DynaBean;
+import com.bytesw.bytebot.etl.batch.beans.TenantBatchBean;
 import com.bytesw.bytebot.etl.batch.factory.mapper.RowMapperFactory;
 import com.bytesw.bytebot.etl.batch.factory.reader.DataBaseItemReaderFactory;
 import com.bytesw.bytebot.etl.batch.processor.ConvertToBeanProcessor;
@@ -21,7 +24,6 @@ import com.bytesw.bytebot.repository.AgentRepository;
 import com.bytesw.xdf.multitenant.core.ThreadLocalStorage;
 import com.google.gson.Gson;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.dbcp.BasicDataSource;
 import org.springframework.batch.core.*;
 import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
 import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
@@ -39,7 +41,6 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.stereotype.Service;
 
-import javax.sql.DataSource;
 import java.time.Duration;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
@@ -192,11 +193,9 @@ public class ScheduleService implements SchedulingConfigurer {
         }
 
         Long id = eventHistoryRepository.maxEventId();
-        log.debug("ID: " + id);
         Map<String, Object> params = new HashMap<>();
         params.putAll(tenantFound.get().getDatasource());
         params.put("query", String.format((String) params.get("query"), id != null ? id : 0));
-        log.debug("PARAMS: " + params);
 
         return dataBaseItemReaderFactory.createReader(rowMapperFactory.createMapper(new HashMap<>()), params);
     }

src/main/java/com/bytesw/bytebot/etl/batch/writer/ByteBotJPAWriter.java

@@ -19,7 +19,8 @@ import java.util.List;
 @Log4j2
 public class ByteBotJPAWriter implements ItemWriter<DynaBean>, StepExecutionListener {
 
-    @Getter @Setter
+    @Getter
+    @Setter
     private ProcessMessageService service;
 
     @Override

src/main/java/com/bytesw/bytebot/etl/batch/writer/DataSensibleJPAWriter.java

 package com.bytesw.bytebot.etl.batch.writer;
 
 import com.bytesw.bytebot.etl.batch.beans.DeleteDataSensBean;
-import com.bytesw.bytebot.etl.batch.beans.DeleteDataSensControlBean;
+import com.bytesw.bytebot.etl.batch.beans.DeleteDataSensRegistryBean;
 import com.bytesw.bytebot.etl.batch.beans.DynaBean;
 import com.bytesw.bytebot.etl.dao.DeleteDataSensibleControlRepository;
 import com.bytesw.bytebot.etl.dao.DeleteDataSensibleLogRepository;
@@ -10,11 +10,10 @@ import com.bytesw.bytebot.etl.enums.EventTypeEnum;
 import com.bytesw.bytebot.etl.model.DeleteDataSensibleControl;
 import com.bytesw.bytebot.etl.model.DeleteDataSensibleLog;
 import com.bytesw.bytebot.etl.model.Intent;
+import com.bytesw.bytebot.etl.services.DeleteSensMessageService;
 import com.bytesw.bytebot.etl.utils.JsonUtils;
 import com.bytesw.xdf.exception.NotFoundException;
 import com.bytesw.xdf.multitenant.core.ThreadLocalStorage;
-import com.bytesw.bytebot.etl.services.DeleteSensMessageService;
-import com.jayway.jsonpath.PathNotFoundException;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.log4j.Log4j2;
@@ -22,8 +21,6 @@ import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.StepExecutionListener;
 import org.springframework.batch.item.ItemWriter;
-import com.bytesw.bytebot.etl.batch.beans.DeleteDataSensRegistryBean;
-import org.springframework.beans.BeanUtils;
 
 import javax.transaction.Transactional;
 import java.sql.Timestamp;
@@ -84,23 +81,23 @@ public class DataSensibleJPAWriter implements ItemWriter<DynaBean>, StepExecutio
                         if (!intenId.isPresent()) {
                             throw new Exception("Intent no esta presente");
                         }
-                        try{
+                        try {
                             sender_id = (String) JsonUtils.getFieldFromJson(json, "$.sender_id");
                             log.info(sender_id);
-                        }catch(Exception e){
+                        } catch (Exception e) {
                             log.info(e.getMessage());
                             sender_id = (String) JsonUtils.getFieldFromJson(json, "$.metadata.sender_id");
                         }
 
                         List<DeleteDataSensRegistryBean> deleteSensibleBean = new ArrayList<>();
 
-                        try{
+                        try {
                             deleteSensibleBean = service.deleteMessage(agent.getAgenId()
                                     , SmSMessageSid, intenId.get().getId(), sender_id);
-                        update_control = true;
-                        } catch (NotFoundException e){
                             update_control = true;
-                        } catch (Exception e){
+                        } catch (NotFoundException e) {
+                            update_control = true;
+                        } catch (Exception e) {
                             update_control = false;
                         }
                         for (DeleteDataSensRegistryBean registry : deleteSensibleBean) {
@@ -117,7 +114,7 @@ public class DataSensibleJPAWriter implements ItemWriter<DynaBean>, StepExecutio
             }
             DeleteDataSensibleControl control = new DeleteDataSensibleControl();
             Optional<DeleteDataSensibleControl> controlBd = deleteDataSensibleControlRepository.findEventIdByAgentId(agent.getAgenId());
-            if (update_control){
+            if (update_control) {
                 if (controlBd.isPresent()) {
                     // Update
                     control.setId(controlBd.get().getId());

src/main/java/com/bytesw/bytebot/etl/services/DeleteSensMessageService.java

@@ -2,13 +2,11 @@ package com.bytesw.bytebot.etl.services;
 
 import com.bytesw.bytebot.etl.batch.beans.DeleteDataSensRegistryBean;
 import com.bytesw.bytebot.etl.dao.DeleteDataSensibleControlRepository;
-import com.bytesw.bytebot.etl.model.DeleteDataSensibleLog;
 import com.bytesw.bytebot.service.provider.TwilioService;
 import com.bytesw.xdf.exception.NotFoundException;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -26,26 +24,26 @@ public class DeleteSensMessageService {
     @Autowired
     DeleteDataSensibleControlRepository deleteDataSensibleControlRepository;
 
-    public List<DeleteDataSensRegistryBean> deleteMessage(Long agentId, String SmsMessage, Long inten_id, String sender_id) throws Exception{
+    public List<DeleteDataSensRegistryBean> deleteMessage(Long agentId, String SmsMessage, Long inten_id, String sender_id) throws Exception {
         List<DeleteDataSensRegistryBean> deleteMessages = new ArrayList<DeleteDataSensRegistryBean>();
-        Map<String,Object> data = new HashMap<>();
-        Map<String,Object> params = new HashMap<>();
-        params.put("agent_id",agentId.intValue());
-        try{
-            Map<String,Object> result = new HashMap<>();
-            data = twilioService.generateInfo(SmsMessage,params);
+        Map<String, Object> data = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
+        params.put("agent_id", agentId.intValue());
+        try {
+            Map<String, Object> result = new HashMap<>();
+            data = twilioService.generateInfo(SmsMessage, params);
 
-            if(data.isEmpty()){
+            if (data.isEmpty()) {
                 throw new Exception("Parámetros vacíos");
             }
 
             DeleteDataSensRegistryBean registry = new DeleteDataSensRegistryBean();
 
-            if(data.get("status") != null){
+            if (data.get("status") != null) {
                 List<String> images = new ArrayList<String>();
                 images = (List<String>) data.get("data");
-                for(String image : images){
-                    if (image.trim().isEmpty()){
+                for (String image : images) {
+                    if (image.trim().isEmpty()) {
                         continue;
                     }
                     // Info del Bean
@@ -58,11 +56,11 @@ public class DeleteSensMessageService {
                     deleteMessages.add(registry);
                 }
             }
-            return  deleteMessages;
-        }catch (NotFoundException e){
+            return deleteMessages;
+        } catch (NotFoundException e) {
             log.debug(e);
             throw new NotFoundException(e.getMessage());
-        }catch (Exception e ){
+        } catch (Exception e) {
             log.debug(e);
             throw new Exception(e.getMessage());
         }

src/main/java/com/bytesw/bytebot/etl/services/MessageProcessedSupport.java

@@ -6,7 +6,9 @@ import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.math.BigDecimal;
-import java.time.*;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -35,7 +37,6 @@ public abstract class MessageProcessedSupport {
 
     protected OffsetDateTime getOffsetDateTimeFromTimestampPython(Object objectTimestamp) {
         BigDecimal dateDecimal;
-        log.debug("TIME MILI: "+objectTimestamp);
         if (objectTimestamp instanceof Double) {
             dateDecimal = new BigDecimal((Double) objectTimestamp);
         } else {
@@ -44,7 +45,7 @@ public abstract class MessageProcessedSupport {
             }
             dateDecimal = new BigDecimal(String.valueOf(objectTimestamp));
         }
-        Long timestamp = (long)(dateDecimal.doubleValue()*1000);
+        Long timestamp = (long) (dateDecimal.doubleValue() * 1000);
         if (String.valueOf(timestamp).length() < 13) {
             int numberOfZero = 13 - String.valueOf(timestamp).length();
             for (int i = 0; i < numberOfZero; i++) {
@@ -52,7 +53,6 @@ public abstract class MessageProcessedSupport {
             }
         }
         OffsetDateTime date = OffsetDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault());
-        log.debug("TIME: "+date);
         return date;
     }
 

src/main/java/com/bytesw/bytebot/etl/services/ProcessMessageService.java

 package com.bytesw.bytebot.etl.services;
 
 import com.bytesw.bytebot.etl.beans.ProcessMessageResult;
-import com.bytesw.bytebot.etl.dao.EventHistoryRepository;
 import com.bytesw.bytebot.etl.dao.DeleteDataSensibleControlRepository;
+import com.bytesw.bytebot.etl.dao.EventHistoryRepository;
 import com.bytesw.bytebot.etl.enums.EventTypeEnum;
 import com.bytesw.bytebot.etl.model.EventHistory;
 import com.bytesw.bytebot.etl.utils.JsonUtils;
@@ -31,18 +31,9 @@ public class ProcessMessageService {
         eventHistoryRepository.save(eventHistory);
     }
 
-    /*public void saveDataSensControl(Long agentId, Timestamp date, Long eventId){
-        DeleteDataSensibleControl deleteDataSensibleControl = new DeleteDataSensibleControl();
-        deleteDataSensibleControl.setAgentId(agentId);
-        deleteDataSensibleControl.setDate(date);
-        deleteDataSensibleControl.setEventId(eventId);
-        deleteDataSensibleControlRepository.save(deleteDataSensibleControl);
-    }*/
-
 
     public ProcessMessageResult processMessage(String json, String senderId) throws Exception {
         ProcessMessageResult result = new ProcessMessageResult();
-        log.debug(json);
         MessageProcessed messageProcessed = detectType(json);
         if (messageProcessed == null) {
             result.setProcessed(false);
@@ -64,11 +55,9 @@ public class ProcessMessageService {
                 if (type != null) {
 
                     // Verify if message is valid
-                    if(EventTypeEnum.USER.equals(type)){
+                    if (EventTypeEnum.USER.equals(type)) {
                         String message_id = (String) JsonUtils.getFieldFromJson(json, "$.message_id");
-                        log.debug("MESSAGE: "+message_id);
-                        log.debug(("TIPO: "+message_id.getClass().getName()));
-                        if (message_id == null){
+                        if (message_id == null) {
                             return null;
                         }
                     }

src/main/java/com/bytesw/bytebot/etl/services/UserMessageProcessed.java

 package com.bytesw.bytebot.etl.services;
 
 import com.bytesw.bytebot.etl.beans.SessionBean;
-import com.bytesw.bytebot.model.Channel;
-import com.bytesw.bytebot.repository.ChannelRepository;
 import com.bytesw.bytebot.etl.dao.IntentRepository;
 import com.bytesw.bytebot.etl.dao.MessageRepository;
 import com.bytesw.bytebot.etl.dao.UserRepository;
 import com.bytesw.bytebot.etl.enums.MessageTypeEnum;
 import com.bytesw.bytebot.etl.jdbc.ETLMessageJDBCRepository;
 import com.bytesw.bytebot.etl.jdbc.ETLSessionBotJDBCRepository;
-import com.bytesw.bytebot.etl.model.*;
+import com.bytesw.bytebot.etl.model.Intent;
+import com.bytesw.bytebot.etl.model.Message;
+import com.bytesw.bytebot.etl.model.Session;
+import com.bytesw.bytebot.etl.model.User;
 import com.bytesw.bytebot.etl.utils.JsonUtils;
+import com.bytesw.bytebot.model.Channel;
+import com.bytesw.bytebot.repository.ChannelRepository;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -73,7 +76,6 @@ public class UserMessageProcessed extends MessageProcessedSupport implements Mes
                 if (message != null) {
                     int correlative = messageJDBCRepository.getLastCorrelativeBySession(message.getSessionId());
                     correlative++;
-                    log.debug("CORRE: "+correlative);
                     message.setCorrelative(correlative);
 
                     messageRepository.save(message);
@@ -134,10 +136,8 @@ public class UserMessageProcessed extends MessageProcessedSupport implements Mes
 
         if (MessageTypeEnum.ACCEPTED.equals(message.getType())) {
             String intentName = (String) JsonUtils.getFieldFromJson(json, this.fields.get(INTENT_NAME));
-            log.debug("INTENTNAME: "+intentName);
             Optional<Intent> optionalIntent = intentRepository.findByIdentifier(intentName);
             if (optionalIntent.isPresent()) {
-                log.debug("Intencion presente en mensaje");
                 message.setIntentId(optionalIntent.get().getId());
             }
         }

src/main/java/com/bytesw/bytebot/jdbc/AgentJDBCRepository.java

 package com.bytesw.bytebot.jdbc;
 
 import com.bytesw.bytebot.bean.DeploymentChannelParamValueBean;
-import com.bytesw.bytebot.model.enums.AgentStatusEnum;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
 
 import java.util.HashMap;
 import java.util.List;
@@ -21,14 +19,14 @@ public class AgentJDBCRepository {
     @Qualifier("sqlSessionFactory")
     private SqlSessionFactory sqlsession;
 
-    @Cacheable(value="deploy_agents")
-    public List<DeploymentChannelParamValueBean> getCredentialsFromAgentStatus(String status){
+    @Cacheable(value = "deploy_agents")
+    public List<DeploymentChannelParamValueBean> getCredentialsFromAgentStatus(String status) {
         SqlSession session = sqlsession.openSession();
 
-        try{
-            Map<String,Object> params = new HashMap<>();
-            params.put("status",status);
-            return session.selectList("com.bytesw.bytebot.dao.jdbc.AgentMapper.getCredentialsFromAgentandChannel",params);
+        try {
+            Map<String, Object> params = new HashMap<>();
+            params.put("status", status);
+            return session.selectList("com.bytesw.bytebot.dao.jdbc.AgentMapper.getCredentialsFromAgentandChannel", params);
 
         } finally {
             session.close();

src/main/java/com/bytesw/bytebot/jdbc/BotSessionJDCBRepository.java

 package com.bytesw.bytebot.jdbc;
 
-import com.bytesw.bytebot.etl.model.Session;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/bytesw/bytebot/service/AgentService.java

@@ -11,7 +11,6 @@ import lombok.extern.log4j.Log4j2;
 import org.apache.camel.ProducerTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -66,7 +65,6 @@ public class AgentService extends CustomPaginationService<Agent> {
         if (values == null){
             values = new ArrayList<>();
         }
-        log.debug("LLegue al getkeysfromagents");
         //log.debug(values);
         return values;
     }
@@ -333,8 +331,6 @@ public class AgentService extends CustomPaginationService<Agent> {
                 } else {
                     deploymentChannelParamValue.setParameter(null);
                 }
-                log.debug("SE GUARDO DEPLOYMEN: "+deploymentChannelBD);
-
                 deploymentChannelParamValueRepository.save(deploymentChannelParamValue);
             }
 

src/main/java/com/bytesw/bytebot/service/dashboard/CustomerInteractionDashboardService.java

@@ -4,7 +4,6 @@ import com.bytesw.bytebot.bean.*;
 import com.bytesw.bytebot.jdbc.ActionJDBCRepository;
 import com.bytesw.bytebot.jdbc.MessageJDBCRepository;
 import com.bytesw.xdf.sql.beans.Pagination;
-import lombok.extern.java.Log;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,7 +32,6 @@ public class CustomerInteractionDashboardService extends DashboardService {
     @Override
     protected void completeData(OffsetDateTime startDate, OffsetDateTime endDate, Integer rangeMinutes,Map<String, Object> info) {
         List<RangeBean> rangeList = calculateRangeList(startDate, endDate);
-        log.debug("PERIOD: "+rangeList);
         info.put("sessionFlow", generateInteractionByCustomerData(startDate, endDate));
         info.put("summaryGoals", generateSummaryByGoals(startDate, endDate));
         info.put("intentAvgByCustomer", generateAverageIntentsByCustomer(rangeList));
@@ -57,8 +55,6 @@ public class CustomerInteractionDashboardService extends DashboardService {
         Map<String, List<Object>> data = new HashMap<>();
         rangeList.stream().forEach(x -> {
             List<String> identifiers = new ArrayList<>();
-            log.debug("START: "+x.getStartDate());
-            log.debug(("END: "+x.getEndDate()));
             List<MessageByIntentBean> list = messageJDBCRepository.countMessageByIntent(x.getStartDate(), x.getEndDate());
             list.stream().forEach(intentSummary -> {
                 identifiers.add((intentSummary.getIdentifier()));
@@ -76,7 +72,6 @@ public class CustomerInteractionDashboardService extends DashboardService {
                 }
             });
         });
-        log.debug("DATA: "+data);
         return data;
     }
 

src/main/java/com/bytesw/bytebot/service/provider/ProviderService.java

 package com.bytesw.bytebot.service.provider;
 
 import com.bytesw.xdf.exception.NotFoundException;
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang.NullArgumentException;
 import com.twilio.exception.AuthenticationException;
+import lombok.extern.log4j.Log4j2;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,28 +10,27 @@ import java.util.Map;
 @Log4j2
 public abstract class ProviderService {
 
-    abstract  void completeData(Map<String, Object> info, String SmsId, int Agent_id) throws AuthenticationException, Exception;
+    abstract void completeData(Map<String, Object> info, String SmsId, int Agent_id) throws Exception;
 
-    public Map<String,Object> generateInfo(String sid, Map<String, Object> params) throws AuthenticationException {
+    public Map<String, Object> generateInfo(String sid, Map<String, Object> params) throws AuthenticationException {
 
         Map<String, Object> info = new HashMap<>();
-        if(params == null){
-            return  info;
+        if (params == null) {
+            return info;
         }
         try {
             int agen_id = (Integer) params.get("agent_id");
-            log.debug("AGEN_ID: " + agen_id);
             this.completeData(info, sid, agen_id);
-        }catch (NotFoundException e){
+        } catch (NotFoundException e) {
             throw new NotFoundException(e.getMessage());
-        }catch (java.lang.ClassCastException e){
+        } catch (java.lang.ClassCastException e) {
             log.info("Body Input inválido");
             throw new ClassCastException("Input inválido");
-        }catch (AuthenticationException e){
+        } catch (AuthenticationException e) {
             throw new AuthenticationException(e.getMessage());
-        }catch (InternalError e){
+        } catch (InternalError e) {
             throw new InternalError(e.getMessage());
-        }catch (Exception e){
+        } catch (Exception e) {
             throw new InternalError(e.getMessage());
         }
 

src/main/java/com/bytesw/bytebot/service/provider/TwilioService.java

@@ -7,44 +7,45 @@ import com.bytesw.bytebot.model.enums.ChannelEnum;
 import com.bytesw.bytebot.model.enums.ProviderErrorEnum;
 import com.bytesw.bytebot.service.AgentService;
 import com.bytesw.xdf.exception.NotFoundException;
-import com.twilio.http.TwilioRestClient;
-import lombok.extern.log4j.Log4j2;
-import com.twilio.exception.AuthenticationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.twilio.Twilio;
 import com.twilio.base.ResourceSet;
+import com.twilio.exception.AuthenticationException;
 import com.twilio.rest.api.v2010.account.message.Media;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 @Log4j2
 @Service
-public class TwilioService extends ProviderService{
+public class TwilioService extends ProviderService {
 
     @Autowired
     private AgentService agentService;
 
-    public List<DeploymentChannelParamValueBean> getAllParamsWithRefresh(){
+    public List<DeploymentChannelParamValueBean> getAllParamsWithRefresh() {
         return getAllParams();
     }
 
-    public List<DeploymentChannelParamValueBean> getAllParams(){
+    public List<DeploymentChannelParamValueBean> getAllParams() {
         List<DeploymentChannelParamValueBean> agents = new ArrayList<>();
         agents = agentService.GetKeysFromAgents(AgentStatusEnum.DEPLOYED);
-        log.debug("AGENTS FROM DB: "+agents);
         return agents;
     }
 
     @Override
-    protected void completeData(Map<String, Object> info, String SmsId,int agent_id) throws AuthenticationException, Exception{
+    protected void completeData(Map<String, Object> info, String SmsId, int agent_id) throws Exception {
         long start_time = System.nanoTime();
         List<DeploymentChannelParamValueBean> agents = getAllParamsWithRefresh();
         long end_time = System.nanoTime();
         long duration = (end_time - start_time) / 1000000;
-        log.debug("DURACION: "+duration);
-        String sid = new String();
-        String token = new String();
+        log.debug("DURACION: " + duration);
+        String sid = "";
+        String token = "";
         int MAX_LIMIT = 999;
 
         List<String> data = new ArrayList<String>();
@@ -63,7 +64,7 @@ public class TwilioService extends ProviderService{
                     exist_agent = true;
                 }
             }
-            if(!exist_agent){
+            if (!exist_agent) {
                 log.info("No existe un agente con el ID especificado");
                 throw new Exception("No se encontró un agente con canales deployados con dicho ID");
             }
@@ -78,9 +79,9 @@ public class TwilioService extends ProviderService{
             }
             if (cont == 0) {
                 log.info("No hay imágenes para el mensaje indicado");
-                throw new NotFoundException("No se encontraron imágenes para el mensaje "+SmsId);
+                throw new NotFoundException("No se encontraron imágenes para el mensaje " + SmsId);
             } else {
-                for(String image : Arrays.copyOfRange(images_droped, 0, cont)){
+                for (String image : Arrays.copyOfRange(images_droped, 0, cont)) {
                     data.add(image);
                 }
             }
@@ -89,20 +90,20 @@ public class TwilioService extends ProviderService{
 
             info.put("data", data);
 
-        }catch (com.twilio.exception.ApiException e){
-            if (e.getMessage().toString().equals(ProviderErrorEnum.AUTHENTICATE.getName())){
+        } catch (com.twilio.exception.ApiException e) {
+            if (e.getMessage().equals(ProviderErrorEnum.AUTHENTICATE.getName())) {
                 log.error("Credenciales inválidas para borrar imagen");
                 throw new AuthenticationException("Credenciales inválidas");
-            }else if(e.getMessage().toString().contains(ProviderErrorEnum.CONEXION.getName())){
+            } else if (e.getMessage().contains(ProviderErrorEnum.CONEXION.getName())) {
                 log.error("Fallo temporal en la conexión con el Proveedor");
                 throw new InternalError("Fallo en la conexión con Twilio API");
-            }else{
+            } else {
                 log.info("El mensaje no existe para : " + SmsId + "\n" + e.getMessage());
-                throw new NotFoundException("No se encontraron imágenes para el mensaje "+SmsId);
+                throw new NotFoundException("No se encontraron imágenes para el mensaje " + SmsId);
             }
-        }catch (NotFoundException e){
+        } catch (NotFoundException e) {
             throw new NotFoundException(e.getMessage());
-        }catch (Exception e){
+        } catch (Exception e) {
             throw new Exception(e.getMessage());
         }
     }