Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/workflows/checkstyle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Call Checkstyle

on:
pull_request:
branches: ["master", "develop"]
paths:
- '**/*.java'

jobs:
style-check:
uses: PSMRI/.github/.github/workflows/checkstyle.yml@main
with:
java-version: '17'
65 changes: 65 additions & 0 deletions checkstyle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">

<module name="Checker">
<property name="severity" value="warning" />
<property name="fileExtensions" value="java" />

<!-- Checks for Size Violations -->
<module name="FileLength">
<property name="max" value="500" />
</module>
<module name="LineLength">
<property name="max" value="120" />
</module>

<module name="TreeWalker">
<!-- Checks for Naming Conventions -->
<module name="MethodName" />
<module name="PackageName" />
<module name="TypeName" />
<module name="ParameterName" />
<module name="LocalVariableName" />
<module name="MemberName" />

<!-- Checks for imports -->
<module name="AvoidStarImport" />
<module name="IllegalImport" />
<module name="RedundantImport" />
<module name="UnusedImports" />

<!-- Checks for Size Violations -->
<module name="MethodLength">
<property name="max" value="50" />
</module>

<!-- Checks for whitespace -->
<module name="EmptyLineSeparator" />
<module name="GenericWhitespace" />
<module name="MethodParamPad" />
<module name="NoWhitespaceAfter" />
<module name="NoWhitespaceBefore" />
<module name="ParenPad" />
<module name="TypecastParenPad" />
<module name="WhitespaceAfter" />
<module name="WhitespaceAround" />

<!-- Modifier Checks -->
<module name="ModifierOrder" />
<module name="RedundantModifier" />

<!-- Checks for blocks -->
<module name="EmptyBlock" />
<module name="LeftCurly" />
<module name="RightCurly" />
<module name="NeedBraces" />

<!-- Checks for common coding problems -->
<module name="EmptyStatement" />
<module name="EqualsHashCode" />
<module name="IllegalInstantiation" />
<module name="MissingSwitchDefault" />
<module name="SimplifyBooleanExpression" />
<module name="SimplifyBooleanReturn" />
</module>
</module>
28 changes: 28 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,34 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.1</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.12.7</version>
</dependency>
</dependencies>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
</configuration>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<reporting>
Expand Down
32 changes: 30 additions & 2 deletions src/main/java/com/iemr/common/config/quartz/QuartzConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ public SchedulerFactoryBean quartzScheduler() {
Trigger[] triggers = { processMQTriggerForUnblock().getObject(), processMQTriggerForSMS().getObject(),
processMQTriggerForEmail().getObject(), processMQTriggerForRegistration().getObject(),
processMQTriggerForEverwellDataSync().getObject(), processMQTriggerForCtiDataSync().getObject(),
processMQTriggerForAvniRegistration().getObject(), processMQTriggerForNHMDashboardData().getObject() };
processMQTriggerForAvniRegistration().getObject(),
processMQTriggerForNHMDashboardData().getObject(), processMQTriggerForGrievanceDataSync().getObject() };

quartzScheduler.setTriggers(triggers);

Expand Down Expand Up @@ -169,7 +170,7 @@ public CronTriggerFactoryBean processMQTriggerForEmail() {
Boolean startJob = ConfigProperties.getBoolean("start-email-scheduler");
CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
String scheduleConfig = quartzJobDefaultSchedule;
if (startJob) {
if (Boolean.TRUE.equals(startJob)) {
scheduleConfig = ConfigProperties.getPropertyByName("cron-scheduler-email");
}
cronTriggerFactoryBean.setJobDetail(processMQJobForEmail().getObject());
Expand Down Expand Up @@ -226,6 +227,33 @@ public CronTriggerFactoryBean processMQTriggerForEverwellDataSync() {
return cronTriggerFactoryBean;
}

//-----------------Grievance Data Sync Scheduler----------------------------------------------

@Bean
public JobDetailFactoryBean processMQJobForGrievanceDataSync() {
JobDetailFactoryBean jobDetailFactory;
jobDetailFactory = new JobDetailFactoryBean();
jobDetailFactory.setJobClass(ScheduleForGrievanceDataSync.class);
jobDetailFactory.setGroup(quartzJobGroup);
return jobDetailFactory;
}

@Bean
public CronTriggerFactoryBean processMQTriggerForGrievanceDataSync() {
Boolean startJob = ConfigProperties.getBoolean("start-grievancedatasync-scheduler");
CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
String scheduleConfig = quartzJobDefaultSchedule;
if (startJob) {
scheduleConfig = ConfigProperties.getPropertyByName("cron-scheduler-grievancedatasync");
}
cronTriggerFactoryBean.setJobDetail(processMQJobForGrievanceDataSync().getObject());
cronTriggerFactoryBean.setCronExpression(scheduleConfig);
cronTriggerFactoryBean.setGroup(quartzJobGroup);
return cronTriggerFactoryBean;
}



// --------------------------------------------------------------------------------------------------------------
@Bean
public JobDetailFactoryBean processMQJobForCtiDataSync() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.iemr.common.config.quartz;

import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.iemr.common.service.grievance.GrievanceDataSync;

@Service
@Transactional
public class ScheduleForGrievanceDataSync implements Job {

private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());


private final GrievanceDataSync grievanceDataSync;

@Autowired
public ScheduleForGrievanceDataSync(GrievanceDataSync grievanceDataSync) {
this.grievanceDataSync = grievanceDataSync;
}

@Override
public void execute(JobExecutionContext arg0) throws JobExecutionException
{
logger.info("Started job for grievance data sync {}", arg0.getClass().getName());
grievanceDataSync.dataSyncToGrievance();
logger.info("Completed job for grievance data sync {}" , arg0.getClass().getName());
}



}
Loading