Each resource now reports its resolver

Author: loverdos

pom.xml

@@ -97,19 +97,19 @@
     <dependency>
       <groupId>com.ckkloverdos</groupId>
       <artifactId>typedkey</artifactId>
-      <version>0.5.0</version>
+      <version>0.7.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
   <build>
-    <sourceDirectory>src/main/scala</sourceDirectory>
-    <testSourceDirectory>src/test/scala</testSourceDirectory>
+    <sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
+    <testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
     <resources>
       <resource>
         <directory>${basedir}/src/main/resources</directory>
@@ -145,23 +145,39 @@
       </plugin>
 
       <plugin>
-        <groupId>org.scala-tools</groupId>
-        <artifactId>maven-scala-plugin</artifactId>
-        <version>2.15.2</version>
+        <groupId>net.alchim31.maven</groupId>
+        <artifactId>scala-maven-plugin</artifactId>
+        <version>3.1.0</version>
         <configuration>
+          <recompileMode>incremental</recompileMode>
           <scalaVersion>${scala.version}</scalaVersion>
           <charset>${project.build.sourceEncoding}</charset>
+          <javacArgs>
+            <javacArg>-Xlint:unchecked</javacArg>
+            <javacArg>-Xlint:deprecation</javacArg>
+          </javacArgs>
           <args>
             <arg>-deprecation</arg>
             <arg>-unchecked</arg>
             <arg>-optimize</arg>
           </args>
-          <charset>${project.build.sourceEncoding}</charset>
         </configuration>
         <executions>
           <execution>
+            <id>scala-compile-first</id>
+            <phase>process-resources</phase>
             <goals>
+              <goal>add-source</goal>
               <goal>compile</goal>
+              <goal>doc-jar</goal>
+            </goals>
+          </execution>
+
+          <execution>
+            <id>scala-test-compile</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <!--<goal>add-source</goal>-->
               <goal>testCompile</goal>
             </goals>
           </execution>
@@ -171,7 +187,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.9</version>
+        <version>2.12.4</version>
         <configuration>
           <useFile>false</useFile>
           <reportFormat>plain</reportFormat>
@@ -181,21 +197,22 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.1.2</version>
+        <version>2.2.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>
             <goals>
-              <goal>jar-no-fork</goal>
+              <goal>jar</goal>
             </goals>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.2.2</version>
+        <version>2.3.2</version>
         <configuration>
           <preparationGoals>clean verify</preparationGoals>
         </configuration>

project/build.properties

@@ -17,11 +17,10 @@
 package com.ckkloverdos.props
 
 import com.ckkloverdos.convert.Converters
-import java.net.URL
+import com.ckkloverdos.maybe.{NoVal, Maybe}
+import com.ckkloverdos.resource.{StreamResourceContext, StreamResource, ThreadResourceContext}
 import java.io.InputStream
 import java.util.Properties
-import com.ckkloverdos.resource.{StreamResourceContext, WrappingStreamResource, StreamResource, DefaultResourceContext}
-import com.ckkloverdos.maybe.{NoVal, Maybe}
 
 /**
  * Properties with conversion methods.
@@ -109,29 +108,32 @@ class AnyProps(val map: Map[String, Any])(implicit conv: Converters = Converters
 object AnyProps {
   lazy val DefaultFalseStrings = Set("false", "off", "0")
 
-  lazy val DummyWrappedURL = new URL("streamresource://wrapped")
-  lazy val DummyWrappedPath = "wrapped"
-
   lazy val empty = new Props(Map())
 
   def apply(rc: StreamResource)(implicit conv: Converters): Maybe[AnyProps] = {
-    rc.mapInputStream { in ⇒
+    rc.mapStream { in ⇒
       val props = new java.util.Properties
       props.load(in)
       import collection.JavaConversions._
       props.toMap
     } map (new AnyProps(_))
   }
 
-  def apply(in: InputStream)(implicit conv: Converters): Maybe[AnyProps] =
-    this(new WrappingStreamResource(in, DummyWrappedPath, DummyWrappedURL))
+  def apply(in: InputStream)(implicit conv: Converters): Maybe[AnyProps] = {
+    Maybe {
+      val props = new java.util.Properties
+      props.load(in)
+      import collection.JavaConversions._
+      new AnyProps(props.toMap)
+    }
+  }
 
   def apply(props: Properties)(implicit conv: Converters): Maybe[AnyProps] = {
     import collection.JavaConversions._
     Maybe(new AnyProps(props.toMap))
   }
 
-  def apply(path: String, rc: StreamResourceContext = DefaultResourceContext)(implicit conv: Converters): Maybe[AnyProps] = {
+  def apply(path: String, rc: StreamResourceContext = ThreadResourceContext)(implicit conv: Converters): Maybe[AnyProps] = {
     rc.getResource(path).flatMap(this(_))
   }
 

project/build/Project.scala

@@ -16,14 +16,13 @@
 
 package com.ckkloverdos.props
 
-import com.ckkloverdos.resource.{StreamResource, WrappingStreamResource, StreamResourceContext, DefaultResourceContext}
-import java.io.InputStream
-import java.net.URL
-import java.util.Properties
 import com.ckkloverdos.convert.Converters
-import com.ckkloverdos.maybe.{NoVal, Maybe}
-import com.ckkloverdos.key.StringKey
 import com.ckkloverdos.env.Env
+import com.ckkloverdos.maybe.{NoVal, Maybe}
+import com.ckkloverdos.resource.{StreamResource, StreamResourceContext, ThreadResourceContext}
+import java.io.InputStream
+import java.util.Properties
+import com.ckkloverdos.key.TKeyOnly
 
 /**
  * Properties with conversion methods.
@@ -208,7 +207,7 @@ class Props(val map: Map[String, String])(implicit conv: Converters = Converters
   }
 
   def toEnv: Env = {
-    map.foldLeft(Env())((env, kv) ⇒ env + (StringKey(kv._1), kv._2))
+    map.foldLeft(Env())((env, kv) ⇒ env + (new TKeyOnly[String](kv._1), kv._2))
   }
 
   def group(keyPrefix: String): Props = {
@@ -228,29 +227,32 @@ class Props(val map: Map[String, String])(implicit conv: Converters = Converters
 }
 
 object Props {
-  lazy val DummyWrappedURL = new URL("streamresource://wrapped")
-  lazy val DummyWrappedPath = "wrapped"
-
   lazy val empty = new Props(Map())
 
   def apply(rc: StreamResource)(implicit conv: Converters): Maybe[Props] = {
-    rc.mapInputStream { in ⇒
+    rc.mapStream { in ⇒
       val props = new java.util.Properties
       props.load(in)
       import collection.JavaConversions._
       props.toMap
     } map (new Props(_))
   }
 
-  def apply(in: InputStream)(implicit conv: Converters): Maybe[Props] =
-    this(new WrappingStreamResource(in, DummyWrappedPath, DummyWrappedURL))
+  def apply(in: InputStream)(implicit conv: Converters): Maybe[Props] = {
+    Maybe {
+      val props = new java.util.Properties
+      props.load(in)
+      import collection.JavaConversions._
+      new Props(props.toMap)
+    }
+  }
 
   def apply(props: Properties)(implicit conv: Converters): Maybe[Props] = {
     import collection.JavaConversions._
     Maybe(new Props(props.toMap))
   }
 
-  def apply(path: String, rc: StreamResourceContext = DefaultResourceContext)(implicit conv: Converters): Maybe[Props] = {
+  def apply(path: String, rc: StreamResourceContext = ThreadResourceContext)(implicit conv: Converters): Maybe[Props] = {
     rc.getResource(path).flatMap(this(_))
   }