activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1373871 - in /activemq/activemq-apollo/trunk: apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ apollo-leveldb/ apollo-util/src/main/scala/org/apache/activemq/apollo/ apollo-util/src/main/scala/org/apache/activemq/apollo/util/
Date Thu, 16 Aug 2012 15:06:58 GMT
Author: chirino
Date: Thu Aug 16 15:06:58 2012
New Revision: 1373871

URL: http://svn.apache.org/viewvc?rev=1373871&view=rev
Log:
Cleanup compiler warnings.

Modified:
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/JsonCodec.java
    activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml
    activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util.scala
    activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/OptionSupport.scala

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/JsonCodec.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/JsonCodec.java?rev=1373871&r1=1373870&r2=1373871&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/JsonCodec.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/JsonCodec.java
Thu Aug 16 15:06:58 2012
@@ -34,7 +34,7 @@ import java.io.IOException;
 public class JsonCodec {
     final public static ObjectMapper mapper = new ObjectMapper();
     static {
-        mapper.getSerializationConfig().setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
+        mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
     }
 
     static public <T> T decode(Buffer buffer, Class<T> type) throws IOException
{

Modified: activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml?rev=1373871&r1=1373870&r2=1373871&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml Thu Aug 16 15:06:58 2012
@@ -51,6 +51,12 @@
       <groupId>org.iq80.leveldb</groupId>
       <artifactId>leveldb</artifactId>
       <version>${leveldb-version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-mapper-asl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.fusesource.leveldbjni</groupId>

Modified: activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util.scala?rev=1373871&r1=1373870&r2=1373871&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util.scala
Thu Aug 16 15:06:58 2012
@@ -19,7 +19,6 @@ package org.apache.activemq.apollo
 import org.fusesource.hawtdispatch._
 import org.fusesource.hawtdispatch.Future
 import java.util.concurrent.CountDownLatch
-import java.util
 
 /**
  *

Modified: activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/OptionSupport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/OptionSupport.scala?rev=1373871&r1=1373870&r2=1373871&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/OptionSupport.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/OptionSupport.scala
Thu Aug 16 15:06:58 2012
@@ -25,44 +25,59 @@ import java.{lang=>jl}
  */
 object OptionSupport {
 
-  implicit def apply(value:jl.Boolean):Option[Boolean] = value match {
+  def apply(value:jl.Boolean):Option[Boolean] = value match {
     case null => None
     case x => Some(x.booleanValue)
   }
 
-  implicit def apply(value:jl.Character):Option[Char] = value match {
+  implicit def BooleanToOption(value:jl.Boolean) = apply(value)
+
+  def apply(value:jl.Character):Option[Char] = value match {
     case null => None
     case x => Some(x.charValue)
   }
 
-  implicit def apply(value:jl.Short):Option[Short] = value match {
+  implicit def CharacterToOption(value:jl.Character) = apply(value)
+
+  def apply(value:jl.Short):Option[Short] = value match {
     case null => None
     case x => Some(x.shortValue)
   }
 
-  implicit def apply(value:jl.Integer):Option[Int] = value match {
+  implicit def ShortToOption(value:jl.Short) = apply(value)
+
+  def apply(value:jl.Integer):Option[Int] = value match {
     case null => None
     case x => Some(x.intValue)
   }
 
-  implicit def apply(value:jl.Long):Option[Long] = value match {
+  implicit def IntegerToOption(value:jl.Integer) = apply(value)
+
+  def apply(value:jl.Long):Option[Long] = value match {
     case null => None
     case x => Some(x.longValue)
   }
 
-  implicit def apply(value:jl.Double):Option[Double] = value match {
+  implicit def LongToOption(value:jl.Long) = apply(value)
+
+  def apply(value:jl.Double):Option[Double] = value match {
     case null => None
     case x => Some(x.doubleValue)
   }
 
-  implicit def apply(value:jl.Float):Option[Float] = value match {
+  implicit def DoubleToOption(value:jl.Double) = apply(value)
+
+  def apply(value:jl.Float):Option[Float] = value match {
     case null => None
     case x => Some(x.floatValue)
   }
 
-  implicit def apply[T](value:T):Option[T] = value match {
+  implicit def FloatToOption(value:jl.Float) = apply(value)
+
+  def apply[T](value:T):Option[T] = value match {
     case null => None
     case x => Some(x)
   }
 
+  implicit def AnyToOption[T](value:T) = apply(value)
 }
\ No newline at end of file



Mime
View raw message