You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2014/09/29 22:11:21 UTC
git commit: THRIFT-2144 Client-side support for Multiplexing Services
on any Transport and Protocol Client: Cocoa Patch: David Robakowski
Repository: thrift
Updated Branches:
refs/heads/master 05d64b4e3 -> aa99e0e2b
THRIFT-2144 Client-side support for Multiplexing Services on any Transport and Protocol
Client: Cocoa
Patch: David Robakowski
This closes #151
This closes #150
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/aa99e0e2
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/aa99e0e2
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/aa99e0e2
Branch: refs/heads/master
Commit: aa99e0e2b8b29b75b18b5dfc8e8c17245cb43e75
Parents: 05d64b4
Author: Jens Geyer <je...@apache.org>
Authored: Mon Sep 29 22:09:15 2014 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Mon Sep 29 22:11:08 2014 +0200
----------------------------------------------------------------------
lib/cocoa/src/protocol/TMultiplexedProtocol.h | 33 +++
lib/cocoa/src/protocol/TMultiplexedProtocol.m | 67 +++++
lib/cocoa/src/protocol/TProtocolDecorator.h | 30 +++
lib/cocoa/src/protocol/TProtocolDecorator.m | 274 +++++++++++++++++++++
4 files changed, 404 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/aa99e0e2/lib/cocoa/src/protocol/TMultiplexedProtocol.h
----------------------------------------------------------------------
diff --git a/lib/cocoa/src/protocol/TMultiplexedProtocol.h b/lib/cocoa/src/protocol/TMultiplexedProtocol.h
new file mode 100644
index 0000000..f298459
--- /dev/null
+++ b/lib/cocoa/src/protocol/TMultiplexedProtocol.h
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import "TProtocolDecorator.h"
+
+FOUNDATION_EXPORT NSString *const MULTIPLEXED_SERVICE_SEPERATOR;
+
+@interface TMultiplexedProtocol : TProtocolDecorator {
+ NSString * mServiceName;
+}
+
+- (id) initWithProtocol: (id <TProtocol>) protocol
+ serviceName: (NSString *) name;
+
+@end
http://git-wip-us.apache.org/repos/asf/thrift/blob/aa99e0e2/lib/cocoa/src/protocol/TMultiplexedProtocol.m
----------------------------------------------------------------------
diff --git a/lib/cocoa/src/protocol/TMultiplexedProtocol.m b/lib/cocoa/src/protocol/TMultiplexedProtocol.m
new file mode 100644
index 0000000..49095e3
--- /dev/null
+++ b/lib/cocoa/src/protocol/TMultiplexedProtocol.m
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+#import "TMultiplexedProtocol.h"
+
+#import "TProtocol.h"
+#import "TObjective-C.h"
+
+NSString *const MULTIPLEXED_SERVICE_SEPERATOR = @":";
+
+@implementation TMultiplexedProtocol
+
+- (id) initWithProtocol: (id <TProtocol>) protocol
+ serviceName: (NSString *) name
+{
+ self = [super initWithProtocol:protocol];
+
+ if (self) {
+ mServiceName = [name retain_stub];
+ }
+ return self;
+}
+
+- (void) writeMessageBeginWithName: (NSString *) name
+ type: (int) messageType
+ sequenceID: (int) sequenceID
+{
+ switch (messageType) {
+ case TMessageType_CALL:
+ case TMessageType_ONEWAY:
+ {
+ NSMutableString * serviceFunction = [[NSMutableString alloc] initWithString:mServiceName];
+ [serviceFunction appendString:MULTIPLEXED_SERVICE_SEPERATOR];
+ [serviceFunction appendString:name];
+ [super writeMessageBeginWithName:serviceFunction type:messageType sequenceID:sequenceID];
+ [serviceFunction release_stub];
+ }
+ break;
+ default:
+ [super writeMessageBeginWithName:name type:messageType sequenceID:sequenceID];
+ break;
+ }
+}
+
+- (void) dealloc
+{
+ [mServiceName release_stub];
+ [super dealloc_stub];
+}
+
+@end
http://git-wip-us.apache.org/repos/asf/thrift/blob/aa99e0e2/lib/cocoa/src/protocol/TProtocolDecorator.h
----------------------------------------------------------------------
diff --git a/lib/cocoa/src/protocol/TProtocolDecorator.h b/lib/cocoa/src/protocol/TProtocolDecorator.h
new file mode 100644
index 0000000..829bed6
--- /dev/null
+++ b/lib/cocoa/src/protocol/TProtocolDecorator.h
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import "TProtocol.h"
+
+@interface TProtocolDecorator : NSObject <TProtocol> {
+ id<TProtocol> mConcreteProtocol;
+}
+
+- (id) initWithProtocol: (id <TProtocol>) protocol;
+
+@end
http://git-wip-us.apache.org/repos/asf/thrift/blob/aa99e0e2/lib/cocoa/src/protocol/TProtocolDecorator.m
----------------------------------------------------------------------
diff --git a/lib/cocoa/src/protocol/TProtocolDecorator.m b/lib/cocoa/src/protocol/TProtocolDecorator.m
new file mode 100644
index 0000000..e5acb6c
--- /dev/null
+++ b/lib/cocoa/src/protocol/TProtocolDecorator.m
@@ -0,0 +1,274 @@
+/*
+ * 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.
+ */
+
+#import "TProtocolDecorator.h"
+#import "TObjective-C.h"
+
+@implementation TProtocolDecorator
+
+- (id) initWithProtocol: (id <TProtocol>) protocol
+{
+ self = [super init];
+ if (self) {
+ mConcreteProtocol = [protocol retain_stub];
+ }
+ return self;
+}
+
+- (id <TTransport>) transport
+{
+ return [mConcreteProtocol transport];
+}
+
+- (void) readMessageBeginReturningName: (NSString **) name
+ type: (int *) type
+ sequenceID: (int *) sequenceID
+{
+ [mConcreteProtocol readMessageBeginReturningName:name
+ type:type
+ sequenceID:sequenceID];
+}
+
+- (void) readMessageEnd
+{
+ [mConcreteProtocol readMessageEnd];
+}
+
+- (void) readStructBeginReturningName: (NSString **) name
+{
+ [mConcreteProtocol readStructBeginReturningName:name];
+}
+
+- (void) readStructEnd
+{
+ [mConcreteProtocol readStructEnd];
+}
+
+- (void) readFieldBeginReturningName: (NSString **) name
+ type: (int *) fieldType
+ fieldID: (int *) fieldID
+{
+ [mConcreteProtocol readFieldBeginReturningName:name
+ type:fieldType
+ fieldID:fieldID];
+}
+- (void) readFieldEnd
+{
+ [mConcreteProtocol readFieldEnd];
+}
+
+- (NSString *) readString
+{
+ return [mConcreteProtocol readString];
+}
+
+- (BOOL) readBool
+{
+ return [mConcreteProtocol readBool];
+}
+
+- (unsigned char) readByte
+{
+ return [mConcreteProtocol readByte];
+}
+
+- (short) readI16
+{
+ return [mConcreteProtocol readI16];
+}
+
+- (int32_t) readI32
+{
+ return [mConcreteProtocol readI32];
+}
+
+- (int64_t) readI64
+{
+ return [mConcreteProtocol readI64];
+}
+
+- (double) readDouble
+{
+ return [mConcreteProtocol readDouble];
+}
+
+- (NSData *) readBinary
+{
+ return [mConcreteProtocol readBinary];
+}
+
+- (void) readMapBeginReturningKeyType: (int *) keyType
+ valueType: (int *) valueType
+ size: (int *) size
+{
+ [mConcreteProtocol readMapBeginReturningKeyType:keyType
+ valueType:valueType
+ size:size];
+}
+- (void) readMapEnd
+{
+ [mConcreteProtocol readMapEnd];
+}
+
+
+- (void) readSetBeginReturningElementType: (int *) elementType
+ size: (int *) size
+{
+ [mConcreteProtocol readSetBeginReturningElementType:elementType
+ size:size];
+}
+- (void) readSetEnd
+{
+ [mConcreteProtocol readSetEnd];
+}
+
+- (void) readListBeginReturningElementType: (int *) elementType
+ size: (int *) size
+{
+ [mConcreteProtocol readListBeginReturningElementType:elementType
+ size:size];
+}
+- (void) readListEnd
+{
+ [mConcreteProtocol readListEnd];
+}
+
+- (void) writeMessageBeginWithName: (NSString *) name
+ type: (int) messageType
+ sequenceID: (int) sequenceID
+{
+ [mConcreteProtocol writeMessageBeginWithName:name
+ type:messageType
+ sequenceID:sequenceID];
+}
+- (void) writeMessageEnd
+{
+ [mConcreteProtocol writeMessageEnd];
+}
+
+- (void) writeStructBeginWithName: (NSString *) name
+{
+ [mConcreteProtocol writeStructBeginWithName:name];
+}
+- (void) writeStructEnd
+{
+ [mConcreteProtocol writeStructEnd];
+}
+
+- (void) writeFieldBeginWithName: (NSString *) name
+ type: (int) fieldType
+ fieldID: (int) fieldID
+{
+ [mConcreteProtocol writeFieldBeginWithName:name
+ type:fieldType
+ fieldID:fieldID];
+}
+
+- (void) writeI32: (int32_t) value
+{
+ [mConcreteProtocol writeI32:value];
+}
+
+- (void) writeI64: (int64_t) value
+{
+ [mConcreteProtocol writeI64:value];
+}
+
+- (void) writeI16: (short) value
+{
+ [mConcreteProtocol writeI16:value];
+}
+
+- (void) writeByte: (uint8_t) value
+{
+ [mConcreteProtocol writeByte:value];
+}
+
+- (void) writeString: (NSString *) value
+{
+ [mConcreteProtocol writeString:value];
+}
+
+- (void) writeDouble: (double) value
+{
+ [mConcreteProtocol writeDouble:value];
+}
+
+- (void) writeBool: (BOOL) value
+{
+ [mConcreteProtocol writeBool:value];
+}
+
+- (void) writeBinary: (NSData *) data
+{
+ [mConcreteProtocol writeBinary:data];
+}
+
+- (void) writeFieldStop
+{
+ [mConcreteProtocol writeFieldStop];
+}
+
+- (void) writeFieldEnd
+{
+ [mConcreteProtocol writeFieldEnd];
+}
+
+- (void) writeMapBeginWithKeyType: (int) keyType
+ valueType: (int) valueType
+ size: (int) size
+{
+ [mConcreteProtocol writeMapBeginWithKeyType:keyType
+ valueType:valueType
+ size:size];
+}
+- (void) writeMapEnd
+{
+ [mConcreteProtocol writeMapEnd];
+}
+
+- (void) writeSetBeginWithElementType: (int) elementType
+ size: (int) size
+{
+ [mConcreteProtocol writeSetBeginWithElementType:elementType size:size];
+}
+
+- (void) writeSetEnd
+{
+ [mConcreteProtocol writeSetEnd];
+}
+
+- (void) writeListBeginWithElementType: (int) elementType
+ size: (int) size
+{
+ [mConcreteProtocol writeListBeginWithElementType:elementType size:size];
+}
+
+- (void) writeListEnd
+{
+ [mConcreteProtocol writeListEnd];
+}
+
+- (void) dealloc
+{
+ [mConcreteProtocol release_stub];
+ [super dealloc_stub];
+}
+
+@end