Merging Code in Springboot

Apromore-Boot/src/main/resources/application.yml

@@ -135,10 +135,10 @@ site:
 
 spring:
   datasource:
-    password: MAcri
+    password: Apromore#!dev
 #    url: jdbc:h2:mem:Manager-Repository;DATABASE_TO_UPPER=FALSE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-    url : jdbc:mysql://localhost:3307/apromore?createDatabaseIfNotExist=true&autoReconnect=true&allowMultiQueries=true&rewriteBatchedStatements=true&characterEncoding=utf-8&serverTimezone=GMT%2B10
-    username: root
+    url : jdbc:mysql://localhost:3306/apromore?createDatabaseIfNotExist=true&autoReconnect=true&allowMultiQueries=true&rewriteBatchedStatements=true&characterEncoding=utf-8&serverTimezone=GMT%2B10
+    username: apromore
   jpa:
     hibernate:
       ddl-auto: none
@@ -148,8 +148,8 @@ spring:
   liquibase:
     change-log: classpath:db/migration/changeLog.yaml
     contexts: MYSQL
-    password: MAcri
-    user: root
+    password: Apromore#!dev
+    user: liquibase_user
 
 
 storage:

Apromore-Calendar/src/main/java/org/apromore/calendar/service/CustomCalendarService.java

@@ -29,9 +29,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;
-
 import javax.transaction.Transactional;
-
 import org.apromore.calendar.exception.CalendarAlreadyExistsException;
 import org.apromore.calendar.exception.CalendarNotExistsException;
 import org.apromore.calendar.model.CalendarModel;
@@ -48,188 +46,197 @@
 import org.apromore.dao.model.Holiday;
 import org.apromore.dao.model.WorkDay;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
-
 import lombok.Data;
 
 @Data
 @Service
 @Transactional
 public class CustomCalendarService implements CalendarService {
 
-    @Autowired
-    public CustomCalendarRepository calendarRepo;
+  @Autowired
+  public CustomCalendarRepository calendarRepo;
 
-    @Autowired
-    public CustomCalendarInfoRepository calendarInfoRepo;
+  @Autowired
+  public CustomCalendarInfoRepository calendarInfoRepo;
 
-    @Autowired
-    public HolidayRepository holidayRepository;
+  @Autowired
+  public HolidayRepository holidayRepository;
 
-    @Autowired
-    private CustomMapper modelMapper;
+  @Autowired
+  @Qualifier("customMapper")
+  private CustomMapper modelMapper;
 
-    @Override
-    public CalendarModel createGenericCalendar(String description, boolean weekendsOff, String zoneId)
-            throws CalendarAlreadyExistsException {
+  @Override
+  public CalendarModel createGenericCalendar(String description, boolean weekendsOff, String zoneId)
+      throws CalendarAlreadyExistsException {
 
-        OffsetTime startTime = OffsetTime.of(LocalTime.MIN, ZoneId.of(zoneId).getRules().getOffset(Instant.now()));
+    OffsetTime startTime =
+        OffsetTime.of(LocalTime.MIN, ZoneId.of(zoneId).getRules().getOffset(Instant.now()));
 
-        OffsetTime endTime = OffsetTime.of(LocalTime.MAX, ZoneId.of(zoneId).getRules().getOffset(Instant.now()));
+    OffsetTime endTime =
+        OffsetTime.of(LocalTime.MAX, ZoneId.of(zoneId).getRules().getOffset(Instant.now()));
 
-        CustomCalendar customCalendar = createCalendar(description, weekendsOff, startTime, endTime);
-        CalendarModel calendarModel = modelMapper.getMapper().map(customCalendar, CalendarModel.class);
-        return calendarModel;
-    }
+    CustomCalendar customCalendar = createCalendar(description, weekendsOff, startTime, endTime);
+    CalendarModel calendarModel = modelMapper.getMapper().map(customCalendar, CalendarModel.class);
+    return calendarModel;
+  }
 
-    @Override
-    public CalendarModel createBusinessCalendar(String description, boolean weekendsOff, String zoneId)
-            throws CalendarAlreadyExistsException {
+  @Override
+  public CalendarModel createBusinessCalendar(String description, boolean weekendsOff,
+      String zoneId) throws CalendarAlreadyExistsException {
 
-        OffsetTime startTime = OffsetTime.of(LocalTime.of(9, 0), ZoneId.of(zoneId).getRules().getOffset(Instant.now()));
-        OffsetTime endTime = OffsetTime.of(LocalTime.of(17, 0), ZoneId.of(zoneId).getRules().getOffset(Instant.now()));
+    OffsetTime startTime =
+        OffsetTime.of(LocalTime.of(9, 0), ZoneId.of(zoneId).getRules().getOffset(Instant.now()));
+    OffsetTime endTime =
+        OffsetTime.of(LocalTime.of(17, 0), ZoneId.of(zoneId).getRules().getOffset(Instant.now()));
 
-        CustomCalendar customCalendar = createCalendar(description, weekendsOff, startTime, endTime);
-        CalendarModel calendarModel = modelMapper.getMapper().map(customCalendar, CalendarModel.class);
+    CustomCalendar customCalendar = createCalendar(description, weekendsOff, startTime, endTime);
+    CalendarModel calendarModel = modelMapper.getMapper().map(customCalendar, CalendarModel.class);
 
-        return calendarModel;
+    return calendarModel;
 
-    }
+  }
 
-    @Override
-    public CalendarModel getCalendar(Long id) {
+  @Override
+  public CalendarModel getCalendar(Long id) {
 
-        return modelMapper.getMapper().map(calendarRepo.findById(id).orElse(null), CalendarModel.class);
+    return modelMapper.getMapper().map(calendarRepo.findById(id).orElse(null), CalendarModel.class);
 
-    }
-
-    @Override
-    public List<CalendarModel> getCalendars() {
+  }
 
-        List<CustomCalendarInfo> calendarInfos = calendarInfoRepo.findAll();
-        List<CalendarModel> calendarModels = new ArrayList<CalendarModel>();
+  @Override
+  public List<CalendarModel> getCalendars() {
 
-        for (CustomCalendarInfo info : calendarInfos) {
-            calendarModels.add(modelMapper.getMapper().map(info, CalendarModel.class));
-        }
-
-        return calendarModels;
+    List<CustomCalendarInfo> calendarInfos = calendarInfoRepo.findAll();
+    List<CalendarModel> calendarModels = new ArrayList<CalendarModel>();
 
+    for (CustomCalendarInfo info : calendarInfos) {
+      calendarModels.add(modelMapper.getMapper().map(info, CalendarModel.class));
     }
 
-    private CustomCalendar createCalendar(String description, boolean weekendsOff, OffsetTime start, OffsetTime end)
-            throws CalendarAlreadyExistsException {
+    return calendarModels;
+
+  }
 
-        validateCalendarExists(calendarRepo.findByName(description));
+  private CustomCalendar createCalendar(String description, boolean weekendsOff, OffsetTime start,
+      OffsetTime end) throws CalendarAlreadyExistsException {
 
-        final CustomCalendar calendar = new CustomCalendar(description);
-        for (WorkDay workDay : getWorkDays(start, end, weekendsOff)) {
-            calendar.addWorkDay(workDay);
-        }
-        CustomCalendar newcalendar = calendarRepo.saveAndFlush(calendar);
-        return newcalendar;
+    validateCalendarExists(calendarRepo.findByName(description));
 
+    final CustomCalendar calendar = new CustomCalendar(description);
+    for (WorkDay workDay : getWorkDays(start, end, weekendsOff)) {
+      calendar.addWorkDay(workDay);
     }
+    CustomCalendar newcalendar = calendarRepo.saveAndFlush(calendar);
+    return newcalendar;
 
-    private List<WorkDay> getWorkDays(OffsetTime start, OffsetTime end, boolean weekendOff) {
+  }
 
-        Predicate<DayOfWeek> isWeekendOff = CalendarUtil.getWeekendOffPRedicate(weekendOff);
-        List<WorkDay> workDaysList = new ArrayList<WorkDay>();
+  private List<WorkDay> getWorkDays(OffsetTime start, OffsetTime end, boolean weekendOff) {
 
-        for (DayOfWeek dayOfWeek : DayOfWeek.values()) {
-            workDaysList.add(new WorkDay(dayOfWeek, start, end, !isWeekendOff.test(dayOfWeek)));
-        }
-        return workDaysList;
+    Predicate<DayOfWeek> isWeekendOff = CalendarUtil.getWeekendOffPRedicate(weekendOff);
+    List<WorkDay> workDaysList = new ArrayList<WorkDay>();
 
+    for (DayOfWeek dayOfWeek : DayOfWeek.values()) {
+      workDaysList.add(new WorkDay(dayOfWeek, start, end, !isWeekendOff.test(dayOfWeek)));
     }
+    return workDaysList;
 
-    private void validateCalendarExists(CustomCalendar calendar) throws CalendarAlreadyExistsException {
+  }
 
-        if (calendar != null) {
-            throw new CalendarAlreadyExistsException("Calendar already exists");
-        }
+  private void validateCalendarExists(CustomCalendar calendar)
+      throws CalendarAlreadyExistsException {
 
+    if (calendar != null) {
+      throw new CalendarAlreadyExistsException("Calendar already exists");
     }
 
-    public void updateHoliday(Long id, List<HolidayModel> holidayModels) throws CalendarNotExistsException {
-        CustomCalendar calendar = getExistingCalendar(id);
+  }
 
-        List<Holiday> holidays = new ArrayList<Holiday>();
-        for (HolidayModel h : holidayModels) {
-            holidays.add(new Holiday(h.getId(), h.getName(), h.getDescription(), h.getHolidayDate(),
-                    HOLIDAYTYPE.valueOf(h.getHolidayType())));
-        }
-
-        calendar.getHolidays().clear();
-        for (Holiday holiday : holidays) {
-            calendar.addHoliday(holiday);
-        }
-        calendarRepo.saveAndFlush(calendar);
+  public void updateHoliday(Long id, List<HolidayModel> holidayModels)
+      throws CalendarNotExistsException {
+    CustomCalendar calendar = getExistingCalendar(id);
 
+    List<Holiday> holidays = new ArrayList<Holiday>();
+    for (HolidayModel h : holidayModels) {
+      holidays.add(new Holiday(h.getId(), h.getName(), h.getDescription(), h.getHolidayDate(),
+          HOLIDAYTYPE.valueOf(h.getHolidayType())));
     }
 
-    private CustomCalendar getExistingCalendar(Long id) throws CalendarNotExistsException {
-        CustomCalendar calendar = calendarRepo.findById(id).orElse(null);
-
-        if (calendar == null) {
-            throw new CalendarNotExistsException("calendar does not exist");
-        }
-        return calendar;
+    calendar.getHolidays().clear();
+    for (Holiday holiday : holidays) {
+      calendar.addHoliday(holiday);
     }
+    calendarRepo.saveAndFlush(calendar);
 
-    public void removeHoliday(Long id, List<Long> holidayIds) {
+  }
 
-        List<Holiday> holidays = new ArrayList<Holiday>();
-        // Bad way to delete, but we need to upgrade jpa of springs to make use of
-        // better ways of delete
-        for (Long idLong : holidayIds) {
-            holidayRepository.deleteById(idLong);
-
-        }
+  private CustomCalendar getExistingCalendar(Long id) throws CalendarNotExistsException {
+    CustomCalendar calendar = calendarRepo.findById(id).orElse(null);
 
+    if (calendar == null) {
+      throw new CalendarNotExistsException("calendar does not exist");
     }
+    return calendar;
+  }
+
+  public void removeHoliday(Long id, List<Long> holidayIds) {
 
-    @Override
-    public void deleteCalendar(Long calendarId) {
-        calendarRepo.deleteById(calendarId);
+    List<Holiday> holidays = new ArrayList<Holiday>();
+    // Bad way to delete, but we need to upgrade jpa of springs to make use of
+    // better ways of delete
+    for (Long idLong : holidayIds) {
+      holidayRepository.deleteById(idLong);
 
     }
 
-    @Override
-    public void updateCalendarName(Long id, String calendarName) throws CalendarNotExistsException {
-        CustomCalendar calendar = getExistingCalendar(id);
+  }
 
-        calendar.setName(calendarName);
+  @Override
+  public void deleteCalendar(Long calendarId) {
+    calendarRepo.deleteById(calendarId);
 
-        calendarRepo.save(calendar);
+  }
 
-    }
+  @Override
+  public void updateCalendarName(Long id, String calendarName) throws CalendarNotExistsException {
+    CustomCalendar calendar = getExistingCalendar(id);
+
+    calendar.setName(calendarName);
 
-    @Override
-    public void updateWorkDays(Long id, List<WorkDayModel> workDayModels) throws CalendarNotExistsException {
-        CustomCalendar calendar = getExistingCalendar(id);
+    calendarRepo.save(calendar);
 
-        List<WorkDay> workDays = new ArrayList<WorkDay>();
-        for (WorkDayModel w : workDayModels) {
+  }
 
-            workDays.add(new WorkDay(w.getId(), w.getDayOfWeek(), w.getStartTime(), w.getEndTime(), w.isWorkingDay()));
-        }
+  @Override
+  public void updateWorkDays(Long id, List<WorkDayModel> workDayModels)
+      throws CalendarNotExistsException {
+    CustomCalendar calendar = getExistingCalendar(id);
 
-        calendar.getWorkDays().clear();
-        for (WorkDay workDay : workDays) {
-            calendar.addWorkDay(workDay);
-        }
-        calendarRepo.saveAndFlush(calendar);
+    List<WorkDay> workDays = new ArrayList<WorkDay>();
+    for (WorkDayModel w : workDayModels) {
 
+      workDays.add(new WorkDay(w.getId(), w.getDayOfWeek(), w.getStartTime(), w.getEndTime(),
+          w.isWorkingDay()));
     }
 
-    @Override
-    public void updateZoneInfo(Long id, String zoneId) throws CalendarNotExistsException {
-        CustomCalendar calendar = getExistingCalendar(id);
-        calendar.setZoneId(zoneId);
-        calendarRepo.save(calendar);
+    calendar.getWorkDays().clear();
+    for (WorkDay workDay : workDays) {
+      calendar.addWorkDay(workDay);
     }
+    calendarRepo.saveAndFlush(calendar);
+
+  }
+
+  @Override
+  public void updateZoneInfo(Long id, String zoneId) throws CalendarNotExistsException {
+    CustomCalendar calendar = getExistingCalendar(id);
+    calendar.setZoneId(zoneId);
+    calendarRepo.save(calendar);
+  }
 
 }
-//public WorkDay(Long id,DayOfWeek dayOfWeek, OffsetTime startTime, OffsetTime endTime,
-//	      boolean isWorkingDay) {
+// public WorkDay(Long id,DayOfWeek dayOfWeek, OffsetTime startTime, OffsetTime endTime,
+// boolean isWorkingDay) {

Apromore-Commons/src/main/java/org/apromore/commons/config/ConfigBean.java

@@ -46,6 +46,8 @@ public class ConfigBean {
   private boolean sanitizationEnabled = false;
   private Site site = new Site();
 
+  private int maxEventCount = 1000000;
+
   @Data
   public class Site {
     private String editor;

Apromore-Core-Components/Apromore-Portal/src/main/webapp/WEB-INF/zk.xml

@@ -401,9 +401,6 @@
 <!--             <listener-class>org.apromore.zk.ApromoreDesktopCleanup</listener-class> -->
 <!--     </listener> -->
 
-    <listener>
-            <listener-class>org.apromore.portal.ApromoreZKListener</listener-class>
-    </listener>
 
     <listener>
             <listener-class>org.apromore.portal.LoggingZKListener</listener-class>