Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'release30'

  • Loading branch information...
commit af8645abf7287cb0abd4588becaf45ac9aec67e0 2 parents 2250e9b + c0301ee
Robey Pointer authored
2  CHANGELOG
View
@@ -24,7 +24,7 @@
Dependencies:
* Upgraded to thrift 0.8.0, util 4.0, and finagle 4.0.
* Upgraded to sbt 0.11.2.
-* Added support for scala 2.9.1 in addition to 2.8.1.
+* Upgraded to scala 2.9.2.
2.5.4 - 03/19/2012
202 LICENSE
View
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
4 README.md
View
@@ -1,7 +1,7 @@
# scrooge
-Scrooge is a [thrift](http://thrift.apache.org/) code generator for scala,
-written in scala.
+Scrooge is a [thrift](http://thrift.apache.org/) code generator written in
+scala, which currently generates code for scala and java.
It's meant to be a replacement for the apache thrift code generator, and
generates conforming, compatible binary codecs by building on top of
40 project/Build.scala
View
@@ -4,8 +4,8 @@ import com.twitter.sbt._
object Scrooge extends Build {
// projects that use finagle will provide their own dependent jar.
- val finagleVersion = "4.0.2"
- val utilVersion = "4.0.1"
+ val finagleVersion = "5.0.0"
+ val utilVersion = "5.0.3"
val generateTestThrift = TaskKey[Seq[File]](
"generate-test-thrift",
@@ -13,6 +13,9 @@ object Scrooge extends Build {
)
val sharedSettings = Seq(
+ version := "3.0.0-SNAPSHOT",
+ scalaVersion := "2.9.2",
+
SubversionPublisher.subversionRepository := Some("https://svn.twitter.biz/maven-public"),
generateTestThrift <<= (
@@ -29,7 +32,8 @@ object Scrooge extends Build {
lazy val scrooge = Project(
id = "scrooge",
- base = file(".")
+ base = file("."),
+ settings = Project.defaultSettings ++ StandardProject.newSettings ++ sharedSettings
) aggregate(scroogeRuntime, scroogeGenerator)
lazy val scroogeRuntime = Project(
@@ -41,24 +45,15 @@ object Scrooge extends Build {
).settings(
name := "scrooge-runtime",
organization := "com.twitter",
- version := "3.0.0-SNAPSHOT",
-
- crossScalaVersions := Seq("2.8.1", "2.9.1"),
libraryDependencies <<= (scalaVersion, libraryDependencies) { (version, deps) =>
deps ++ Seq(
- "org.apache.thrift" % "libthrift" % "0.8.0" % "provided"
- ) ++ (if (version == "2.8.1") Seq(
+ "org.apache.thrift" % "libthrift" % "0.8.0" % "provided",
"com.twitter" % "util-codec" % utilVersion % "provided",
// for tests:
- "org.scala-tools.testing" % "specs_2.8.1" % "1.6.7" % "test"
- ) else Seq(
- "com.twitter" %% "util-codec" % utilVersion % "provided",
-
- // for tests:
"org.scala-tools.testing" % "specs_2.9.1" % "1.6.9" % "test"
- ))
+ )
}
)
@@ -73,28 +68,27 @@ object Scrooge extends Build {
).settings(
name := "scrooge",
organization := "com.twitter",
- version := "3.0.0-SNAPSHOT",
// we only generate one scrooge to bind them all.
crossPaths := false,
libraryDependencies ++= Seq(
"org.apache.thrift" % "libthrift" % "0.8.0",
- "com.github.scopt" %% "scopt" % "2.0.1",
- "com.twitter" %% "util-core" % utilVersion,
+ "com.github.scopt" % "scopt_2.9.1" % "2.0.1",
+ "com.twitter" % "util-core" % utilVersion,
// for tests:
- "org.scala-tools.testing" %% "specs" % "1.6.9" % "test" withSources(),
- "org.scalatest" %% "scalatest" % "1.7.1" % "test",
- "com.twitter" %% "scalatest-mixins" % "1.0.3" % "test",
+ "org.scala-tools.testing" % "specs_2.9.1" % "1.6.9" % "test" withSources(),
+ "org.scalatest" % "scalatest_2.9.1" % "1.7.1" % "test",
+ "com.twitter" % "scalatest-mixins_2.9.1" % "1.0.3" % "test",
"org.jmock" % "jmock" % "2.4.0" % "test",
"org.hamcrest" % "hamcrest-all" % "1.1" % "test",
"cglib" % "cglib" % "2.1_3" % "test",
"asm" % "asm" % "1.5.3" % "test",
"org.objenesis" % "objenesis" % "1.1" % "test",
- "com.twitter" %% "finagle-core" % finagleVersion % "test",
- "com.twitter" %% "finagle-thrift" % finagleVersion % "test",
- "com.twitter" %% "finagle-ostrich4" % finagleVersion % "test"
+ "com.twitter" % "finagle-core" % finagleVersion % "test",
+ "com.twitter" % "finagle-thrift" % finagleVersion % "test",
+ "com.twitter" % "finagle-ostrich4" % finagleVersion % "test"
),
mainClass := Some("com.twitter.scrooge.Main"),
2  project/plugins.sbt
View
@@ -19,4 +19,4 @@ resolvers <<= (resolvers) { r =>
externalResolvers <<= (resolvers) map identity
-addSbtPlugin("com.twitter" % "sbt-package-dist" % "1.0.5")
+addSbtPlugin("com.twitter" % "sbt-package-dist" % "1.0.6")
1  scrooge-generator/src/main/resources/javagen/service.java
View
@@ -1,5 +1,6 @@
package {{package}};
+import com.twitter.scrooge.ScroogeOption;
import com.twitter.finagle.SourcedException;
import com.twitter.scrooge.ThriftStruct;
import com.twitter.scrooge.ThriftStructCodec;
7 scrooge-generator/src/main/resources/javagen/struct.java
View
@@ -1,6 +1,7 @@
{{#public}}
package {{package}};
+import com.twitter.scrooge.ScroogeOption;
import com.twitter.scrooge.Utilities;
import com.twitter.scrooge.ThriftStruct;
import com.twitter.scrooge.ThriftStructCodec;
@@ -22,7 +23,7 @@
private static final TStruct STRUCT = new TStruct("{{name}}");
{{#fields}}
private static final TField {{fieldConst}} = new TField("{{name}}", TType.{{constType}}, (short) {{id}});
- final {{#optional}}Utilities.Option<{{fieldType}}>{{/optional}}{{^optional}}{{primitiveFieldType}}{{/optional}} {{name}};
+ final {{#optional}}ScroogeOption<{{fieldType}}>{{/optional}}{{^optional}}{{primitiveFieldType}}{{/optional}} {{name}};
{{/fields}}
public static class Builder {
@@ -47,7 +48,7 @@
return new {{name}}(
{{#fields}}
{{#optional}}
- Utilities.Option.make(this._got_{{name}}, this._{{name}}){{/optional}}
+ ScroogeOption.make(this._got_{{name}}, this._{{name}}){{/optional}}
{{^optional}}
this._{{name}}{{/optional}}
{{/fields|,
@@ -118,7 +119,7 @@ public static void encode({{name}} struct, TProtocol oprot) throws org.apache.th
public {{name}}(
{{#fields}}
- {{#optional}}Utilities.Option<{{fieldType}}>{{/optional}}{{^optional}}{{primitiveFieldType}}{{/optional}} {{name}}{{comma}}
+ {{#optional}}ScroogeOption<{{fieldType}}>{{/optional}}{{^optional}}{{primitiveFieldType}}{{/optional}} {{name}}{{comma}}
{{/fields}}
) {
{{#isException}}
8 scrooge-generator/src/test/scala/com/twitter/scrooge/scalagen/JavaGeneratorSpec.scala
View
@@ -250,7 +250,7 @@ class JavaGeneratorSpec extends Specification with EvalHelper with JMocker with
endRead(protocol)
}
- OptionalInt.decode(protocol) mustEqual new OptionalInt("Commie", new Utilities.Option.Some(14))
+ OptionalInt.decode(protocol) mustEqual new OptionalInt("Commie", new ScroogeOption.Some(14))
}
"read with missing field" in {
@@ -260,7 +260,7 @@ class JavaGeneratorSpec extends Specification with EvalHelper with JMocker with
endRead(protocol)
}
- OptionalInt.decode(protocol) mustEqual new OptionalInt("Commie", Utilities.Option.none())
+ OptionalInt.decode(protocol) mustEqual new OptionalInt("Commie", ScroogeOption.none())
}
"write" in {
@@ -272,7 +272,7 @@ class JavaGeneratorSpec extends Specification with EvalHelper with JMocker with
endWrite(protocol)
}
- new OptionalInt("Commie", new Utilities.Option.Some(14)).write(protocol) mustEqual ()
+ new OptionalInt("Commie", new ScroogeOption.Some(14)).write(protocol) mustEqual ()
}
"write with missing field" in {
@@ -282,7 +282,7 @@ class JavaGeneratorSpec extends Specification with EvalHelper with JMocker with
endWrite(protocol)
}
- new OptionalInt("Commie", Utilities.Option.none()).write(protocol) mustEqual ()
+ new OptionalInt("Commie", ScroogeOption.none()).write(protocol) mustEqual ()
}
}
56 scrooge-runtime/src/main/java/com/twitter/scrooge/ScroogeOption.java
View
@@ -0,0 +1,56 @@
+package com.twitter.scrooge;
+
+import java.util.*;
+
+public abstract class ScroogeOption<A> {
+ public abstract A get();
+ public abstract boolean isDefined();
+
+ public static <A> ScroogeOption<A> make(boolean b, A a) {
+ if (b) {
+ return new Some<A>(a);
+ } else {
+ return none();
+ }
+ }
+
+ public static <A> ScroogeOption<A> none() {
+ return (ScroogeOption<A>) NONE;
+ }
+
+ public static ScroogeOption<Void> NONE = new ScroogeOption<Void>() {
+ public Void get() {
+ throw new IllegalArgumentException();
+ }
+
+ public boolean isDefined() {
+ return false;
+ }
+ };
+
+ public static class Some<A> extends ScroogeOption<A> {
+ final A a;
+
+ public Some(A a) {
+ this.a = a;
+ }
+
+ public A get() {
+ return a;
+ }
+
+ public boolean isDefined() {
+ return true;
+ }
+
+ public boolean equals(Object other) {
+ if (!(other instanceof Some)) return false;
+ Some<A> that = (Some<A>) other;
+ return this.a.equals(that.a);
+ }
+
+ public String toString() {
+ return "Some(" + this.a.toString() + ")";
+ }
+ }
+}
55 scrooge-runtime/src/main/java/com/twitter/scrooge/Utilities.java
View
@@ -44,57 +44,4 @@ B getSecond() {
public static <A, B> Tuple<A, B> makeTuple(A a, B b) {
return new Tuple<A, B>(a, b);
}
-
- public static abstract class Option<A> {
- public abstract A get();
- public abstract boolean isDefined();
-
- public static <A> Option<A> make(boolean b, A a) {
- if (b) {
- return new Some<A>(a);
- } else {
- return none();
- }
- }
-
- public static <A> Option<A> none() {
- return (Option<A>) NONE;
- }
-
- public static Option<Void> NONE = new Option<Void>() {
- public Void get() {
- throw new IllegalArgumentException();
- }
-
- public boolean isDefined() {
- return false;
- }
- };
-
- public static class Some<A> extends Option<A> {
- final A a;
-
- public Some(A a) {
- this.a = a;
- }
-
- public A get() {
- return a;
- }
-
- public boolean isDefined() {
- return true;
- }
-
- public boolean equals(Object other) {
- if (!(other instanceof Some)) return false;
- Some<A> that = (Some<A>) other;
- return this.a.equals(that.a);
- }
-
- public String toString() {
- return "Some(" + this.a.toString() + ")";
- }
- }
- }
-}
+}
Please sign in to comment.
Something went wrong with that request. Please try again.