You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by cr...@apache.org on 2014/03/25 18:33:34 UTC
git commit: SAMZA-206; fix build error for scala 2.9.2
Repository: incubator-samza
Updated Branches:
refs/heads/master bbb5a65c1 -> e32595bf8
SAMZA-206; fix build error for scala 2.9.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/e32595bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/e32595bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/e32595bf
Branch: refs/heads/master
Commit: e32595bf89e49bfedad579650bad8b8f268a7f1a
Parents: bbb5a65
Author: Chris Riccomini <cr...@criccomi-mn.linkedin.biz>
Authored: Tue Mar 25 10:33:14 2014 -0700
Committer: Chris Riccomini <cr...@criccomi-mn.linkedin.biz>
Committed: Tue Mar 25 10:33:14 2014 -0700
----------------------------------------------------------------------
samza-core/src/main/scala/org/apache/samza/util/Util.scala | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/e32595bf/samza-core/src/main/scala/org/apache/samza/util/Util.scala
----------------------------------------------------------------------
diff --git a/samza-core/src/main/scala/org/apache/samza/util/Util.scala b/samza-core/src/main/scala/org/apache/samza/util/Util.scala
index e44e2ba..2bd2c1c 100644
--- a/samza-core/src/main/scala/org/apache/samza/util/Util.scala
+++ b/samza-core/src/main/scala/org/apache/samza/util/Util.scala
@@ -31,6 +31,7 @@ import org.apache.samza.system.{ SystemStreamPartition, SystemFactory, SystemStr
import org.codehaus.jackson.map.ObjectMapper
import org.codehaus.jackson.`type`.TypeReference
import java.util
+import scala.reflect.BeanProperty
object Util extends Logging {
@@ -147,9 +148,9 @@ object Util extends Logging {
/**
* Jackson really hates Scala's classes, so we need to wrap up the SSP in a form Jackson will take
*/
- private class SSPWrapper(@scala.beans.BeanProperty var partition:java.lang.Integer = null,
- @scala.beans.BeanProperty var Stream:java.lang.String = null,
- @scala.beans.BeanProperty var System:java.lang.String = null) {
+ private class SSPWrapper(@BeanProperty var partition:java.lang.Integer = null,
+ @BeanProperty var Stream:java.lang.String = null,
+ @BeanProperty var System:java.lang.String = null) {
def this() { this(null, null, null) }
def this(ssp:SystemStreamPartition) { this(ssp.getPartition.getPartitionId, ssp.getSystemStream.getStream, ssp.getSystemStream.getSystem)}
}