fix scaladoc creation

- link to jdk (fixes warnings about the throws clauses)
- link to all the AWS jars (no longer just one)

Author: dwhjames

scaladoc.sbt

@@ -1,8 +1,9 @@
 import scala.util.matching.Regex.Match
 
 
-scalacOptions in (Compile, doc) ++=
+scalacOptions in (Compile, doc) :=
   Seq(
+    "-encoding", "UTF-8",
     "-sourcepath", baseDirectory.value.getAbsolutePath,
     "-doc-source-url", s"https://github.com/dwhjames/aws-wrap/tree/v${version.value}€{FILE_PATH}.scala")
 
@@ -11,10 +12,17 @@ autoAPIMappings := true
 
 apiURL := Some(url("https://dwhjames.github.io/aws-wrap/api/current/"))
 
-apiMappings += {
+apiMappings ++= {
+  val builder = Map.newBuilder[sbt.File, sbt.URL]
   val jarFiles = (managedClasspath in Compile).value.files
-  val datomicJarFile = jarFiles.find(file => file.toString.contains("com.amazonaws/aws-java-sdk")).get
-  (datomicJarFile -> url("http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/"))
+  jarFiles.filter(file => file.toString.contains("com.amazonaws/aws-java-sdk")).foreach { awsJarFile =>
+    builder += awsJarFile -> url("http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/")
+  }
+  val bootPath = System.getProperty("sun.boot.library.path")
+  if (bootPath ne null) {
+    builder += file(bootPath + "/rt.jar") -> url("http://docs.oracle.com/javase/6/docs/api/")
+  }
+  builder.result()
 }
 
 lazy val transformJavaDocLinksTask = taskKey[Unit](
@@ -26,17 +34,24 @@ transformJavaDocLinksTask := {
   log.info("Transforming JavaDoc links")
   val t = (target in (Compile, doc)).value
   (t ** "*.html").get.filter(hasJavadocApiLink).foreach { f =>
-    log.info("Transforming " + f)
-    val newContent = javadocApiLink.replaceAllIn(IO.read(f), transformJavaDocLinks)
-    IO.write(f, newContent)
+    log.debug("Transforming " + f)
+    val content1 = javadocApiLink.replaceAllIn(IO.read(f), transformJavaDocLinks)
+    val content2 = awsJavadocApiLink.replaceAllIn(content1, transformJavaDocLinks)
+    IO.write(f, content2)
   }
 }
 
 val transformJavaDocLinks: Match => String = m =>
     "href=\"" + m.group(1) + "?" + m.group(2).replace(".", "/") + ".html"
 
-val javadocApiLink = """href=\"(http://docs\.aws\.amazon\.com/AWSJavaSDK/latest/javadoc/index\.html)#([^"]*)""".r
+val javadocApiLink = """href=\"(http://docs\.oracle\.com/javase/6/docs/api/index\.html)#([^"]*)""".r
 
-def hasJavadocApiLink(f: File): Boolean = (javadocApiLink findFirstIn IO.read(f)).nonEmpty
+val awsJavadocApiLink = """href=\"(http://docs\.aws\.amazon\.com/AWSJavaSDK/latest/javadoc/index\.html)#([^"]*)""".r
+
+def hasJavadocApiLink(f: File): Boolean = {
+  val content = IO.read(f)
+  (javadocApiLink findFirstIn content).nonEmpty ||
+  (awsJavadocApiLink findFirstIn content).nonEmpty
+}
 
 transformJavaDocLinksTask <<= transformJavaDocLinksTask triggeredBy (doc in Compile)

src/main/scala/dynamodb/ConcurrentBatchWriter.scala

@@ -282,7 +282,7 @@ class ConcurrentBatchWriter(
       * Note that this is an blocking call
       *
       * @return true if the group of writes completed without errors
-      * @throws InterruptedException if interrupted while waiting
+      * @throws java.lang.InterruptedException if interrupted while waiting
       */
     @throws(classOf[InterruptedException])
     def awaitCompletionOfAllWrites(): Boolean = {
@@ -387,7 +387,7 @@ class ConcurrentBatchWriter(
       *
       * @param requests
       *     an iterable collection of WriteRequests
-      * @throws InterruptedException if interrupted while waiting
+      * @throws java.lang.InterruptedException if interrupted while waiting
       */
     @throws(classOf[InterruptedException])
     def queueWriteRequests(requests: Iterable[WriteRequest]): Unit = {