Merge pull request #200 from Netflix/bean_refactor

Netflix · Mar 19, 2016 · 53f6c44 · 53f6c44
2 parents f4699b9 + da6e53f
commit 53f6c44
Show file tree

Hide file tree

Showing 21 changed files with 879 additions and 457 deletions.
diff --git a/genie-core/src/main/java/com/netflix/genie/core/jpa/services/JpaApplicationServiceImpl.java b/genie-core/src/main/java/com/netflix/genie/core/jpa/services/JpaApplicationServiceImpl.java
@@ -46,7 +46,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.validation.ConstraintViolationException;
@@ -65,7 +64,6 @@
  * @author tgianos
  * @since 2.0.0
  */
-@Service
 @Transactional(
     rollbackFor = {
         GenieException.class,

diff --git a/genie-core/src/main/java/com/netflix/genie/core/jpa/services/JpaClusterServiceImpl.java b/genie-core/src/main/java/com/netflix/genie/core/jpa/services/JpaClusterServiceImpl.java
@@ -42,10 +42,8 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.NotEmpty;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.validation.ConstraintViolationException;
@@ -65,7 +63,6 @@
  * @author amsharma
  * @author tgianos
  */
-@Service
 @Transactional(
     rollbackFor = {
         GenieException.class,
@@ -85,7 +82,6 @@ public class JpaClusterServiceImpl implements ClusterService {
      * @param clusterRepo The cluster repository to use.
      * @param commandRepo The command repository to use.
      */
-    @Autowired
     public JpaClusterServiceImpl(
         final JpaClusterRepository clusterRepo,
         final JpaCommandRepository commandRepo

diff --git a/genie-core/src/main/java/com/netflix/genie/core/jpa/services/JpaCommandServiceImpl.java b/genie-core/src/main/java/com/netflix/genie/core/jpa/services/JpaCommandServiceImpl.java
@@ -46,10 +46,8 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.NotEmpty;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.validation.ConstraintViolationException;
@@ -68,7 +66,6 @@
  * @author tgianos
  * @since 2.0.0
  */
-@Service
 @Transactional(
     rollbackFor = {
         GenieException.class,
@@ -90,7 +87,6 @@ public class JpaCommandServiceImpl implements CommandService {
      * @param appRepo     the application repository to use
      * @param clusterRepo the cluster repository to use
      */
-    @Autowired
     public JpaCommandServiceImpl(
         final JpaCommandRepository commandRepo,
         final JpaApplicationRepository appRepo,

diff --git a/...-core/src/main/java/com/netflix/genie/core/jpa/services/JpaJobPersistenceServiceImpl.java b/...-core/src/main/java/com/netflix/genie/core/jpa/services/JpaJobPersistenceServiceImpl.java
@@ -39,8 +39,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.NotBlank;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.validation.ConstraintViolationException;
@@ -52,7 +50,6 @@
  *
  * @author amsharma
  */
-@Service
 @Transactional(
     rollbackFor = {
         GenieException.class,
@@ -69,15 +66,14 @@ public class JpaJobPersistenceServiceImpl implements JobPersistenceService {
     private final JpaCommandRepository commandRepo;
 
     /**
-     * Default Constructor.
+     * Constructor.
      *
      * @param jobRepo          The job repository to use
      * @param jobRequestRepo   The job request repository to use
      * @param jobExecutionRepo The jobExecution Repository to use
      * @param clusterRepo      The cluster repository to use
      * @param commandRepo      The command repository to use
      */
-    @Autowired
     public JpaJobPersistenceServiceImpl(
         final JpaJobRepository jobRepo,
         final JpaJobRequestRepository jobRequestRepo,

diff --git a/genie-core/src/main/java/com/netflix/genie/core/jpa/services/JpaJobSearchServiceImpl.java b/genie-core/src/main/java/com/netflix/genie/core/jpa/services/JpaJobSearchServiceImpl.java
@@ -36,12 +36,10 @@
 import com.netflix.genie.core.services.JobSearchService;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.validator.constraints.NotBlank;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
@@ -64,7 +62,6 @@
  * @author amsharma
  */
 @Slf4j
-@Service
 @Transactional(readOnly = true)
 public class JpaJobSearchServiceImpl implements JobSearchService {
 
@@ -82,7 +79,6 @@ public class JpaJobSearchServiceImpl implements JobSearchService {
      * @param jobRequestRepository   The repository to use for job request entities
      * @param jobExecutionRepository The repository to use for job execution entities
      */
-    @Autowired
     public JpaJobSearchServiceImpl(
         final JpaJobRepository jobRepository,
         final JpaJobRequestRepository jobRequestRepository,

diff --git a/genie-core/src/main/java/com/netflix/genie/core/metrics/JobCountManager.java b/genie-core/src/main/java/com/netflix/genie/core/metrics/JobCountManager.java
diff --git a/genie-core/src/main/java/com/netflix/genie/core/metrics/impl/GenieNodeStatisticsImpl.java b/genie-core/src/main/java/com/netflix/genie/core/metrics/impl/GenieNodeStatisticsImpl.java
@@ -19,7 +19,6 @@
 
 import com.netflix.genie.core.metrics.GenieNodeStatistics;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -32,7 +31,6 @@
  * @author skrishnan
  * @author tgianos
  */
-@Component
 @Slf4j
 public class GenieNodeStatisticsImpl implements GenieNodeStatistics {