Permalink
Browse files

Sbt => 0.13, use scalariform

  • Loading branch information...
1 parent 76dadb3 commit 68333132d43929709e6f609ff0f1e73b62a2c158 Jonathan Coveney committed Jun 19, 2014
Showing with 657 additions and 682 deletions.
  1. +8 −8 bijection-avro/src/main/scala/com/twitter/bijection/avro/AvroCodecs.scala
  2. +3 −4 bijection-avro/src/test/scala/com/twitter/bijection/avro/GenericAvroCodecLaws.scala
  3. +3 −4 bijection-avro/src/test/scala/com/twitter/bijection/avro/GenericAvroCodecsSpecification.scala
  4. +2 −4 bijection-avro/src/test/scala/com/twitter/bijection/avro/SpecificAvroCodecLaws.scala
  5. +2 −3 bijection-avro/src/test/scala/com/twitter/bijection/avro/SpecificAvroCodecsSpecification.scala
  6. +98 −98 bijection-clojure/src/main/scala/com/twitter/bijection/clojure/GeneratedIFnBijections.scala
  7. +23 −24 bijection-core/src/main/scala/com/twitter/bijection/Bijection.scala
  8. +2 −2 bijection-core/src/main/scala/com/twitter/bijection/BinaryBijections.scala
  9. +45 −50 bijection-core/src/main/scala/com/twitter/bijection/Bufferable.scala
  10. +11 −12 bijection-core/src/main/scala/com/twitter/bijection/CollectionBijections.scala
  11. +20 −28 bijection-core/src/main/scala/com/twitter/bijection/CollectionInjections.scala
  12. +14 −14 bijection-core/src/main/scala/com/twitter/bijection/Conversion.scala
  13. +60 −60 bijection-core/src/main/scala/com/twitter/bijection/EnglishInt.scala
  14. +3 −2 bijection-core/src/main/scala/com/twitter/bijection/ImplicitBijection.scala
  15. +20 −18 bijection-core/src/main/scala/com/twitter/bijection/Injection.scala
  16. +1 −1 bijection-core/src/main/scala/com/twitter/bijection/InversionFailure.scala
  17. +3 −6 bijection-core/src/main/scala/com/twitter/bijection/JavaSerializationInjection.scala
  18. +12 −13 bijection-core/src/main/scala/com/twitter/bijection/ModDivInjection.scala
  19. +16 −16 bijection-core/src/main/scala/com/twitter/bijection/NumberSystems.scala
  20. +14 −14 bijection-core/src/main/scala/com/twitter/bijection/NumericBijections.scala
  21. +2 −2 bijection-core/src/main/scala/com/twitter/bijection/NumericInjections.scala
  22. +11 −11 bijection-core/src/main/scala/com/twitter/bijection/Pivot.scala
  23. +6 −7 bijection-core/src/main/scala/com/twitter/bijection/StringBijections.scala
  24. +1 −1 bijection-core/src/main/scala/com/twitter/bijection/StringInjections.scala
  25. +8 −8 bijection-core/src/main/scala/com/twitter/package.scala
  26. +3 −3 bijection-core/src/test/scala/com/twitter/bijection/AsSyntax.scala
  27. +33 −31 bijection-core/src/test/scala/com/twitter/bijection/BaseProperties.scala
  28. +1 −1 bijection-core/src/test/scala/com/twitter/bijection/BinaryBijectionLaws.scala
  29. +12 −10 bijection-core/src/test/scala/com/twitter/bijection/BufferableLaws.scala
  30. +4 −4 bijection-core/src/test/scala/com/twitter/bijection/CollectionLaws.scala
  31. +7 −7 bijection-core/src/test/scala/com/twitter/bijection/EnglishIntLaws.scala
  32. +13 −13 bijection-core/src/test/scala/com/twitter/bijection/NumericBijectionLaws.scala
  33. +11 −8 bijection-core/src/test/scala/com/twitter/bijection/StringBijectionLaws.scala
  34. +4 −4 bijection-core/src/test/scala/com/twitter/bijection/TupleBijectionLaws.scala
  35. +3 −6 bijection-guava/src/main/scala/com/twitter/bijection/guava/GuavaBijections.scala
  36. +1 −4 bijection-guava/src/main/scala/com/twitter/bijection/guava/GuavaBinaryBijections.scala
  37. +1 −2 bijection-guava/src/test/scala/com/twitter/bijection/guava/GuavaBijectionLaws.scala
  38. +1 −2 bijection-guava/src/test/scala/com/twitter/bijection/guava/GuavaBinaryBijectionsLaws.scala
  39. +0 −1 bijection-hbase/src/main/scala/com/twitter/bijection/hbase/HBaseBijections.scala
  40. +16 −17 bijection-hbase/src/main/scala/com/twitter/bijection/hbase/HBaseInjections.scala
  41. +1 −2 bijection-hbase/src/test/scala/com/twitter/bijection/hbase/HBaseBijectionsLaws.scala
  42. +1 −1 bijection-hbase/src/test/scala/com/twitter/bijection/hbase/HBaseBijectionsSpecifications.scala
  43. +5 −5 bijection-jodatime/src/main/scala/com/twitter/bijection/jodatime/DateBijections.scala
  44. +1 −2 bijection-jodatime/src/main/scala/com/twitter/bijection/jodatime/DateInjections.scala
  45. +2 −3 bijection-jodatime/src/test/scala/com/twitter/bijection/jodatime/DateBijectionLaws.scala
  46. +28 −32 bijection-json/src/main/scala/com/twitter/bijection/json/JsonInjection.scala
  47. +4 −3 bijection-json/src/main/scala/com/twitter/bijection/json/UnparsedJson.scala
  48. +20 −20 bijection-json/src/test/scala/com/twitter/bijection/json/JsonInjectionLaws.scala
  49. +3 −3 bijection-json4s/src/main/scala/com/twitter/bijection/json4s/Json4sInjections.scala
  50. +1 −1 bijection-json4s/src/main/scala/com/twitter/bijection/json4s/package.scala
  51. +11 −11 bijection-json4s/src/test/scala/com/twitter/bijection/json4s/Json4sInjectionLaws.scala
  52. +2 −1 bijection-netty/src/main/scala/com/twitter/bijection/netty/ChannelBufferBijection.scala
  53. +3 −3 bijection-protobuf/src/main/scala/com/twitter/bijection/protobuf/ProtobufCodecs.scala
  54. +1 −1 bijection-protobuf/src/test/scala/com/twitter/bijection/protobuf/ProtobufCodecLaws.scala
  55. +9 −11 bijection-scrooge/src/main/scala/com/twitter/bijection/scrooge/ScroogeCodecs.scala
  56. +15 −10 bijection-scrooge/src/main/scala/com/twitter/bijection/scrooge/TBinaryProtocol.scala
  57. +1 −1 bijection-scrooge/src/test/scala/com/twitter/bijection/scrooge/ScroogeCodecLaws.scala
  58. +9 −18 bijection-scrooge/src/test/scala/com/twitter/bijection/scrooge/TestStruct.scala
  59. +14 −14 bijection-thrift/src/main/scala/com/twitter/bijection/thrift/ThriftCodecs.scala
  60. +1 −1 bijection-thrift/src/test/scala/com/twitter/bijection/thrift/ThriftCodecLaws.scala
  61. +1 −1 bijection-util/src/main/scala/com/twitter/bijection/twitter_util/ScalaFuturePool.scala
  62. +2 −2 bijection-util/src/main/scala/com/twitter/bijection/twitter_util/UtilBijections.scala
  63. +2 −2 bijection-util/src/test/scala/com/twitter/bijection/twitter_util/UtilBijectionLaws.scala
  64. +17 −6 project/Build.scala
  65. +1 −1 project/build.properties
  66. +4 −4 project/plugins.sbt
@@ -15,14 +15,14 @@ limitations under the License.
package com.twitter.bijection.avro
import com.twitter.bijection.Injection
-import org.apache.avro.specific.{SpecificDatumReader, SpecificDatumWriter, SpecificRecordBase}
-import org.apache.avro.file.{DataFileStream, DataFileWriter}
-import java.io.{ByteArrayInputStream, ByteArrayOutputStream}
+import org.apache.avro.specific.{ SpecificDatumReader, SpecificDatumWriter, SpecificRecordBase }
+import org.apache.avro.file.{ DataFileStream, DataFileWriter }
+import java.io.{ ByteArrayInputStream, ByteArrayOutputStream }
import com.twitter.bijection.Inversion.attempt
import com.twitter.bijection.Attempt
-import org.apache.avro.generic.{GenericDatumReader, GenericDatumWriter, GenericRecord}
+import org.apache.avro.generic.{ GenericDatumReader, GenericDatumWriter, GenericRecord }
import org.apache.avro.Schema
-import org.apache.avro.io.{DecoderFactory, DatumReader, EncoderFactory, DatumWriter}
+import org.apache.avro.io.{ DecoderFactory, DatumReader, EncoderFactory, DatumWriter }
import Injection.utf8
/**
@@ -37,7 +37,7 @@ object SpecificAvroCodecs {
* @tparam T compiled Avro record
* @return Injection
*/
- def apply[T <: SpecificRecordBase : Manifest]: Injection[T, Array[Byte]] = {
+ def apply[T <: SpecificRecordBase: Manifest]: Injection[T, Array[Byte]] = {
val klass = manifest[T].erasure.asInstanceOf[Class[T]]
new SpecificAvroCodec[T](klass)
}
@@ -47,7 +47,7 @@ object SpecificAvroCodecs {
* @tparam T compiled Avro record
* @return Injection
*/
- def toBinary[T <: SpecificRecordBase : Manifest]: Injection[T, Array[Byte]] = {
+ def toBinary[T <: SpecificRecordBase: Manifest]: Injection[T, Array[Byte]] = {
val klass = manifest[T].erasure.asInstanceOf[Class[T]]
val writer = new SpecificDatumWriter[T](klass)
val reader = new SpecificDatumReader[T](klass)
@@ -60,7 +60,7 @@ object SpecificAvroCodecs {
* @tparam T compiled Avro record
* @return Injection
*/
- def toJson[T <: SpecificRecordBase : Manifest](schema: Schema): Injection[T, String] = {
+ def toJson[T <: SpecificRecordBase: Manifest](schema: Schema): Injection[T, String] = {
val klass = manifest[T].erasure.asInstanceOf[Class[T]]
val writer = new SpecificDatumWriter[T](klass)
val reader = new SpecificDatumReader[T](klass)
@@ -13,18 +13,18 @@ limitations under the License.
*/
package com.twitter.bijection.avro
-import com.twitter.bijection.{BaseProperties, Injection}
+import com.twitter.bijection.{ BaseProperties, Injection }
import org.scalacheck.Properties
-import org.apache.avro.generic.{GenericRecord, GenericData}
+import org.apache.avro.generic.{ GenericRecord, GenericData }
import org.apache.avro.Schema
/**
* @author Muhammad Ashraf
* @since 7/5/13
*/
object GenericAvroCodecLaws extends Properties("GenericAvroCodecs") with BaseProperties {
- val testSchema = new Schema.Parser().parse( """{
+ val testSchema = new Schema.Parser().parse("""{
"type":"record",
"name":"FiscalRecord",
"namespace":"avro",
@@ -81,4 +81,3 @@ object GenericAvroCodecLaws extends Properties("GenericAvroCodecs") with BasePro
roundTripsGenericRecordToJson(GenericAvroCodecs.toJson[GenericRecord](testSchema))
}
-
@@ -15,17 +15,17 @@ limitations under the License.
package com.twitter.bijection.avro
import org.specs.Specification
-import com.twitter.bijection.{Injection, BaseProperties}
+import com.twitter.bijection.{ Injection, BaseProperties }
import org.apache.avro.Schema
import avro.FiscalRecord
-import org.apache.avro.generic.{GenericData, GenericRecord}
+import org.apache.avro.generic.{ GenericData, GenericRecord }
/**
* @author Muhammad Ashraf
* @since 7/6/13
*/
object GenericAvroCodecsSpecification extends Specification with BaseProperties {
- val testSchema = new Schema.Parser().parse( """{
+ val testSchema = new Schema.Parser().parse("""{
"type":"record",
"name":"FiscalRecord",
"namespace":"avro",
@@ -51,7 +51,6 @@ object GenericAvroCodecsSpecification extends Specification with BaseProperties
]
}""")
-
"Generic Avro codec" should {
"Round trip generic record using Generic Injection" in {
@@ -1,7 +1,7 @@
package com.twitter.bijection.avro
import org.scalacheck.Properties
-import com.twitter.bijection.{Injection, BaseProperties}
+import com.twitter.bijection.{ Injection, BaseProperties }
import org.apache.avro.Schema
import avro.FiscalRecord
@@ -10,7 +10,7 @@ import avro.FiscalRecord
* @since 10/5/13
*/
object SpecificAvroCodecLaws extends Properties("SpecificAvroCodecs") with BaseProperties {
- val testSchema = new Schema.Parser().parse( """{
+ val testSchema = new Schema.Parser().parse("""{
"type":"record",
"name":"FiscalRecord",
"namespace":"avro",
@@ -36,7 +36,6 @@ object SpecificAvroCodecLaws extends Properties("SpecificAvroCodecs") with BaseP
]
}""")
-
def buildSpecificAvroRecord(i: (String, Int, Int)): FiscalRecord = {
FiscalRecord.newBuilder()
.setCalendarDate(i._1)
@@ -68,4 +67,3 @@ object SpecificAvroCodecLaws extends Properties("SpecificAvroCodecs") with BaseP
}
-
@@ -1,7 +1,7 @@
package com.twitter.bijection.avro
import org.specs.Specification
-import com.twitter.bijection.{Injection, BaseProperties}
+import com.twitter.bijection.{ Injection, BaseProperties }
import org.apache.avro.Schema
import avro.FiscalRecord
@@ -10,7 +10,7 @@ import avro.FiscalRecord
* @since 10/5/13
*/
object SpecificAvroCodecsSpecification extends Specification with BaseProperties {
- val testSchema = new Schema.Parser().parse( """{
+ val testSchema = new Schema.Parser().parse("""{
"type":"record",
"name":"FiscalRecord",
"namespace":"avro",
@@ -36,7 +36,6 @@ object SpecificAvroCodecsSpecification extends Specification with BaseProperties
]
}""")
-
"Avro codec" should {
"Round trip specific record using Specific Injection" in {
Oops, something went wrong.

0 comments on commit 6833313

Please sign in to comment.