Assign copyright to Microsoft, conform with MS OSS requirements

CHANGELOG.md

@@ -1,3 +1,8 @@
+0.2.0 (Unreleased)
+------------------
+
+- Re-design `Transport` to not use Okio, avoid potential threading issues therein
+
 0.1.4 (released 16 February 2016)
 ---------------------------------
 

CONTRIBUTING.md

@@ -0,0 +1,45 @@
+Contributing to Thrifty
+=======================
+
+The Thrifty team welcomes contributions of all kinds, from simple bug reports through documentation, test cases,
+bugfixes, and features.
+
+DOs and DON'Ts
+--------------
+
+* DO follow our coding style (as described below)
+* DO give priority to the current style of the project or file you're changing even if it diverges from the general guidelines.
+* DO include tests when adding new features. When fixing bugs, start with adding a test that highlights how the current behavior is broken.
+* DO keep the discussions focused. When a new or related topic comes up it's often better to create new issue than to side track the discussion.
+* DO run all Gradle verification tasks (`./gradlew check`) before submitting a pull request
+
+* DO NOT send PRs for style changes.
+* DON'T surprise us with big pull requests. Instead, file an issue and start a discussion so we can agree on a direction before you invest a large amount of time.
+* DON'T commit code that you didn't write. If you find code that you think is a good fit, file an issue and start a discussion before proceeding.
+* DON'T submit PRs that alter licensing related files or headers. If you believe there's a problem with them, file an issue and we'll be happy to discuss it.
+
+
+Coding Style
+------------
+
+The coding style employed here is fairly conventional Java - indentations are four spaces, class
+names are PascalCased, identifiers and methods are camelCased.  Code style is checked automatically
+with checkstyle - nonconforming code will fail during CI builds.  Anything not covered by checkstyle
+is left to your discretion, but please try to favor matching the style of existing code.
+
+Workflow
+--------
+
+We love Github issues!  Before working on any new features, please open an issue so that we can agree on the
+direction, and hopefully avoid investing a lot of time on a feature that might need reworking.
+
+Small pull requests for things like typos, bugfixes, etc are always welcome.
+
+Please note that we will not accept pull requests for style changes.
+
+
+Contributor License Agreement (CLA)
+-----------------------------------
+
+Before we can accept your code, you must sign an individual Contributor License Agreement.  When you
+open a new pull request, our CLA robot will guide you through the process.

NOTICE

@@ -1,5 +1,5 @@
 Thrifty
-Copyright 2015-2016 Benjamin Bader
+Copyright (c) Microsoft Corporation
 
 This software contains code derived from Square's Wire project (https://github.com/square/wire),
 Apache's Thrift project (https://github.com/apache/thrift), and KeepSafe's Dexcount project

README.md

@@ -3,7 +3,7 @@ Thrifty
 
 "Thrift, but cheaper"
 
-[![Build Status](https://travis-ci.org/benjamin-bader/thrifty.svg?branch=master)](https://travis-ci.org/benjamin-bader/thrifty)
+[![Build Status](https://travis-ci.org/microsoft/thrifty.svg?branch=master)](https://travis-ci.org/microsoft/thrifty)
 
 Thrifty is an implementation of the Apache Thrift software stack for Android.
 
@@ -29,7 +29,7 @@ repositories {
 }
 
 dependencies {
-  compile 'com.bendb.thrifty:thrifty-runtime:0.1.3'
+  compile 'com.microsoft.thrifty:thrifty-runtime:0.2.0'
 }
 ```
 
@@ -111,14 +111,14 @@ The latter looks like this:
 package com.foo.bar;
 
 import android.support.annotation.NonNull;
-import com.bendb.thrifty.Adapter;
-import com.bendb.thrifty.StructBuilder;
-import com.bendb.thrifty.TType;
-import com.bendb.thrifty.ThriftField;
-import com.bendb.thrifty.protocol.FieldMetadata;
-import com.bendb.thrifty.protocol.ListMetadata;
-import com.bendb.thrifty.protocol.Protocol;
-import com.bendb.thrifty.util.ProtocolUtil;
+import com.microsoft.thrifty.Adapter;
+import com.microsoft.thrifty.StructBuilder;
+import com.microsoft.thrifty.TType;
+import com.microsoft.thrifty.ThriftField;
+import com.microsoft.thrifty.protocol.FieldMetadata;
+import com.microsoft.thrifty.protocol.ListMetadata;
+import com.microsoft.thrifty.protocol.Protocol;
+import com.microsoft.thrifty.util.ProtocolUtil;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -332,19 +332,11 @@ client.search(query, new ServiceMethodCallback<List<SearchResult>>() {
 ./gradlew check
 ```
 
-### Deploying
-
-```bash
-./gradlew uploadArchives
-```
-
-You will need to have valid Sonatype Nexus OSS credentials, as well as a valid *and published* GPG signing key, configured in your local `gradle.properties` file.
-
 ### Thanks
 
 Thrifty owes an enormous debt to Square and the Wire team; without them, this project would not exist.  Thanks!
 An equal debt is owed to Facebook and Apache for developing and opening Thrift to the world.
 
 -------
 
-Copyright © 2015-2016 Benjamin Bader
+Copyright © Microsoft Corporation

build.gradle

@@ -1,17 +1,22 @@
 /*
- * Copyright (C) 2015-2016 Benjamin Bader
+ * Thrifty
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright (c) Microsoft Corporation
+ *
+ * All rights reserved.
+ *
+ * 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
+ * WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE,
+ * FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
  *
- * 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.
+ * See the Apache Version 2.0 License for specific language governing permissions and limitations under the License.
  */
 
 allprojects {

gradle.properties

@@ -1,11 +1,11 @@
-GROUP=com.bendb.thrifty
+GROUP=com.microsoft.thrifty
 VERSION=0.2.0-SNAPSHOT
 
-POM_URL=https://github.com/benjamin-bader/thrifty/
+POM_URL=https://github.com/microsoft/thrifty/
 
-POM_SCM_URL=https://github.com/benjamin-bader/thrifty/
-POM_SCM_CONNECTION=scm:git:git://github.com/benjamin-bader/thrifty.git
-POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/benjamin-bader/thrifty.git
+POM_SCM_URL=https://github.com/microsoft/thrifty/
+POM_SCM_CONNECTION=scm:git:git://github.com/microsoft/thrifty.git
+POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/microsoft/thrifty.git
 
 POM_LICENSE_NAME=The Apache Software License, Version 2.0
 POM_LICENSE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt

gradle/gradle-mvn-push.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Benjamin Bader
+ * Copyright 2015-2016 Microsoft Corporation
  * Copyright 2015 KeepSafe Software
  * Copyright 2013 Chris Banes
  *

thrifty-compiler-plugins/README.md

@@ -43,7 +43,7 @@ src/
     - resources/
       - META-INF/
         - services/
-          - com.bendb.thrifty.compiler.spi.TypeProcessor
+          - com.microsoft.thrifty.compiler.spi.TypeProcessor
 
 The file under META-INF is how Java services are identified.  The file should
 contain the full name of your processor class, in this example:
@@ -56,7 +56,7 @@ Once this project is built into a JAR, you can include it in the classpath on th
 like so:
 
 ```bash
-java -cp thrifty-compiler.jar:your-processor.jar com.bendb.thrifty.compiler.ThriftyCompiler # compiler args as usual
+java -cp thrifty-compiler.jar:your-processor.jar com.microsoft.thrifty.compiler.ThriftyCompiler # compiler args as usual
 ```
 
 This is a little wordy.  An easier but less-flexible approach could be to build an uberjar including

thrifty-compiler-plugins/build.gradle

@@ -1,17 +1,22 @@
 /*
- * Copyright (C) 2015-2016 Benjamin Bader
+ * Thrifty
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright (c) Microsoft Corporation
+ *
+ * All rights reserved.
+ *
+ * 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
+ * WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE,
+ * FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
  *
- * 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.
+ * See the Apache Version 2.0 License for specific language governing permissions and limitations under the License.
  */
 dependencies {
     compile libraries.javaPoet

thrifty-compiler-plugins/src/main/java/com/bendb/thrifty/compiler/TypeProcessorService.java → thrifty-compiler-plugins/src/main/java/com/microsoft/thrifty/compiler/TypeProcessorService.java

@@ -1,21 +1,26 @@
 /*
- * Copyright (C) 2015-2016 Benjamin Bader
+ * Thrifty
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright (c) Microsoft Corporation
+ *
+ * All rights reserved.
+ *
+ * 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
+ * WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE,
+ * FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
  *
- * 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.
+ * See the Apache Version 2.0 License for specific language governing permissions and limitations under the License.
  */
-package com.bendb.thrifty.compiler;
+package com.microsoft.thrifty.compiler;
 
-import com.bendb.thrifty.compiler.spi.TypeProcessor;
+import com.microsoft.thrifty.compiler.spi.TypeProcessor;
 
 import java.util.Iterator;
 import java.util.ServiceLoader;

thrifty-compiler-plugins/src/main/java/com/bendb/thrifty/compiler/spi/TypeProcessor.java → thrifty-compiler-plugins/src/main/java/com/microsoft/thrifty/compiler/spi/TypeProcessor.java

@@ -1,19 +1,24 @@
 /*
- * Copyright (C) 2015-2016 Benjamin Bader
+ * Thrifty
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright (c) Microsoft Corporation
+ *
+ * All rights reserved.
+ *
+ * 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
+ * WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE,
+ * FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
  *
- * 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.
+ * See the Apache Version 2.0 License for specific language governing permissions and limitations under the License.
  */
-package com.bendb.thrifty.compiler.spi;
+package com.microsoft.thrifty.compiler.spi;
 
 import com.squareup.javapoet.TypeSpec;
 

thrifty-compiler/build.gradle

@@ -1,17 +1,22 @@
 /*
- * Copyright (C) 2015-2016 Benjamin Bader
+ * Thrifty
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright (c) Microsoft Corporation
+ *
+ * All rights reserved.
+ *
+ * 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
+ * WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE,
+ * FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
  *
- * 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.
+ * See the Apache Version 2.0 License for specific language governing permissions and limitations under the License.
  */
 repositories {
     mavenCentral()
@@ -42,7 +47,7 @@ jar {
     }
 
     manifest {
-        attributes("Main-Class": "com.bendb.thrifty.compiler.ThriftyCompiler")
+        attributes("Main-Class": "com.microsoft.thrifty.compiler.ThriftyCompiler")
     }
 }
 

thrifty-compiler/src/main/java/com/bendb/thrifty/compiler/ThriftyCompiler.java → thrifty-compiler/src/main/java/com/microsoft/thrifty/compiler/ThriftyCompiler.java

@@ -1,25 +1,30 @@
 /*
- * Copyright (C) 2015-2016 Benjamin Bader
+ * Thrifty
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright (c) Microsoft Corporation
+ *
+ * All rights reserved.
+ *
+ * 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
+ * WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE,
+ * FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
  *
- * 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.
+ * See the Apache Version 2.0 License for specific language governing permissions and limitations under the License.
  */
-package com.bendb.thrifty.compiler;
+package com.microsoft.thrifty.compiler;
 
-import com.bendb.thrifty.compiler.spi.TypeProcessor;
-import com.bendb.thrifty.gen.ThriftyCodeGenerator;
-import com.bendb.thrifty.schema.FieldNamingPolicy;
-import com.bendb.thrifty.schema.Loader;
-import com.bendb.thrifty.schema.Schema;
+import com.microsoft.thrifty.compiler.spi.TypeProcessor;
+import com.microsoft.thrifty.gen.ThriftyCodeGenerator;
+import com.microsoft.thrifty.schema.FieldNamingPolicy;
+import com.microsoft.thrifty.schema.Loader;
+import com.microsoft.thrifty.schema.Schema;
 
 import java.io.File;
 import java.io.IOException;