Random progress
This commit is contained in:
Ben Bader
Родитель
cae445759c
Коммит
eb0e81ed85
|
|
@ -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.
|
||||
|
|
@ -3,10 +3,6 @@ apply plugin: 'idea'
|
|||
group 'com.bendb.thrifty'
|
||||
version '1.0-SNAPSHOT'
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
|
|
|
|||
|
|
@ -7,4 +7,8 @@ sourceCompatibility = 1.5
|
|||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "com.squareup.okio:okio:1.6.0"
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
package com.bendb.thrifty;
|
||||
|
||||
public class TException extends Exception {
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
package com.bendb.thrifty;
|
||||
|
||||
public final class TMessageType {
|
||||
public static final byte CALL = 1;
|
||||
public static final byte REPLY = 2;
|
||||
public static final byte EXCEPTION = 3;
|
||||
public static final byte ONEWAY = 4;
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
package com.bendb.thrifty;
|
||||
|
||||
public abstract class TStruct<S extends TStruct<S, B>, B extends TStruct.Builder<S, B>> {
|
||||
|
||||
public abstract static class Builder<S extends TStruct<S, B>, B extends Builder<S, B>> {
|
||||
public Builder() {
|
||||
// nothing
|
||||
}
|
||||
|
||||
public abstract S build();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you 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.
|
||||
*/
|
||||
|
||||
package com.bendb.thrifty;
|
||||
|
||||
/**
|
||||
* Type constants in the Thrift protocol.
|
||||
*/
|
||||
public final class TType {
|
||||
public static final byte STOP = 0;
|
||||
public static final byte VOID = 1;
|
||||
public static final byte BOOL = 2;
|
||||
public static final byte BYTE = 3;
|
||||
public static final byte DOUBLE = 4;
|
||||
public static final byte I16 = 6;
|
||||
public static final byte I32 = 8;
|
||||
public static final byte I64 = 10;
|
||||
public static final byte STRING = 11;
|
||||
public static final byte STRUCT = 12;
|
||||
public static final byte MAP = 13;
|
||||
public static final byte SET = 14;
|
||||
public static final byte LIST = 15;
|
||||
public static final byte ENUM = 16;
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
package com.bendb.thrifty;
|
||||
|
||||
public class TUnion {
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
package com.bendb.thrifty;
|
||||
|
||||
import com.bendb.thrifty.protocol.TProtocol;
|
||||
|
||||
public abstract class ThriftAdapter<T> {
|
||||
abstract T read(TProtocol protocol);
|
||||
abstract void write(TProtocol protocol, T struct);
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package com.bendb.thrifty;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
/**
|
||||
* Annotates generated fields with data necessary for serialization.
|
||||
*/
|
||||
@Documented
|
||||
@Target(ElementType.FIELD)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface ThriftField {
|
||||
int tag();
|
||||
boolean isRequired() default false;
|
||||
String typedefName() default "";
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
package com.bendb.thrifty.protocol;
|
||||
|
||||
public class TBinaryProtocol {
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
package com.bendb.thrifty.protocol;
|
||||
|
||||
public class TFieldMetadata {
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
package com.bendb.thrifty.protocol;
|
||||
|
||||
public final class TMessageMetadata {
|
||||
public final String name;
|
||||
public final byte type;
|
||||
public final int seqId;
|
||||
|
||||
public TMessageMetadata(String name, byte type, int seqId) {
|
||||
this.name = name == null ? "" : name;
|
||||
this.type = type;
|
||||
this.seqId = seqId;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
package com.bendb.thrifty.protocol;
|
||||
|
||||
import com.bendb.thrifty.TException;
|
||||
import okio.*;
|
||||
|
||||
public abstract class TProtocol {
|
||||
protected final BufferedSource source;
|
||||
protected final BufferedSink sink;
|
||||
|
||||
protected TProtocol(Source source, Sink sink) {
|
||||
if (source == null) throw new NullPointerException("source");
|
||||
if (sink == null) throw new NullPointerException("sink");
|
||||
this.source = Okio.buffer(source);
|
||||
this.sink = Okio.buffer(sink);
|
||||
}
|
||||
|
||||
public abstract void writeMessageBegin(TMessageMetadata message) throws TException;
|
||||
|
||||
public abstract void writeMessageEnd() throws TException;
|
||||
|
||||
public abstract void writeStructBegin(String structName) throws TException;
|
||||
|
||||
public abstract void writeStructEnd() throws TException;
|
||||
|
||||
public abstract void writeFieldBegin(String fieldName, int fieldId, byte typeId) throws TException;
|
||||
|
||||
public abstract void writeFieldEnd() throws TException;
|
||||
|
||||
public abstract void writeFieldStop() throws TException;
|
||||
|
||||
public abstract void writeMapBegin(byte keyTypeId, byte valueTypeId, int mapSize) throws TException;
|
||||
|
||||
public abstract void writeMapEnd() throws TException;
|
||||
|
||||
public abstract void writeListBegin(byte elementTypeId, int listSize) throws TException;
|
||||
|
||||
public abstract void writeListEnd() throws TException;
|
||||
|
||||
public abstract void writeSetBegin(byte elementTypeId, int setSize) throws TException;
|
||||
|
||||
public abstract void writeSetEnd() throws TException;
|
||||
|
||||
public abstract void writeBool(boolean b) throws TException;
|
||||
|
||||
public abstract void writeByte(byte b) throws TException;
|
||||
|
||||
public abstract void writeI16(short i16) throws TException;
|
||||
|
||||
public abstract void writeI32(int i32) throws TException;
|
||||
|
||||
public abstract void writeI64(long i64) throws TException;
|
||||
|
||||
public abstract void writeDouble(double dub) throws TException;
|
||||
|
||||
public abstract void writeString(String str) throws TException;
|
||||
|
||||
public abstract void writeBinary(ByteString buf) throws TException;
|
||||
}
|
||||
|
|
@ -0,0 +1,200 @@
|
|||
/*
|
||||
* Copyright 2015 Ben Bader
|
||||
* Copyright Apache Thrift Authors
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you 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.
|
||||
*/
|
||||
|
||||
package com.bendb.thrifty.protocol;
|
||||
|
||||
import com.bendb.thrifty.TException;
|
||||
import okio.ByteString;
|
||||
import okio.Sink;
|
||||
import okio.Source;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayDeque;
|
||||
import java.util.Deque;
|
||||
|
||||
public class TSimpleJsonProtocol extends TProtocol {
|
||||
|
||||
private static final byte[] COMMA = new byte[] { ',' };
|
||||
private static final byte[] COLON = new byte[] { ':' };
|
||||
|
||||
private final Deque<Context> contextStack = new ArrayDeque<>();
|
||||
|
||||
public TSimpleJsonProtocol(Source source, Sink sink) {
|
||||
super(source, sink);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeMessageBegin(TMessageMetadata message) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeMessageEnd() throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeStructBegin(String structName) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeStructEnd() throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeFieldBegin(String fieldName, int fieldId, byte typeId) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeFieldEnd() throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeFieldStop() throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeMapBegin(byte keyTypeId, byte valueTypeId, int mapSize) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeMapEnd() throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeListBegin(byte elementTypeId, int listSize) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeListEnd() throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeSetBegin(byte elementTypeId, int setSize) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeSetEnd() throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeBool(boolean b) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeByte(byte b) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeI16(short i16) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeI32(int i32) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeI64(long i64) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeDouble(double dub) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeString(String str) throws TException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeBinary(ByteString buf) throws TException {
|
||||
|
||||
}
|
||||
|
||||
private class Context {
|
||||
protected void write() throws IOException {}
|
||||
|
||||
protected boolean isMapKey() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private class ListContext extends Context {
|
||||
private boolean first = true;
|
||||
|
||||
@Override
|
||||
protected void write() throws IOException {
|
||||
if (first) {
|
||||
first = false;
|
||||
} else {
|
||||
sink.write(COMMA);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class StructContext extends Context {
|
||||
private boolean first = true;
|
||||
private boolean colon = true;
|
||||
|
||||
@Override
|
||||
protected void write() throws IOException {
|
||||
if (first) {
|
||||
first = false;
|
||||
} else {
|
||||
sink.write(colon ? COLON : COMMA);
|
||||
colon = !colon;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class MapContext extends StructContext {
|
||||
private boolean isKey = true;
|
||||
|
||||
@Override
|
||||
protected void write() throws IOException {
|
||||
super.write();
|
||||
isKey = !isKey;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isMapKey() {
|
||||
return isKey;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
package com.bendb.thrifty.protocol;
|
||||
|
||||
public class TTupleProtocol {
|
||||
}
|
||||
|
|
@ -0,0 +1,142 @@
|
|||
package com.bendb.thrifty.transport;
|
||||
|
||||
import okio.Okio;
|
||||
import okio.Sink;
|
||||
import okio.Source;
|
||||
|
||||
import javax.net.SocketFactory;
|
||||
import java.io.Closeable;
|
||||
import java.io.IOException;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.net.Socket;
|
||||
|
||||
public class TSocket implements Closeable {
|
||||
private final String host;
|
||||
private final int port;
|
||||
private final int readTimeout;
|
||||
private final int connectTimeout;
|
||||
private final SocketFactory socketFactory;
|
||||
|
||||
private Socket socket;
|
||||
private Source source;
|
||||
private Sink sink;
|
||||
|
||||
public static class Builder {
|
||||
private final String host;
|
||||
private final int port;
|
||||
private int readTimeout;
|
||||
private int connectTimeout;
|
||||
private SocketFactory socketFactory;
|
||||
|
||||
public Builder(String host, int port) {
|
||||
if (host == null || host.length() == 0) {
|
||||
throw new NullPointerException("host");
|
||||
}
|
||||
|
||||
if (port < 0 || port > 0xFFFF) {
|
||||
throw new IllegalStateException("Invalid port number: " + port);
|
||||
}
|
||||
|
||||
this.host = host;
|
||||
this.port = port;
|
||||
}
|
||||
|
||||
public Builder readTimeout(int readTimeout) {
|
||||
if (readTimeout < 0) {
|
||||
throw new IllegalArgumentException("readTimeout cannot be negative");
|
||||
}
|
||||
this.readTimeout = readTimeout;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder connectTimeout(int connectTimeout) {
|
||||
if (connectTimeout < 0) {
|
||||
throw new IllegalArgumentException("connectTimeout cannot be negative");
|
||||
}
|
||||
this.connectTimeout = connectTimeout;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder socketFactory(SocketFactory socketFactory) {
|
||||
if (socketFactory == null) {
|
||||
throw new NullPointerException("socketFactory");
|
||||
}
|
||||
|
||||
this.socketFactory = socketFactory;
|
||||
return this;
|
||||
}
|
||||
|
||||
public TSocket build() {
|
||||
return new TSocket(this);
|
||||
}
|
||||
}
|
||||
|
||||
TSocket(Builder builder) {
|
||||
this.host = builder.host;
|
||||
this.port = builder.port;
|
||||
this.readTimeout = builder.readTimeout;
|
||||
this.connectTimeout = builder.connectTimeout;
|
||||
this.socketFactory = builder.socketFactory == null
|
||||
? SocketFactory.getDefault()
|
||||
: builder.socketFactory;
|
||||
}
|
||||
|
||||
public boolean isConnected() {
|
||||
Socket s = socket;
|
||||
return s != null && s.isConnected() && !s.isClosed();
|
||||
}
|
||||
|
||||
public Source getSource() {
|
||||
return source;
|
||||
}
|
||||
|
||||
public Sink getSink() {
|
||||
return sink;
|
||||
}
|
||||
|
||||
public void connect() throws IOException {
|
||||
if (socket == null) {
|
||||
socket = socketFactory.createSocket();
|
||||
}
|
||||
|
||||
socket.setTcpNoDelay(true);
|
||||
socket.setSoLinger(false, 0);
|
||||
socket.setKeepAlive(true);
|
||||
socket.setSoTimeout(readTimeout);
|
||||
|
||||
socket.connect(InetSocketAddress.createUnresolved(host, port), connectTimeout);
|
||||
|
||||
source = Okio.source(socket);
|
||||
sink = Okio.sink(socket);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
Socket socket = this.socket;
|
||||
Source source = this.source;
|
||||
Sink sink = this.sink;
|
||||
|
||||
this.socket = null;
|
||||
this.source = null;
|
||||
this.sink = null;
|
||||
|
||||
if (source != null) {
|
||||
try {
|
||||
source.close();
|
||||
} catch (IOException ignored) {}
|
||||
}
|
||||
|
||||
if (sink != null) {
|
||||
try {
|
||||
sink.close();
|
||||
} catch (IOException ignored) {}
|
||||
}
|
||||
|
||||
if (socket != null) {
|
||||
try {
|
||||
socket.close();
|
||||
} catch (IOException ignored) {}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -18,6 +18,12 @@ public abstract class EnumMemberElement {
|
|||
.documentation("");
|
||||
}
|
||||
|
||||
public EnumMemberElement withValue(Integer value) {
|
||||
return new AutoValue_EnumMemberElement.Builder(this)
|
||||
.value(value)
|
||||
.build();
|
||||
}
|
||||
|
||||
EnumMemberElement() {}
|
||||
|
||||
@AutoValue.Builder
|
||||
|
|
|
|||
|
|
@ -14,6 +14,12 @@ public abstract class FieldElement {
|
|||
.required(false);
|
||||
}
|
||||
|
||||
public FieldElement withId(int fieldId) {
|
||||
return new AutoValue_FieldElement.Builder(this)
|
||||
.fieldId(fieldId)
|
||||
.build();
|
||||
}
|
||||
|
||||
public abstract Location location();
|
||||
public abstract String documentation();
|
||||
@Nullable public abstract Integer fieldId();
|
||||
|
|
|
|||
|
|
@ -17,10 +17,15 @@
|
|||
package com.bendb.thrifty.parser;
|
||||
|
||||
import autovalue.shaded.com.google.common.common.base.Preconditions;
|
||||
import autovalue.shaded.com.google.common.common.collect.Sets;
|
||||
import com.bendb.thrifty.Location;
|
||||
import com.bendb.thrifty.NamespaceScope;
|
||||
import com.google.common.base.Strings;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public final class ThriftParser {
|
||||
private final Location location;
|
||||
private final char[] data;
|
||||
|
|
@ -193,7 +198,8 @@ public final class ThriftParser {
|
|||
}
|
||||
|
||||
if ("enum".equals(word)) {
|
||||
throw unexpected("enum is not yet implemented");
|
||||
++declCount;
|
||||
return readEnum(location, doc);
|
||||
}
|
||||
|
||||
if ("senum".equals(word)) {
|
||||
|
|
@ -223,6 +229,79 @@ public final class ThriftParser {
|
|||
throw unexpected("unexpected element: " + word);
|
||||
}
|
||||
|
||||
private EnumElement readEnum(Location location, String documentation) {
|
||||
String name = readIdentifier();
|
||||
|
||||
if (readChar() != '{') {
|
||||
throw unexpected("expected an opening brace in enum definition for: " + name);
|
||||
}
|
||||
|
||||
int nextId = 0;
|
||||
Set<Integer> ids = Sets.newHashSet();
|
||||
ImmutableList.Builder<EnumMemberElement> members = ImmutableList.builder();
|
||||
while (true) {
|
||||
String memberDoc = readDocumentation();
|
||||
if (peekChar() == '}') {
|
||||
++pos;
|
||||
break;
|
||||
}
|
||||
|
||||
EnumMemberElement member = readEnumMember(memberDoc);
|
||||
|
||||
int value;
|
||||
if (member.value() == null) {
|
||||
value = nextId++;
|
||||
member = member.withValue(value);
|
||||
} else {
|
||||
//noinspection ConstantConditions
|
||||
value = member.value();
|
||||
nextId = Math.max(nextId, value) + 1;
|
||||
}
|
||||
|
||||
if (!ids.add(value)) {
|
||||
throw unexpected(member.location(), "duplicate enum value: " + value);
|
||||
}
|
||||
|
||||
members.add(member);
|
||||
}
|
||||
|
||||
return EnumElement.builder(location)
|
||||
.documentation(documentation)
|
||||
.name(name)
|
||||
.members(members.build())
|
||||
.build();
|
||||
}
|
||||
|
||||
private EnumMemberElement readEnumMember(String doc) {
|
||||
// enum member:
|
||||
// identifier ('=' IntValue)? Separator? Comment? '\n'
|
||||
Location location = location();
|
||||
String name = readIdentifier();
|
||||
|
||||
skipWhitespace(false);
|
||||
if (pos == data.length) {
|
||||
throw unexpected("unexpected end of output");
|
||||
}
|
||||
|
||||
char next = data[pos];
|
||||
Integer value = null;
|
||||
if (next == '=') {
|
||||
++pos;
|
||||
value = readInt();
|
||||
}
|
||||
|
||||
String trailingDoc = readTrailingDoc(true);
|
||||
if (!Strings.isNullOrEmpty(trailingDoc)) {
|
||||
doc = doc + System.lineSeparator() + trailingDoc;
|
||||
}
|
||||
|
||||
return EnumMemberElement.builder(location)
|
||||
.documentation(doc)
|
||||
.name(name)
|
||||
.value(value)
|
||||
.build();
|
||||
}
|
||||
|
||||
private StructElement readStruct(Location location, String documentation) {
|
||||
return readAggregateType(location, documentation, StructElement.Type.STRUCT);
|
||||
}
|
||||
|
|
@ -243,6 +322,9 @@ public final class ThriftParser {
|
|||
throw unexpected("expected an opening brace in struct definition for: " + name);
|
||||
}
|
||||
|
||||
int currentId = 1;
|
||||
Set<Integer> ids = new HashSet<>();
|
||||
|
||||
ImmutableList.Builder<FieldElement> fields = ImmutableList.builder();
|
||||
while (true) {
|
||||
String fieldDoc = readDocumentation();
|
||||
|
|
@ -253,6 +335,24 @@ public final class ThriftParser {
|
|||
|
||||
FieldElement field = readField(fieldDoc);
|
||||
|
||||
Integer id = field.fieldId();
|
||||
if (id != null) {
|
||||
if (!ids.add(id)) {
|
||||
throw unexpected("duplicate field ID: " + id);
|
||||
}
|
||||
|
||||
if (id >= currentId) {
|
||||
currentId = id + 1;
|
||||
}
|
||||
} else {
|
||||
while (!ids.add(currentId)) {
|
||||
// just increment until we find an unused ID
|
||||
++currentId;
|
||||
}
|
||||
|
||||
field = field.withId(currentId++);
|
||||
}
|
||||
|
||||
fields.add(field);
|
||||
}
|
||||
|
||||
|
|
@ -271,11 +371,15 @@ public final class ThriftParser {
|
|||
|
||||
Location location = location();
|
||||
Integer fieldId = null;
|
||||
if (data[pos] >= '0' && data[pos] <= '9') {
|
||||
if ((data[pos] >= '0' && data[pos] <= '9') || data[pos] == '-') {
|
||||
try {
|
||||
fieldId = readInt();
|
||||
} catch (Exception e) {
|
||||
throw unexpected("Invalid field ID: " + e.getMessage());
|
||||
throw unexpected("invalid field ID: " + e.getMessage());
|
||||
}
|
||||
|
||||
if (fieldId < 1) {
|
||||
throw unexpected("field ID must be greater than zero, was: " + fieldId);
|
||||
}
|
||||
|
||||
if (readChar() != ':') {
|
||||
|
|
@ -327,6 +431,92 @@ public final class ThriftParser {
|
|||
return data[pos];
|
||||
}
|
||||
|
||||
private String readTrailingDoc(boolean consumeSeparator) {
|
||||
boolean acceptSeparator = consumeSeparator;
|
||||
int commentType = -1;
|
||||
while (pos < data.length) {
|
||||
char c = data[pos];
|
||||
if (acceptSeparator && (c == ',' || c == ';')) {
|
||||
++pos;
|
||||
acceptSeparator = false;
|
||||
} else if (c == ' ' || c == '\t') {
|
||||
++pos;
|
||||
} else if (c == '#' || c == '/') {
|
||||
++pos;
|
||||
commentType = c;
|
||||
break;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (commentType == -1) {
|
||||
return "";
|
||||
}
|
||||
|
||||
if (commentType == '/') {
|
||||
if (pos == data.length || (data[pos] != '/' && data[pos] != '*')) {
|
||||
--pos;
|
||||
throw unexpected("expected '//' or '/*'");
|
||||
}
|
||||
|
||||
commentType = data[pos++];
|
||||
}
|
||||
|
||||
int start = pos;
|
||||
int end;
|
||||
if (commentType == '*') {
|
||||
while (true) {
|
||||
if (pos == data.length || data[pos] == '\n') {
|
||||
throw unexpected("trailing comment must be closed on the same line");
|
||||
}
|
||||
if (data[pos] == '*' && pos + 1 < data.length && data[pos + 1] == '/') {
|
||||
end = pos - 1;
|
||||
pos += 2;
|
||||
break;
|
||||
}
|
||||
++pos;
|
||||
}
|
||||
|
||||
// Only whitespace can follow a trailing star comment
|
||||
while (pos < data.length) {
|
||||
char c = data[pos++];
|
||||
if (c == '\n') {
|
||||
newline();
|
||||
break;
|
||||
}
|
||||
|
||||
if (c != ' ' && c != '\t') {
|
||||
throw unexpected("no syntax may follow trailing comment");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
while (true) {
|
||||
if (pos == data.length) {
|
||||
end = pos - 1;
|
||||
break;
|
||||
}
|
||||
|
||||
char c = data[pos++];
|
||||
if (c == '\n') {
|
||||
newline();
|
||||
end = pos - 2;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
while (end > start && (data[end] == ' ' || data[end] == '\t')) {
|
||||
--end;
|
||||
}
|
||||
|
||||
if (end == start) {
|
||||
return "";
|
||||
}
|
||||
|
||||
return new String(data, start, end - start + 1);
|
||||
}
|
||||
|
||||
private String readLiteral() {
|
||||
skipWhitespace(true);
|
||||
char quote = readChar();
|
||||
|
|
@ -491,16 +681,29 @@ public final class ThriftParser {
|
|||
}
|
||||
|
||||
private int readInt() {
|
||||
String word = readWord();
|
||||
try {
|
||||
int base = 10;
|
||||
if (word.startsWith("0x") || word.startsWith("0X")) {
|
||||
word = word.substring(2);
|
||||
base = 16;
|
||||
skipWhitespace(false);
|
||||
int start = pos;
|
||||
while (pos < data.length) {
|
||||
char c = data[pos];
|
||||
if ((c >= '0' && c <= '9')
|
||||
|| (c == '+')
|
||||
|| (c == '-')
|
||||
|| (c == 'x') // for hex prefix
|
||||
|| (c == '.')) {
|
||||
pos++;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
return Integer.valueOf(word, base);
|
||||
}
|
||||
if (start == pos) {
|
||||
throw unexpected("unexpected end of input");
|
||||
}
|
||||
String text = new String(data, start, pos - start);
|
||||
try {
|
||||
int radix = text.startsWith("0x") ? 16 : 10;
|
||||
return Integer.parseInt(text, radix);
|
||||
} catch (Exception e) {
|
||||
throw unexpected("expected an int but was " + word);
|
||||
throw unexpected("expected an integer but was " + text);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -147,4 +147,25 @@ public class ThriftParserTest {
|
|||
assertThat(second.required(), is(true));
|
||||
assertThat(second.name(), is("bar"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void invalidFieldIds() {
|
||||
String thrift = "struct NegativeId { -1: required i32 nope }";
|
||||
try {
|
||||
ThriftParser.parse(Location.get("", ""), thrift);
|
||||
fail("Should not parse a struct with a negative field ID");
|
||||
} catch (IllegalStateException e) {
|
||||
assertThat(e.getMessage(), containsString("field ID must be greater than zero"));
|
||||
}
|
||||
|
||||
thrift = "struct ZeroId {\n" +
|
||||
" 0: option i64 stillNope\n" +
|
||||
"}";
|
||||
try {
|
||||
ThriftParser.parse(Location.get("", ""), thrift);
|
||||
fail("Should not parse a struct with a zero field ID");
|
||||
} catch (IllegalStateException e) {
|
||||
assertThat(e.getMessage(), containsString("field ID must be greater than zero"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче