upgraded to Scala 2.8.0.RC3 : needed to change annotations, since def…

…ault @field was not working
debasishg · May 28, 2010 · 6883a63 · 6883a63
1 parent 2b3b308
commit 6883a63
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,13 +4,13 @@
   <groupId>sjson.json</groupId>
   <artifactId>sjson</artifactId>
   <packaging>jar</packaging>
-  <version>0.5</version>
+  <version>0.6-SNAPSHOT</version>
   <name>sjson</name>
 
   <properties>
-    <sjson.version>0.5</sjson.version>
+    <sjson.version>0.6-SNAPSHOT</sjson.version>
     <sjson.groupId>sjson</sjson.groupId>
-    <scala.version>2.8.0.Beta1</scala.version>
+    <scala.version>2.8.0.RC3</scala.version>
   </properties>
 
   <licenses>
@@ -41,14 +41,6 @@
       <name>Scala-Tools Maven2 Repository</name>
       <url>http://scala-tools.org/repo-releases</url>
     </repository>
-    <repository>
-      <id>databinder.net/repo/</id>
-      <name>dbDispatch Repository for Maven</name>
-      <url>http://databinder.net/repo</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
   </repositories>
 
   <pluginRepositories>
@@ -137,7 +129,6 @@
           <args>
             <arg>-deprecation</arg>
 	    <arg>-Xcheckinit</arg>
-	    <arg>-Xstrict-warnings</arg>
             <arg>-Xwarninit</arg>
           </args>
           <scalaVersion>${scala.version}</scalaVersion>
@@ -246,12 +237,12 @@
      <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
-      <version>2.8.0.Beta1</version>
+      <version>2.8.0.RC3</version>
     </dependency>
     <dependency>
       <groupId>net.databinder</groupId>
-      <artifactId>dispatch-json_2.8.0.Beta1</artifactId>
-      <version>0.6.6</version>
+      <artifactId>dispatch-json_2.8.0.RC3</artifactId>
+      <version>0.7.4</version>
     </dependency>
     <dependency>
       <groupId>org.objenesis</groupId>
@@ -262,7 +253,7 @@
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest</artifactId>
-      <version>1.0.1-for-scala-2.8.0.Beta1-with-test-interfaces-0.3-SNAPSHOT</version>
+      <version>1.2-for-scala-2.8.0.RC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/src/test/scala/sjson/json/TestBeans.scala b/src/test/scala/sjson/json/TestBeans.scala
@@ -20,7 +20,7 @@ object TestBeans {
 
   @BeanInfo
   case class Contact(name: String, 
-                     @JSONTypeHint(classOf[Address])
+                     @(JSONTypeHint @field)(value = classOf[Address])
                      addresses: Map[String, Address]) {
 
     private def this() = this(null, null)
@@ -64,9 +64,9 @@ object TestBeans {
 
   @BeanInfo
   case class ContactWithOptionalAddr(name: String, 
-                                @JSONTypeHint(classOf[Address])
-                                @OptionTypeHint(classOf[Map[_,_]])
-                                addresses: Option[Map[String, Address]]) {
+    @(JSONTypeHint @field)(value = classOf[Address])
+    @(OptionTypeHint @field)(value = classOf[Map[_,_]])
+    addresses: Option[Map[String, Address]]) {
 
     private def this() = this(null, None)
 
@@ -81,7 +81,7 @@ object TestBeans {
   @BeanInfo  
   case class Person(lastName: String, 
                firstName: String,
-               @JSONTypeHint(classOf[Address])
+               @(JSONTypeHint @field)(value = classOf[Address])
                addresses: List[Address]) {
 
     def this() = this(null, null, Nil)
@@ -193,7 +193,7 @@ object TestBeans {
     val prevEmployer: String,
 
     @(JSONProperty @getter)(value = "Addresses")
-    @JSONTypeHint(classOf[Address])
+    @(JSONTypeHint @field)(value = classOf[Address])
     val addresses: List[Address],
 
     @(JSONProperty @getter)(value = "Salary")
@@ -229,7 +229,7 @@ object TestBeans {
   case class ArrayTest(
     id: Int,
     name: String,
-    @JSONTypeHint(classOf[String])
+    @(JSONTypeHint @field)(value = classOf[String])
     var addresses: Array[String]) {
     def this() = this(0, null, null)
   }
@@ -238,15 +238,15 @@ object TestBeans {
   case class ObjectArrayTest(
     id: Int,
     name: String,
-    @JSONTypeHint(classOf[Address])
+    @(JSONTypeHint @field)(value = classOf[Address])
     var addresses: Array[Address]) {
     def this() = this(0, null, null)
   }
 
   @BeanInfo
   case class Market(
     name: String, 
-    @JSONTypeHint(classOf[Shop])
+    @(JSONTypeHint @field)(value = classOf[Shop])
     shops: Map[Int, Shop], 
     country: String) {
     private def this() = this(null, null, null)
@@ -255,7 +255,7 @@ object TestBeans {
   @BeanInfo
   case class MyTuple2Message(
     val id: String, 
-    @JSONTypeHint(classOf[Shop])
+    @(JSONTypeHint @field)(value = classOf[Shop])
     val value: Tuple2[String, Shop]) {
     private def this() = this(null, null)
   }
@@ -276,10 +276,10 @@ object TestBeans {
 
   @BeanInfo
   case class EnumTest(
-    @EnumTypeHint("sjson.json.WeekDay") start: WeekDay.Value, 
-    @EnumTypeHint("sjson.json.Shape") shape: Shape.Value,
-    @JSONTypeHint(classOf[sjson.json.WeekDay.WeekDay])
-    @EnumTypeHint("sjson.json.WeekDay") 
+    @(EnumTypeHint @field)(value = "sjson.json.WeekDay") start: WeekDay.Value, 
+    @(EnumTypeHint @field)(value = "sjson.json.Shape") shape: Shape.Value,
+    @(JSONTypeHint @field)(value = classOf[sjson.json.WeekDay.WeekDay])
+    @(EnumTypeHint @field)(value = "sjson.json.WeekDay") 
     work: List[WeekDay.Value]) {
     private def this() = this(null, null, null)
   }