Merge pull request #62 from jarreds/scala212

Upgrade to Scala 2.12.1

Author: jarreds

.travis.yml

@@ -1,6 +1,8 @@
 language: scala
 scala:
-  - 2.9.2
+  - 2.12.1
+jdk:
+  - oraclejdk8
 install: true
 script:
   - "mvn test"

README.md

@@ -7,8 +7,8 @@ jdub
 Requirements
 ------------
 
-* Java SE 6 or above
-* Scala 2.11.x
+* Java SE 8 or above
+* Scala 2.12.x
 
 How To Use
 ----------
@@ -180,6 +180,6 @@ License
 -------
 
 Copyright (c) 2011-2012 Coda Hale
-Copyright (c) 2012-2016 Simple Finance Technology Corp. All rights reserved.
+Copyright (c) 2012-2017 Simple Finance Technology Corp. All rights reserved.
 
 Published under The MIT License, see [LICENSE.md](LICENSE.md)

pom.xml

@@ -5,33 +5,33 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.simple</groupId>
-    <artifactId>jdub_2.11</artifactId>
-    <version>1.4.0</version>
+    <artifactId>jdub_2.12</artifactId>
+    <version>2.0.0</version>
     <name>Jdub for Scala ${scala.version}</name>
     <url>https://github.com/SimpleFinance/jdub</url>
     <description>Jdub is a Scala wrapper over JDBC.</description>
 
     <properties>
-        <grizzled-slf4j.version>1.2.0</grizzled-slf4j.version>
-        <hikaricp-java7.version>2.4.9</hikaricp-java7.version>
-        <hsqldb.version>2.3.3</hsqldb.version>
-        <joda-convert.version>1.7</joda-convert.version>
-        <joda-time.version>2.9.1</joda-time.version>
-        <logback.version>1.1.7</logback.version>
-        <maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
-        <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
-        <maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
-        <maven-resources-plugin.version>2.6</maven-resources-plugin.version>
-        <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
-        <maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
+        <grizzled-slf4j.version>1.3.0</grizzled-slf4j.version>
+        <hikaricp.version>2.5.1</hikaricp.version>
+        <hsqldb.version>2.3.4</hsqldb.version>
+        <joda-convert.version>1.8.1</joda-convert.version>
+        <joda-time.version>2.9.7</joda-time.version>
+        <logback.version>1.1.8</logback.version>
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
+        <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+        <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
+        <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
+        <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <metrics.version>3.1.2</metrics.version>
-        <mockito.version>1.9.5</mockito.version>
-        <scala.major.version>2.11</scala.major.version>
-        <scala.version>${scala.major.version}.8</scala.version>
-        <scala-maven-plugin.version>3.2.0</scala-maven-plugin.version>
-        <scalatest.version>3.0.0</scalatest.version>
+        <mockito.version>1.10.19</mockito.version>
+        <scala.major.version>2.12</scala.major.version>
+        <scala.version>${scala.major.version}.1</scala.version>
+        <scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
+        <scalatest.version>3.0.1</scalatest.version>
         <scalatest-maven-plugin.version>1.0</scalatest-maven-plugin.version>
-        <wagon-ssh-external.version>2.6</wagon-ssh-external.version>
+        <wagon-ssh-external.version>2.10</wagon-ssh-external.version>
     </properties>
 
     <developers>
@@ -111,8 +111,8 @@
         </dependency>
         <dependency>
           <groupId>com.zaxxer</groupId>
-          <artifactId>HikariCP-java7</artifactId>
-          <version>${hikaricp-java7.version}</version>
+          <artifactId>HikariCP</artifactId>
+          <version>${hikaricp.version}</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -192,9 +192,10 @@
                 <configuration>
                     <verbose>true</verbose>
                     <args>
-                        <arg>-optimise</arg>
                         <arg>-unchecked</arg>
                         <arg>-deprecation</arg>
+                        <arg>-feature</arg>
+                        <arg>-language:higherKinds</arg>
                     </args>
                     <charset>UTF-8</charset>
                 </configuration>
@@ -204,8 +205,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>

src/main/scala/com/simple/jdub/TransactionManager.scala

@@ -5,14 +5,14 @@
 
 package com.simple.jdub
 
-import scala.collection.mutable.Stack
+import java.util.Stack
 
 trait TransactionProvider {
   def transactionExists: Boolean
   def currentTransaction: Transaction
-  def begin(transaction: Transaction)
-  def end: Unit
-  def rollback: Unit
+  def begin(transaction: Transaction): Unit
+  def end(): Unit
+  def rollback(): Unit
 }
 
 class TransactionManager extends TransactionProvider {
@@ -22,48 +22,52 @@ class TransactionManager extends TransactionProvider {
     override def initialValue = None
   }
 
-  protected def ambientTransactionState = {
+  protected def ambientTransactionState: Option[TransactionState] = {
     localTransactionStorage.get
   }
 
-  protected def ambientTransaction = {
-    ambientTransactionState.flatMap(t => Some(t.transactions.head))
+  protected def ambientTransaction: Option[Transaction] = {
+    ambientTransactionState.map(_.transactions.peek)
   }
 
-  protected def currentTransactionState = {
-    ambientTransactionState
-      .getOrElse(throw new Exception("No transaction in current context"))
+  protected def currentTransactionState: TransactionState = {
+    ambientTransactionState.getOrElse(
+      throw new Exception("No transaction in current context")
+    )
   }
 
-  def currentTransaction = {
-    ambientTransaction
-      .getOrElse(throw new Exception("No transaction in current context"))
+  def transactionExists: Boolean = {
+    ambientTransactionState.isDefined
   }
 
-  def transactionExists = {
-    ambientTransactionState.isEmpty == false
+  def currentTransaction: Transaction = {
+    ambientTransaction.getOrElse(
+      throw new Exception("No transaction in current context")
+    )
   }
 
-  def begin(transaction: Transaction) {
+  def begin(transaction: Transaction): Unit = {
     if (!transactionExists) {
-      localTransactionStorage.set(Some(new TransactionState(Stack(transaction))))
+      val stack = new Stack[Transaction]()
+      stack.push(transaction)
+      localTransactionStorage.set(Some(new TransactionState(stack)))
     } else {
       currentTransactionState.transactions.push(transaction)
     }
   }
 
-  def end {
+  def end(): Unit = {
     if (!transactionExists) {
       throw new Exception("No transaction in current context")
     } else {
       currentTransactionState.transactions.pop
-      if (currentTransactionState.transactions.isEmpty) {
+      if (currentTransactionState.transactions.empty) {
         localTransactionStorage.set(None)
       }
     }
   }
 
-  def rollback = {
+  def rollback(): Unit = {
     currentTransaction.rollback
   }
 }