Skip to content

Dependency injection change #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ankitshaw wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Dependency injection change #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a16500f
changed from field to setter injection
ankitshaw Feb 13, 2023
7eac029
changed constructor based DI
ankitshaw Feb 27, 2023
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: 9 additions & 4 deletions src/main/java/org/onedatashare/odsmetadata/controller/BatchJobController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,22 @@
@RestController
@RequestMapping(value = "/api/v1/meta", produces = MediaType.APPLICATION_JSON_VALUE)
public class BatchJobController {
@Autowired
JobService jobService;

@Autowired
InfluxIOService influxIOService;
private JobService jobService;

private InfluxIOService influxIOService;

private static final String REGEX_PATTERN = "^(?=.{1,64}@)[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)*@"
+ "[^-][A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*(\\.[A-Za-z]{2,})$"; //this is used to validate that the userEmail is an email

private static final String REGEX = "\\d+";

@Autowired
public BatchJobController(JobService jobService, InfluxIOService influxIOService){
this.jobService = jobService;
this.influxIOService = influxIOService;
}

/**
* Returns all the jobs with the corresponding userEmail
* This call should be done if you only want the JobIds
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/org/onedatashare/odsmetadata/services/JobService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,22 @@
@Service
public class JobService {

@Autowired
BatchJobRepository batchJobRepository;
private BatchJobRepository batchJobRepository;

@Autowired
BatchJobParamRepository batchJobParamRepository;
private BatchJobParamRepository batchJobParamRepository;

private BatchJobMapper mapper = Mappers.getMapper(BatchJobMapper.class);

private static final String STRING_VAL = "STRING";
private static final String LONG_VAL = "LONG";
private static final String DOUBLE_VAL = "DOUBLE";

@Autowired
public JobService(BatchJobParamRepository batchJobParamRepository, BatchJobRepository batchJobRepository) {
this.batchJobParamRepository = batchJobParamRepository;
this.batchJobRepository = batchJobRepository;
}

public BatchJobData getJobStat(Long jobId) {
log.info("JobId: {}", jobId);
BatchJobData batchJobData = new BatchJobData();
Expand Down