6 files changed, 486 insertions, 0 deletions
diff --git a/src/test/java/io/trygvis/test/Article.java b/src/test/java/io/trygvis/test/Article.java
new file mode 100755
index 0000000..d4f54ce
--- /dev/null
+++ b/src/test/java/io/trygvis/test/Article.java
@@ -0,0 +1,55 @@
+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;
+    private String title;
+    private String body;
+
+    @SuppressWarnings("UnusedDeclaration")
+    private Article() {
+    }
+
+    public Article(Date created, Date updated, String title, String body) {
+        this.created = created;
+        this.updated = updated;
+        this.title = title;
+        this.body = body;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public Date getUpdated() {
+        return updated;
+    }
+
+    public void setUpdated(Date updated) {
+        this.updated = updated;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getBody() {
+        return body;
+    }
+}
diff --git a/src/test/java/io/trygvis/test/CreateArticleCallable.java b/src/test/java/io/trygvis/test/CreateArticleCallable.java
new file mode 100755
index 0000000..f68cd5b
--- /dev/null
+++ b/src/test/java/io/trygvis/test/CreateArticleCallable.java
@@ -0,0 +1,41 @@
+package io.trygvis.test;
+
+import io.trygvis.async.AsyncService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
+import static org.springframework.transaction.annotation.Propagation.MANDATORY;
+
+@Component("createArticle")
+@Transactional(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<String> arguments) throws Exception {
+        log.info("CreateArticeJob.run: BEGIN");
+
+        if (random.nextInt() % 3 == 0) {
+            throw new RuntimeException("failing create article");
+        }
+
+        Date now = new Date();
+
+        log.info("now = {}", now);
+
+        Article article = new Article(new Date(), null, "title", "body");
+//        entityManager.persist(article);
+
+        log.info("CreateArticeJob.run: END");
+    }
+}
diff --git a/src/test/java/io/trygvis/test/Main.java b/src/test/java/io/trygvis/test/Main.java
new file mode 100755
index 0000000..721df61
--- /dev/null
+++ b/src/test/java/io/trygvis/test/Main.java
@@ -0,0 +1,115 @@
+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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import static java.lang.System.*;
+import static java.lang.Thread.sleep;
+
+@Component
+public class Main {
+    private static final Logger log = LoggerFactory.getLogger(Main.class);
+
+    public static void main(String[] args) throws Exception {
+        SLF4JBridgeHandler.install();
+
+        String username = getProperty("user.name");
+        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");
+        log.info("Started context");
+
+        try {
+            context.getBean(Main.class).run();
+//            log.info("Sleeping");
+//            sleep(1000 * 1000);
+        } catch (Exception e) {
+            e.printStackTrace(System.out);
+        }
+
+        log.info("Stopping context");
+        context.stop();
+        log.info("Stopped context");
+
+        exit(0);
+    }
+
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    @Autowired
+    private AsyncService asyncService;
+
+    @Autowired
+    @Qualifier("createArticle")
+    private AsyncService.AsyncCallable createArticleCallable;
+
+    @Autowired
+    @Qualifier("updateArticle")
+    private AsyncService.AsyncCallable updateArticleCallable;
+
+    public void run() throws Exception {
+        log.info("Main.run");
+
+        final Queue q = asyncService.registerQueue("create-article", 1, createArticleCallable);
+//        log.info("queue registered: ref = {}", q);
+//        asyncService.registerQueue("update-queue", 1, updateArticleCallable);
+
+//        q = asyncService.getQueue("create-queue");
+
+        final List<Task> tasks = new ArrayList<>();
+
+        final int count = 1;
+        log.info("Creating {} tasks", count);
+//        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+//            protected void doInTransactionWithoutResult(TransactionStatus status) {
+//                for (int i = 0; i < count; i++) {
+//                    tasks.add(asyncService.schedule(q));
+//                }
+//            }
+//        });
+        log.info("Created {} tasks", count);
+
+        while (true) {
+            sleep(10000);
+
+            log.info("Checking for status of {} tasks", tasks.size());
+            for (Iterator<Task> iterator = tasks.iterator(); iterator.hasNext(); ) {
+                Task task = iterator.next();
+
+                task = asyncService.update(task);
+
+//                log.info("task = {}", task);
+
+                if (task.isDone()) {
+                    iterator.remove();
+                }
+            }
+
+            if (tasks.isEmpty()) {
+                log.info("No more tasks");
+                break;
+            }
+        }
+    }
+}
diff --git a/src/test/java/io/trygvis/test/UpdateArticleCallable.java b/src/test/java/io/trygvis/test/UpdateArticleCallable.java
new file mode 100755
index 0000000..aae28b9
--- /dev/null
+++ b/src/test/java/io/trygvis/test/UpdateArticleCallable.java
@@ -0,0 +1,44 @@
+package io.trygvis.test;
+
+import io.trygvis.async.AsyncService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
+@Component("updateArticle")
+public class UpdateArticleCallable
+    implements AsyncService.AsyncCallable {
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
+    private final Random r = new Random();
+
+//    @PersistenceContext
+//    private EntityManager entityManager;
+
+//    @Transactional(propagation = REQUIRES_NEW)
+    public void run(List<String> arguments) throws Exception {
+        log.info("UpdateArticeJob.run: BEGIN");
+
+        Date now = new Date();
+
+        log.info("now = {}", now);
+
+/*
+        TypedQuery<Article> q = entityManager.createQuery(entityManager.getCriteriaBuilder().createQuery(Article.class));
+
+        List<Article> list = q.getResultList();
+        log.info("Got {} articles", list.size());
+
+        Article a = list.get(r.nextInt(list.size()));
+        a.setUpdated(new Date());
+
+        entityManager.persist(a);
+*/
+
+        log.info("UpdateArticeJob.run: END");
+    }
+}
diff --git a/src/test/java/io/trygvis/test/spring/PlainSpringTest.java b/src/test/java/io/trygvis/test/spring/PlainSpringTest.java
new file mode 100644
index 0000000..9a7a436
--- /dev/null
+++ b/src/test/java/io/trygvis/test/spring/PlainSpringTest.java
@@ -0,0 +1,59 @@
+package io.trygvis.test.spring;
+
+import io.trygvis.async.AsyncService;
+import io.trygvis.queue.Queue;
+import io.trygvis.spring.DefaultConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static java.lang.System.getProperty;
+import static java.lang.System.setProperty;
+import static org.fest.assertions.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = {TestConfig.class, DefaultConfig.class})
+public class PlainSpringTest {
+
+    @Autowired
+    private AsyncService asyncService;
+
+    static {
+        String username = getProperty("user.name");
+        setProperty("database.url", getProperty("jdbc.url", "jdbc:postgresql://localhost/" + username));
+        setProperty("database.username", username);
+        setProperty("database.password", username);
+    }
+
+    @Test
+    public void testBasic() throws SQLException, InterruptedException {
+        final AtomicReference<List<String>> ref = new AtomicReference<>();
+        Queue test = asyncService.registerQueue("test", 10, new AsyncService.AsyncCallable() {
+            public void run(List<String> arguments) throws Exception {
+                System.out.println("PlainSpringTest.run");
+                ref.set(arguments);
+                synchronized (ref) {
+                    ref.notify();
+                }
+            }
+        });
+
+        synchronized (ref) {
+            System.out.println("Scheduling task");
+            asyncService.schedule(test, "hello", "world");
+            System.out.println("Waiting");
+            ref.wait(1000);
+        }
+
+        List<String> args = ref.get();
+        assertNotNull(args);
+        assertThat(args).containsExactly("hello", "world");
+    }
+}
diff --git a/src/test/java/io/trygvis/test/spring/TestConfig.java b/src/test/java/io/trygvis/test/spring/TestConfig.java
new file mode 100755
index 0000000..7853cb5
--- /dev/null
+++ b/src/test/java/io/trygvis/test/spring/TestConfig.java
@@ -0,0 +1,172 @@
+package io.trygvis.test.spring;
+
+import com.jolbox.bonecp.BoneCPDataSource;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy;
+import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.sql.DataSource;
+
+@Configuration
+@ComponentScan(basePackages = "io.trygvis")
+@EnableTransactionManagement
+//@EnableJpaRepositories(basePackages = "io.trygvis.data")
+public class TestConfig {
+
+    @Bean
+    public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() throws Exception {
+        return new PropertySourcesPlaceholderConfigurer() {{
+//            setLocation(new UrlResource("file:environment.properties"));
+            setProperties(System.getProperties());
+            setLocalOverride(true);
+        }};
+    }
+
+    @Bean
+    public JdbcTemplate jdbcTemplate(DataSource dataSource) {
+        return new JdbcTemplate(dataSource);
+    }
+
+//    public SpringBeanJobFactory springBeanJobFactory() {
+//        SpringBeanJobFactory factory = new SpringBeanJobFactory();
+//        return factory;
+//    }
+
+/*
+    @Bean
+    public SchedulerFactoryBean quartz(DataSource dataSource, PlatformTransactionManager transactionManager) {
+        SchedulerFactoryBean bean = new SchedulerFactoryBean();
+        bean.setApplicationContextSchedulerContextKey("applicationContext");
+        bean.setDataSource(dataSource);
+        bean.setTransactionManager(transactionManager);
+//        bean.setJobFactory(new JobFactory() {
+//            public Job newJob(TriggerFiredBundle bundle, Scheduler scheduler) throws SchedulerException {
+//                Class<? extends Job> klass = bundle.getJobDetail().getJobClass();
+//            }
+//        });
+
+        Properties quartzProperties = new Properties();
+        quartzProperties.setProperty("org.quartz.scheduler.skipUpdateCheck", "true");
+//        quartzProperties.setProperty("org.quartz.jobStore.selectWithLockSQL", "false");
+        quartzProperties.setProperty("org.quartz.jobStore.driverDelegateClass", PostgreSQLDelegate.class.getName());
+        quartzProperties.setProperty("org.quartz.scheduler.jmx.export", "true");
+        bean.setQuartzProperties(quartzProperties);
+        return bean;
+    }
+*/
+
+    // This turns out to be fairly useless as Spring won't register them automatically.
+    // It's probably better to use @Scheduled/@Async instead
+    /*
+    @Bean(name = "my-job")
+    public JobDetailFactoryBean myJobDetailBean() {
+        JobDetailFactoryBean bean = new JobDetailFactoryBean();
+        bean.setJobClass(MyJob.class);
+        bean.setDurability(true);
+
+        return bean;
+    }
+
+    @Bean
+    public CronTriggerFactoryBean myJobTrigger(JobDetail jobDetail) {
+        CronTriggerFactoryBean bean = new CronTriggerFactoryBean();
+        bean.setName("my-trigger");
+        bean.setBeanName("my-job");
+        bean.setJobDetail(jobDetail);
+        bean.setCronExpression("0/10 * * * * ?");
+
+        return bean;
+    }
+    */
+
+    @Bean
+    public DataSource dataSource(@Value("${database.url}") String jdbcUrl,
+                                 @Value("${database.username}") String username,
+                                 @Value("${database.password}") String password) {
+        BoneCPDataSource ds = new BoneCPDataSource();
+
+        ds.setLogStatementsEnabled(true);
+
+        ds.setJdbcUrl(jdbcUrl);
+        ds.setUsername(username);
+        ds.setPassword(password);
+
+        ds.setIdleConnectionTestPeriodInSeconds(60);
+        ds.setIdleMaxAgeInSeconds(240);
+        ds.setMaxConnectionsPerPartition(40);
+        ds.setMinConnectionsPerPartition(0);
+        ds.setPartitionCount(1);
+        ds.setAcquireIncrement(1);
+        ds.setStatementsCacheSize(1000);
+        ds.setReleaseHelperThreads(3);
+        ds.setStatisticsEnabled(true);
+        return new TransactionAwareDataSourceProxy(new LazyConnectionDataSourceProxy(ds));
+    }
+
+/*
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource,
+                                                                       @Value("${hibernate.hbm2ddl.auto}") String hbm2ddl,
+                                                                       @Value("${hibernate.showSql:false}") boolean showSql,
+                                                                       @Value("${hibernate.dialect}") String dialect) {
+        LocalContainerEntityManagerFactoryBean x = new LocalContainerEntityManagerFactoryBean();
+        x.setDataSource(dataSource);
+        x.setJpaPropertyMap(createJpaMap(hbm2ddl, showSql, dialect));
+        x.setPackagesToScan(Article.class.getPackage().getName());
+        HibernatePersistence persistenceProvider = new HibernatePersistence();
+        x.setPersistenceProvider(persistenceProvider);
+        return x;
+    }
+
+    public static Map<String, Object> createJpaMap(String hbm2ddl, boolean showSql, String dialect) {
+        Map<String, Object> map = new HashMap<>();
+        map.put(HBM2DDL_AUTO, hbm2ddl);
+        map.put(FORMAT_SQL, showSql);
+        map.put(SHOW_SQL, showSql);
+        map.put(USE_SQL_COMMENTS, showSql);
+        map.put(GENERATE_STATISTICS, true);
+        map.put(NAMING_STRATEGY, ImprovedNamingStrategy.class.getName());
+
+        map.put(DEFAULT_CACHE_CONCURRENCY_STRATEGY, CacheConcurrencyStrategy.READ_WRITE.toString());
+        map.put(CURRENT_SESSION_CONTEXT_CLASS, SpringSessionContext.class.getName());
+//        map.put(CACHE_REGION_FACTORY, EhCacheRegionFactory.class.getName());
+        map.put(USE_SECOND_LEVEL_CACHE, false);
+        map.put(USE_QUERY_CACHE, false);
+//        map.put(SHARED_CACHE_MODE, SharedCacheMode.ENABLE_SELECTIVE.toString());
+
+        map.put(DIALECT, dialect);
+        map.put("hibernate.temp.use_jdbc_metadata_defaults", "false");
+
+        return map;
+    }
+
+    @Bean
+    public SessionFactory sessionFactory(LocalContainerEntityManagerFactoryBean entityManagerFactory) {
+        return ((HibernateEntityManagerFactory) entityManagerFactory.nativeEntityManagerFactory).getSessionFactory();
+    }
+
+    @Bean
+    public JpaTransactionManager transactionManager(EntityManagerFactory entityManagerFactory) {
+        return new JpaTransactionManager(entityManagerFactory);
+    }
+*/
+
+    @Bean
+    public PlatformTransactionManager transactionManager(DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    @Bean
+    public TransactionTemplate transactionTemplate(PlatformTransactionManager platformTransactionManager) {
+        return new TransactionTemplate(platformTransactionManager);
+    }
+}