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. --- Locking.md | 14 ++++ pom.xml | 83 +++++++++++----------- .../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 --- .../io/trygvis/test/CreateArticleCallable.java | 3 - src/test/java/io/trygvis/test/Main.java | 4 -- .../io/trygvis/test/UpdateArticleCallable.java | 4 -- 9 files changed, 55 insertions(+), 83 deletions(-) create mode 100644 Locking.md delete mode 100755 src/main/java/io/trygvis/data/QueueRepository.java delete mode 100755 src/main/java/io/trygvis/data/TaskRepository.java diff --git a/Locking.md b/Locking.md new file mode 100644 index 0000000..aea1d62 --- /dev/null +++ b/Locking.md @@ -0,0 +1,14 @@ +Test data: + + begin; + drop table x; + create table x(id integer not null primary key, value integer default random() * 1000); + insert into x(id) select * from generate_series(1, 100); + commit; + +Execution: + + rollback; + begin; + select id from (select id from x order by value limit 10) as rows where pg_try_advisory_xact_lock(id); + diff --git a/pom.xml b/pom.xml index d18496b..2527f35 100755 --- a/pom.xml +++ b/pom.xml @@ -5,96 +5,94 @@ 1.0-SNAPSHOT - org.hibernate - hibernate-jpamodelgen - 1.2.0.Final - - - org.hibernate - hibernate-entitymanager - 4.1.9.Final + org.slf4j + slf4j-api + ${version.slf4j} + + - org.hibernate - hibernate-core - 4.1.9.Final + org.springframework + spring-context + ${version.spring} + provided org.springframework - spring-context + spring-tx ${version.spring} + provided org.springframework - spring-context-support + spring-jdbc ${version.spring} + provided org.springframework - spring-orm + spring-beans ${version.spring} + provided + org.springframework spring-test ${version.spring} test + + + junit + junit + 4.11 + test + - org.springframework.data - spring-data-jpa - 1.2.0.RELEASE + org.easytesting + fest-assert + 1.4 + test + com.jolbox bonecp-spring 0.7.1.RELEASE + test - - org.quartz-scheduler - quartz - 2.1.7 - - - c3p0 - c3p0 - - - + com.google.guava guava 14.0.1 + test + ch.qos.logback logback-classic 1.0.9 + test org.slf4j jul-to-slf4j - 1.7.2 + ${version.slf4j} + test org.slf4j jcl-over-slf4j - 1.7.2 + ${version.slf4j} + test org.postgresql postgresql 9.2-1002-jdbc4 - - - junit - junit - 4.11 - - - org.easytesting - fest-assert - 1.4 + test @@ -102,17 +100,18 @@ org.slf4j slf4j-api - 1.7.2 + ${version.slf4j} org.slf4j log4j-over-slf4j - 1.7.2 + ${version.slf4j} 3.2.2.RELEASE + 1.7.2 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