Fix code smells

bcgov · Jun 29, 2023 · f4c2cc3 · f4c2cc3
1 parent 7714f83
commit f4c2cc3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/.../gov/educ/grad/report/service/impl/DistrictDistributionYearEndCredentialsServiceImpl.java b/.../gov/educ/grad/report/service/impl/DistrictDistributionYearEndCredentialsServiceImpl.java
@@ -22,13 +22,11 @@
 import ca.bc.gov.educ.grad.report.model.district.District;
 import ca.bc.gov.educ.grad.report.model.reports.GraduationReport;
 import ca.bc.gov.educ.grad.report.model.reports.Parameters;
-import ca.bc.gov.educ.grad.report.model.reports.ReportService;
 import ca.bc.gov.educ.grad.report.model.school.School;
 import ca.bc.gov.educ.grad.report.model.school.SchoolDistributionReport;
 import jakarta.annotation.security.DeclareRoles;
 import jakarta.annotation.security.RolesAllowed;
 import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -53,9 +51,6 @@ public class DistrictDistributionYearEndCredentialsServiceImpl extends SchoolDis
     private static final long serialVersionUID = 2L;
     static final String CLASSNAME = DistrictDistributionYearEndCredentialsServiceImpl.class.getName();
 
-    @Autowired
-    ReportService reportService;
-
     @RolesAllowed({STUDENT_CERTIFICATE_REPORT, USER})
     @Override
     public SchoolDistributionReport buildSchoolDistributionReport() throws DomainServiceException, IOException {

diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/GradReportServiceImpl.java b/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/GradReportServiceImpl.java
@@ -3,6 +3,7 @@
 import ca.bc.gov.educ.grad.report.api.client.ReportData;
 import ca.bc.gov.educ.grad.report.api.client.TraxCountry;
 import ca.bc.gov.educ.grad.report.api.client.TraxSchool;
+import ca.bc.gov.educ.grad.report.api.service.utils.JsonTransformer;
 import ca.bc.gov.educ.grad.report.dao.GradDataConvertionBean;
 import ca.bc.gov.educ.grad.report.dao.ReportRequestDataThreadLocal;
 import ca.bc.gov.educ.grad.report.dto.SignatureBlockTypeCode;
@@ -64,6 +65,8 @@ public abstract class GradReportServiceImpl implements Serializable {
     @Autowired
     GradDataConvertionBean gradDataConvertionBean;
     @Autowired
+    JsonTransformer jsonTransformer;
+    @Autowired
     transient WebClient webClient;
     @Autowired
     transient EducGradReportApiConstants constants;

diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/SchoolDistributionServiceImpl.java b/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/SchoolDistributionServiceImpl.java
@@ -17,17 +17,13 @@
  */
 package ca.bc.gov.educ.grad.report.service.impl;
 
-import ca.bc.gov.educ.grad.report.api.service.utils.JsonTransformer;
-import ca.bc.gov.educ.grad.report.dao.GradDataConvertionBean;
 import ca.bc.gov.educ.grad.report.dto.impl.SchoolDistributionReportImpl;
 import ca.bc.gov.educ.grad.report.model.common.DomainServiceException;
 import ca.bc.gov.educ.grad.report.model.reports.GraduationReport;
-import ca.bc.gov.educ.grad.report.model.reports.ReportService;
 import ca.bc.gov.educ.grad.report.model.school.SchoolDistributionReport;
 import ca.bc.gov.educ.grad.report.model.school.SchoolDistributionService;
 import jakarta.annotation.security.DeclareRoles;
 import jakarta.annotation.security.RolesAllowed;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -53,15 +49,6 @@ public class SchoolDistributionServiceImpl extends GradReportServiceImpl
     private static final long serialVersionUID = 2L;
     static final String CLASSNAME = SchoolDistributionServiceImpl.class.getName();
 
-    @Autowired
-    ReportService reportService;
-
-    @Autowired
-    GradDataConvertionBean gradDataConvertionBean;
-
-    @Autowired
-    JsonTransformer jsonTransformer;
-
     @RolesAllowed({STUDENT_CERTIFICATE_REPORT, USER})
     @Override
     public SchoolDistributionReport buildSchoolDistributionReport() throws DomainServiceException, IOException {