From 1eeef021c65c85c24d62a0cc1ee4a746a601beb5 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sun, 2 Jun 2013 13:05:49 +0200 Subject: o Cleaning up dependencies. --- .../java/io/trygvis/async/spring/SpringJdbcAsyncService.java | 2 -- src/main/java/io/trygvis/data/QueueRepository.java | 8 -------- src/main/java/io/trygvis/data/TaskRepository.java | 11 ----------- src/test/java/io/trygvis/test/Article.java | 9 --------- src/test/java/io/trygvis/test/CreateArticleCallable.java | 3 --- src/test/java/io/trygvis/test/Main.java | 4 ---- src/test/java/io/trygvis/test/UpdateArticleCallable.java | 4 ---- 7 files changed, 41 deletions(-) delete mode 100755 src/main/java/io/trygvis/data/QueueRepository.java delete mode 100755 src/main/java/io/trygvis/data/TaskRepository.java (limited to 'src') diff --git a/src/main/java/io/trygvis/async/spring/SpringJdbcAsyncService.java b/src/main/java/io/trygvis/async/spring/SpringJdbcAsyncService.java index 8517c68..327dffa 100644 --- a/src/main/java/io/trygvis/async/spring/SpringJdbcAsyncService.java +++ b/src/main/java/io/trygvis/async/spring/SpringJdbcAsyncService.java @@ -7,7 +7,6 @@ import io.trygvis.queue.Queue; import io.trygvis.queue.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.ConnectionCallback; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.transaction.annotation.Transactional; @@ -15,7 +14,6 @@ import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationAdapter; import org.springframework.transaction.support.TransactionTemplate; -import javax.annotation.PostConstruct; import java.sql.Connection; import java.sql.SQLException; import java.util.concurrent.Executors; diff --git a/src/main/java/io/trygvis/data/QueueRepository.java b/src/main/java/io/trygvis/data/QueueRepository.java deleted file mode 100755 index 4ea6707..0000000 --- a/src/main/java/io/trygvis/data/QueueRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.trygvis.data; - -import io.trygvis.queue.Queue; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface QueueRepository extends JpaRepository { - Queue findByName(String name); -} diff --git a/src/main/java/io/trygvis/data/TaskRepository.java b/src/main/java/io/trygvis/data/TaskRepository.java deleted file mode 100755 index c0df329..0000000 --- a/src/main/java/io/trygvis/data/TaskRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.trygvis.data; - -import io.trygvis.queue.Queue; -import io.trygvis.queue.Task; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface TaskRepository extends JpaRepository { - List findByQueueAndCompletedIsNull(Queue queue); -} diff --git a/src/test/java/io/trygvis/test/Article.java b/src/test/java/io/trygvis/test/Article.java index d4f54ce..bf52e41 100755 --- a/src/test/java/io/trygvis/test/Article.java +++ b/src/test/java/io/trygvis/test/Article.java @@ -1,17 +1,8 @@ package io.trygvis.test; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; import java.util.Date; -@Entity public class Article { - @Id - @SequenceGenerator(name="id_seq", sequenceName="id_seq") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "id_seq") private Integer id; private Date created; private Date updated; diff --git a/src/test/java/io/trygvis/test/CreateArticleCallable.java b/src/test/java/io/trygvis/test/CreateArticleCallable.java index f68cd5b..a822a51 100755 --- a/src/test/java/io/trygvis/test/CreateArticleCallable.java +++ b/src/test/java/io/trygvis/test/CreateArticleCallable.java @@ -17,9 +17,6 @@ import static org.springframework.transaction.annotation.Propagation.MANDATORY; public class CreateArticleCallable implements AsyncService.AsyncCallable { private final Logger log = LoggerFactory.getLogger(getClass()); -// @PersistenceContext -// private EntityManager entityManager; - private Random random = new Random(); public void run(List arguments) throws Exception { diff --git a/src/test/java/io/trygvis/test/Main.java b/src/test/java/io/trygvis/test/Main.java index 721df61..d274101 100755 --- a/src/test/java/io/trygvis/test/Main.java +++ b/src/test/java/io/trygvis/test/Main.java @@ -3,7 +3,6 @@ package io.trygvis.test; import io.trygvis.async.AsyncService; import io.trygvis.queue.Queue; import io.trygvis.queue.Task; -import org.hibernate.dialect.PostgreSQL82Dialect; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.bridge.SLF4JBridgeHandler; @@ -31,9 +30,6 @@ public class Main { setProperty("database.url", getProperty("jdbc.url", "jdbc:postgresql://localhost/" + username)); setProperty("database.username", username); setProperty("database.password", username); -// setProperty("hibernate.showSql", "true"); - setProperty("hibernate.hbm2ddl.auto", "create"); // create - setProperty("hibernate.dialect", PostgreSQL82Dialect.class.getName()); log.info("Starting context"); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationContext.xml"); diff --git a/src/test/java/io/trygvis/test/UpdateArticleCallable.java b/src/test/java/io/trygvis/test/UpdateArticleCallable.java index aae28b9..f50c10a 100755 --- a/src/test/java/io/trygvis/test/UpdateArticleCallable.java +++ b/src/test/java/io/trygvis/test/UpdateArticleCallable.java @@ -16,10 +16,6 @@ public class UpdateArticleCallable private final Random r = new Random(); -// @PersistenceContext -// private EntityManager entityManager; - -// @Transactional(propagation = REQUIRES_NEW) public void run(List arguments) throws Exception { log.info("UpdateArticeJob.run: BEGIN"); -- cgit v1.2.3