You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/06/07 15:55:20 UTC
[44/50] [abbrv] storm git commit: STORM-2882: thrift
STORM-2882: thrift
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/91251c54
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/91251c54
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/91251c54
Branch: refs/heads/master
Commit: 91251c54abdb5bc267851dcf38a1cfcea247eaad
Parents: 142ad60
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed May 30 10:37:55 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:13 2018 -0500
----------------------------------------------------------------------
.../st/tests/window/SlidingWindowTest.java | 11 +-
.../apache/storm/st/wrapper/StormCluster.java | 17 +-
.../org/apache/storm/st/wrapper/TopoWrap.java | 53 +-
shaded-deps/pom.xml | 26 +
storm-client/pom.xml | 21 -
storm-client/src/genthrift.sh | 2 +-
.../src/jvm/org/apache/storm/ILocalCluster.java | 2 +-
.../jvm/org/apache/storm/StormSubmitter.java | 2 +-
.../apache/storm/blobstore/NimbusBlobStore.java | 2 +-
.../storm/drpc/DRPCInvocationsClient.java | 4 +-
.../jvm/org/apache/storm/drpc/DRPCSpout.java | 2 +-
.../org/apache/storm/drpc/ReturnResults.java | 5 +-
.../apache/storm/generated/AccessControl.java | 106 +-
.../storm/generated/AccessControlType.java | 2 +-
.../storm/generated/AlreadyAliveException.java | 74 +-
.../org/apache/storm/generated/Assignment.java | 212 +-
.../storm/generated/AuthorizationException.java | 74 +-
.../storm/generated/BeginDownloadResult.java | 116 +-
.../jvm/org/apache/storm/generated/Bolt.java | 88 +-
.../storm/generated/BoltAggregateStats.java | 140 +-
.../org/apache/storm/generated/BoltStats.java | 230 +-
.../apache/storm/generated/ClusterSummary.java | 144 +-
.../storm/generated/ClusterWorkerHeartbeat.java | 138 +-
.../storm/generated/CommonAggregateStats.java | 198 +-
.../generated/ComponentAggregateStats.java | 108 +-
.../apache/storm/generated/ComponentCommon.java | 138 +-
.../apache/storm/generated/ComponentObject.java | 74 +-
.../storm/generated/ComponentPageInfo.java | 334 +-
.../apache/storm/generated/ComponentType.java | 2 +-
.../org/apache/storm/generated/Credentials.java | 84 +-
.../storm/generated/DRPCExceptionType.java | 2 +-
.../storm/generated/DRPCExecutionException.java | 86 +-
.../org/apache/storm/generated/DRPCRequest.java | 88 +-
.../apache/storm/generated/DebugOptions.java | 98 +-
.../apache/storm/generated/DistributedRPC.java | 286 +-
.../generated/DistributedRPCInvocations.java | 904 +-
.../org/apache/storm/generated/ErrorInfo.java | 124 +-
.../storm/generated/ExecutorAggregateStats.java | 84 +-
.../apache/storm/generated/ExecutorInfo.java | 100 +-
.../storm/generated/ExecutorSpecificStats.java | 62 +-
.../apache/storm/generated/ExecutorStats.java | 164 +-
.../apache/storm/generated/ExecutorSummary.java | 154 +-
.../apache/storm/generated/GetInfoOptions.java | 72 +-
.../apache/storm/generated/GlobalStreamId.java | 88 +-
.../org/apache/storm/generated/Grouping.java | 124 +-
.../generated/HBAuthorizationException.java | 74 +-
.../storm/generated/HBExecutionException.java | 74 +-
.../org/apache/storm/generated/HBMessage.java | 102 +-
.../apache/storm/generated/HBMessageData.java | 98 +-
.../jvm/org/apache/storm/generated/HBNodes.java | 80 +-
.../jvm/org/apache/storm/generated/HBPulse.java | 98 +-
.../org/apache/storm/generated/HBRecords.java | 80 +-
.../storm/generated/HBServerMessageType.java | 2 +-
.../generated/InvalidTopologyException.java | 74 +-
.../org/apache/storm/generated/JavaObject.java | 96 +-
.../apache/storm/generated/JavaObjectArg.java | 98 +-
.../generated/KeyAlreadyExistsException.java | 74 +-
.../storm/generated/KeyNotFoundException.java | 74 +-
.../org/apache/storm/generated/KillOptions.java | 78 +-
.../storm/generated/LSApprovedWorkers.java | 84 +-
.../generated/LSSupervisorAssignments.java | 84 +-
.../apache/storm/generated/LSSupervisorId.java | 74 +-
.../apache/storm/generated/LSTopoHistory.java | 140 +-
.../storm/generated/LSTopoHistoryList.java | 82 +-
.../storm/generated/LSWorkerHeartbeat.java | 136 +-
.../apache/storm/generated/ListBlobsResult.java | 96 +-
.../apache/storm/generated/LocalAssignment.java | 140 +-
.../apache/storm/generated/LocalStateData.java | 84 +-
.../org/apache/storm/generated/LogConfig.java | 82 +-
.../org/apache/storm/generated/LogLevel.java | 136 +-
.../apache/storm/generated/LogLevelAction.java | 2 +-
.../jvm/org/apache/storm/generated/Nimbus.java | 11668 ++++++++---------
.../apache/storm/generated/NimbusSummary.java | 148 +-
.../org/apache/storm/generated/NodeInfo.java | 96 +-
.../storm/generated/NotAliveException.java | 74 +-
.../org/apache/storm/generated/NullStruct.java | 60 +-
.../apache/storm/generated/NumErrorsChoice.java | 2 +-
.../storm/generated/OwnerResourceSummary.java | 408 +-
.../storm/generated/PrivateWorkerKey.java | 122 +-
.../apache/storm/generated/ProfileAction.java | 2 +-
.../apache/storm/generated/ProfileRequest.java | 108 +-
.../storm/generated/ReadableBlobMeta.java | 96 +-
.../storm/generated/RebalanceOptions.java | 174 +-
.../storm/generated/SettableBlobMeta.java | 100 +-
.../apache/storm/generated/SharedMemory.java | 134 +-
.../apache/storm/generated/ShellComponent.java | 84 +-
.../storm/generated/SpecificAggregateStats.java | 62 +-
.../storm/generated/SpoutAggregateStats.java | 80 +-
.../org/apache/storm/generated/SpoutSpec.java | 88 +-
.../org/apache/storm/generated/SpoutStats.java | 162 +-
.../apache/storm/generated/StateSpoutSpec.java | 88 +-
.../org/apache/storm/generated/StormBase.java | 234 +-
.../apache/storm/generated/StormTopology.java | 274 +-
.../org/apache/storm/generated/StreamInfo.java | 102 +-
.../apache/storm/generated/SubmitOptions.java | 86 +-
.../org/apache/storm/generated/Supervisor.java | 686 +-
.../storm/generated/SupervisorAssignments.java | 82 +-
.../apache/storm/generated/SupervisorInfo.java | 246 +-
.../storm/generated/SupervisorPageInfo.java | 100 +-
.../storm/generated/SupervisorSummary.java | 266 +-
.../generated/SupervisorWorkerHeartbeat.java | 116 +-
.../generated/SupervisorWorkerHeartbeats.java | 96 +-
.../storm/generated/ThriftSerializedObject.java | 100 +-
.../storm/generated/TopologyActionOptions.java | 62 +-
.../storm/generated/TopologyHistoryInfo.java | 80 +-
.../apache/storm/generated/TopologyInfo.java | 376 +-
.../storm/generated/TopologyInitialStatus.java | 2 +-
.../storm/generated/TopologyPageInfo.java | 620 +-
.../apache/storm/generated/TopologyStats.java | 170 +-
.../apache/storm/generated/TopologyStatus.java | 2 +-
.../apache/storm/generated/TopologySummary.java | 372 +-
.../storm/generated/WorkerMetricList.java | 80 +-
.../storm/generated/WorkerMetricPoint.java | 160 +-
.../apache/storm/generated/WorkerMetrics.java | 122 +-
.../apache/storm/generated/WorkerResources.java | 204 +-
.../apache/storm/generated/WorkerSummary.java | 326 +-
.../org/apache/storm/generated/WorkerToken.java | 126 +-
.../apache/storm/generated/WorkerTokenInfo.java | 132 +-
.../storm/generated/WorkerTokenServiceType.java | 2 +-
.../storm/security/auth/ITransportPlugin.java | 10 +-
.../security/auth/SimpleTransportPlugin.java | 24 +-
.../storm/security/auth/TBackoffConnect.java | 4 +-
.../storm/security/auth/ThriftClient.java | 8 +-
.../storm/security/auth/ThriftServer.java | 6 +-
.../auth/digest/DigestSaslTransportPlugin.java | 10 +-
.../kerberos/KerberosSaslTransportPlugin.java | 10 +-
.../security/auth/kerberos/NoOpTTrasport.java | 6 +-
.../auth/plain/PlainSaslTransportPlugin.java | 10 +-
.../security/auth/sasl/SaslTransportPlugin.java | 24 +-
.../GzipThriftSerializationDelegate.java | 8 +-
.../ThriftSerializationDelegate.java | 8 +-
.../trident/drpc/ReturnResultsReducer.java | 5 +-
.../apache/storm/trident/util/TridentUtils.java | 2 +-
.../jvm/org/apache/storm/utils/DRPCClient.java | 4 +-
.../jvm/org/apache/storm/utils/LocalState.java | 6 +-
.../org/apache/storm/utils/NimbusClient.java | 2 +-
.../apache/storm/utils/SupervisorClient.java | 2 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 8 +-
.../storm/security/auth/ThriftClientTest.java | 2 +-
.../jvm/org/apache/storm/utils/UtilsTest.java | 2 +-
.../src/clj/org/apache/storm/thrift.clj | 2 +-
.../ILocalClusterTrackedTopologyAware.java | 2 +-
.../java/org/apache/storm/LocalCluster.java | 4 +-
.../main/java/org/apache/storm/LocalDRPC.java | 2 +-
.../src/main/java/org/apache/storm/Testing.java | 2 +-
.../apache/storm/blobstore/BlobStoreUtils.java | 2 +-
.../org/apache/storm/daemon/nimbus/Nimbus.java | 4 +-
.../storm/daemon/supervisor/Supervisor.java | 4 +-
.../timer/ReportWorkerHeartbeats.java | 2 +-
.../timer/SynchronizeAssignments.java | 2 +-
.../apache/storm/localizer/AsyncLocalizer.java | 2 +-
.../metricstore/NimbusMetricProcessor.java | 2 +-
.../nimbus/NimbusHeartbeatsPressureTest.java | 4 +-
.../org/apache/storm/utils/ServerUtils.java | 5 +-
.../java/org/apache/storm/TestRebalance.java | 2 +-
.../apache/storm/security/auth/AuthTest.java | 15 +-
.../storm/daemon/drpc/webapp/DRPCResource.java | 2 +-
157 files changed, 13137 insertions(+), 13149 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java
----------------------------------------------------------------------
diff --git a/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java b/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java
index 83b981e..6add83a 100644
--- a/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java
+++ b/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java
@@ -18,16 +18,18 @@
package org.apache.storm.st.tests.window;
import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.List;
import org.apache.storm.st.helper.AbstractTest;
-import org.apache.storm.st.wrapper.LogData;
-import org.apache.storm.st.wrapper.TopoWrap;
-import org.apache.thrift.TException;
import org.apache.storm.st.topology.TestableTopology;
import org.apache.storm.st.topology.window.SlidingTimeCorrectness;
import org.apache.storm.st.topology.window.SlidingWindowCorrectness;
import org.apache.storm.st.topology.window.data.TimeData;
import org.apache.storm.st.topology.window.data.TimeDataWindow;
import org.apache.storm.st.utils.TimeUtil;
+import org.apache.storm.st.wrapper.LogData;
+import org.apache.storm.st.wrapper.TopoWrap;
+import org.apache.storm.thrift.TException;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.slf4j.Logger;
@@ -37,9 +39,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import java.net.MalformedURLException;
-import java.util.List;
-
public final class SlidingWindowTest extends AbstractTest {
private static Logger log = LoggerFactory.getLogger(SlidingWindowTest.class);
private TopoWrap topo;
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java
----------------------------------------------------------------------
diff --git a/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java b/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java
index f8e59f5..716c37d 100644
--- a/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java
+++ b/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java
@@ -19,27 +19,26 @@ package org.apache.storm.st.wrapper;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.storm.generated.ClusterSummary;
import org.apache.storm.generated.KillOptions;
import org.apache.storm.generated.Nimbus;
import org.apache.storm.generated.TopologyInfo;
import org.apache.storm.generated.TopologySummary;
import org.apache.storm.st.utils.AssertUtil;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.thrift.TException;
+import org.apache.storm.thrift.TException;
import org.apache.storm.utils.NimbusClient;
import org.apache.storm.utils.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
public class StormCluster {
private static Logger log = LoggerFactory.getLogger(StormCluster.class);
private final Nimbus.Iface client;
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/integration-test/src/test/java/org/apache/storm/st/wrapper/TopoWrap.java
----------------------------------------------------------------------
diff --git a/integration-test/src/test/java/org/apache/storm/st/wrapper/TopoWrap.java b/integration-test/src/test/java/org/apache/storm/st/wrapper/TopoWrap.java
index 52b8646..ef1494e 100644
--- a/integration-test/src/test/java/org/apache/storm/st/wrapper/TopoWrap.java
+++ b/integration-test/src/test/java/org/apache/storm/st/wrapper/TopoWrap.java
@@ -22,33 +22,6 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
-import org.apache.storm.generated.AlreadyAliveException;
-import org.apache.storm.generated.AuthorizationException;
-import org.apache.storm.generated.ComponentAggregateStats;
-import org.apache.storm.generated.ComponentPageInfo;
-import org.apache.storm.generated.ExecutorAggregateStats;
-import org.apache.storm.generated.ExecutorStats;
-import org.apache.storm.generated.ExecutorSummary;
-import org.apache.storm.generated.InvalidTopologyException;
-import org.apache.storm.generated.StormTopology;
-import org.apache.storm.generated.TopologyInfo;
-import org.apache.storm.generated.TopologySummary;
-import org.apache.storm.st.utils.AssertUtil;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.storm.StormSubmitter;
-import org.apache.thrift.TException;
-import org.apache.storm.st.topology.window.data.FromJson;
-import org.apache.storm.st.utils.StringDecorator;
-import org.apache.storm.st.utils.TimeUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -66,8 +39,34 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.storm.Config;
+import org.apache.storm.StormSubmitter;
+import org.apache.storm.generated.AlreadyAliveException;
+import org.apache.storm.generated.AuthorizationException;
+import org.apache.storm.generated.ComponentAggregateStats;
+import org.apache.storm.generated.ComponentPageInfo;
+import org.apache.storm.generated.ExecutorAggregateStats;
+import org.apache.storm.generated.ExecutorStats;
+import org.apache.storm.generated.ExecutorSummary;
+import org.apache.storm.generated.InvalidTopologyException;
+import org.apache.storm.generated.StormTopology;
+import org.apache.storm.generated.TopologyInfo;
+import org.apache.storm.generated.TopologySummary;
+import org.apache.storm.st.topology.window.data.FromJson;
+import org.apache.storm.st.utils.AssertUtil;
+import org.apache.storm.st.utils.StringDecorator;
+import org.apache.storm.st.utils.TimeUtil;
+import org.apache.storm.thrift.TException;
import org.apache.storm.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
public class TopoWrap {
private static Logger log = LoggerFactory.getLogger(TopoWrap.class);
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index 7d71dc2..9cbe139 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -105,6 +105,25 @@
<groupId>org.jgrapht</groupId>
<artifactId>jgrapht-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
@@ -134,14 +153,21 @@
<include>commons-lang:commons-lang</include>
<include>io.netty:netty</include>
<include>org.apache.curator:*</include>
+ <include>org.apache.thrift:*</include>
<include>org.apache.zookeeper:zookeeper</include>
<include>org.jctools:jctools-core</include>
<include>org.jgrapht:jgrapht-core</include>
<include>org.yaml:snakeyaml</include>
+
</includes>
</artifactSet>
<relocations>
<relocation>
+ <pattern>org.apache.thrift</pattern>
+ <!-- This pattern is inconsistent for backwards compatibility purposes. -->
+ <shadedPattern>org.apache.storm.thrift</shadedPattern>
+ </relocation>
+ <relocation>
<pattern>com.google.common</pattern>
<shadedPattern>org.apache.storm.shade.com.google.common</shadedPattern>
</relocation>
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index 9c68e9b..c5004a9 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -73,27 +73,6 @@
<version>${project.version}</version>
</dependency>
- <!-- thrift -->
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- kryo -->
<dependency>
<groupId>com.esotericsoftware</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/genthrift.sh
----------------------------------------------------------------------
diff --git a/storm-client/src/genthrift.sh b/storm-client/src/genthrift.sh
index c63bf44..cb9d9a3 100644
--- a/storm-client/src/genthrift.sh
+++ b/storm-client/src/genthrift.sh
@@ -19,7 +19,7 @@ rm -rf gen-javabean gen-py py
rm -rf jvm/org/apache/storm/generated
thrift --gen java:beans,nocamel,generated_annotations=undated --gen py:utf8strings storm.thrift
for file in gen-javabean/org/apache/storm/generated/* ; do
- cat java_license_header.txt ${file} > ${file}.tmp
+ cat java_license_header.txt ${file} | sed -e 's/org\.apache\.thrift/org.apache.storm.thrift/g' > ${file}.tmp
mv -f ${file}.tmp ${file}
done
cat py_license_header.txt gen-py/__init__.py > gen-py/__init__.py.tmp
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/ILocalCluster.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/ILocalCluster.java b/storm-client/src/jvm/org/apache/storm/ILocalCluster.java
index b442ed2..1c420de 100644
--- a/storm-client/src/jvm/org/apache/storm/ILocalCluster.java
+++ b/storm-client/src/jvm/org/apache/storm/ILocalCluster.java
@@ -21,7 +21,7 @@ import org.apache.storm.generated.RebalanceOptions;
import org.apache.storm.generated.StormTopology;
import org.apache.storm.generated.SubmitOptions;
import org.apache.storm.generated.TopologyInfo;
-import org.apache.thrift.TException;
+import org.apache.storm.thrift.TException;
/**
* This is here mostly for backwards compatibility.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
index 15cfc11..37eb40c 100644
--- a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
+++ b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
@@ -46,7 +46,7 @@ import org.apache.storm.utils.BufferFileInputStream;
import org.apache.storm.utils.NimbusClient;
import org.apache.storm.utils.Utils;
import org.apache.storm.validation.ConfigValidation;
-import org.apache.thrift.TException;
+import org.apache.storm.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java b/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java
index fd58062..8b8a549 100644
--- a/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java
+++ b/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java
@@ -25,9 +25,9 @@ import org.apache.storm.generated.KeyNotFoundException;
import org.apache.storm.generated.ListBlobsResult;
import org.apache.storm.generated.ReadableBlobMeta;
import org.apache.storm.generated.SettableBlobMeta;
+import org.apache.storm.thrift.TException;
import org.apache.storm.utils.NimbusClient;
import org.apache.storm.utils.ObjectReader;
-import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java b/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java
index 86ed655..e30549b 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java
@@ -20,8 +20,8 @@ import org.apache.storm.generated.DRPCRequest;
import org.apache.storm.generated.DistributedRPCInvocations;
import org.apache.storm.security.auth.ThriftClient;
import org.apache.storm.security.auth.ThriftConnectionType;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransportException;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java b/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
index 703a6c1..f8b6bc7 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
@@ -37,6 +37,7 @@ import org.apache.storm.generated.DistributedRPCInvocations;
import org.apache.storm.shade.org.json.simple.JSONValue;
import org.apache.storm.spout.SpoutOutputCollector;
import org.apache.storm.task.TopologyContext;
+import org.apache.storm.thrift.TException;
import org.apache.storm.topology.OutputFieldsDeclarer;
import org.apache.storm.topology.base.BaseRichSpout;
import org.apache.storm.tuple.Fields;
@@ -45,7 +46,6 @@ import org.apache.storm.utils.DRPCClient;
import org.apache.storm.utils.ExtendedThreadPoolExecutor;
import org.apache.storm.utils.ObjectReader;
import org.apache.storm.utils.ServiceRegistry;
-import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java b/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java
index a829be9..cb0aaa8 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java
@@ -23,17 +23,16 @@ import org.apache.storm.shade.org.json.simple.JSONValue;
import org.apache.storm.shade.org.json.simple.parser.ParseException;
import org.apache.storm.task.OutputCollector;
import org.apache.storm.task.TopologyContext;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.transport.TTransportException;
import org.apache.storm.topology.OutputFieldsDeclarer;
import org.apache.storm.topology.base.BaseRichBolt;
import org.apache.storm.tuple.Tuple;
import org.apache.storm.utils.ObjectReader;
import org.apache.storm.utils.ServiceRegistry;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
public class ReturnResults extends BaseRichBolt {
public static final Logger LOG = LoggerFactory.getLogger(ReturnResults.class);
//ANY CHANGE TO THIS CODE MUST BE SERIALIZABLE COMPATIBLE OR THERE WILL BE PROBLEMS
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java b/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java
index 58e8e27..bef3f32 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java
@@ -25,22 +25,22 @@ package org.apache.storm.generated;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class AccessControl implements org.apache.thrift.TBase<AccessControl, AccessControl._Fields>, java.io.Serializable, Cloneable, Comparable<AccessControl> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AccessControl");
+public class AccessControl implements org.apache.storm.thrift.TBase<AccessControl, AccessControl._Fields>, java.io.Serializable, Cloneable, Comparable<AccessControl> {
+ private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("AccessControl");
- private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1);
- private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField ACCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("access", org.apache.thrift.protocol.TType.I32, (short)3);
+ private static final org.apache.storm.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("type", org.apache.storm.thrift.protocol.TType.I32, (short)1);
+ private static final org.apache.storm.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("name", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.storm.thrift.protocol.TField ACCESS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("access", org.apache.storm.thrift.protocol.TType.I32, (short)3);
- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AccessControlStandardSchemeFactory();
- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AccessControlTupleSchemeFactory();
+ private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AccessControlStandardSchemeFactory();
+ private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AccessControlTupleSchemeFactory();
private AccessControlType type; // required
private java.lang.String name; // optional
private int access; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ public enum _Fields implements org.apache.storm.thrift.TFieldIdEnum {
/**
*
* @see AccessControlType
@@ -111,17 +111,17 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
private static final int __ACCESS_ISSET_ID = 0;
private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.NAME};
- public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.Map<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, AccessControlType.class)));
- tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.ACCESS, new org.apache.thrift.meta_data.FieldMetaData("access", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ java.util.Map<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.TYPE, new org.apache.storm.thrift.meta_data.FieldMetaData("type", org.apache.storm.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, AccessControlType.class)));
+ tmpMap.put(_Fields.NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("name", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.ACCESS, new org.apache.storm.thrift.meta_data.FieldMetaData("access", org.apache.storm.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AccessControl.class, metaDataMap);
+ org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AccessControl.class, metaDataMap);
}
public AccessControl() {
@@ -227,16 +227,16 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
}
public void unset_access() {
- __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ACCESS_ISSET_ID);
+ __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ACCESS_ISSET_ID);
}
/** Returns true if field access is set (has been assigned a value) and false otherwise */
public boolean is_set_access() {
- return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ACCESS_ISSET_ID);
+ return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ACCESS_ISSET_ID);
}
public void set_access_isSet(boolean value) {
- __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ACCESS_ISSET_ID, value);
+ __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ACCESS_ISSET_ID, value);
}
public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -375,7 +375,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
return lastComparison;
}
if (is_set_type()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
+ lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.type, other.type);
if (lastComparison != 0) {
return lastComparison;
}
@@ -385,7 +385,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
return lastComparison;
}
if (is_set_name()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
+ lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) {
return lastComparison;
}
@@ -395,7 +395,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
return lastComparison;
}
if (is_set_access()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.access, other.access);
+ lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.access, other.access);
if (lastComparison != 0) {
return lastComparison;
}
@@ -407,11 +407,11 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
scheme(iprot).read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
scheme(oprot).write(oprot, this);
}
@@ -445,14 +445,14 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws org.apache.storm.thrift.TException {
// check for required fields
if (!is_set_type()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'type' is unset! Struct:" + toString());
+ throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'type' is unset! Struct:" + toString());
}
if (!is_set_access()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'access' is unset! Struct:" + toString());
+ throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'access' is unset! Struct:" + toString());
}
// check for sub-struct validity
@@ -460,8 +460,8 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
- write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
+ write(new org.apache.storm.thrift.protocol.TCompactProtocol(new org.apache.storm.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.storm.thrift.TException te) {
throw new java.io.IOException(te);
}
}
@@ -470,56 +470,56 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
try {
// it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
__isset_bitfield = 0;
- read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
+ read(new org.apache.storm.thrift.protocol.TCompactProtocol(new org.apache.storm.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.storm.thrift.TException te) {
throw new java.io.IOException(te);
}
}
- private static class AccessControlStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ private static class AccessControlStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
public AccessControlStandardScheme getScheme() {
return new AccessControlStandardScheme();
}
}
- private static class AccessControlStandardScheme extends org.apache.thrift.scheme.StandardScheme<AccessControl> {
+ private static class AccessControlStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<AccessControl> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, AccessControl struct) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField schemeField;
+ public void read(org.apache.storm.thrift.protocol.TProtocol iprot, AccessControl struct) throws org.apache.storm.thrift.TException {
+ org.apache.storm.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.storm.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
case 1: // TYPE
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
struct.type = org.apache.storm.generated.AccessControlType.findByValue(iprot.readI32());
struct.set_type_isSet(true);
} else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
case 2: // NAME
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
struct.name = iprot.readString();
struct.set_name_isSet(true);
} else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
case 3: // ACCESS
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
struct.access = iprot.readI32();
struct.set_access_isSet(true);
} else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
iprot.readFieldEnd();
}
@@ -527,7 +527,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, AccessControl struct) throws org.apache.thrift.TException {
+ public void write(org.apache.storm.thrift.protocol.TProtocol oprot, AccessControl struct) throws org.apache.storm.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -552,17 +552,17 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
}
- private static class AccessControlTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ private static class AccessControlTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
public AccessControlTupleScheme getScheme() {
return new AccessControlTupleScheme();
}
}
- private static class AccessControlTupleScheme extends org.apache.thrift.scheme.TupleScheme<AccessControl> {
+ private static class AccessControlTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<AccessControl> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, AccessControl struct) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ public void write(org.apache.storm.thrift.protocol.TProtocol prot, AccessControl struct) throws org.apache.storm.thrift.TException {
+ org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
oprot.writeI32(struct.type.getValue());
oprot.writeI32(struct.access);
java.util.BitSet optionals = new java.util.BitSet();
@@ -576,8 +576,8 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, AccessControl struct) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ public void read(org.apache.storm.thrift.protocol.TProtocol prot, AccessControl struct) throws org.apache.storm.thrift.TException {
+ org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
struct.type = org.apache.storm.generated.AccessControlType.findByValue(iprot.readI32());
struct.set_type_isSet(true);
struct.access = iprot.readI32();
@@ -590,8 +590,8 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
}
}
- private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
- return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+ private static <S extends org.apache.storm.thrift.scheme.IScheme> S scheme(org.apache.storm.thrift.protocol.TProtocol proto) {
+ return (org.apache.storm.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java b/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java
index 159dffa..0f2f3d4 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java
@@ -24,7 +24,7 @@
package org.apache.storm.generated;
-public enum AccessControlType implements org.apache.thrift.TEnum {
+public enum AccessControlType implements org.apache.storm.thrift.TEnum {
OTHER(1),
USER(2);
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java b/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java
index 6a43897..c1d6bb5 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class AlreadyAliveException extends org.apache.thrift.TException implements org.apache.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<AlreadyAliveException> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlreadyAliveException");
+public class AlreadyAliveException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<AlreadyAliveException> {
+ private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("AlreadyAliveException");
- private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.storm.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("msg", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AlreadyAliveExceptionStandardSchemeFactory();
- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AlreadyAliveExceptionTupleSchemeFactory();
+ private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AlreadyAliveExceptionStandardSchemeFactory();
+ private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AlreadyAliveExceptionTupleSchemeFactory();
private java.lang.String msg; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ public enum _Fields implements org.apache.storm.thrift.TFieldIdEnum {
MSG((short)1, "msg");
private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,13 +94,13 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
}
// isset id assignments
- public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.Map<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ java.util.Map<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.MSG, new org.apache.storm.thrift.meta_data.FieldMetaData("msg", org.apache.storm.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AlreadyAliveException.class, metaDataMap);
+ org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AlreadyAliveException.class, metaDataMap);
}
public AlreadyAliveException() {
@@ -240,7 +240,7 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
return lastComparison;
}
if (is_set_msg()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
+ lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.msg, other.msg);
if (lastComparison != 0) {
return lastComparison;
}
@@ -252,11 +252,11 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
scheme(iprot).read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
scheme(oprot).write(oprot, this);
}
@@ -276,10 +276,10 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws org.apache.storm.thrift.TException {
// check for required fields
if (!is_set_msg()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
+ throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
}
// check for sub-struct validity
@@ -287,48 +287,48 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
- write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
+ write(new org.apache.storm.thrift.protocol.TCompactProtocol(new org.apache.storm.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.storm.thrift.TException te) {
throw new java.io.IOException(te);
}
}
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
try {
- read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
+ read(new org.apache.storm.thrift.protocol.TCompactProtocol(new org.apache.storm.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.storm.thrift.TException te) {
throw new java.io.IOException(te);
}
}
- private static class AlreadyAliveExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ private static class AlreadyAliveExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
public AlreadyAliveExceptionStandardScheme getScheme() {
return new AlreadyAliveExceptionStandardScheme();
}
}
- private static class AlreadyAliveExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<AlreadyAliveException> {
+ private static class AlreadyAliveExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<AlreadyAliveException> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, AlreadyAliveException struct) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField schemeField;
+ public void read(org.apache.storm.thrift.protocol.TProtocol iprot, AlreadyAliveException struct) throws org.apache.storm.thrift.TException {
+ org.apache.storm.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.storm.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
case 1: // MSG
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
struct.msg = iprot.readString();
struct.set_msg_isSet(true);
} else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
iprot.readFieldEnd();
}
@@ -336,7 +336,7 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, AlreadyAliveException struct) throws org.apache.thrift.TException {
+ public void write(org.apache.storm.thrift.protocol.TProtocol oprot, AlreadyAliveException struct) throws org.apache.storm.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -351,30 +351,30 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
}
- private static class AlreadyAliveExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ private static class AlreadyAliveExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
public AlreadyAliveExceptionTupleScheme getScheme() {
return new AlreadyAliveExceptionTupleScheme();
}
}
- private static class AlreadyAliveExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<AlreadyAliveException> {
+ private static class AlreadyAliveExceptionTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<AlreadyAliveException> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, AlreadyAliveException struct) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ public void write(org.apache.storm.thrift.protocol.TProtocol prot, AlreadyAliveException struct) throws org.apache.storm.thrift.TException {
+ org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
oprot.writeString(struct.msg);
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, AlreadyAliveException struct) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ public void read(org.apache.storm.thrift.protocol.TProtocol prot, AlreadyAliveException struct) throws org.apache.storm.thrift.TException {
+ org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
struct.msg = iprot.readString();
struct.set_msg_isSet(true);
}
}
- private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
- return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+ private static <S extends org.apache.storm.thrift.scheme.IScheme> S scheme(org.apache.storm.thrift.protocol.TProtocol proto) {
+ return (org.apache.storm.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
}
}