Simplified packange structure + simplified spring autowiring

Author: bwajtr

pom.xml

@@ -61,7 +61,7 @@
 
             <!-- You can use this plugin to generate classes needed by Jooq -->
             <!-- Just run it using 'mvn jooq-codegen:generate' -->
-            <!-- Generated classes will go to  ./src/main/java/com/clevergang/dbtests/service/repository/impl/jooq/generated -->
+            <!-- Generated classes will go to  ./src/main/java/com/clevergang/dbtests/repository/repository/impl/jooq/generated -->
             <plugin>
 
                 <!-- Specify the maven code generator plugin -->
@@ -128,7 +128,7 @@
 
                         <target>
                             <!-- The destination package of your generated classes (within the destination directory) -->
-                            <packageName>com.clevergang.dbtests.service.repository.impl.jooq.generated</packageName>
+                            <packageName>com.clevergang.dbtests.repository.impl.jooq.generated</packageName>
 
                             <!-- The destination directory of your generated classes -->
                             <directory>./src/main/java/</directory>

src/main/java/com/clevergang/dbtests/Scenarios.java

@@ -7,7 +7,7 @@
 
 import com.clevergang.dbtests.model.Employee;
 import com.clevergang.dbtests.model.Project;
-import com.clevergang.dbtests.service.repository.DataRepository;
+import com.clevergang.dbtests.repository.DataRepository;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

…s/service/repository/DataRepository.java …g/dbtests/repository/DataRepository.javasrc/main/java/com/clevergang/dbtests/service/repository/DataRepository.java renamed to src/main/java/com/clevergang/dbtests/repository/DataRepository.java src/main/java/com/clevergang/dbtests/service/repository/DataRepository.java renamed to src/main/java/com/clevergang/dbtests/repository/DataRepository.java

@@ -1,4 +1,4 @@
-package com.clevergang.dbtests.service.repository;
+package com.clevergang.dbtests.repository;
 
 import java.util.List;
 

…jdbctemplate/JDBCDataRepositoryImpl.java …jdbctemplate/JDBCDataRepositoryImpl.javasrc/main/java/com/clevergang/dbtests/service/repository/impl/jdbctemplate/JDBCDataRepositoryImpl.java renamed to src/main/java/com/clevergang/dbtests/repository/impl/jdbctemplate/JDBCDataRepositoryImpl.java src/main/java/com/clevergang/dbtests/service/repository/impl/jdbctemplate/JDBCDataRepositoryImpl.java renamed to src/main/java/com/clevergang/dbtests/repository/impl/jdbctemplate/JDBCDataRepositoryImpl.java

@@ -1,4 +1,4 @@
-package com.clevergang.dbtests.service.repository.impl.jdbctemplate;
+package com.clevergang.dbtests.repository.impl.jdbctemplate;
 
 import java.sql.Date;
 import java.util.HashMap;
@@ -8,8 +8,7 @@
 import com.clevergang.dbtests.model.Company;
 import com.clevergang.dbtests.model.Employee;
 import com.clevergang.dbtests.model.Project;
-import com.clevergang.dbtests.service.repository.DataRepository;
-import com.clevergang.dbtests.service.repository.impl.ImplBasedOn;
+import com.clevergang.dbtests.repository.DataRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,13 +19,10 @@
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 
-import static com.clevergang.dbtests.service.repository.impl.RepoImplementation.JDBCTEMPLATE;
-
 /**
  * @author Bretislav Wajtr <bretislav.wajtr@clevergang.com>
  */
 @Repository
-@ImplBasedOn(JDBCTEMPLATE)
 public class JDBCDataRepositoryImpl implements DataRepository {
     private static final Logger logger = LoggerFactory.getLogger(JDBCDataRepositoryImpl.class);
 

…ry/impl/jooq/JooqDataRepositoryImpl.java …ry/impl/jooq/JooqDataRepositoryImpl.javasrc/main/java/com/clevergang/dbtests/service/repository/impl/jooq/JooqDataRepositoryImpl.java renamed to src/main/java/com/clevergang/dbtests/repository/impl/jooq/JooqDataRepositoryImpl.java src/main/java/com/clevergang/dbtests/service/repository/impl/jooq/JooqDataRepositoryImpl.java renamed to src/main/java/com/clevergang/dbtests/repository/impl/jooq/JooqDataRepositoryImpl.java

@@ -1,4 +1,4 @@
-package com.clevergang.dbtests.service.repository.impl.jooq;
+package com.clevergang.dbtests.repository.impl.jooq;
 
 import java.math.BigDecimal;
 import java.sql.Date;
@@ -7,25 +7,22 @@
 import com.clevergang.dbtests.model.Company;
 import com.clevergang.dbtests.model.Employee;
 import com.clevergang.dbtests.model.Project;
-import com.clevergang.dbtests.service.repository.DataRepository;
-import com.clevergang.dbtests.service.repository.impl.ImplBasedOn;
-import com.clevergang.dbtests.service.repository.impl.jooq.generated.tables.records.EmployeeRecord;
+import com.clevergang.dbtests.repository.DataRepository;
+import com.clevergang.dbtests.repository.impl.jooq.generated.tables.records.EmployeeRecord;
 import org.jooq.BatchBindStep;
 import org.jooq.DSLContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
-import static com.clevergang.dbtests.service.repository.impl.RepoImplementation.JOOQ;
-import static com.clevergang.dbtests.service.repository.impl.jooq.generated.Tables.*;
+import static com.clevergang.dbtests.repository.impl.jooq.generated.Tables.*;
 
 
 /**
  * @author Bretislav Wajtr <bretislav.wajtr@clevergang.com>
  */
 @Repository
-@ImplBasedOn(JOOQ)
 public class JooqDataRepositoryImpl implements DataRepository {
     private static final Logger logger = LoggerFactory.getLogger(JooqDataRepositoryImpl.class);