diff --git a/.gitignore b/.gitignore index 7faaac8a56..b2a37f9c99 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ deploy/logs *.jar bin/jzmq .DS_Store -pom.xml deploy/classes *.fyc *.rbc @@ -28,4 +27,4 @@ target /.lein-plugins/ *.ipr *.iws -.idea +.idea \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 0982606743..c6387df9f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +## 0.9.1-incubating +* Fix to prevent Nimbus from hanging if random data is sent to nimbus thrift port +* Improved support for running on Windows platforms +* Removed dependency on the `unzip` binary +* Switch build system from Leiningen to Maven +* STORM-1: Replaced 0MQ as the default transport with Netty. +* STORM-181: Nimbus now validates topology configuration when topologies are submitted (thanks d2r) +* STORM-182: Storm UI now includes tooltips to document fields (thanks d2r) +* STORM-195: `dependency-reduced-pom.xml` should be in `.gitignore` +* STORM-13: Change license on README.md +* STORM-2: Move all dependencies off of storm-specific builds +* STORM-159: Upload separate source and javadoc jars for maven use +* STORM-149: `storm jar` doesn't work on Windows + ## 0.9.0.1 * Update build configuration to force compatibility with Java 1.6 diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 0000000000..8638904d9d --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1,10 @@ +Apache Storm is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. diff --git a/KEYS b/KEYS index d6ce3b8b92..d3bf1da836 100644 --- a/KEYS +++ b/KEYS @@ -1,10 +1,19 @@ +This file contains the PGP keys of various developers. + + pub 2048R/E80B8FFD 2012-03-05 [expires: 2018-03-05] +uid P. Taylor Goetz +sig 3 E80B8FFD 2013-12-17 P. Taylor Goetz uid P. Taylor Goetz -sig 3 E80B8FFD 2012-03-05 P. Taylor Goetz +sig 3 E80B8FFD 2012-03-05 P. Taylor Goetz +sig 3D0C92B9 2013-12-05 Owen O'Malley (Code signing) +sig ECB31663 2013-12-05 Matthew Foley (CODE SIGNING KEY) +sub 2048R/D830CE6C 2012-03-05 [expires: 2018-03-05] +sig E80B8FFD 2012-03-05 P. Taylor Goetz -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG/MacGPG2 v2.0.20 (Darwin) -Comment: GPGTools - http://gpgtools.org +Version: GnuPG/MacGPG2 v2.0.22 (Darwin) +Comment: GPGTools - https://gpgtools.org mQENBE9VAVUBCADwWjI9USSW4xx45L0KSeHiu+rT1t2eolKx+yxxfMC9QJWb1uGt WCKG2zb2lk6DBej2/vF6v6EA6d+esOZfmSZazkd61q0INyimuxi0PBHEjipWD/f3 @@ -19,6 +28,54 @@ noqCY2yEYV54Bm6e59qlYUifPEFCMKULB5IzMdyou2DYoUrJquHTYdsHUBTr8cuN pIdkbLDBj/RL5jdflKAFuYKSsIEaj0bCvECoR1CRPfTJX2XtPDzRTP28ccRu/pEz 2I588JSZ/RSjqk9DW2Mh75g1CBocRLp90qhW9jUoCkZb0Pis8jnm5gkcHYOz5Hpr qPzxjZOlMD+cLkP9Geo0+Gs13tt3rwBgIE0l/mPdRltPBbQ9xXORoMlGHtZlXZrn -qSx4e87y -=RfYX +qSx4e87yiQIcBBABCgAGBQJSn8WTAAoJEBIJ5/E9DJK5te8P+we1CceIMx2gj4cr +aCWrm0LT2FStVv6LxwQ6C45OruVu0ZwRkqanytNpVr6BTKzDoZwY1NdPE6MUQ4Ip +prZv1P2THR2EPwz+14b+BBHBSXLszlf0FjjlXGEG3hpfN6iVwoBcM0129mzB/XHs +Ly2dLf3jDhihr/IKVWd6BT0iYj4jTJNU6rI9d3Ho+39HE8vF954VMzf3FIg+D1Qh ++Vh35BcAah/j/H38TY/4wxlUfjohV+KxXRkqFwHOmUz/Gv29BzUH1DbUc5PZ3iii +MbXtoKXXeuxc2whYAYYisld7voAz8SGHualN8xdR7mq7ojBlZJO9eYAGlvSlNQ84 +2pCOVoHTCuEDY46IARzesMEHMwezVDHoFw4YXtsSL8C70ztUQOMg8QjVwZ1wzxlx +LuZ6n33BTaU+26ijxjFF8oKLStiC0v0njqhE+bG/TygPfrrr5s+1VHRdelts697m +51LTuQPhZ2t0qL/lJTa4J785RoD1Co+et9SXQJ1a1trGwYJupYGWEAWPz9x5aceI +5asH6EXE5ZzuqFIAXMHVV5cnlG6UssN6XY3BmaCrMP75kg4rNJPsZP3CxM76EsOm +52mSSrPANPzFsXJEBDDsVQ+zkurKyT3N7ikoxNMBBxwtFly2sD38jHox5S3Cxb7k +q0h7SQqhk3CRSqGceIdX9v0U+bpUiQIcBBABCgAGBQJSn+HzAAoJEEFpqifssxZj +5SQP/i18eHv+HcIk8IkIMZQq9APentCRjDZ7XjNX61keWFR+uKgQU4+DbiWfCWIJ +HL8QR86ZrM8/SH334MS2YfSugKNb5OOpgBUWXAS1mTp55aE7EZJ95KJjDUM/DSgR +EnKC98yAyVUiu89GJ4pMvTk/mJicTXO9c41OjWiHN50DS30dmpN09mydVMlR5mSP +dEBMOsVJ/JIE5LC652wKVg9Xw1Xn9MyA58P2dCEu+tLNsfLD9vRxBjZMmEmo1qoI +18b0EW3Zs0ac9K8xH830vI5L7q2hhgI3BG3C1PY0WX8Nv7MrueawH1SnSv8wD4A2 +ibzWIqqaRR21oLBTcASfiLLwIMaK5wFOm6feH3JRqKS0lZHFAh/6DhhOUO9dZLCi +YHtJBVBh/K0z3+7XTumAscxsgEgnsrWi4DYvJXuTkizRNTzA9BstYgryl7miK2JP +NstScv86aF09IhjcqTFuGt7o19npFdq+wBhtfgk454ICod7EQNPeEmrRdfAvmYse +QkbQAGbVO593qt+QGTeLw8ZruvEMoCB8bSTfDHT/dwCiddiwSNgjMBuR+/Mxm2Xr +dtivMvbl6odI0Il+ORHmwEWsRjdhmbSEL9XvcCujJKZfrGFRZ380FkA5AXSxVoeO +ip1aOrfeshLOQqJ9MrBPAgU24gHPlqrcUSP0H4YI74yicrRgtCRQLiBUYXlsb3Ig +R29ldHogPHB0Z29ldHpAYXBhY2hlLm9yZz6JAT0EEwEKACcFAlKvsE4CGy8FCQtI +hoAFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQjeA5YugLj/0IAAf9G6H/hksj +IMDjnrayy5mzsLg6MBg5pJ4iZJHVL3tXsbtqevy1akxRY3uUt1QoQyOFAZpcGL5Z +9am8UhWEvfnKkAvzwcPpAZML/yGZt3bLHrxHHP1u6N+GQPYuuTTKEZT/Mz7Ei8SK +bQOT4g+qsBb7kNvhnsnH8qSuEmatWl+ve3Wl9/9jbzjBb9u7ZMwgWr36I7N5FE3x +isb0FzM7GFZ0ds1A7i9+soHk2dte/pN+x/8tpM7vRtgV5Q2Q4zRFjvx9dMBNGXg/ +0YDut/LZxl8cErQUAoYDVh6OTKqDlwOxuqI45h8YL9PTWi39hY97CrJLE9zSQSYe +gwOX83yNk+qnI7kBDQRPVQFVAQgArxIAYtVu214Hqm7RNGsJ7AGKpdmvGqgJzl9r +yqzBFQrzbKVzBUxwWXWLKOwjZhP2m8xe2sW72ZM9D+ovbVOwz3hzLqfYQnhBwK3Y +m/UeGA/3T25nHxDGFp+fExGI9Cg+QJWkt1qbDte8VV2Y7x70Ftal/ht/xKFdDGaD +jtlSw9VO2TDMMTAFqBMzsCX9PcqsjLHJWcz81LfoOZjn1/E24w540FiddFDFdYV/ +cOjFfzKsp6j/qvFydTonOKaC3GKo10UKVDeCIDxo13RUPITeqJGC+B3U8z8kc2cG +emHU/yDoFLcC3o6F6bIDIxqvAqD6TRPEoGnf8pTgrPf13p9LdwARAQABiQJEBBgB +AgAPBQJPVQFVAhsuBQkLSIaAASkJEI3gOWLoC4/9wF0gBBkBAgAGBQJPVQFVAAoJ +EHxFUhzYMM5s4gUH/2zPHes06ehmSlu1qzxcaFvcgPLTqn3DLJi+3dKidmL4rb80 +NnindIIYH1b3Oym7QZiGmlTpIimEcTeCgCqABPJUiR69ZV/rGX2OdnFwcfTX49fm +0tRr1zhhhzgMXrW/3NhgjiR/SLK+5PsBx1Atm0o9iuRi8z/lO94qv0CWsZ1XhLLR +S/zNcXKGCjJ7DlTiiw8NGOts8aVZazZ/M8cmZYp9q1p119dEcbI7xTq9FDALlqTK +F9i5Ra9nwyulmb9j1uMZlPl9sKAT4mTjFeejqOCBzZcSkDCztjr1cja1BVsCHz1R +qAm5vzPA8ID60JmD90WX1RpyV+8XTDx20nyY+DDuHAgA2lRb3zOLyzVQwQZqQxFq +rU5PufB2cLNmR6hYmug9Hx+6gWujhic3JvdENTjK3+mBnn9rYLKXAsEgnCtXzz+s +CTUjl6Pz/hOBFwBKY8ilwBpTW+cd7A6jRCaUVNlEZrx+NODFxxtZ9xCKPEla3Aed +/fSxU7Rfc/quF2uGPyM+TQJ7lmbusQyDgC79brb0KVIBpHmGc17EfUiAdUQexlzv +wm8jfOCfRsAOzujhTTu5QKDJn6RLVu7/oKhvDlwDobftZtGCA5Nsf91HSt3mwsxx +Be/J4vDCRO3I+6qUpQwfNaUzjcHBaStzlV35mu/6Xeq7Kkr5VVmqqwT53Xig1laL +Vw== +=E8Vm -----END PGP PUBLIC KEY BLOCK----- diff --git a/MODULES b/MODULES deleted file mode 100644 index 76c078a7b5..0000000000 --- a/MODULES +++ /dev/null @@ -1,4 +0,0 @@ -storm-console-logging -storm-core -storm-netty - diff --git a/VERSION b/VERSION index 8ebaebf21e..ad96e7cf93 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.1-incubating-SNAPSHOT +${project.version} diff --git a/bin/build_modules.sh b/bin/build_modules.sh deleted file mode 100644 index e507fb1969..0000000000 --- a/bin/build_modules.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# 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. - -LEIN=`which lein2 || which lein` -export LEIN_ROOT=1 - - -for module in $(cat MODULES) -do - echo "Building $module" - cd $module - if [ $module != "storm-console-logging" ] - then - rm ../conf/logback.xml - fi - - - $LEIN with-profile release clean - $LEIN with-profile release deps - $LEIN with-profile release jar - $LEIN with-profile release install - $LEIN with-profile release pom - - git checkout ../conf/logback.xml - cd .. -done \ No newline at end of file diff --git a/bin/build_release.sh b/bin/build_release.sh deleted file mode 100644 index d09649ee4e..0000000000 --- a/bin/build_release.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# 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. - -function quit { - exit 1 -} -trap quit 1 2 3 15 #Ctrl+C exits. - -RELEASE=`cat VERSION` -LEIN=`which lein2 || which lein` -export LEIN_ROOT=1 - -echo Making release $RELEASE - -DIR=`pwd`/_release/storm-$RELEASE - -rm -rf _release -rm -f *.zip -rm -f *.tar.gz -$LEIN pom || exit 1 -mkdir -p $DIR/lib - - -sh bin/build_modules.sh - -for module in $(cat MODULES) -do - cd $module - mvn dependency:copy-dependencies || exit 1 - cp -f target/dependency/*.jar $DIR/lib/ - cp -f target/*.jar $DIR/ - cd .. -done - -cd _release/storm-$RELEASE -for i in *.jar -do - rm -f lib/$i -done -cd ../.. - -cp CHANGELOG.md $DIR/ - -echo $RELEASE > $DIR/RELEASE - -mkdir -p $DIR/logback -mkdir -p $DIR/logs -cp -R logback/cluster.xml $DIR/logback/cluster.xml - -mkdir $DIR/conf -cp conf/storm.yaml.example $DIR/conf/storm.yaml - -cp -R storm-core/src/ui/public $DIR/ - -cp -R bin $DIR/ - -cp README.markdown $DIR/ -cp LICENSE.html $DIR/ - -cd _release -zip -r storm-$RELEASE.zip * -mv storm-*.zip ../ -tar -cvzf ../storm-$RELEASE.tar.gz ./ - -cd .. - -rm -rf _release - diff --git a/bin/install_zmq.sh b/bin/install_zmq.sh deleted file mode 100755 index b06a3aeac4..0000000000 --- a/bin/install_zmq.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# 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. - -export JAVA_HOME=${JAVA_HOME:/usr/libexec/java_home} - -if [ ! -d "$JAVA_HOME/include" ]; then - echo " -Looks like you're missing your 'include' directory. If you're using Mac OS X, You'll need to install the Java dev package. - -- Navigate to http://goo.gl/D8lI -- Click the Java tab on the right -- Install the appropriate version and try again. -" - exit -1; -fi - -#install zeromq -wget http://download.zeromq.org/zeromq-2.1.7.tar.gz -tar -xzf zeromq-2.1.7.tar.gz -cd zeromq-2.1.7 -./configure -make -sudo make install - -cd ../ - -#install jzmq (both native and into local maven cache) -git clone https://github.com/nathanmarz/jzmq.git -cd jzmq -./autogen.sh -./configure -make -sudo make install diff --git a/bin/javadoc.sh b/bin/javadoc.sh deleted file mode 100644 index 2c18899bf0..0000000000 --- a/bin/javadoc.sh +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - -mkdir -p doc -javadoc -d doc-$1/ `find . -name "*.java" | grep -v generated` diff --git a/bin/storm b/bin/storm index 053d600c0f..aee46cbfa3 100755 --- a/bin/storm +++ b/bin/storm @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http:# www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd new file mode 100644 index 0000000000..ccf1d4f65a --- /dev/null +++ b/bin/storm-config.cmd @@ -0,0 +1,111 @@ +@echo off + +@rem Licensed to the Apache Software Foundation (ASF) under one +@rem or more contributor license agreements. See the NOTICE file +@rem distributed with this work for additional information +@rem regarding copyright ownership. The ASF licenses this file +@rem to you under the Apache License, Version 2.0 (the +@rem "License"); you may not use this file except in compliance +@rem with the License. You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. + + +set STORM_HOME=%~dp0 +for %%i in (%STORM_HOME%.) do ( + set STORM_HOME=%%~dpi +) +if "%STORM_HOME:~-1%" == "\" ( + set STORM_HOME=%STORM_HOME:~0,-1% +) + +if not exist %STORM_HOME%\lib\storm*.jar ( + @echo +================================================================+ + @echo ^| Error: STORM_HOME is not set correctly ^| + @echo +----------------------------------------------------------------+ + @echo ^| Please set your STORM_HOME variable to the absolute path of ^| + @echo ^| the directory that contains the storm distribution ^| + @echo +================================================================+ + exit /b 1 +) + +set STORM_BIN_DIR=%STORM_HOME%\bin + +if not defined STORM_CONF_DIR ( + set STORM_CONF_DIR=%STORM_HOME%\conf +) + +@rem +@rem setup java environment variables +@rem + +if not defined JAVA_HOME ( + set JAVA_HOME=c:\apps\java\openjdk7 +) + +if not exist %JAVA_HOME%\bin\java.exe ( + echo Error: JAVA_HOME is incorrectly set. + goto :eof +) + +set JAVA=%JAVA_HOME%\bin\java +set JAVA_HEAP_MAX=-Xmx1024m + +@rem +@rem check envvars which might override default args +@rem + +if defined STORM_HEAPSIZE ( + set JAVA_HEAP_MAX=-Xmx%STORM_HEAPSIZE%m +) + +@rem +@rem CLASSPATH initially contains %STORM_CONF_DIR% +@rem + +set CLASSPATH=%STORM_HOME%\*;%STORM_CONF_DIR% +set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar + +@rem +@rem add libs to CLASSPATH +@rem + +set CLASSPATH=!CLASSPATH!;%STORM_HOME%\lib\* + +if not defined STORM_LOG_DIR ( + set STORM_LOG_DIR=%STORM_HOME%\logs +) + +if not defined STORM_LOGFILE ( + set STORM_LOGFILE=storm.log +) + +if not defined STORM_ROOT_LOGGER ( + set STORM_ROOT_LOGGER=INFO,console,DRFA +) + +if not defined STORM_LOGBACK_CONFIGURATION_FILE ( + set STORM_LOGBACK_CONFIGURATION_FILE=%STORM_CONF_DIR%\logback.xml +) + +set STORM_OPTS=-Dstorm.home=%STORM_HOME% -Djava.library.path=sbin +set STORM_OPTS=%STORM_OPTS% -Dlogback.configurationFile=%STORM_LOGBACK_CONFIGURATION_FILE% +set STORM_OPTS=%STORM_OPTS% -Dstorm.log.dir=%STORM_LOG_DIR% +set STORM_OPTS=%STORM_OPTS% -Dstorm.root.logger=%STORM_ROOT_LOGGER% + + +if not defined STORM_SERVER_OPTS ( + set STORM_SERVER_OPTS=-server +) + +if not defined STORM_CLIENT_OPTS ( + set STORM_CLIENT_OPTS=-client +) + +:eof diff --git a/bin/storm.cmd b/bin/storm.cmd new file mode 100644 index 0000000000..a656ac8851 --- /dev/null +++ b/bin/storm.cmd @@ -0,0 +1,201 @@ +@echo off + +@rem Licensed to the Apache Software Foundation (ASF) under one +@rem or more contributor license agreements. See the NOTICE file +@rem distributed with this work for additional information +@rem regarding copyright ownership. The ASF licenses this file +@rem to you under the Apache License, Version 2.0 (the +@rem "License"); you may not use this file except in compliance +@rem with the License. You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. + +@rem The storm command script +@rem +@rem Environment Variables +@rem +@rem JAVA_HOME The java implementation to use. Overrides JAVA_HOME. +@rem +@rem STORM_CLASSPATH Extra Java CLASSPATH entries. +@rem +@rem STORM_HEAPSIZE The maximum amount of heap to use, in MB. +@rem Default is 1000. +@rem +@rem STORM_OPTS Extra Java runtime options. +@rem +@rem STORM_CONF_DIR Alternate conf dir. Default is ${STORM_HOME}/conf. +@rem +@rem STORM_ROOT_LOGGER The root appender. Default is INFO,console +@rem + +:main + setlocal enabledelayedexpansion + + call %~dp0storm-config.cmd + + set storm-command=%1 + if not defined storm-command ( + goto print_usage + ) + + call :make_command_arguments %* + + set shellcommands=classpath help version + for %%i in ( %shellcommands% ) do ( + if %storm-command% == %%i set shellcommand=true + ) + if defined shellcommand ( + call :%storm-command% %* + goto :eof + ) + + set corecommands=activate deactivate dev-zookeeper drpc kill list nimbus rebalance repl shell supervisor ui + for %%i in ( %corecommands% ) do ( + if %storm-command% == %%i set corecommand=true + ) + if defined corecommand ( + call :%storm-command% %storm-command-arguments% + ) else ( + set CLASS=%storm-command% + ) + + if %storm-command% == jar ( + set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS% -Dstorm.jar=%2 + set CLASSPATH=%CLASSPATH%;%2 + set CLASS=%3 + set storm-command-arguments=%4 %5 %6 %7 %8 %9 + ) + + if not defined STORM_LOG_FILE ( + set STORM_LOG_FILE=-Dlogfile.name=%storm-command%.log + ) + + if defined STORM_DEBUG ( + %JAVA% %JAVA_HEAP_MAX% %STORM_OPTS% %STORM_LOG_FILE% %CLASS% %storm-command-arguments% + ) + set path=%PATH%;%STORM_BIN_DIR%;%STORM_SBIN_DIR% + call %JAVA% %JAVA_HEAP_MAX% %STORM_OPTS% %STORM_LOG_FILE% %CLASS% %storm-command-arguments% + goto :eof + + +:activate + set CLASS=backtype.storm.command.activate + set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS% + goto :eof + +:classpath + echo %CLASSPATH% + goto :eof + +:deactivate + set CLASS=backtype.storm.command.deactivate + set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS% + goto :eof + +:dev-zookeeper + set CLASS=backtype.storm.command.dev_zookeeper + set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% + goto :eof + +:drpc + set CLASS=backtype.storm.daemon.drpc + set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% + goto :eof + +:help + call :print_usage + goto :eof + +:kill + set CLASS=backtype.storm.command.kill_topology + set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS% + goto :eof + +:list + set CLASS=backtype.storm.command.list + set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS% + goto :eof + +:nimbus + set CLASS=backtype.storm.daemon.nimbus + set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% + goto :eof + +:rebalance + set CLASS=backtype.storm.command.rebalance + set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS% + goto :eof + +:repl + set CLASS=clojure.main + set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS% + goto :eof + +:shell + set CLASS=backtype.storm.command.shell_submission + set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS% + goto :eof + +:supervisor + set CLASS=backtype.storm.daemon.supervisor + set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% + goto :eof + +:ui + set CLASS=backtype.storm.ui.core + set CLASSPATH=%CLASSPATH%;%STORM_HOME% + set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% + goto :eof + +:version + type RELEASE + goto :eof + +:make_command_arguments + if "%2" == "" goto :eof + set _count=0 + set _shift=1 + for %%i in (%*) do ( + set /a _count=!_count!+1 + if !_count! GTR %_shift% ( + if not defined _arguments ( + set _arguments=%%i + ) else ( + set _arguments=!_arguments! %%i + ) + ) + ) + set storm-command-arguments=%_arguments% + goto :eof + +:print_usage + @echo Usage: storm COMMAND + @echo where COMMAND is one of: + @echo activate activates the specified topology's spouts + @echo classpath prints the classpath used by the storm client when running commands + @echo deactivate deactivates the specified topology's spouts + @echo dev-zookeeper launches a fresh dev/test Zookeeper server + @echo drpc launches a DRPC daemon + @echo help + @echo jar ^ run a jar file + @echo kill kills the topology with the name topology-name + @echo list list the running topologies and their statuses + @echo nimbus launches the nimbus daemon + @echo rebalance redistribute or change the parallelism of a running topology + @echo repl opens up a Clojure REPL + @echo shell storm shell + @echo supervisor launches the supervisor daemon + @echo ui launches the UI daemon + @echo version print the version + @echo. + @echo or + @echo CLASSNAME run the class named CLASSNAME + @echo Most commands print help when invoked w/o parameters. + +endlocal diff --git a/bin/to_maven.sh b/bin/to_maven.sh deleted file mode 100644 index 9f1c02fe50..0000000000 --- a/bin/to_maven.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -# 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. - -function quit { - exit 1 -} -trap quit 1 2 3 15 #Ctrl+C exits. - -RELEASE=`cat VERSION` -LEIN=`which lein2 || which lein` -export LEIN_ROOT=1 - - -sh bin/build_modules.sh - -echo ==== Module jars ==== -for module in $(cat MODULES) -do - cd $module - scp target/*jar pom.xml clojars@clojars.org: - cd .. -done - - -#L - -echo ==== Storm jar ==== -$LEIN clean -$LEIN pom -$LEIN jar -scp pom.xml target/*jar clojars@clojars.org: - -echo ==== Storm-lib jar ==== -cd storm-lib -$LEIN clean -$LEIN pom -$LEIN jar -scp pom.xml target/*jar clojars@clojars.org: -cd .. diff --git a/conf/defaults.yaml b/conf/defaults.yaml index 95e3366555..2dbba24c9f 100644 --- a/conf/defaults.yaml +++ b/conf/defaults.yaml @@ -6,7 +6,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http:# www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -35,11 +35,12 @@ storm.zookeeper.retry.intervalceiling.millis: 30000 storm.cluster.mode: "distributed" # can be distributed or local storm.local.mode.zmq: false storm.thrift.transport: "backtype.storm.security.auth.SimpleTransportPlugin" -storm.messaging.transport: "backtype.storm.messaging.zmq" +storm.messaging.transport: "backtype.storm.messaging.netty.Context" ### nimbus.* configs are for the master nimbus.host: "localhost" nimbus.thrift.port: 6627 +nimbus.thrift.max_buffer_size: 1048576 nimbus.childopts: "-Xmx1024m" nimbus.task.timeout.secs: 30 nimbus.supervisor.timeout.secs: 60 diff --git a/conf/storm.yaml.example b/conf/storm.yaml.example index b11aba9cc6..88b3dfd370 100644 --- a/conf/storm.yaml.example +++ b/conf/storm.yaml.example @@ -6,7 +6,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http:# www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000..720fab3b9c --- /dev/null +++ b/pom.xml @@ -0,0 +1,649 @@ + + + + 4.0.0 + + + org.apache + apache + 10 + + + + org.apache.storm + storm + 0.9.1-incubating-SNAPSHOT + pom + Storm + Distributed and fault-tolerant realtime computation + http://storm.incubator.apache.org + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + Storm user mailing list + user-subscribe@storm.incubator.apache.org + user-unsubscribe@storm.incubator.apache.org + user@storm.incubator.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-storm-user/ + + + Storm developer mailing list + dev-subscribe@storm.incubator.apache.org + dev-unsubscribe@storm.incubator.apache.org + dev@storm.incubator.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-storm-dev/ + + + + + + nathanmarz + Nathan Marz + nathan@nathanmarz.com + + Committer + + -8 + + + ptgoetz + P. Taylor Goetz + ptgoetz@apache.org + + Committer + + -5 + + + xumingming + James Xu + xumingming@apache.org + + Committer + + + + + afeng + Andy Feng + afeng@apache.org + + Committer + + -8 + + + davidlao + David Lao + davidlao@microsoft.com + + Committer + + -8 + + + mrflip + Flip Kromer + mrflip@apache.org + + Committer + + + + + jjackson + Jason Jackson + jason@cvk.ca + + Committer + + -8 + + + + + + 3.0.0 + + + + storm-buildtools/maven-shade-clojure-transformer + storm-core + + + + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-storm.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-storm.git + HEAD + https://git-wip-us.apache.org/repos/asf/incubator-storm + + + + jira + https://issues.apache.org/jira/browse/STORM + + + + UTF-8 + + + 1.4.0 + 1.1.3 + 0.3.6 + 1.4 + 2.5 + 1.1 + 0.4.1 + 1.0.1 + 1.1 + 0.3.11 + 0.2.3 + 0.0.1 + 1.3.2 + 1.11 + 4.1.1 + 0.2.2 + 2.10.1 + 0.9.0 + 13.0 + 1.0.6 + 1.6.6 + 3.6.3.Final + 0.2.3 + 0.2.3 + 1.9.5 + 0.3.0 + + + + + + + sign + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + dist + + storm-dist/binary + storm-dist/source + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + true + + + + + + + + + + + + + storm.maven.website + Storm Website + file:///tmp/site + + + + + + + org.clojure + clojure + ${clojure.version} + + + commons-io + commons-io + ${commons-io.verson} + + + org.apache.commons + commons-exec + ${commons-exec.version} + + + commons-lang + commons-lang + ${commons-lang.version} + + + clj-time + clj-time + ${clj-time.version} + + + com.netflix.curator + curator-framework + ${curator.version} + + + log4j + log4j + + + + + com.googlecode.json-simple + json-simple + ${json-simple.version} + + + compojure + compojure + ${compojure.version} + + + hiccup + hiccup + ${hiccup.version} + + + ring + ring-devel + ${ring.version} + + + ring + ring-jetty-adapter + ${ring.version} + + + org.clojure + tools.logging + ${clojure.tools.logging.version} + + + org.clojure + math.numeric-tower + ${clojure.math.numeric-tower.version} + + + com.twitter + carbonite + ${carbonite.version} + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + org.clojure + tools.cli + ${clojure.tools.cli.version} + + + com.googlecode.disruptor + disruptor + ${disruptor.version} + + + org.jgrapht + jgrapht-core + ${jgrapht.version} + + + com.google.guava + guava + ${guava.version} + + + ch.qos.logback + logback-classic + ${logback-classic.version} + + + org.slf4j + log4j-over-slf4j + ${log4j-over-slf4j.version} + + + io.netty + netty + ${netty.version} + + + org.clojure + tools.nrepl + ${clojure.tools.nrepl.version} + test + + + clojure + org.clojure + + + + + clojure-complete + clojure-complete + ${clojure-complete.version} + test + + + clojure + org.clojure + + + + + org.mockito + mockito-all + ${mockito.version} + test + + + org.apache.thrift + libthrift + 0.7.0 + compile + + + + + + + + + + reply + reply + ${reply.version} + provided + + + + + + + true + + + false + + central + http://repo1.maven.org/maven2/ + + + + true + + + true + + clojars + https://clojars.org/repo/ + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2.2 + + + org.apache.maven.plugins + maven-install-plugin + 2.4 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + org.apache.maven.plugins + maven-release-plugin + 2.4.1 + + + com.theoryinpractise + clojure-maven-plugin + 1.3.18 + true + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.16 + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.4 + + + org.apache.maven.plugins + maven-shade-plugin + 2.2 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.7 + + + org.apache.maven.plugins + maven-site-plugin + 3.3 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-release-plugin + + true + v@{project.version} + + + + com.theoryinpractise + clojure-maven-plugin + true + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.11 + + + + checkstyle + + + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.0.1 + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + ${project.build.directory}/test-reports + ${project.build.directory}/surefire-reports + + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + + + Todo Work + + + TODO + exact + + + FIXME + exact + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.rat + apache-rat-plugin + 0.10 + + false + + + **/target/** + + **/*.iml + + + CHANGELOG.md + VERSION + TODO + + **/src/py/** + + + **/src/ui/public/js/jquery-1.6.2.min.js + **/src/ui/public/js/jquery.cookies.2.2.0.min.js + **/src/ui/public/js/jquery.tablesorter.min.js + + + **/dependency-reduced-pom.xml + + + + + + diff --git a/project.clj b/project.clj deleted file mode 100644 index 8f63cd6afd..0000000000 --- a/project.clj +++ /dev/null @@ -1,31 +0,0 @@ -;; 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. -(def VERSION (.trim (slurp "VERSION"))) -(def MODULES (-> "MODULES" slurp (.split "\n"))) -(def DEPENDENCIES (for [m MODULES] [(symbol (str "storm/" m)) VERSION])) - -(eval `(defproject storm/storm ~VERSION - :url "http://storm-project.net" - :description "Distributed and fault-tolerant realtime computation" - :license {:name "Eclipse Public License - Version 1.0" :url "https://github.com/nathanmarz/storm/blob/master/LICENSE.html"} - :mailing-list {:name "Storm user mailing list" - :archive "https://groups.google.com/group/storm-user" - :post "storm-user@googlegroups.com"} - :dependencies [~@DEPENDENCIES] - :plugins [[~'lein-sub "0.2.1"]] - :min-lein-version "2.0.0" - :sub [~@MODULES] - )) diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml new file mode 100644 index 0000000000..3b8cd9796a --- /dev/null +++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml @@ -0,0 +1,39 @@ + + + + 4.0.0 + + + storm + org.apache.storm + 0.9.1-incubating-SNAPSHOT + ../../pom.xml + + + org.apache.storm + maven-shade-clojure-transformer + + + + org.apache.maven.plugins + maven-shade-plugin + 2.2 + provided + + + \ No newline at end of file diff --git a/storm-buildtools/maven-shade-clojure-transformer/src/main/java/org/apache/storm/maven/shade/clojure/ClojureTransformer.java b/storm-buildtools/maven-shade-clojure-transformer/src/main/java/org/apache/storm/maven/shade/clojure/ClojureTransformer.java new file mode 100644 index 0000000000..a24c67d74e --- /dev/null +++ b/storm-buildtools/maven-shade-clojure-transformer/src/main/java/org/apache/storm/maven/shade/clojure/ClojureTransformer.java @@ -0,0 +1,72 @@ +/* + * 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 org.apache.storm.maven.shade.clojure; + +import org.apache.maven.plugins.shade.relocation.Relocator; +import org.apache.maven.plugins.shade.resource.ResourceTransformer; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import java.util.jar.JarEntry; +import java.util.jar.JarOutputStream; + + +public class ClojureTransformer implements ResourceTransformer { + + private HashMap entries = new HashMap(); + + @Override + public boolean canTransformResource(String s) { + if(s.endsWith(".clj")){ + return true; + } + return false; + } + + @Override + public void processResource(String s, InputStream inputStream, List relocators) throws IOException { + + ByteArrayOutputStream out = new ByteArrayOutputStream(); + int b; + while((b = inputStream.read()) != -1){ + out.write(b); + } + String data = out.toString(); + + for(Relocator rel : relocators){ + data = rel.applyToSourceContent(data); + } + this.entries.put(s, data); + } + + @Override + public boolean hasTransformedResource() { + return true; + } + + @Override + public void modifyOutputStream(JarOutputStream jarOut) throws IOException { + for(String key : this.entries.keySet()){ + jarOut.putNextEntry(new JarEntry(key)); + jarOut.write(this.entries.get(key).getBytes()); + } + } +} diff --git a/storm-console-logging/logback/logback.xml b/storm-console-logging/logback/logback.xml deleted file mode 120000 index c49f90276d..0000000000 --- a/storm-console-logging/logback/logback.xml +++ /dev/null @@ -1 +0,0 @@ -../../conf/logback.xml \ No newline at end of file diff --git a/storm-console-logging/project.clj b/storm-console-logging/project.clj deleted file mode 100644 index 44644195d1..0000000000 --- a/storm-console-logging/project.clj +++ /dev/null @@ -1,26 +0,0 @@ -;; 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. -(def ROOT-DIR (subs *file* 0 (- (count *file*) (count "project.clj")))) -(def VERSION (-> ROOT-DIR (str "/../VERSION") slurp (.trim))) - -(defproject storm/storm-console-logging VERSION - :resource-paths ["logback"] - :target-path "target" - :javac-options ["-target" "1.6" "-source" "1.6"] - :profiles {:release {} - } - - :aot :all) diff --git a/storm-core/pom.xml b/storm-core/pom.xml new file mode 100644 index 0000000000..20366861ec --- /dev/null +++ b/storm-core/pom.xml @@ -0,0 +1,266 @@ + + + + 4.0.0 + + storm + org.apache.storm + 0.9.1-incubating-SNAPSHOT + + org.apache.storm + storm-core + jar + Storm Core + Storm Core Java API and Clojure implementation. + + + + + org.clojure + clojure + + + clj-time + clj-time + + + compojure + compojure + + + hiccup + hiccup + + + ring + ring-devel + + + ring + ring-jetty-adapter + + + org.clojure + tools.logging + + + org.clojure + math.numeric-tower + + + org.clojure + tools.cli + + + org.clojure + tools.nrepl + test + + + clojure-complete + clojure-complete + test + + + + + commons-io + commons-io + + + org.apache.commons + commons-exec + + + commons-lang + commons-lang + + + org.apache.thrift + libthrift + 0.7.0 + compile + + + org.slf4j + slf4j-api + + + javax.servlet + servlet-api + + + + + + + com.netflix.curator + curator-framework + + + com.googlecode.json-simple + json-simple + + + + + com.twitter + carbonite + + + org.yaml + snakeyaml + + + org.apache.httpcomponents + httpclient + + + + com.googlecode.disruptor + disruptor + + + org.jgrapht + jgrapht-core + + + com.google.guava + guava + + + ch.qos.logback + logback-classic + + + org.slf4j + log4j-over-slf4j + + + io.netty + netty + + + + org.mockito + mockito-all + test + + + + src/jvm + + + ../conf + + + + + src/dev + + + test/resources + + + + + com.theoryinpractise + clojure-maven-plugin + true + + + src/clj + + + test/clj + + false + + + + compile-clojure + compile + + compile + + + + test-clojure + test + + test-with-junit + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + ${project.build.directory}/test-reports + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.2 + + + package + + shade + + + + + true + false + true + false + + + org.apache.thrift:* + odg.apache.storm:* + + + + + + org.apache.thrift + org.apache.thrift7 + + + + + + + + + + org.apache.storm + maven-shade-clojure-transformer + ${project.version} + + + + + + + diff --git a/storm-core/project.clj b/storm-core/project.clj deleted file mode 100644 index 8b917169e8..0000000000 --- a/storm-core/project.clj +++ /dev/null @@ -1,67 +0,0 @@ -;; 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. -(def ROOT-DIR (subs *file* 0 (- (count *file*) (count "project.clj")))) -(def VERSION (-> ROOT-DIR (str "/../VERSION") slurp (.trim))) - -(defproject storm/storm-core VERSION - :dependencies [[org.clojure/clojure "1.4.0"] - [commons-io "1.4"] - [org.apache.commons/commons-exec "1.1"] - [storm/libthrift7 "0.7.0-2" - :exclusions [org.slf4j/slf4j-api]] - [clj-time "0.4.1"] - [com.netflix.curator/curator-framework "1.0.1" - :exclusions [log4j/log4j]] - [backtype/jzmq "2.1.0"] - [com.googlecode.json-simple/json-simple "1.1"] - [compojure "1.1.3"] - [hiccup "0.3.6"] - [ring/ring-devel "0.3.11"] - [ring/ring-jetty-adapter "0.3.11"] - [org.clojure/tools.logging "0.2.3"] - [org.clojure/math.numeric-tower "0.0.1"] - [com.twitter/carbonite "1.3.2"] - [org.yaml/snakeyaml "1.11"] - [org.apache.httpcomponents/httpclient "4.1.1"] - [org.clojure/tools.cli "0.2.2"] - [com.googlecode.disruptor/disruptor "2.10.1"] - [org.jgrapht/jgrapht-core "0.9.0"] - [com.google.guava/guava "13.0"] - [ch.qos.logback/logback-classic "1.0.6"] - [org.slf4j/log4j-over-slf4j "1.6.6"] - ] - - :source-paths ["src/clj"] - :java-source-paths ["src/jvm"] - :test-paths ["test/clj"] - :resource-paths ["../conf"] - :target-path "target" - :javac-options ["-target" "1.6" "-source" "1.6"] - :profiles {:dev {:resource-paths ["src/dev"] - :dependencies [[org.mockito/mockito-all "1.9.5"]]} - :release {} - :lib {} - } - - :plugins [[lein-swank "1.4.4"]] - - :repositories {"sonatype" - "http://oss.sonatype.org/content/groups/public/"} - - :javac-options ["-g"] - :jvm-opts ["-Djava.library.path=/usr/local/lib:/opt/local/lib:/usr/lib"] - - :aot :all) diff --git a/storm-core/src/clj/backtype/storm/LocalCluster.clj b/storm-core/src/clj/backtype/storm/LocalCluster.clj index 1bd5007921..77f3b3f881 100644 --- a/storm-core/src/clj/backtype/storm/LocalCluster.clj +++ b/storm-core/src/clj/backtype/storm/LocalCluster.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/LocalDRPC.clj b/storm-core/src/clj/backtype/storm/LocalDRPC.clj index ca46dfbe8f..a6dab95c32 100644 --- a/storm-core/src/clj/backtype/storm/LocalDRPC.clj +++ b/storm-core/src/clj/backtype/storm/LocalDRPC.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/bootstrap.clj b/storm-core/src/clj/backtype/storm/bootstrap.clj index 0ecf7dda6a..5f34ff1022 100644 --- a/storm-core/src/clj/backtype/storm/bootstrap.clj +++ b/storm-core/src/clj/backtype/storm/bootstrap.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/clojure.clj b/storm-core/src/clj/backtype/storm/clojure.clj index 919b4aec3c..33d204b3ce 100644 --- a/storm-core/src/clj/backtype/storm/clojure.clj +++ b/storm-core/src/clj/backtype/storm/clojure.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/cluster.clj b/storm-core/src/clj/backtype/storm/cluster.clj index 3d272243ac..b5c1e3b6f1 100644 --- a/storm-core/src/clj/backtype/storm/cluster.clj +++ b/storm-core/src/clj/backtype/storm/cluster.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/command/activate.clj b/storm-core/src/clj/backtype/storm/command/activate.clj index b7f2431535..500e981f7d 100644 --- a/storm-core/src/clj/backtype/storm/command/activate.clj +++ b/storm-core/src/clj/backtype/storm/command/activate.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/command/config_value.clj b/storm-core/src/clj/backtype/storm/command/config_value.clj index 4e0cb66d73..1d193a2171 100644 --- a/storm-core/src/clj/backtype/storm/command/config_value.clj +++ b/storm-core/src/clj/backtype/storm/command/config_value.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/command/deactivate.clj b/storm-core/src/clj/backtype/storm/command/deactivate.clj index 08f818ef1b..1a614de2b8 100644 --- a/storm-core/src/clj/backtype/storm/command/deactivate.clj +++ b/storm-core/src/clj/backtype/storm/command/deactivate.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/command/dev_zookeeper.clj b/storm-core/src/clj/backtype/storm/command/dev_zookeeper.clj index 58ea616766..d90e72a10b 100644 --- a/storm-core/src/clj/backtype/storm/command/dev_zookeeper.clj +++ b/storm-core/src/clj/backtype/storm/command/dev_zookeeper.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/command/kill_topology.clj b/storm-core/src/clj/backtype/storm/command/kill_topology.clj index ac2f27d097..94b458550a 100644 --- a/storm-core/src/clj/backtype/storm/command/kill_topology.clj +++ b/storm-core/src/clj/backtype/storm/command/kill_topology.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/command/list.clj b/storm-core/src/clj/backtype/storm/command/list.clj index 8d305b366f..79cfcf7293 100644 --- a/storm-core/src/clj/backtype/storm/command/list.clj +++ b/storm-core/src/clj/backtype/storm/command/list.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/command/rebalance.clj b/storm-core/src/clj/backtype/storm/command/rebalance.clj index d8e54d3ff0..b38d197250 100644 --- a/storm-core/src/clj/backtype/storm/command/rebalance.clj +++ b/storm-core/src/clj/backtype/storm/command/rebalance.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/command/shell_submission.clj b/storm-core/src/clj/backtype/storm/command/shell_submission.clj index d572b853db..bd0a5027af 100644 --- a/storm-core/src/clj/backtype/storm/command/shell_submission.clj +++ b/storm-core/src/clj/backtype/storm/command/shell_submission.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/config.clj b/storm-core/src/clj/backtype/storm/config.clj index 7db986faf7..955fdfed92 100644 --- a/storm-core/src/clj/backtype/storm/config.clj +++ b/storm-core/src/clj/backtype/storm/config.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -105,7 +105,7 @@ (defn read-default-config [] (clojurify-structure (Utils/readDefaultConfig))) -(defn- validate-configs-with-schemas [conf] +(defn validate-configs-with-schemas [conf] (doseq [[k v] conf :let [schema (CONFIG-SCHEMA-MAP k)]] (if (not (nil? schema)) @@ -123,67 +123,67 @@ conf)) (defn master-local-dir [conf] - (let [ret (str (conf STORM-LOCAL-DIR) "/nimbus")] + (let [ret (str (conf STORM-LOCAL-DIR) file-path-separator "nimbus")] (FileUtils/forceMkdir (File. ret)) ret )) (defn master-stormdist-root ([conf] - (str (master-local-dir conf) "/stormdist")) + (str (master-local-dir conf) file-path-separator "stormdist")) ([conf storm-id] - (str (master-stormdist-root conf) "/" storm-id))) + (str (master-stormdist-root conf) file-path-separator storm-id))) (defn master-stormjar-path [stormroot] - (str stormroot "/stormjar.jar")) + (str stormroot file-path-separator "stormjar.jar")) (defn master-stormcode-path [stormroot] - (str stormroot "/stormcode.ser")) + (str stormroot file-path-separator "stormcode.ser")) (defn master-stormconf-path [stormroot] - (str stormroot "/stormconf.ser")) + (str stormroot file-path-separator "stormconf.ser")) (defn master-inbox [conf] - (let [ret (str (master-local-dir conf) "/inbox")] + (let [ret (str (master-local-dir conf) file-path-separator "inbox")] (FileUtils/forceMkdir (File. ret)) ret )) (defn master-inimbus-dir [conf] - (str (master-local-dir conf) "/inimbus")) + (str (master-local-dir conf) file-path-separator "inimbus")) (defn supervisor-local-dir [conf] - (let [ret (str (conf STORM-LOCAL-DIR) "/supervisor")] + (let [ret (str (conf STORM-LOCAL-DIR) file-path-separator "supervisor")] (FileUtils/forceMkdir (File. ret)) ret )) (defn supervisor-isupervisor-dir [conf] - (str (supervisor-local-dir conf) "/isupervisor")) + (str (supervisor-local-dir conf) file-path-separator "isupervisor")) (defn supervisor-stormdist-root - ([conf] (str (supervisor-local-dir conf) "/stormdist")) + ([conf] (str (supervisor-local-dir conf) file-path-separator "stormdist")) ([conf storm-id] - (str (supervisor-stormdist-root conf) "/" (java.net.URLEncoder/encode storm-id)))) + (str (supervisor-stormdist-root conf) file-path-separator (java.net.URLEncoder/encode storm-id)))) (defn supervisor-stormjar-path [stormroot] - (str stormroot "/stormjar.jar")) + (str stormroot file-path-separator "stormjar.jar")) (defn supervisor-stormcode-path [stormroot] - (str stormroot "/stormcode.ser")) + (str stormroot file-path-separator "stormcode.ser")) (defn supervisor-stormconf-path [stormroot] - (str stormroot "/stormconf.ser")) + (str stormroot file-path-separator "stormconf.ser")) (defn supervisor-tmp-dir [conf] - (let [ret (str (supervisor-local-dir conf) "/tmp")] + (let [ret (str (supervisor-local-dir conf) file-path-separator "tmp")] (FileUtils/forceMkdir (File. ret)) ret )) (defn supervisor-storm-resources-path [stormroot] - (str stormroot "/" RESOURCES-SUBDIR)) + (str stormroot file-path-separator RESOURCES-SUBDIR)) (defn ^LocalState supervisor-state [conf] - (LocalState. (str (supervisor-local-dir conf) "/localstate"))) + (LocalState. (str (supervisor-local-dir conf) file-path-separator "localstate"))) (defn read-supervisor-storm-conf [conf storm-id] (let [stormroot (supervisor-stormdist-root conf storm-id) @@ -200,20 +200,20 @@ (defn worker-root ([conf] - (str (conf STORM-LOCAL-DIR) "/workers")) + (str (conf STORM-LOCAL-DIR) file-path-separator "workers")) ([conf id] - (str (worker-root conf) "/" id))) + (str (worker-root conf) file-path-separator id))) (defn worker-pids-root [conf id] - (str (worker-root conf id) "/pids")) + (str (worker-root conf id) file-path-separator "pids")) (defn worker-pid-path [conf id pid] - (str (worker-pids-root conf id) "/" pid)) + (str (worker-pids-root conf id) file-path-separator pid)) (defn worker-heartbeats-root [conf id] - (str (worker-root conf id) "/heartbeats")) + (str (worker-root conf id) file-path-separator "heartbeats")) ;; workers heartbeat here with pid and timestamp ;; if supervisor stops receiving heartbeat, it kills and restarts the process diff --git a/storm-core/src/clj/backtype/storm/daemon/acker.clj b/storm-core/src/clj/backtype/storm/daemon/acker.clj index 74913a2320..ce88d11e42 100644 --- a/storm-core/src/clj/backtype/storm/daemon/acker.clj +++ b/storm-core/src/clj/backtype/storm/daemon/acker.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/daemon/builtin_metrics.clj b/storm-core/src/clj/backtype/storm/daemon/builtin_metrics.clj index 02ca93dd44..b911642c08 100644 --- a/storm-core/src/clj/backtype/storm/daemon/builtin_metrics.clj +++ b/storm-core/src/clj/backtype/storm/daemon/builtin_metrics.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/daemon/common.clj b/storm-core/src/clj/backtype/storm/daemon/common.clj index 5047848276..63d9b9b24c 100644 --- a/storm-core/src/clj/backtype/storm/daemon/common.clj +++ b/storm-core/src/clj/backtype/storm/daemon/common.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/daemon/drpc.clj b/storm-core/src/clj/backtype/storm/daemon/drpc.clj index 97af4b16d0..df07343b04 100644 --- a/storm-core/src/clj/backtype/storm/daemon/drpc.clj +++ b/storm-core/src/clj/backtype/storm/daemon/drpc.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -14,10 +14,10 @@ ;; See the License for the specific language governing permissions and ;; limitations under the License. (ns backtype.storm.daemon.drpc - (:import [org.apache.thrift7.server THsHaServer THsHaServer$Args]) - (:import [org.apache.thrift7.protocol TBinaryProtocol TBinaryProtocol$Factory]) - (:import [org.apache.thrift7 TException]) - (:import [org.apache.thrift7.transport TNonblockingServerTransport TNonblockingServerSocket]) + (:import [org.apache.thrift.server THsHaServer THsHaServer$Args]) + (:import [org.apache.thrift.protocol TBinaryProtocol TBinaryProtocol$Factory]) + (:import [org.apache.thrift.exception]) + (:import [org.apache.thrift.transport TNonblockingServerTransport TNonblockingServerSocket]) (:import [backtype.storm.generated DistributedRPC DistributedRPC$Iface DistributedRPC$Processor DRPCRequest DRPCExecutionException DistributedRPCInvocations DistributedRPCInvocations$Iface DistributedRPCInvocations$Processor]) diff --git a/storm-core/src/clj/backtype/storm/daemon/executor.clj b/storm-core/src/clj/backtype/storm/daemon/executor.clj index 892eb04871..f133a1b4c6 100644 --- a/storm-core/src/clj/backtype/storm/daemon/executor.clj +++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj index bc0e08c1d4..71f497fa3e 100644 --- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj +++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -78,7 +78,7 @@ Note that if anything goes wrong, this will throw an Error and exit." (html4 [:head [:title "Storm log viewer"] - (include-css "/css/bootstrap-1.1.0.css") + (include-css "/css/bootstrap-1.4.0.css") (include-css "/css/style.css") (include-js "/js/jquery-1.6.2.min.js") (include-js "/js/jquery.tablesorter.min.js") diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj index 13d4cefdd4..eaef6c12c3 100644 --- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj +++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -14,10 +14,10 @@ ;; See the License for the specific language governing permissions and ;; limitations under the License. (ns backtype.storm.daemon.nimbus - (:import [org.apache.thrift7.server THsHaServer THsHaServer$Args]) - (:import [org.apache.thrift7.protocol TBinaryProtocol TBinaryProtocol$Factory]) - (:import [org.apache.thrift7 TException]) - (:import [org.apache.thrift7.transport TNonblockingServerTransport TNonblockingServerSocket]) + (:import [org.apache.thrift.server THsHaServer THsHaServer$Args]) + (:import [org.apache.thrift.protocol TBinaryProtocol TBinaryProtocol$Factory]) + (:import [org.apache.thrift.exception]) + (:import [org.apache.thrift.transport TNonblockingServerTransport TNonblockingServerSocket]) (:import [java.nio ByteBuffer]) (:import [java.io FileNotFoundException]) (:import [java.nio.channels Channels WritableByteChannel]) @@ -25,6 +25,7 @@ (:import [backtype.storm.scheduler INimbus SupervisorDetails WorkerSlot TopologyDetails Cluster Topologies SchedulerAssignment SchedulerAssignmentImpl DefaultScheduler ExecutorDetails]) (:use [backtype.storm bootstrap util]) + (:use [backtype.storm.config :only [validate-configs-with-schemas]]) (:use [backtype.storm.daemon common]) (:gen-class :methods [^{:static true} [launch [backtype.storm.scheduler.INimbus] void]])) @@ -925,10 +926,15 @@ (assert (not-nil? submitOptions)) (validate-topology-name! storm-name) (check-storm-active! nimbus storm-name false) - (.validate ^backtype.storm.nimbus.ITopologyValidator (:validator nimbus) - storm-name - (from-json serializedConf) - topology) + (let [topo-conf (from-json serializedConf)] + (try + (validate-configs-with-schemas topo-conf) + (catch IllegalArgumentException ex + (throw (InvalidTopologyException. (.getMessage ex))))) + (.validate ^backtype.storm.nimbus.ITopologyValidator (:validator nimbus) + storm-name + topo-conf + topology)) (swap! (:submitted-count nimbus) inc) (let [storm-id (str storm-name "-" @(:submitted-count nimbus) "-" (current-time-secs)) storm-conf (normalize-conf @@ -1152,15 +1158,14 @@ options (-> (TNonblockingServerSocket. (int (conf NIMBUS-THRIFT-PORT))) (THsHaServer$Args.) (.workerThreads 64) - (.protocolFactory (TBinaryProtocol$Factory.)) + (.protocolFactory (TBinaryProtocol$Factory. false true (conf NIMBUS-THRIFT-MAX-BUFFER-SIZE))) (.processor (Nimbus$Processor. service-handler)) ) - server (THsHaServer. options)] + server (THsHaServer. (do (set! (. options maxReadBufferBytes)(conf NIMBUS-THRIFT-MAX-BUFFER-SIZE)) options))] (.addShutdownHook (Runtime/getRuntime) (Thread. (fn [] (.shutdown service-handler) (.stop server)))) (log-message "Starting Nimbus server...") (.serve server))) - ;; distributed implementation (defmethod setup-jar :distributed [conf tmp-jar-location stormroot] diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj index af47c264b6..43cb6fe8b8 100644 --- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj +++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -109,11 +109,11 @@ {} (dofor [[id hb] id->heartbeat] (let [state (cond + (not hb) + :not-started (or (not (contains? approved-ids id)) (not (matches-an-assignment? hb assigned-executors))) :disallowed - (not hb) - :not-started (> (- now (:time-secs hb)) (conf SUPERVISOR-WORKER-TIMEOUT-SECS)) :timed-out @@ -159,7 +159,10 @@ (rmpath (worker-root conf id)) (catch RuntimeException e (log-warn-error e "Failed to cleanup worker " id ". Will retry later") - ))) + ) + (catch java.io.FileNotFoundException e (log-message (.getMessage e))) + (catch java.io.IOException e (log-message (.getMessage e))) + )) (defn shutdown-worker [supervisor id] (log-message "Shutting down " (:supervisor-id supervisor) ":" id) @@ -170,7 +173,9 @@ (psim/kill-process thread-pid)) (doseq [pid pids] (ensure-process-killed! pid) - (rmpath (worker-pid-path conf id pid)) + (try + (rmpath (worker-pid-path conf id pid)) + (catch Exception e)) ;; on windows, the supervisor may still holds the lock on the worker directory ) (try-cleanup-worker conf id)) (log-message "Shut down " (:supervisor-id supervisor) ":" id)) @@ -268,6 +273,21 @@ (map :storm-id) set)) +(defn shutdown-disallowed-workers [supervisor] + (let [conf (:conf supervisor) + ^LocalState local-state (:local-state supervisor) + assigned-executors (defaulted (.get local-state LS-LOCAL-ASSIGNMENTS) {}) + now (current-time-secs) + allocated (read-allocated-workers supervisor assigned-executors now) + disallowed (keys (filter-val + (fn [[state _]] (= state :disallowed)) + allocated))] + (log-debug "Allocated workers " allocated) + (log-debug "Disallowed workers " disallowed) + (doseq [id disallowed] + (shutdown-worker supervisor id)) + )) + (defn mk-synchronize-supervisor [supervisor sync-processes event-manager processes-event-manager] (fn this [] (let [conf (:conf supervisor) @@ -323,11 +343,14 @@ ;; important that this happens after setting the local assignment so that ;; synchronize-supervisor doesn't try to launch workers for which the ;; resources don't exist + (if on-windows? (shutdown-disallowed-workers supervisor)) (doseq [storm-id downloaded-storm-ids] (when-not (assigned-storm-ids storm-id) (log-message "Removing code for storm id " storm-id) - (rmr (supervisor-stormdist-root conf storm-id)) + (try + (rmr (supervisor-stormdist-root conf storm-id)) + (catch Exception e (log-message (.getMessage e)))) )) (.add processes-event-manager sync-processes) ))) @@ -404,7 +427,7 @@ (defmethod download-storm-code :distributed [conf storm-id master-code-dir] ;; Downloading to permanent location is atomic - (let [tmproot (str (supervisor-tmp-dir conf) "/" (uuid)) + (let [tmproot (str (supervisor-tmp-dir conf) file-path-separator (uuid)) stormroot (supervisor-stormdist-root conf storm-id)] (FileUtils/forceMkdir (File. tmproot)) @@ -458,7 +481,7 @@ (let [classloader (.getContextClassLoader (Thread/currentThread)) resources-jar (resources-jar) url (.getResource classloader RESOURCES-SUBDIR) - target-dir (str stormroot "/" RESOURCES-SUBDIR)] + target-dir (str stormroot file-path-separator RESOURCES-SUBDIR)] (cond resources-jar (do diff --git a/storm-core/src/clj/backtype/storm/daemon/task.clj b/storm-core/src/clj/backtype/storm/daemon/task.clj index 0dfbb62d2a..36501506d7 100644 --- a/storm-core/src/clj/backtype/storm/daemon/task.clj +++ b/storm-core/src/clj/backtype/storm/daemon/task.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj index 1473853b9e..3055b66bc6 100644 --- a/storm-core/src/clj/backtype/storm/daemon/worker.clj +++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/disruptor.clj b/storm-core/src/clj/backtype/storm/disruptor.clj index 9224c9e17b..9456d1a837 100644 --- a/storm-core/src/clj/backtype/storm/disruptor.clj +++ b/storm-core/src/clj/backtype/storm/disruptor.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/event.clj b/storm-core/src/clj/backtype/storm/event.clj index c3885aa9fe..70ba8a6c9d 100644 --- a/storm-core/src/clj/backtype/storm/event.clj +++ b/storm-core/src/clj/backtype/storm/event.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/log.clj b/storm-core/src/clj/backtype/storm/log.clj index a1483bf522..adb2774564 100644 --- a/storm-core/src/clj/backtype/storm/log.clj +++ b/storm-core/src/clj/backtype/storm/log.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/messaging/loader.clj b/storm-core/src/clj/backtype/storm/messaging/loader.clj index e44574f2ba..9e43c26f09 100644 --- a/storm-core/src/clj/backtype/storm/messaging/loader.clj +++ b/storm-core/src/clj/backtype/storm/messaging/loader.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/messaging/local.clj b/storm-core/src/clj/backtype/storm/messaging/local.clj index 544da7ccb7..bf4d5b25bf 100644 --- a/storm-core/src/clj/backtype/storm/messaging/local.clj +++ b/storm-core/src/clj/backtype/storm/messaging/local.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/messaging/zmq.clj b/storm-core/src/clj/backtype/storm/messaging/zmq.clj deleted file mode 100644 index 7c758ff043..0000000000 --- a/storm-core/src/clj/backtype/storm/messaging/zmq.clj +++ /dev/null @@ -1,108 +0,0 @@ -;; 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. -(ns backtype.storm.messaging.zmq - (:refer-clojure :exclude [send]) - (:use [backtype.storm config log]) - (:import [backtype.storm.messaging IContext IConnection TaskMessage]) - (:import [java.nio ByteBuffer]) - (:import [org.zeromq ZMQ]) - (:import [java.util Map]) - (:require [zilch.mq :as mq]) - (:gen-class - :methods [^{:static true} [makeContext [java.util.Map] backtype.storm.messaging.IContext]])) - -(defn mk-packet [task ^bytes message] - (let [bb (ByteBuffer/allocate (+ 2 (count message)))] - (.putShort bb (short task)) - (.put bb message) - (.array bb) - )) - -(defn parse-packet [^bytes packet] - (let [bb (ByteBuffer/wrap packet) - port (.getShort bb) - msg (byte-array (- (count packet) 2))] - (.get bb msg) - (TaskMessage. (int port) msg) - )) - -(defn get-bind-zmq-url [local? port] - (if local? - (str "ipc://" port ".ipc") - (str "tcp://*:" port))) - -(defn get-connect-zmq-url [local? host port] - (if local? - (str "ipc://" port ".ipc") - (str "tcp://" host ":" port))) - - -(defprotocol ZMQContextQuery - (zmq-context [this])) - -(deftype ZMQConnection [socket] - IConnection - (^TaskMessage recv [this ^int flags] - (require 'backtype.storm.messaging.zmq) - (if-let [packet (mq/recv socket flags)] - (parse-packet packet))) - (^void send [this ^int taskId ^bytes payload] - (require 'backtype.storm.messaging.zmq) - (mq/send socket (mk-packet taskId payload) ZMQ/NOBLOCK)) ;; TODO: how to do backpressure if doing noblock?... need to only unblock if the target disappears - (^void close [this] - (.close socket))) - -(defn mk-connection [socket] - (ZMQConnection. socket)) - -(deftype ZMQContext [^{:unsynchronized-mutable true} context - ^{:unsynchronized-mutable true} linger-ms - ^{:unsynchronized-mutable true} hwm - ^{:unsynchronized-mutable true} local?] - IContext - (^void prepare [this ^Map storm-conf] - (let [num-threads (.get storm-conf ZMQ-THREADS)] - (set! context (mq/context num-threads)) - (set! linger-ms (.get storm-conf ZMQ-LINGER-MILLIS)) - (set! hwm (.get storm-conf ZMQ-HWM)) - (set! local? (= (.get storm-conf STORM-CLUSTER-MODE) "local")))) - (^IConnection bind [this ^String storm-id ^int port] - (require 'backtype.storm.messaging.zmq) - (-> context - (mq/socket mq/pull) - (mq/set-hwm hwm) - (mq/bind (get-bind-zmq-url local? port)) - mk-connection - )) - (^IConnection connect [this ^String storm-id ^String host ^int port] - (require 'backtype.storm.messaging.zmq) - (-> context - (mq/socket mq/push) - (mq/set-hwm hwm) - (mq/set-linger linger-ms) - (mq/connect (get-connect-zmq-url local? host port)) - mk-connection)) - (^void term [this] - (.term context)) - - ZMQContextQuery - (zmq-context [this] - context)) - -(defn -makeContext [^Map storm-conf] - (let [context (ZMQContext. nil 0 0 true)] - (.prepare context storm-conf) - context)) diff --git a/storm-core/src/clj/backtype/storm/metric/testing.clj b/storm-core/src/clj/backtype/storm/metric/testing.clj index 816f4e31f1..a05dfee614 100644 --- a/storm-core/src/clj/backtype/storm/metric/testing.clj +++ b/storm-core/src/clj/backtype/storm/metric/testing.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/process_simulator.clj b/storm-core/src/clj/backtype/storm/process_simulator.clj index 3ad484c2e8..0446a983a3 100644 --- a/storm-core/src/clj/backtype/storm/process_simulator.clj +++ b/storm-core/src/clj/backtype/storm/process_simulator.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/scheduler/DefaultScheduler.clj b/storm-core/src/clj/backtype/storm/scheduler/DefaultScheduler.clj index 2e23584d95..1198eb6bac 100644 --- a/storm-core/src/clj/backtype/storm/scheduler/DefaultScheduler.clj +++ b/storm-core/src/clj/backtype/storm/scheduler/DefaultScheduler.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/scheduler/EvenScheduler.clj b/storm-core/src/clj/backtype/storm/scheduler/EvenScheduler.clj index febe6ff9cc..28b9202077 100644 --- a/storm-core/src/clj/backtype/storm/scheduler/EvenScheduler.clj +++ b/storm-core/src/clj/backtype/storm/scheduler/EvenScheduler.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/scheduler/IsolationScheduler.clj b/storm-core/src/clj/backtype/storm/scheduler/IsolationScheduler.clj index d3db381345..c6cf8d9ad7 100644 --- a/storm-core/src/clj/backtype/storm/scheduler/IsolationScheduler.clj +++ b/storm-core/src/clj/backtype/storm/scheduler/IsolationScheduler.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/stats.clj b/storm-core/src/clj/backtype/storm/stats.clj index 95c9057a4f..944d2b6d33 100644 --- a/storm-core/src/clj/backtype/storm/stats.clj +++ b/storm-core/src/clj/backtype/storm/stats.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/testing.clj b/storm-core/src/clj/backtype/storm/testing.clj index 94469e5227..3ce2c3f6a2 100644 --- a/storm-core/src/clj/backtype/storm/testing.clj +++ b/storm-core/src/clj/backtype/storm/testing.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -47,7 +47,7 @@ (FeederSpout. (Fields. fields))) (defn local-temp-path [] - (str (System/getProperty "java.io.tmpdir") "/" (uuid))) + (str (System/getProperty "java.io.tmpdir") (if-not on-windows? "/") (uuid))) (defn delete-all [paths] (dorun @@ -111,7 +111,7 @@ ;; local dir is always overridden in maps ;; can customize the supervisors (except for ports) by passing in map for :supervisors parameter ;; if need to customize amt of ports more, can use add-supervisor calls afterwards -(defnk mk-local-storm-cluster [:supervisors 2 :ports-per-supervisor 3 :daemon-conf {} :inimbus nil :supervisor-slot-port-min 1] +(defnk mk-local-storm-cluster [:supervisors 2 :ports-per-supervisor 3 :daemon-conf {} :inimbus nil :supervisor-slot-port-min 1024] (let [zk-tmp (local-temp-path) [zk-port zk-handle] (zk/mk-inprocess-zookeeper zk-tmp) daemon-conf (merge (read-storm-config) @@ -176,7 +176,9 @@ (log-message "Done shutting down in process zookeeper") (doseq [t @(:tmp-dirs cluster-map)] (log-message "Deleting temporary path " t) - (rmr t) + (try + (rmr t) + (catch Exception e (log-message (.getMessage e)))) ;; on windows, the host process still holds lock on the logfile )) (def TEST-TIMEOUT-MS 5000) diff --git a/storm-core/src/clj/backtype/storm/testing4j.clj b/storm-core/src/clj/backtype/storm/testing4j.clj index 8bbd227377..5d44604dde 100644 --- a/storm-core/src/clj/backtype/storm/testing4j.clj +++ b/storm-core/src/clj/backtype/storm/testing4j.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -15,6 +15,7 @@ ;; limitations under the License. (ns backtype.storm.testing4j (:import [java.util Map List Collection ArrayList]) + (:require [backtype.storm LocalCluster]) (:import [backtype.storm Config ILocalCluster LocalCluster]) (:import [backtype.storm.generated StormTopology]) (:import [backtype.storm.daemon nimbus]) diff --git a/storm-core/src/clj/backtype/storm/thrift.clj b/storm-core/src/clj/backtype/storm/thrift.clj index 0de88356d4..ec8ce5d35b 100644 --- a/storm-core/src/clj/backtype/storm/thrift.clj +++ b/storm-core/src/clj/backtype/storm/thrift.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -23,8 +23,8 @@ (:import [backtype.storm.grouping CustomStreamGrouping]) (:import [backtype.storm.topology TopologyBuilder]) (:import [backtype.storm.clojure RichShellBolt RichShellSpout]) - (:import [org.apache.thrift7.protocol TBinaryProtocol TProtocol]) - (:import [org.apache.thrift7.transport TTransport TFramedTransport TSocket]) + (:import [org.apache.thrift.protocol TBinaryProtocol TProtocol]) + (:import [org.apache.thrift.transport TTransport TFramedTransport TSocket]) (:use [backtype.storm util config log]) ) diff --git a/storm-core/src/clj/backtype/storm/timer.clj b/storm-core/src/clj/backtype/storm/timer.clj index c594f59f0c..f9774b6d1a 100644 --- a/storm-core/src/clj/backtype/storm/timer.clj +++ b/storm-core/src/clj/backtype/storm/timer.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/tuple.clj b/storm-core/src/clj/backtype/storm/tuple.clj index 4f415eeb29..eaec81802b 100644 --- a/storm-core/src/clj/backtype/storm/tuple.clj +++ b/storm-core/src/clj/backtype/storm/tuple.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj index a575b1ff18..63a3053d52 100644 --- a/storm-core/src/clj/backtype/storm/ui/core.clj +++ b/storm-core/src/clj/backtype/storm/ui/core.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -22,6 +22,7 @@ (:use [backtype.storm.daemon [common :only [ACKER-COMPONENT-ID system-id?]]]) (:use [ring.adapter.jetty :only [run-jetty]]) (:use [clojure.string :only [trim]]) + (:import [backtype.storm.utils Utils]) (:import [backtype.storm.generated ExecutorSpecificStats ExecutorStats ExecutorSummary TopologyInfo SpoutStats BoltStats ErrorInfo ClusterSummary SupervisorSummary TopologySummary @@ -47,21 +48,85 @@ (map #(.get_stats ^ExecutorSummary %)) (filter not-nil?))) +(def tips + "Defines a mapping of help texts for elements of the UI pages." + {:sys-stats "Use this to toggle inclusion of storm system components." + :version (str "The version of storm installed on the UI node. (Hopefully, " + "this is the same on all storm nodes!)") + :nimbus-uptime (str "The duration the current Nimbus instance has been " + "running. (Note that the storm cluster may have been " + "deployed and available for a much longer period than " + "the current Nimbus process has been running.)") + :num-supervisors "The number of nodes in the cluster currently." + :num-slots "Slots are Workers (processes)." + :num-execs "Executors are threads in a Worker process." + :num-tasks (str "A Task is an instance of a Bolt or Spout. The number of " + "Tasks is almost always equal to the number of Executors.") + :name "The name given to the topology by when it was submitted." + :name-link "Click the name to view the Topology's information." + :topo-id "The unique ID given to a Topology each time it is launched." + :status "The status can be one of ACTIVE, INACTIVE, KILLED, or REBALANCING." + :topo-uptime "The time since the Topology was submitted." + :num-workers "The number of Workers (processes)." + :sup-id (str "A unique identifier given to a Supervisor when it joins the " + "cluster.") + :sup-host (str "The hostname reported by the remote host. (Note that this " + "hostname is not the result of a reverse lookup at the " + "Nimbus node.)") + :sup-uptime (str "The length of time a Supervisor has been registered to the " + "cluster.") + :window (str "The past period of time for which the statistics apply. " + "Click on a value to set the window for this page.") + :emitted "The number of Tuples emitted." + :transferred "The number of Tuples emitted that sent to one or more bolts." + :complete-lat (str "The average time a Tuple \"tree\" takes to be completely " + "processed by the Topology. A value of 0 is expected " + "if no acking is done.") + :spout-acked (str "The number of Tuple \"trees\" successfully processed. A " + "value of 0 is expected if no acking is done.") + :spout-failed (str "The number of Tuple \"trees\" that were explicitly " + "failed or timed out before acking was completed. A value " + "of 0 is expected if no acking is done.") + :comp-id "The ID assigned to a the Component by the Topology." + :comp-id-link "Click on the name to view the Component's page." + :capacity (str "If this is around 1.0, the corresponding Bolt is running as " + "fast as it can, so you may want to increase the Bolt's " + "parallelism. This is (number executed * average execute " + "latency) / measurement time.") + :exec-lat (str "The average time a Tuple spends in the execute method. The " + "execute method may complete without sending an Ack for the " + "tuple.") + :num-executed "The number of incoming Tuples processed." + :proc-lat (str "The average time it takes to Ack a Tuple after it is first " + "received. Bolts that join, aggregate or batch may not Ack a " + "tuple until a number of other Tuples have been received.") + :bolt-acked "The number of Tuples acknowledged by this Bolt." + :bolt-failed "The number of tuples Failed by this Bolt." + :stream (str "The name of the Tuple stream given in the Topolgy, or \"" + Utils/DEFAULT_STREAM_ID "\" if none was given.") + :exec-id "The unique executor ID." + :exec-uptime "The length of time an Executor (thread) has been alive." + :port (str "The port number used by the Worker to which an Executor is " + "assigned. Click on the port number to open the logviewer page " + "for this Worker.")}) + (defn mk-system-toggle-button [include-sys?] [:p {:class "js-only"} + [:span.tip.right {:title (:sys-stats tips)} [:input {:type "button" :value (str (if include-sys? "Hide" "Show") " System Stats") - :onclick "toggleSys()"}]]) + :onclick "toggleSys()"}]]]) (defn ui-template [body] (html4 [:head [:title "Storm UI"] - (include-css "/css/bootstrap-1.1.0.css") + (include-css "/css/bootstrap-1.4.0.css") (include-css "/css/style.css") (include-js "/js/jquery-1.6.2.min.js") (include-js "/js/jquery.tablesorter.min.js") (include-js "/js/jquery.cookies.2.2.0.min.js") + (include-js "/js/bootstrap-twipsy.js") (include-js "/js/script.js") ] [:body @@ -88,7 +153,22 @@ total-executors (->> (.get_topologies summ) (map #(.get_num_executors ^TopologySummary %)) (reduce +))] - (table ["Version" "Nimbus uptime" "Supervisors" "Used slots" "Free slots" "Total slots" "Executors" "Tasks"] + (table [{:text "Version" :attr {:class "tip right" + :title (:version tips)}} + {:text "Nimbus uptime" :attr {:class "tip right" + :title (:nimbus-uptime tips)}} + {:text "Supervisors" :attr {:class "tip above" + :title (:num-supervisors tips)}} + {:text "Used slots" :attr {:class "tip above" + :title (:num-slots tips)}} + {:text "Free slots" :attr {:class "tip above" + :title (:num-slots tips)}} + {:text "Total slots" :attr {:class "tip above" + :title (:num-slots tips)}} + {:text "Executors" :attr {:class "tip above" + :title (:num-execs tips)}} + {:text "Tasks" :attr {:class "tip left" + :title (:num-tasks tips)}}] [[(read-storm-version) (pretty-uptime-sec (.get_nimbus_uptime_secs summ)) (count sups) @@ -105,10 +185,21 @@ (link-to (url-format "/topology/%s" id) (escape-html content)))) (defn main-topology-summary-table [summs] - ;; make the id clickable - ;; make the table sortable (sorted-table - ["Name" "Id" "Status" "Uptime" "Num workers" "Num executors" "Num tasks"] + [{:text "Name" :attr {:class "tip right" + :title (str (:name tips) " " (:name-link tips))}} + {:text "Id" :attr {:class "tip right" + :title (:topo-id tips)}} + {:text "Status" :attr {:class "tip above" + :title (:status tips)}} + {:text "Uptime" :attr {:class "tip above" + :title (:topo-uptime tips)}} + {:text "Num workers" :attr {:class "tip above" + :title (:num-workers tips)}} + {:text "Num executors" :attr {:class "tip above" + :title (:num-execs tips)}} + {:text "Num tasks" :attr {:class "tip above" + :title (:num-tasks tips)}}] (for [^TopologySummary t summs] [(topology-link (.get_id t) (.get_name t)) (escape-html (.get_id t)) @@ -124,7 +215,16 @@ (defn supervisor-summary-table [summs] (sorted-table - ["Id" "Host" "Uptime" "Slots" "Used slots"] + [{:text "Id" :attr {:class "tip right" + :title (:sup-id tips)}} + {:text "Host" :attr {:class "tip above" + :title (:sup-host tips)}} + {:text "Uptime" :attr {:class "tip above" + :title (:sup-uptime tips)}} + {:text "Slots" :attr {:class "tip above" + :title (:num-slots tips)}} + {:text "Used slots" :attr {:class "tip left" + :title (:num-slots tips)}}] (for [^SupervisorSummary s summs] [(.get_supervisor_id s) (.get_host s) @@ -317,7 +417,20 @@ (defn topology-summary-table [^TopologyInfo summ] (let [executors (.get_executors summ) workers (set (for [^ExecutorSummary e executors] [(.get_host e) (.get_port e)]))] - (table ["Name" "Id" "Status" "Uptime" "Num workers" "Num executors" "Num tasks"] + (table [{:text "Name" :attr {:class "tip right" + :title (:name tips)}} + {:text "Id" :attr {:class "tip right" + :title (:topo-id tips)}} + {:text "Status" :attr {:class "tip above" + :title (:status tips)}} + {:text "Uptime" :attr {:class "tip above" + :title (:topo-uptime tips)}} + {:text "Num workers" :attr {:class "tip above" + :title (:num-workers tips)}} + {:text "Num executors" :attr {:class "tip above" + :title (:num-execs tips)}} + {:text "Num tasks" :attr {:class "tip above" + :title (:num-tasks tips)}}] [[(escape-html (.get_name summ)) (escape-html (.get_id summ)) (.get_status summ) @@ -356,7 +469,18 @@ display-map (into {} (for [t times] [t pretty-uptime-sec])) display-map (assoc display-map ":all-time" (fn [_] "All time"))] (sorted-table - ["Window" "Emitted" "Transferred" "Complete latency (ms)" "Acked" "Failed"] + [{:text "Window" :attr {:class "tip right" + :title (:window tips)}} + {:text "Emitted" :attr {:class "tip above" + :title (:emitted tips)}} + {:text "Transferred" :attr {:class "tip above" + :title (:transferred tips)}} + {:text "Complete latency (ms)" :attr {:class "tip above" + :title (:complete-lat tips)}} + {:text "Acked" :attr {:class "tip above" + :title (:spout-acked tips)}} + {:text "Failed" :attr {:class "tip left" + :title (:spout-failed tips)}}] (for [k (concat times [":all-time"]) :let [disp ((display-map k) k)]] [(link-to (if (= k window) {:class "red"} {}) @@ -431,8 +555,23 @@ (defn spout-comp-table [top-id summ-map errors window include-sys?] (sorted-table - ["Id" "Executors" "Tasks" "Emitted" "Transferred" "Complete latency (ms)" - "Acked" "Failed" "Last error"] + [{:text "Id" :attr {:class "tip right" + :title (str (:comp-id tips) " " (:comp-id-link tips))}} + {:text "Executors" :attr {:class "tip right" + :title (:num-execs tips)}} + {:text "Tasks" :attr {:class "tip above" + :title (:num-tasks tips)}} + {:text "Emitted" :attr {:class "tip above" + :title (:emitted tips)}} + {:text "Transferred" :attr {:class "tip above" + :title (:transferred tips)}} + {:text "Complete latency (ms)" :attr {:class "tip above" + :title (:complete-lat tips)}} + {:text "Acked" :attr {:class "tip above" + :title (:spout-acked tips)}} + {:text "Failed" :attr {:class "tip above" + :title (:spout-failed tips)}} + "Last error"] (for [[id summs] summ-map :let [stats-seq (get-filled-stats summs) stats (aggregate-spout-streams @@ -452,8 +591,29 @@ (defn bolt-comp-table [top-id summ-map errors window include-sys?] (sorted-table - ["Id" "Executors" "Tasks" "Emitted" "Transferred" "Capacity (last 10m)" "Execute latency (ms)" "Executed" "Process latency (ms)" - "Acked" "Failed" "Last error"] + [{:text "Id" :attr {:class "tip right" + :title (str (:comp-id tips) " " (:comp-id-link tips))}} + {:text "Executors" :attr {:class "tip right" + :title (:num-execs tips)}} + {:text "Tasks" :attr {:class "tip above" + :title (:num-tasks tips)}} + {:text "Emitted" :attr {:class "tip above" + :title (:emitted tips)}} + {:text "Transferred" :attr {:class "tip above" + :title (:transferred tips)}} + {:text "Capacity (last 10m)" :attr {:class "tip above" + :title (:capacity tips)}} + {:text "Execute latency (ms)" :attr {:class "tip above" + :title (:exec-lat tips)}} + {:text "Executed" :attr {:class "tip above" + :title (:num-executed tips)}} + {:text "Process latency (ms)":attr {:class "tip above" + :title (:proc-lat tips)}} + {:text "Acked" :attr {:class "tip above" + :title (:bolt-acked tips)}} + {:text "Failed" :attr {:class "tip left" + :title (:bolt-failed tips)}} + "Last error"] (for [[id summs] summ-map :let [stats-seq (get-filled-stats summs) stats (aggregate-bolt-streams @@ -541,7 +701,18 @@ display-map (into {} (for [t times] [t pretty-uptime-sec])) display-map (assoc display-map ":all-time" (fn [_] "All time"))] (sorted-table - ["Window" "Emitted" "Transferred" "Complete latency (ms)" "Acked" "Failed"] + [{:text "Window" :attr {:class "tip right" + :title (:window tips)}} + {:text "Emitted" :attr {:class "tip above" + :title (:emitted tips)}} + {:text "Transferred" :attr {:class "tip above" + :title (:transferred tips)}} + {:text "Complete latency (ms)" :attr {:class "tip above" + :title (:complete-lat tips)}} + {:text "Acked" :attr {:class "tip above" + :title (:spout-acked tips)}} + {:text "Failed" :attr {:class "tip left" + :title (:spout-failed tips)}}] (for [k (concat times [":all-time"]) :let [disp ((display-map k) k)]] [(link-to (if (= k window) {:class "red"} {}) @@ -558,7 +729,18 @@ (defn spout-output-summary-table [stream-summary window] (let [stream-summary (map-val swap-map-order (swap-map-order stream-summary))] (sorted-table - ["Stream" "Emitted" "Transferred" "Complete latency (ms)" "Acked" "Failed"] + [{:text "Stream" :attr {:class "tip right" + :title (:stream tips)}} + {:text "Emitted" :attr {:class "tip above" + :title (:emitted tips)}} + {:text "Transferred" :attr {:class "tip above" + :title (:transferred tips)}} + {:text "Complete latency (ms)" :attr {:class "tip above" + :title (:complete-lat tips)}} + {:text "Acked" :attr {:class "tip above" + :title (:spout-acked tips)}} + {:text "Failed" :attr {:class "tip left" + :title (:spout-failed tips)}}] (for [[s stats] (stream-summary window)] [s (nil-to-zero (:emitted stats)) @@ -570,8 +752,24 @@ (defn spout-executor-table [topology-id executors window include-sys?] (sorted-table - ["Id" "Uptime" "Host" "Port" "Emitted" "Transferred" - "Complete latency (ms)" "Acked" "Failed"] + [{:text "Id" :attr {:class "tip right" + :title (:exec-id tips)}} + {:text "Uptime" :attr {:class "tip right" + :title (:exec-uptime tips)}} + {:text "Host" :attr {:class "tip above" + :title (:sup-host tips)}} + {:text "Port" :attr {:class "tip above" + :title (:port tips)}} + {:text "Emitted" :attr {:class "tip above" + :title (:emitted tips)}} + {:text "Transferred" :attr {:class "tip above" + :title (:transferred tips)}} + {:text "Complete latency (ms)" :attr {:class "tip above" + :title (:complete-lat tips)}} + {:text "Acked" :attr {:class "tip above" + :title (:spout-acked tips)}} + {:text "Failed" :attr {:class "tip left" + :title (:spout-failed tips)}}] (for [^ExecutorSummary e executors :let [stats (.get_stats e) stats (if stats @@ -616,7 +814,12 @@ (select-keys [:emitted :transferred]) swap-map-order)] (sorted-table - ["Stream" "Emitted" "Transferred"] + [{:text "Stream" :attr {:class "tip right" + :title (:stream tips)}} + {:text "Emitted" :attr {:class "tip above" + :title (:emitted tips)}} + {:text "Transferred" :attr {:class "tip above" + :title (:transferred tips)}}] (for [[s stats] stream-summary] [s (nil-to-zero (:emitted stats)) @@ -631,7 +834,20 @@ (select-keys [:acked :failed :process-latencies :executed :execute-latencies]) swap-map-order)] (sorted-table - ["Component" "Stream" "Execute latency (ms)" "Executed" "Process latency (ms)" "Acked" "Failed"] + [{:text "Component" :attr {:class "tip right" + :title (:comp-id tips)}} + {:text "Stream" :attr {:class "tip right" + :title (:stream tips)}} + {:text "Execute latency (ms)" :attr {:class "tip above" + :title (:exec-lat tips)}} + {:text "Executed" :attr {:class "tip above" + :title (:num-executed tips)}} + {:text "Process latency (ms)":attr {:class "tip above" + :title (:proc-lat tips)}} + {:text "Acked" :attr {:class "tip above" + :title (:bolt-acked tips)}} + {:text "Failed" :attr {:class "tip left" + :title (:bolt-failed tips)}}] (for [[^GlobalStreamId s stats] stream-summary] [(escape-html (.get_componentId s)) (.get_streamId s) @@ -645,8 +861,30 @@ (defn bolt-executor-table [topology-id executors window include-sys?] (sorted-table - ["Id" "Uptime" "Host" "Port" "Emitted" "Transferred" "Capacity (last 10m)" - "Execute latency (ms)" "Executed" "Process latency (ms)" "Acked" "Failed"] + [{:text "Id" :attr {:class "tip right" + :title (:exec-id tips)}} + {:text "Uptime" :attr {:class "tip right" + :title (:exec-uptime tips)}} + {:text "Host" :attr {:class "tip above" + :title (:sup-host tips)}} + {:text "Port" :attr {:class "tip above" + :title (:port tips)}} + {:text "Emitted" :attr {:class "tip above" + :title (:emitted tips)}} + {:text "Transferred" :attr {:class "tip above" + :title (:transferred tips)}} + {:text "Capacity (last 10m)" :attr {:class "tip above" + :title (:capacity tips)}} + {:text "Execute latency (ms)" :attr {:class "tip above" + :title (:exec-lat tips)}} + {:text "Executed" :attr {:class "tip above" + :title (:num-executed tips)}} + {:text "Process latency (ms)":attr {:class "tip above" + :title (:proc-lat tips)}} + {:text "Acked" :attr {:class "tip above" + :title (:bolt-acked tips)}} + {:text "Failed" :attr {:class "tip left" + :title (:bolt-failed tips)}}] (for [^ExecutorSummary e executors :let [stats (.get_stats e) stats (if stats @@ -677,7 +915,22 @@ display-map (into {} (for [t times] [t pretty-uptime-sec])) display-map (assoc display-map ":all-time" (fn [_] "All time"))] (sorted-table - ["Window" "Emitted" "Transferred" "Execute latency (ms)" "Executed" "Process latency (ms)" "Acked" "Failed"] + [{:text "Window" :attr {:class "tip right" + :title (:window tips)}} + {:text "Emitted" :attr {:class "tip above" + :title (:emitted tips)}} + {:text "Transferred" :attr {:class "tip above" + :title (:transferred tips)}} + {:text "Execute latency (ms)" :attr {:class "tip above" + :title (:exec-lat tips)}} + {:text "Executed" :attr {:class "tip above" + :title (:num-executed tips)}} + {:text "Process latency (ms)":attr {:class "tip above" + :title (:proc-lat tips)}} + {:text "Acked" :attr {:class "tip above" + :title (:bolt-acked tips)}} + {:text "Failed" :attr {:class "tip left" + :title (:bolt-failed tips)}}] (for [k (concat times [":all-time"]) :let [disp ((display-map k) k)]] [(link-to (if (= k window) {:class "red"} {}) @@ -735,7 +988,14 @@ (= type :bolt) (bolt-page window summ component summs include-sys?))] (concat [[:h2 "Component summary"] - (table ["Id" "Topology" "Executors" "Tasks"] + (table [{:text "Id" :attr {:class "tip right" + :title (:comp-id tips)}} + {:text "Topology" :attr {:class "tip above" + :title (str (:name tips) " " (:name-link tips))}} + {:text "Executors" :attr {:class "tip above" + :title (:num-execs tips)}} + {:text "Tasks" :attr {:class "tip above" + :title (:num-tasks tips)}}] [[(escape-html component) (topology-link (.get_id summ) (.get_name summ)) (count summs) @@ -757,9 +1017,11 @@ ui-template)) (GET "/topology/:id" [:as {cookies :cookies} id & m] (let [include-sys? (get-include-sys? cookies)] - (-> (topology-page id (:window m) include-sys?) + (try + (-> (topology-page id (:window m) include-sys?) (concat [(mk-system-toggle-button include-sys?)]) - ui-template))) + ui-template) + (catch Exception e (resp/redirect "/"))))) (GET "/topology/:id/component/:component" [:as {cookies :cookies} id component & m] (let [include-sys? (get-include-sys? cookies)] (-> (component-page id component (:window m) include-sys?) diff --git a/storm-core/src/clj/backtype/storm/ui/helpers.clj b/storm-core/src/clj/backtype/storm/ui/helpers.clj index 800107421d..45e051ce31 100644 --- a/storm-core/src/clj/backtype/storm/ui/helpers.clj +++ b/storm-core/src/clj/backtype/storm/ui/helpers.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -68,12 +68,12 @@ (pretty-uptime-str* ms PRETTY-MS-DIVIDERS)) -(defelem table [headers data] +(defelem table [headers-map data] [:table [:thead [:tr - (for [h headers] - [:th h]) + (for [h headers-map] + [:th (if (:text h) [:span (:attr h) (:text h)] h)]) ]] [:tbody (for [row data] diff --git a/storm-core/src/clj/backtype/storm/util.clj b/storm-core/src/clj/backtype/storm/util.clj index 5e488e0cf0..2ab30c7e24 100644 --- a/storm-core/src/clj/backtype/storm/util.clj +++ b/storm-core/src/clj/backtype/storm/util.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -24,7 +24,7 @@ (:import [java.util.zip ZipFile]) (:import [java.util.concurrent.locks ReentrantReadWriteLock]) (:import [java.util.concurrent Semaphore]) - (:import [java.io File RandomAccessFile StringWriter PrintWriter]) + (:import [java.io File FileOutputStream StringWriter PrintWriter IOException]) (:import [java.lang.management ManagementFactory]) (:import [org.apache.commons.exec DefaultExecutor CommandLine]) (:import [org.apache.commons.io FileUtils]) @@ -33,6 +33,7 @@ (:require [clojure [string :as str]]) (:import [clojure.lang RT]) (:require [clojure [set :as set]]) + (:require [clojure.java.io :as io]) (:use [clojure walk]) (:use [backtype.storm log]) ) @@ -44,6 +45,15 @@ e (RuntimeException. e))) +(def on-windows? + (= "Windows_NT" (System/getenv "OS"))) + +(def file-path-separator + (System/getProperty "file.separator")) + +(def class-path-separator + (System/getProperty "path.separator")) + (defmacro defalias "Defines an alias for a var: a new var with the same root binding (if any) and similar metadata. The metadata of the alias is its initial @@ -366,15 +376,20 @@ (defn extract-dir-from-jar [jarpath dir destdir] (try-cause - (exec-command! (str "unzip -qq " jarpath " " dir "/** -d " destdir)) - (catch ExecuteException e + (with-open [jarpath (ZipFile. jarpath)] + (let [entries (enumeration-seq (.entries jarpath))] + (doseq [file (filter (fn [entry](and (not (.isDirectory entry)) (.startsWith (.getName entry) dir))) entries)] + (.mkdirs (.getParentFile (File. destdir (.getName file)))) + (with-open [out (FileOutputStream. (File. destdir (.getName file)))] + (io/copy (.getInputStream jarpath file) out))))) + (catch IOException e (log-message "Could not extract " dir " from " jarpath)) )) (defn ensure-process-killed! [pid] ;; TODO: should probably do a ps ax of some sort to make sure it was killed (try-cause - (exec-command! (str "kill -9 " pid)) + (exec-command! (str (if on-windows? "taskkill /f /pid " "kill -9 ") pid)) (catch ExecuteException e (log-message "Error when trying to kill " pid ". Process is probably already dead.")) )) @@ -474,7 +489,8 @@ (defn touch [path] (log-debug "Touching file at " path) - (let [success? (.createNewFile (File. path))] + (let [success? (do (if on-windows? (.mkdirs (.getParentFile (File. path)))) + (.createNewFile (File. path)))] (when-not success? (throw (RuntimeException. (str "Failed to touch " path)))) )) @@ -492,7 +508,7 @@ (System/getProperty "java.class.path")) (defn add-to-classpath [classpath paths] - (str/join ":" (cons classpath paths))) + (str/join class-path-separator (cons classpath paths))) (defn ^ReentrantReadWriteLock mk-rw-lock [] (ReentrantReadWriteLock.)) @@ -740,7 +756,7 @@ (defn zip-contains-dir? [zipfile target] (let [entries (->> zipfile (ZipFile.) .entries enumeration-seq (map (memfn getName)))] - (some? #(.startsWith % (str target "/")) entries) + (some? #(.startsWith % (str target file-path-separator)) entries) )) (defn url-encode [s] diff --git a/storm-core/src/clj/backtype/storm/zookeeper.clj b/storm-core/src/clj/backtype/storm/zookeeper.clj index c1c0f1cde0..617e69b323 100644 --- a/storm-core/src/clj/backtype/storm/zookeeper.clj +++ b/storm-core/src/clj/backtype/storm/zookeeper.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/clj/storm/trident/testing.clj b/storm-core/src/clj/storm/trident/testing.clj index 2cc8eed1b8..3207173b9a 100644 --- a/storm-core/src/clj/storm/trident/testing.clj +++ b/storm-core/src/clj/storm/trident/testing.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -14,6 +14,7 @@ ;; See the License for the specific language governing permissions and ;; limitations under the License. (ns storm.trident.testing + (:require [backtype.storm.LocalDRPC :as LocalDRPC]) (:import [storm.trident.testing FeederBatchSpout FeederCommitterBatchSpout MemoryMapState MemoryMapState$Factory TuplifyArgs]) (:import [backtype.storm LocalDRPC]) (:import [backtype.storm.tuple Fields]) diff --git a/storm-core/src/clj/zilch/mq.clj b/storm-core/src/clj/zilch/mq.clj deleted file mode 100644 index c71f82410e..0000000000 --- a/storm-core/src/clj/zilch/mq.clj +++ /dev/null @@ -1,119 +0,0 @@ -;; 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. -;; Copyright 2011 Tim Dysinger - -;; 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. - -(ns zilch.mq - (:refer-clojure :exclude [send]) - ) - -(defmacro zeromq-imports [] - '(do - (import '[org.zeromq ZMQ ZMQ$Context ZMQ$Socket]) - )) - -(zeromq-imports) - -(defn ^ZMQ$Context context [threads] - (ZMQ/context threads)) - -(defmacro with-context - [id threads & body] - `(let [~id (context ~threads)] - (try ~@body - (finally (.term ~id))))) - -(def sndmore ZMQ/SNDMORE) - -(def req ZMQ/REQ) -(def rep ZMQ/REP) -(def xreq ZMQ/XREQ) -(def xrep ZMQ/XREP) -(def pub ZMQ/PUB) -(def sub ZMQ/SUB) -(def pair ZMQ/PAIR) -(def push ZMQ/PUSH) -(def pull ZMQ/PULL) - -(defn ^bytes barr [& arr] - (byte-array (map byte arr))) - -(defn ^ZMQ$Socket socket - [^ZMQ$Context context type] - (.socket context type)) - -(defn set-linger - [^ZMQ$Socket socket linger-ms] - (doto socket - (.setLinger (long linger-ms)))) - -(defn set-hwm - [^ZMQ$Socket socket hwm] - (if hwm - (doto socket - (.setHWM (long hwm))) - socket - )) - -(defn bind - [^ZMQ$Socket socket url] - (doto socket - (.bind url))) - -(defn connect - [^ZMQ$Socket socket url] - (doto socket - (.connect url))) - -(defn subscribe - ([^ZMQ$Socket socket ^bytes topic] - (doto socket - (.subscribe topic))) - ([^ZMQ$Socket socket] - (subscribe socket (byte-array [])))) - -(defn unsubscribe - ([^ZMQ$Socket socket ^bytes topic] - (doto socket - (.unsubscribe (.getBytes topic)))) - ([^ZMQ$Socket socket] - (unsubscribe socket ""))) - -(defn send - ([^ZMQ$Socket socket ^bytes message flags] - (.send socket message flags)) - ([^ZMQ$Socket socket ^bytes message] - (send socket message ZMQ/NOBLOCK))) - -(defn recv-more? [^ZMQ$Socket socket] - (.hasReceiveMore socket)) - -(defn recv - ([^ZMQ$Socket socket flags] - (.recv socket flags)) - ([^ZMQ$Socket socket] - (recv socket 0))) diff --git a/storm-core/src/dev/resources/tester_bolt.py b/storm-core/src/dev/resources/tester_bolt.py index ece5eedb8f..1951711181 100644 --- a/storm-core/src/dev/resources/tester_bolt.py +++ b/storm-core/src/dev/resources/tester_bolt.py @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http:# www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/dev/resources/tester_bolt.rb b/storm-core/src/dev/resources/tester_bolt.rb index 094d5b03e7..6697a8991a 100644 --- a/storm-core/src/dev/resources/tester_bolt.rb +++ b/storm-core/src/dev/resources/tester_bolt.rb @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http:# www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/dev/resources/tester_spout.py b/storm-core/src/dev/resources/tester_spout.py index 4114243cbc..c3ce9344fa 100644 --- a/storm-core/src/dev/resources/tester_spout.py +++ b/storm-core/src/dev/resources/tester_spout.py @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http:# www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/dev/resources/tester_spout.rb b/storm-core/src/dev/resources/tester_spout.rb index dc3c2f373f..6cbfc719c9 100644 --- a/storm-core/src/dev/resources/tester_spout.rb +++ b/storm-core/src/dev/resources/tester_spout.rb @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http:# www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/genthrift.sh b/storm-core/src/genthrift.sh index 0d0a178b12..50d5cb0af8 100644 --- a/storm-core/src/genthrift.sh +++ b/storm-core/src/genthrift.sh @@ -6,7 +6,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http:# www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java index 9e607866fd..281ae525df 100644 --- a/storm-core/src/jvm/backtype/storm/Config.java +++ b/storm-core/src/jvm/backtype/storm/Config.java @@ -221,6 +221,12 @@ public class Config extends HashMap { public static final String NIMBUS_THRIFT_PORT = "nimbus.thrift.port"; public static final Object NIMBUS_THRIFT_PORT_SCHEMA = Number.class; + /** + * The maximum buffer size thrift should use when reading messages. + */ + public static final String NIMBUS_THRIFT_MAX_BUFFER_SIZE = "nimbus.thrift.max_buffer_size"; + public static final Object NIMBUS_THRIFT_MAX_BUFFER_SIZE_SCHEMA = Number.class; + /** * This parameter is used by the storm-deploy project to configure the @@ -550,7 +556,7 @@ public class Config extends HashMap { * See Kryo's documentation for more information about writing custom serializers. */ public static final String TOPOLOGY_KRYO_REGISTER = "topology.kryo.register"; - public static final Object TOPOLOGY_KRYO_REGISTER_SCHEMA = ConfigValidation.StringsValidator; + public static final Object TOPOLOGY_KRYO_REGISTER_SCHEMA = ConfigValidation.KryoRegValidator; /** * A list of classes that customize storm's kryo instance during start-up. diff --git a/storm-core/src/jvm/backtype/storm/ConfigValidation.java b/storm-core/src/jvm/backtype/storm/ConfigValidation.java index 953a70991c..15ef6ba129 100644 --- a/storm-core/src/jvm/backtype/storm/ConfigValidation.java +++ b/storm-core/src/jvm/backtype/storm/ConfigValidation.java @@ -103,4 +103,36 @@ public void validateField(String name, Object o) throws IllegalArgumentException throw new IllegalArgumentException("Field " + name + " must be a power of 2."); } }; + + /** + * Validates Kryo Registration + */ + public static Object KryoRegValidator = new FieldValidator() { + @Override + public void validateField(String name, Object o) throws IllegalArgumentException { + if (o == null) { + // A null value is acceptable. + return; + } + if (o instanceof Iterable) { + for (Object e : (Iterable)o) { + if (e instanceof Map) { + for (Map.Entry entry: ((Map)e).entrySet()) { + if (!(entry.getKey() instanceof String) || + !(entry.getValue() instanceof String)) { + throw new IllegalArgumentException( + "Each element of the list " + name + " must be a String or a Map of Strings"); + } + } + } else if (!(e instanceof String)) { + throw new IllegalArgumentException( + "Each element of the list " + name + " must be a String or a Map of Strings"); + } + } + return; + } + throw new IllegalArgumentException( + "Field " + name + " must be an Iterable containing only Strings or Maps of Strings"); + } + }; } diff --git a/storm-core/src/jvm/backtype/storm/StormSubmitter.java b/storm-core/src/jvm/backtype/storm/StormSubmitter.java index 35a008a8eb..80734568b0 100644 --- a/storm-core/src/jvm/backtype/storm/StormSubmitter.java +++ b/storm-core/src/jvm/backtype/storm/StormSubmitter.java @@ -26,7 +26,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.thrift7.TException; +import org.apache.thrift.TException; import org.json.simple.JSONValue; /** @@ -98,7 +98,7 @@ public static void submitTopology(String name, Map stormConf, StormTopology topo client.getClient().submitTopology(name, submittedJar, serConf, topology); } } catch(InvalidTopologyException e) { - LOG.warn("Topology submission exception", e); + LOG.warn("Topology submission exception: "+e.get_msg()); throw e; } catch(AlreadyAliveException e) { LOG.warn("Topology already alive exception", e); diff --git a/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java b/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java index 567b0a3945..fadebf67d1 100644 --- a/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java +++ b/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java @@ -19,11 +19,11 @@ import backtype.storm.generated.DRPCRequest; import backtype.storm.generated.DistributedRPCInvocations; -import org.apache.thrift7.TException; -import org.apache.thrift7.protocol.TBinaryProtocol; -import org.apache.thrift7.transport.TFramedTransport; -import org.apache.thrift7.transport.TSocket; -import org.apache.thrift7.transport.TTransport; +import org.apache.thrift.TException; +import org.apache.thrift.protocol.TBinaryProtocol; +import org.apache.thrift.transport.TFramedTransport; +import org.apache.thrift.transport.TSocket; +import org.apache.thrift.transport.TTransport; public class DRPCInvocationsClient implements DistributedRPCInvocations.Iface { private TTransport conn; diff --git a/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java b/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java index da32426622..918cbc0204 100644 --- a/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java +++ b/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java @@ -35,7 +35,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.thrift7.TException; +import org.apache.thrift.TException; import org.json.simple.JSONValue; public class DRPCSpout extends BaseRichSpout { @@ -114,7 +114,7 @@ public void nextTuple() { _collector.emit(new Values(req.get_func_args(), JSONValue.toJSONString(returnInfo)), new DRPCMessageId(req.get_request_id(), i)); break; } - } catch (TException e) { + } catch (Exception e) { LOG.error("Failed to fetch DRPC result from DRPC server", e); } } diff --git a/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java b/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java index 39a68ccd03..34cca985eb 100644 --- a/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java +++ b/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java @@ -32,7 +32,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.thrift7.TException; +import org.apache.thrift.TException; import org.json.simple.JSONValue; diff --git a/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java b/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java index 0051d6f7e1..a2672c8049 100644 --- a/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java +++ b/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java @@ -38,15 +38,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AlreadyAliveException extends Exception implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("AlreadyAliveException"); +public class AlreadyAliveException extends Exception implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlreadyAliveException"); - private static final org.apache.thrift7.protocol.TField MSG_FIELD_DESC = new org.apache.thrift7.protocol.TField("msg", org.apache.thrift7.protocol.TType.STRING, (short)1); + 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 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.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { MSG((short)1, "msg"); private static final Map byName = new HashMap(); @@ -105,13 +105,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.MSG, new org.apache.thrift7.meta_data.FieldMetaData("msg", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 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))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(AlreadyAliveException.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AlreadyAliveException.class, metaDataMap); } public AlreadyAliveException() { @@ -250,7 +250,7 @@ public int compareTo(AlreadyAliveException other) { return lastComparison; } if (is_set_msg()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.msg, typedOther.msg); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg); if (lastComparison != 0) { return lastComparison; } @@ -262,25 +262,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // MSG - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.msg = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -288,7 +288,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -317,26 +317,26 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_msg()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/Bolt.java b/storm-core/src/jvm/backtype/storm/generated/Bolt.java index deaba07e4c..63c71472e2 100644 --- a/storm-core/src/jvm/backtype/storm/generated/Bolt.java +++ b/storm-core/src/jvm/backtype/storm/generated/Bolt.java @@ -38,17 +38,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class Bolt implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("Bolt"); +public class Bolt implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Bolt"); - private static final org.apache.thrift7.protocol.TField BOLT_OBJECT_FIELD_DESC = new org.apache.thrift7.protocol.TField("bolt_object", org.apache.thrift7.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift7.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift7.protocol.TField("common", org.apache.thrift7.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField BOLT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("bolt_object", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift.protocol.TField("common", org.apache.thrift.protocol.TType.STRUCT, (short)2); private ComponentObject bolt_object; // required private ComponentCommon common; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { BOLT_OBJECT((short)1, "bolt_object"), COMMON((short)2, "common"); @@ -110,15 +110,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.BOLT_OBJECT, new org.apache.thrift7.meta_data.FieldMetaData("bolt_object", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ComponentObject.class))); - tmpMap.put(_Fields.COMMON, new org.apache.thrift7.meta_data.FieldMetaData("common", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ComponentCommon.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.BOLT_OBJECT, new org.apache.thrift.meta_data.FieldMetaData("bolt_object", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentObject.class))); + tmpMap.put(_Fields.COMMON, new org.apache.thrift.meta_data.FieldMetaData("common", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentCommon.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(Bolt.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Bolt.class, metaDataMap); } public Bolt() { @@ -313,7 +313,7 @@ public int compareTo(Bolt other) { return lastComparison; } if (is_set_bolt_object()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.bolt_object, typedOther.bolt_object); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bolt_object, typedOther.bolt_object); if (lastComparison != 0) { return lastComparison; } @@ -323,7 +323,7 @@ public int compareTo(Bolt other) { return lastComparison; } if (is_set_common()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.common, typedOther.common); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, typedOther.common); if (lastComparison != 0) { return lastComparison; } @@ -335,34 +335,34 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // BOLT_OBJECT - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.bolt_object = new ComponentObject(); this.bolt_object.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // COMMON - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.common = new ComponentCommon(); this.common.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -370,7 +370,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -412,30 +412,30 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_bolt_object()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'bolt_object' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'bolt_object' is unset! Struct:" + toString()); } if (!is_set_common()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/BoltStats.java b/storm-core/src/jvm/backtype/storm/generated/BoltStats.java index ac54c710bd..d4b6326c97 100644 --- a/storm-core/src/jvm/backtype/storm/generated/BoltStats.java +++ b/storm-core/src/jvm/backtype/storm/generated/BoltStats.java @@ -38,14 +38,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class BoltStats implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("BoltStats"); +public class BoltStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BoltStats"); - private static final org.apache.thrift7.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift7.protocol.TField("acked", org.apache.thrift7.protocol.TType.MAP, (short)1); - private static final org.apache.thrift7.protocol.TField FAILED_FIELD_DESC = new org.apache.thrift7.protocol.TField("failed", org.apache.thrift7.protocol.TType.MAP, (short)2); - private static final org.apache.thrift7.protocol.TField PROCESS_MS_AVG_FIELD_DESC = new org.apache.thrift7.protocol.TField("process_ms_avg", org.apache.thrift7.protocol.TType.MAP, (short)3); - private static final org.apache.thrift7.protocol.TField EXECUTED_FIELD_DESC = new org.apache.thrift7.protocol.TField("executed", org.apache.thrift7.protocol.TType.MAP, (short)4); - private static final org.apache.thrift7.protocol.TField EXECUTE_MS_AVG_FIELD_DESC = new org.apache.thrift7.protocol.TField("execute_ms_avg", org.apache.thrift7.protocol.TType.MAP, (short)5); + private static final org.apache.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("acked", org.apache.thrift.protocol.TType.MAP, (short)1); + private static final org.apache.thrift.protocol.TField FAILED_FIELD_DESC = new org.apache.thrift.protocol.TField("failed", org.apache.thrift.protocol.TType.MAP, (short)2); + private static final org.apache.thrift.protocol.TField PROCESS_MS_AVG_FIELD_DESC = new org.apache.thrift.protocol.TField("process_ms_avg", org.apache.thrift.protocol.TType.MAP, (short)3); + private static final org.apache.thrift.protocol.TField EXECUTED_FIELD_DESC = new org.apache.thrift.protocol.TField("executed", org.apache.thrift.protocol.TType.MAP, (short)4); + private static final org.apache.thrift.protocol.TField EXECUTE_MS_AVG_FIELD_DESC = new org.apache.thrift.protocol.TField("execute_ms_avg", org.apache.thrift.protocol.TType.MAP, (short)5); private Map> acked; // required private Map> failed; // required @@ -54,7 +54,7 @@ public class BoltStats implements org.apache.thrift7.TBase> execute_ms_avg; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ACKED((short)1, "acked"), FAILED((short)2, "failed"), PROCESS_MS_AVG((short)3, "process_ms_avg"), @@ -125,41 +125,41 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ACKED, new org.apache.thrift7.meta_data.FieldMetaData("acked", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, GlobalStreamId.class), - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I64))))); - tmpMap.put(_Fields.FAILED, new org.apache.thrift7.meta_data.FieldMetaData("failed", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, GlobalStreamId.class), - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I64))))); - tmpMap.put(_Fields.PROCESS_MS_AVG, new org.apache.thrift7.meta_data.FieldMetaData("process_ms_avg", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, GlobalStreamId.class), - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.DOUBLE))))); - tmpMap.put(_Fields.EXECUTED, new org.apache.thrift7.meta_data.FieldMetaData("executed", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, GlobalStreamId.class), - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I64))))); - tmpMap.put(_Fields.EXECUTE_MS_AVG, new org.apache.thrift7.meta_data.FieldMetaData("execute_ms_avg", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, GlobalStreamId.class), - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.DOUBLE))))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ACKED, new org.apache.thrift.meta_data.FieldMetaData("acked", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))))); + tmpMap.put(_Fields.FAILED, new org.apache.thrift.meta_data.FieldMetaData("failed", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))))); + tmpMap.put(_Fields.PROCESS_MS_AVG, new org.apache.thrift.meta_data.FieldMetaData("process_ms_avg", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))))); + tmpMap.put(_Fields.EXECUTED, new org.apache.thrift.meta_data.FieldMetaData("executed", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))))); + tmpMap.put(_Fields.EXECUTE_MS_AVG, new org.apache.thrift.meta_data.FieldMetaData("execute_ms_avg", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(BoltStats.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BoltStats.class, metaDataMap); } public BoltStats() { @@ -692,7 +692,7 @@ public int compareTo(BoltStats other) { return lastComparison; } if (is_set_acked()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.acked, typedOther.acked); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acked, typedOther.acked); if (lastComparison != 0) { return lastComparison; } @@ -702,7 +702,7 @@ public int compareTo(BoltStats other) { return lastComparison; } if (is_set_failed()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.failed, typedOther.failed); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failed, typedOther.failed); if (lastComparison != 0) { return lastComparison; } @@ -712,7 +712,7 @@ public int compareTo(BoltStats other) { return lastComparison; } if (is_set_process_ms_avg()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.process_ms_avg, typedOther.process_ms_avg); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.process_ms_avg, typedOther.process_ms_avg); if (lastComparison != 0) { return lastComparison; } @@ -722,7 +722,7 @@ public int compareTo(BoltStats other) { return lastComparison; } if (is_set_executed()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.executed, typedOther.executed); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executed, typedOther.executed); if (lastComparison != 0) { return lastComparison; } @@ -732,7 +732,7 @@ public int compareTo(BoltStats other) { return lastComparison; } if (is_set_execute_ms_avg()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.execute_ms_avg, typedOther.execute_ms_avg); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.execute_ms_avg, typedOther.execute_ms_avg); if (lastComparison != 0) { return lastComparison; } @@ -744,20 +744,20 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ACKED - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map45 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map45 = iprot.readMapBegin(); this.acked = new HashMap>(2*_map45.size); for (int _i46 = 0; _i46 < _map45.size; ++_i46) { @@ -765,7 +765,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. Map _val48; // required _key47 = iprot.readString(); { - org.apache.thrift7.protocol.TMap _map49 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map49 = iprot.readMapBegin(); _val48 = new HashMap(2*_map49.size); for (int _i50 = 0; _i50 < _map49.size; ++_i50) { @@ -783,13 +783,13 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // FAILED - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map53 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map53 = iprot.readMapBegin(); this.failed = new HashMap>(2*_map53.size); for (int _i54 = 0; _i54 < _map53.size; ++_i54) { @@ -797,7 +797,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. Map _val56; // required _key55 = iprot.readString(); { - org.apache.thrift7.protocol.TMap _map57 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map57 = iprot.readMapBegin(); _val56 = new HashMap(2*_map57.size); for (int _i58 = 0; _i58 < _map57.size; ++_i58) { @@ -815,13 +815,13 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // PROCESS_MS_AVG - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map61 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map61 = iprot.readMapBegin(); this.process_ms_avg = new HashMap>(2*_map61.size); for (int _i62 = 0; _i62 < _map61.size; ++_i62) { @@ -829,7 +829,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. Map _val64; // required _key63 = iprot.readString(); { - org.apache.thrift7.protocol.TMap _map65 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin(); _val64 = new HashMap(2*_map65.size); for (int _i66 = 0; _i66 < _map65.size; ++_i66) { @@ -847,13 +847,13 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 4: // EXECUTED - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map69 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map69 = iprot.readMapBegin(); this.executed = new HashMap>(2*_map69.size); for (int _i70 = 0; _i70 < _map69.size; ++_i70) { @@ -861,7 +861,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. Map _val72; // required _key71 = iprot.readString(); { - org.apache.thrift7.protocol.TMap _map73 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map73 = iprot.readMapBegin(); _val72 = new HashMap(2*_map73.size); for (int _i74 = 0; _i74 < _map73.size; ++_i74) { @@ -879,13 +879,13 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 5: // EXECUTE_MS_AVG - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map77 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map77 = iprot.readMapBegin(); this.execute_ms_avg = new HashMap>(2*_map77.size); for (int _i78 = 0; _i78 < _map77.size; ++_i78) { @@ -893,7 +893,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. Map _val80; // required _key79 = iprot.readString(); { - org.apache.thrift7.protocol.TMap _map81 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map81 = iprot.readMapBegin(); _val80 = new HashMap(2*_map81.size); for (int _i82 = 0; _i82 < _map81.size; ++_i82) { @@ -911,11 +911,11 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -923,19 +923,19 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); if (this.acked != null) { oprot.writeFieldBegin(ACKED_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.MAP, this.acked.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.acked.size())); for (Map.Entry> _iter85 : this.acked.entrySet()) { oprot.writeString(_iter85.getKey()); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRUCT, org.apache.thrift7.protocol.TType.I64, _iter85.getValue().size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter85.getValue().size())); for (Map.Entry _iter86 : _iter85.getValue().entrySet()) { _iter86.getKey().write(oprot); @@ -951,12 +951,12 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.failed != null) { oprot.writeFieldBegin(FAILED_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.MAP, this.failed.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.failed.size())); for (Map.Entry> _iter87 : this.failed.entrySet()) { oprot.writeString(_iter87.getKey()); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRUCT, org.apache.thrift7.protocol.TType.I64, _iter87.getValue().size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter87.getValue().size())); for (Map.Entry _iter88 : _iter87.getValue().entrySet()) { _iter88.getKey().write(oprot); @@ -972,12 +972,12 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.process_ms_avg != null) { oprot.writeFieldBegin(PROCESS_MS_AVG_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.MAP, this.process_ms_avg.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.process_ms_avg.size())); for (Map.Entry> _iter89 : this.process_ms_avg.entrySet()) { oprot.writeString(_iter89.getKey()); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRUCT, org.apache.thrift7.protocol.TType.DOUBLE, _iter89.getValue().size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, _iter89.getValue().size())); for (Map.Entry _iter90 : _iter89.getValue().entrySet()) { _iter90.getKey().write(oprot); @@ -993,12 +993,12 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.executed != null) { oprot.writeFieldBegin(EXECUTED_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.MAP, this.executed.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.executed.size())); for (Map.Entry> _iter91 : this.executed.entrySet()) { oprot.writeString(_iter91.getKey()); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRUCT, org.apache.thrift7.protocol.TType.I64, _iter91.getValue().size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter91.getValue().size())); for (Map.Entry _iter92 : _iter91.getValue().entrySet()) { _iter92.getKey().write(oprot); @@ -1014,12 +1014,12 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.execute_ms_avg != null) { oprot.writeFieldBegin(EXECUTE_MS_AVG_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.MAP, this.execute_ms_avg.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.execute_ms_avg.size())); for (Map.Entry> _iter93 : this.execute_ms_avg.entrySet()) { oprot.writeString(_iter93.getKey()); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRUCT, org.apache.thrift7.protocol.TType.DOUBLE, _iter93.getValue().size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, _iter93.getValue().size())); for (Map.Entry _iter94 : _iter93.getValue().entrySet()) { _iter94.getKey().write(oprot); @@ -1084,42 +1084,42 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_acked()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'acked' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'acked' is unset! Struct:" + toString()); } if (!is_set_failed()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'failed' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'failed' is unset! Struct:" + toString()); } if (!is_set_process_ms_avg()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'process_ms_avg' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'process_ms_avg' is unset! Struct:" + toString()); } if (!is_set_executed()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'executed' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'executed' is unset! Struct:" + toString()); } if (!is_set_execute_ms_avg()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'execute_ms_avg' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'execute_ms_avg' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java b/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java index 902cd511f4..a2623aba49 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java +++ b/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java @@ -38,19 +38,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ClusterSummary implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("ClusterSummary"); +public class ClusterSummary implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClusterSummary"); - private static final org.apache.thrift7.protocol.TField SUPERVISORS_FIELD_DESC = new org.apache.thrift7.protocol.TField("supervisors", org.apache.thrift7.protocol.TType.LIST, (short)1); - private static final org.apache.thrift7.protocol.TField NIMBUS_UPTIME_SECS_FIELD_DESC = new org.apache.thrift7.protocol.TField("nimbus_uptime_secs", org.apache.thrift7.protocol.TType.I32, (short)2); - private static final org.apache.thrift7.protocol.TField TOPOLOGIES_FIELD_DESC = new org.apache.thrift7.protocol.TField("topologies", org.apache.thrift7.protocol.TType.LIST, (short)3); + private static final org.apache.thrift.protocol.TField SUPERVISORS_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisors", org.apache.thrift.protocol.TType.LIST, (short)1); + private static final org.apache.thrift.protocol.TField NIMBUS_UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("nimbus_uptime_secs", org.apache.thrift.protocol.TType.I32, (short)2); + private static final org.apache.thrift.protocol.TField TOPOLOGIES_FIELD_DESC = new org.apache.thrift.protocol.TField("topologies", org.apache.thrift.protocol.TType.LIST, (short)3); private List supervisors; // required private int nimbus_uptime_secs; // required private List topologies; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUPERVISORS((short)1, "supervisors"), NIMBUS_UPTIME_SECS((short)2, "nimbus_uptime_secs"), TOPOLOGIES((short)3, "topologies"); @@ -117,19 +117,19 @@ public String getFieldName() { private static final int __NIMBUS_UPTIME_SECS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUPERVISORS, new org.apache.thrift7.meta_data.FieldMetaData("supervisors", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.ListMetaData(org.apache.thrift7.protocol.TType.LIST, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, SupervisorSummary.class)))); - tmpMap.put(_Fields.NIMBUS_UPTIME_SECS, new org.apache.thrift7.meta_data.FieldMetaData("nimbus_uptime_secs", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.TOPOLOGIES, new org.apache.thrift7.meta_data.FieldMetaData("topologies", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.ListMetaData(org.apache.thrift7.protocol.TType.LIST, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, TopologySummary.class)))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUPERVISORS, new org.apache.thrift.meta_data.FieldMetaData("supervisors", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SupervisorSummary.class)))); + tmpMap.put(_Fields.NIMBUS_UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("nimbus_uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.TOPOLOGIES, new org.apache.thrift.meta_data.FieldMetaData("topologies", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TopologySummary.class)))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(ClusterSummary.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ClusterSummary.class, metaDataMap); } public ClusterSummary() { @@ -419,7 +419,7 @@ public int compareTo(ClusterSummary other) { return lastComparison; } if (is_set_supervisors()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.supervisors, typedOther.supervisors); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisors, typedOther.supervisors); if (lastComparison != 0) { return lastComparison; } @@ -429,7 +429,7 @@ public int compareTo(ClusterSummary other) { return lastComparison; } if (is_set_nimbus_uptime_secs()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.nimbus_uptime_secs, typedOther.nimbus_uptime_secs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nimbus_uptime_secs, typedOther.nimbus_uptime_secs); if (lastComparison != 0) { return lastComparison; } @@ -439,7 +439,7 @@ public int compareTo(ClusterSummary other) { return lastComparison; } if (is_set_topologies()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.topologies, typedOther.topologies); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topologies, typedOther.topologies); if (lastComparison != 0) { return lastComparison; } @@ -451,20 +451,20 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // SUPERVISORS - if (field.type == org.apache.thrift7.protocol.TType.LIST) { + if (field.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift7.protocol.TList _list37 = iprot.readListBegin(); + org.apache.thrift.protocol.TList _list37 = iprot.readListBegin(); this.supervisors = new ArrayList(_list37.size); for (int _i38 = 0; _i38 < _list37.size; ++_i38) { @@ -476,21 +476,21 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readListEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // NIMBUS_UPTIME_SECS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.nimbus_uptime_secs = iprot.readI32(); set_nimbus_uptime_secs_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // TOPOLOGIES - if (field.type == org.apache.thrift7.protocol.TType.LIST) { + if (field.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift7.protocol.TList _list40 = iprot.readListBegin(); + org.apache.thrift.protocol.TList _list40 = iprot.readListBegin(); this.topologies = new ArrayList(_list40.size); for (int _i41 = 0; _i41 < _list40.size; ++_i41) { @@ -502,11 +502,11 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readListEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -514,14 +514,14 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); if (this.supervisors != null) { oprot.writeFieldBegin(SUPERVISORS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift7.protocol.TList(org.apache.thrift7.protocol.TType.STRUCT, this.supervisors.size())); + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.supervisors.size())); for (SupervisorSummary _iter43 : this.supervisors) { _iter43.write(oprot); @@ -536,7 +536,7 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.topologies != null) { oprot.writeFieldBegin(TOPOLOGIES_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift7.protocol.TList(org.apache.thrift7.protocol.TType.STRUCT, this.topologies.size())); + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.topologies.size())); for (TopologySummary _iter44 : this.topologies) { _iter44.write(oprot); @@ -577,26 +577,26 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_supervisors()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'supervisors' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisors' is unset! Struct:" + toString()); } if (!is_set_nimbus_uptime_secs()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'nimbus_uptime_secs' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'nimbus_uptime_secs' is unset! Struct:" + toString()); } if (!is_set_topologies()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'topologies' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'topologies' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -605,8 +605,8 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException 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_bit_vector = new BitSet(1); - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java b/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java index 5824094c16..f2cc2e9cec 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java +++ b/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java @@ -38,13 +38,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ComponentCommon implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("ComponentCommon"); +public class ComponentCommon implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentCommon"); - private static final org.apache.thrift7.protocol.TField INPUTS_FIELD_DESC = new org.apache.thrift7.protocol.TField("inputs", org.apache.thrift7.protocol.TType.MAP, (short)1); - private static final org.apache.thrift7.protocol.TField STREAMS_FIELD_DESC = new org.apache.thrift7.protocol.TField("streams", org.apache.thrift7.protocol.TType.MAP, (short)2); - private static final org.apache.thrift7.protocol.TField PARALLELISM_HINT_FIELD_DESC = new org.apache.thrift7.protocol.TField("parallelism_hint", org.apache.thrift7.protocol.TType.I32, (short)3); - private static final org.apache.thrift7.protocol.TField JSON_CONF_FIELD_DESC = new org.apache.thrift7.protocol.TField("json_conf", org.apache.thrift7.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("inputs", org.apache.thrift.protocol.TType.MAP, (short)1); + private static final org.apache.thrift.protocol.TField STREAMS_FIELD_DESC = new org.apache.thrift.protocol.TField("streams", org.apache.thrift.protocol.TType.MAP, (short)2); + private static final org.apache.thrift.protocol.TField PARALLELISM_HINT_FIELD_DESC = new org.apache.thrift.protocol.TField("parallelism_hint", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField JSON_CONF_FIELD_DESC = new org.apache.thrift.protocol.TField("json_conf", org.apache.thrift.protocol.TType.STRING, (short)4); private Map inputs; // required private Map streams; // required @@ -52,7 +52,7 @@ public class ComponentCommon implements org.apache.thrift7.TBase metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.INPUTS, new org.apache.thrift7.meta_data.FieldMetaData("inputs", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, GlobalStreamId.class), - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, Grouping.class)))); - tmpMap.put(_Fields.STREAMS, new org.apache.thrift7.meta_data.FieldMetaData("streams", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, StreamInfo.class)))); - tmpMap.put(_Fields.PARALLELISM_HINT, new org.apache.thrift7.meta_data.FieldMetaData("parallelism_hint", org.apache.thrift7.TFieldRequirementType.OPTIONAL, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.JSON_CONF, new org.apache.thrift7.meta_data.FieldMetaData("json_conf", org.apache.thrift7.TFieldRequirementType.OPTIONAL, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.INPUTS, new org.apache.thrift.meta_data.FieldMetaData("inputs", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Grouping.class)))); + tmpMap.put(_Fields.STREAMS, new org.apache.thrift.meta_data.FieldMetaData("streams", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StreamInfo.class)))); + tmpMap.put(_Fields.PARALLELISM_HINT, new org.apache.thrift.meta_data.FieldMetaData("parallelism_hint", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.JSON_CONF, new org.apache.thrift.meta_data.FieldMetaData("json_conf", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(ComponentCommon.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentCommon.class, metaDataMap); } public ComponentCommon() { @@ -487,7 +487,7 @@ public int compareTo(ComponentCommon other) { return lastComparison; } if (is_set_inputs()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.inputs, typedOther.inputs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inputs, typedOther.inputs); if (lastComparison != 0) { return lastComparison; } @@ -497,7 +497,7 @@ public int compareTo(ComponentCommon other) { return lastComparison; } if (is_set_streams()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.streams, typedOther.streams); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.streams, typedOther.streams); if (lastComparison != 0) { return lastComparison; } @@ -507,7 +507,7 @@ public int compareTo(ComponentCommon other) { return lastComparison; } if (is_set_parallelism_hint()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.parallelism_hint, typedOther.parallelism_hint); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parallelism_hint, typedOther.parallelism_hint); if (lastComparison != 0) { return lastComparison; } @@ -517,7 +517,7 @@ public int compareTo(ComponentCommon other) { return lastComparison; } if (is_set_json_conf()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.json_conf, typedOther.json_conf); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.json_conf, typedOther.json_conf); if (lastComparison != 0) { return lastComparison; } @@ -529,20 +529,20 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // INPUTS - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map12 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map12 = iprot.readMapBegin(); this.inputs = new HashMap(2*_map12.size); for (int _i13 = 0; _i13 < _map12.size; ++_i13) { @@ -557,13 +557,13 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // STREAMS - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map16 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin(); this.streams = new HashMap(2*_map16.size); for (int _i17 = 0; _i17 < _map16.size; ++_i17) { @@ -577,26 +577,26 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // PARALLELISM_HINT - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.parallelism_hint = iprot.readI32(); set_parallelism_hint_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 4: // JSON_CONF - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.json_conf = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -604,14 +604,14 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); if (this.inputs != null) { oprot.writeFieldBegin(INPUTS_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRUCT, org.apache.thrift7.protocol.TType.STRUCT, this.inputs.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, this.inputs.size())); for (Map.Entry _iter20 : this.inputs.entrySet()) { _iter20.getKey().write(oprot); @@ -624,7 +624,7 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.streams != null) { oprot.writeFieldBegin(STREAMS_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.STRUCT, this.streams.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.streams.size())); for (Map.Entry _iter21 : this.streams.entrySet()) { oprot.writeString(_iter21.getKey()); @@ -690,22 +690,22 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_inputs()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'inputs' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'inputs' is unset! Struct:" + toString()); } if (!is_set_streams()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'streams' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'streams' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -714,8 +714,8 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException 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_bit_vector = new BitSet(1); - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/ComponentObject.java b/storm-core/src/jvm/backtype/storm/generated/ComponentObject.java index dfd8b9d0df..8581ef7caa 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ComponentObject.java +++ b/storm-core/src/jvm/backtype/storm/generated/ComponentObject.java @@ -38,14 +38,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ComponentObject extends org.apache.thrift7.TUnion { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("ComponentObject"); - private static final org.apache.thrift7.protocol.TField SERIALIZED_JAVA_FIELD_DESC = new org.apache.thrift7.protocol.TField("serialized_java", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField SHELL_FIELD_DESC = new org.apache.thrift7.protocol.TField("shell", org.apache.thrift7.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift7.protocol.TField JAVA_OBJECT_FIELD_DESC = new org.apache.thrift7.protocol.TField("java_object", org.apache.thrift7.protocol.TType.STRUCT, (short)3); +public class ComponentObject extends org.apache.thrift.TUnion { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentObject"); + private static final org.apache.thrift.protocol.TField SERIALIZED_JAVA_FIELD_DESC = new org.apache.thrift.protocol.TField("serialized_java", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField SHELL_FIELD_DESC = new org.apache.thrift.protocol.TField("shell", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField JAVA_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("java_object", org.apache.thrift.protocol.TType.STRUCT, (short)3); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SERIALIZED_JAVA((short)1, "serialized_java"), SHELL((short)2, "shell"), JAVA_OBJECT((short)3, "java_object"); @@ -108,17 +108,17 @@ public String getFieldName() { } } - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SERIALIZED_JAVA, new org.apache.thrift7.meta_data.FieldMetaData("serialized_java", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING , true))); - tmpMap.put(_Fields.SHELL, new org.apache.thrift7.meta_data.FieldMetaData("shell", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ShellComponent.class))); - tmpMap.put(_Fields.JAVA_OBJECT, new org.apache.thrift7.meta_data.FieldMetaData("java_object", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, JavaObject.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SERIALIZED_JAVA, new org.apache.thrift.meta_data.FieldMetaData("serialized_java", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); + tmpMap.put(_Fields.SHELL, new org.apache.thrift.meta_data.FieldMetaData("shell", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ShellComponent.class))); + tmpMap.put(_Fields.JAVA_OBJECT, new org.apache.thrift.meta_data.FieldMetaData("java_object", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, JavaObject.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(ComponentObject.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentObject.class, metaDataMap); } public ComponentObject() { @@ -185,7 +185,7 @@ protected void checkType(_Fields setField, Object value) throws ClassCastExcepti } @Override - protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apache.thrift7.protocol.TField field) throws org.apache.thrift7.TException { + protected Object readValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException { _Fields setField = _Fields.findByThriftId(field.id); if (setField != null) { switch (setField) { @@ -195,7 +195,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac serialized_java = iprot.readBinary(); return serialized_java; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case SHELL: @@ -205,7 +205,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac shell.read(iprot); return shell; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case JAVA_OBJECT: @@ -215,20 +215,20 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac java_object.read(iprot); return java_object; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } default: throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } } @Override - protected void writeValue(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + protected void writeValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { switch (setField_) { case SERIALIZED_JAVA: ByteBuffer serialized_java = (ByteBuffer)value_; @@ -248,7 +248,7 @@ protected void writeValue(org.apache.thrift7.protocol.TProtocol oprot) throws or } @Override - protected org.apache.thrift7.protocol.TField getFieldDesc(_Fields setField) { + protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) { switch (setField) { case SERIALIZED_JAVA: return SERIALIZED_JAVA_FIELD_DESC; @@ -262,7 +262,7 @@ protected org.apache.thrift7.protocol.TField getFieldDesc(_Fields setField) { } @Override - protected org.apache.thrift7.protocol.TStruct getStructDesc() { + protected org.apache.thrift.protocol.TStruct getStructDesc() { return STRUCT_DESC; } @@ -277,7 +277,7 @@ public _Fields fieldForId(int fieldId) { public byte[] get_serialized_java() { - set_serialized_java(org.apache.thrift7.TBaseHelper.rightSize(buffer_for_serialized_java())); + set_serialized_java(org.apache.thrift.TBaseHelper.rightSize(buffer_for_serialized_java())); ByteBuffer b = buffer_for_serialized_java(); return b == null ? null : b.array(); } @@ -357,9 +357,9 @@ public boolean equals(ComponentObject other) { @Override public int compareTo(ComponentObject other) { - int lastComparison = org.apache.thrift7.TBaseHelper.compareTo(getSetField(), other.getSetField()); + int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField()); if (lastComparison == 0) { - return org.apache.thrift7.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue()); + return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue()); } return lastComparison; } @@ -369,12 +369,12 @@ public int compareTo(ComponentObject other) { public int hashCode() { HashCodeBuilder hcb = new HashCodeBuilder(); hcb.append(this.getClass().getName()); - org.apache.thrift7.TFieldIdEnum setField = getSetField(); + org.apache.thrift.TFieldIdEnum setField = getSetField(); if (setField != null) { hcb.append(setField.getThriftFieldId()); Object value = getFieldValue(); - if (value instanceof org.apache.thrift7.TEnum) { - hcb.append(((org.apache.thrift7.TEnum)getFieldValue()).getValue()); + if (value instanceof org.apache.thrift.TEnum) { + hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue()); } else { hcb.append(value); } @@ -383,8 +383,8 @@ public int hashCode() { } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -392,8 +392,8 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java b/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java index d9d9214139..e40bd94317 100644 --- a/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java +++ b/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java @@ -38,15 +38,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DRPCExecutionException extends Exception implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("DRPCExecutionException"); +public class DRPCExecutionException extends Exception implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DRPCExecutionException"); - private static final org.apache.thrift7.protocol.TField MSG_FIELD_DESC = new org.apache.thrift7.protocol.TField("msg", org.apache.thrift7.protocol.TType.STRING, (short)1); + 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 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.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { MSG((short)1, "msg"); private static final Map byName = new HashMap(); @@ -105,13 +105,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.MSG, new org.apache.thrift7.meta_data.FieldMetaData("msg", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 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))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(DRPCExecutionException.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DRPCExecutionException.class, metaDataMap); } public DRPCExecutionException() { @@ -250,7 +250,7 @@ public int compareTo(DRPCExecutionException other) { return lastComparison; } if (is_set_msg()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.msg, typedOther.msg); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg); if (lastComparison != 0) { return lastComparison; } @@ -262,25 +262,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // MSG - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.msg = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -288,7 +288,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -317,26 +317,26 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_msg()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java b/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java index 85ff0364a5..3b0a66006e 100644 --- a/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java +++ b/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java @@ -38,17 +38,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DRPCRequest implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("DRPCRequest"); +public class DRPCRequest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DRPCRequest"); - private static final org.apache.thrift7.protocol.TField FUNC_ARGS_FIELD_DESC = new org.apache.thrift7.protocol.TField("func_args", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField REQUEST_ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("request_id", org.apache.thrift7.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField FUNC_ARGS_FIELD_DESC = new org.apache.thrift.protocol.TField("func_args", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField REQUEST_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("request_id", org.apache.thrift.protocol.TType.STRING, (short)2); private String func_args; // required private String request_id; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { FUNC_ARGS((short)1, "func_args"), REQUEST_ID((short)2, "request_id"); @@ -110,15 +110,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.FUNC_ARGS, new org.apache.thrift7.meta_data.FieldMetaData("func_args", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.REQUEST_ID, new org.apache.thrift7.meta_data.FieldMetaData("request_id", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.FUNC_ARGS, new org.apache.thrift.meta_data.FieldMetaData("func_args", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.REQUEST_ID, new org.apache.thrift.meta_data.FieldMetaData("request_id", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(DRPCRequest.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DRPCRequest.class, metaDataMap); } public DRPCRequest() { @@ -313,7 +313,7 @@ public int compareTo(DRPCRequest other) { return lastComparison; } if (is_set_func_args()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.func_args, typedOther.func_args); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.func_args, typedOther.func_args); if (lastComparison != 0) { return lastComparison; } @@ -323,7 +323,7 @@ public int compareTo(DRPCRequest other) { return lastComparison; } if (is_set_request_id()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.request_id, typedOther.request_id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.request_id, typedOther.request_id); if (lastComparison != 0) { return lastComparison; } @@ -335,32 +335,32 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // FUNC_ARGS - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.func_args = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // REQUEST_ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.request_id = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -368,7 +368,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -410,30 +410,30 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_func_args()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'func_args' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'func_args' is unset! Struct:" + toString()); } if (!is_set_request_id()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'request_id' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'request_id' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java b/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java index 87d678d90c..7922340fed 100644 --- a/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java +++ b/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java @@ -42,43 +42,43 @@ public class DistributedRPC { public interface Iface { - public String execute(String functionName, String funcArgs) throws DRPCExecutionException, org.apache.thrift7.TException; + public String execute(String functionName, String funcArgs) throws DRPCExecutionException, org.apache.thrift.TException; } public interface AsyncIface { - public void execute(String functionName, String funcArgs, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void execute(String functionName, String funcArgs, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; } - public static class Client extends org.apache.thrift7.TServiceClient implements Iface { - public static class Factory implements org.apache.thrift7.TServiceClientFactory { + public static class Client extends org.apache.thrift.TServiceClient implements Iface { + public static class Factory implements org.apache.thrift.TServiceClientFactory { public Factory() {} - public Client getClient(org.apache.thrift7.protocol.TProtocol prot) { + public Client getClient(org.apache.thrift.protocol.TProtocol prot) { return new Client(prot); } - public Client getClient(org.apache.thrift7.protocol.TProtocol iprot, org.apache.thrift7.protocol.TProtocol oprot) { + public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { return new Client(iprot, oprot); } } - public Client(org.apache.thrift7.protocol.TProtocol prot) + public Client(org.apache.thrift.protocol.TProtocol prot) { super(prot, prot); } - public Client(org.apache.thrift7.protocol.TProtocol iprot, org.apache.thrift7.protocol.TProtocol oprot) { + public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { super(iprot, oprot); } - public String execute(String functionName, String funcArgs) throws DRPCExecutionException, org.apache.thrift7.TException + public String execute(String functionName, String funcArgs) throws DRPCExecutionException, org.apache.thrift.TException { send_execute(functionName, funcArgs); return recv_execute(); } - public void send_execute(String functionName, String funcArgs) throws org.apache.thrift7.TException + public void send_execute(String functionName, String funcArgs) throws org.apache.thrift.TException { execute_args args = new execute_args(); args.set_functionName(functionName); @@ -86,7 +86,7 @@ public void send_execute(String functionName, String funcArgs) throws org.apache sendBase("execute", args); } - public String recv_execute() throws DRPCExecutionException, org.apache.thrift7.TException + public String recv_execute() throws DRPCExecutionException, org.apache.thrift.TException { execute_result result = new execute_result(); receiveBase(result, "execute"); @@ -96,45 +96,45 @@ public String recv_execute() throws DRPCExecutionException, org.apache.thrift7.T if (result.e != null) { throw result.e; } - throw new org.apache.thrift7.TApplicationException(org.apache.thrift7.TApplicationException.MISSING_RESULT, "execute failed: unknown result"); + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "execute failed: unknown result"); } } - public static class AsyncClient extends org.apache.thrift7.async.TAsyncClient implements AsyncIface { - public static class Factory implements org.apache.thrift7.async.TAsyncClientFactory { - private org.apache.thrift7.async.TAsyncClientManager clientManager; - private org.apache.thrift7.protocol.TProtocolFactory protocolFactory; - public Factory(org.apache.thrift7.async.TAsyncClientManager clientManager, org.apache.thrift7.protocol.TProtocolFactory protocolFactory) { + public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { + public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { + private org.apache.thrift.async.TAsyncClientManager clientManager; + private org.apache.thrift.protocol.TProtocolFactory protocolFactory; + public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) { this.clientManager = clientManager; this.protocolFactory = protocolFactory; } - public AsyncClient getAsyncClient(org.apache.thrift7.transport.TNonblockingTransport transport) { + public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) { return new AsyncClient(protocolFactory, clientManager, transport); } } - public AsyncClient(org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.async.TAsyncClientManager clientManager, org.apache.thrift7.transport.TNonblockingTransport transport) { + public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) { super(protocolFactory, clientManager, transport); } - public void execute(String functionName, String funcArgs, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void execute(String functionName, String funcArgs, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); execute_call method_call = new execute_call(functionName, funcArgs, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class execute_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class execute_call extends org.apache.thrift.async.TAsyncMethodCall { private String functionName; private String funcArgs; - public execute_call(String functionName, String funcArgs, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public execute_call(String functionName, String funcArgs, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.functionName = functionName; this.funcArgs = funcArgs; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("execute", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("execute", org.apache.thrift.protocol.TMessageType.CALL, 0)); execute_args args = new execute_args(); args.set_functionName(functionName); args.set_funcArgs(funcArgs); @@ -142,34 +142,34 @@ public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.ap prot.writeMessageEnd(); } - public String getResult() throws DRPCExecutionException, org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public String getResult() throws DRPCExecutionException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_execute(); } } } - public static class Processor extends org.apache.thrift7.TBaseProcessor implements org.apache.thrift7.TProcessor { + public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName()); public Processor(I iface) { - super(iface, getProcessMap(new HashMap>())); + super(iface, getProcessMap(new HashMap>())); } - protected Processor(I iface, Map> processMap) { + protected Processor(I iface, Map> processMap) { super(iface, getProcessMap(processMap)); } - private static Map> getProcessMap(Map> processMap) { + private static Map> getProcessMap(Map> processMap) { processMap.put("execute", new execute()); return processMap; } - private static class execute extends org.apache.thrift7.ProcessFunction { + private static class execute extends org.apache.thrift.ProcessFunction { public execute() { super("execute"); } @@ -178,7 +178,7 @@ protected execute_args getEmptyArgsInstance() { return new execute_args(); } - protected execute_result getResult(I iface, execute_args args) throws org.apache.thrift7.TException { + protected execute_result getResult(I iface, execute_args args) throws org.apache.thrift.TException { execute_result result = new execute_result(); try { result.success = iface.execute(args.functionName, args.funcArgs); @@ -191,17 +191,17 @@ protected execute_result getResult(I iface, execute_args args) throws org.apache } - public static class execute_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("execute_args"); + public static class execute_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("execute_args"); - private static final org.apache.thrift7.protocol.TField FUNCTION_NAME_FIELD_DESC = new org.apache.thrift7.protocol.TField("functionName", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField FUNC_ARGS_FIELD_DESC = new org.apache.thrift7.protocol.TField("funcArgs", org.apache.thrift7.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField FUNCTION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("functionName", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField FUNC_ARGS_FIELD_DESC = new org.apache.thrift.protocol.TField("funcArgs", org.apache.thrift.protocol.TType.STRING, (short)2); private String functionName; // required private String funcArgs; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { FUNCTION_NAME((short)1, "functionName"), FUNC_ARGS((short)2, "funcArgs"); @@ -263,15 +263,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.FUNCTION_NAME, new org.apache.thrift7.meta_data.FieldMetaData("functionName", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.FUNC_ARGS, new org.apache.thrift7.meta_data.FieldMetaData("funcArgs", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.FUNCTION_NAME, new org.apache.thrift.meta_data.FieldMetaData("functionName", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.FUNC_ARGS, new org.apache.thrift.meta_data.FieldMetaData("funcArgs", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(execute_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(execute_args.class, metaDataMap); } public execute_args() { @@ -466,7 +466,7 @@ public int compareTo(execute_args other) { return lastComparison; } if (is_set_functionName()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.functionName, typedOther.functionName); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.functionName, typedOther.functionName); if (lastComparison != 0) { return lastComparison; } @@ -476,7 +476,7 @@ public int compareTo(execute_args other) { return lastComparison; } if (is_set_funcArgs()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.funcArgs, typedOther.funcArgs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.funcArgs, typedOther.funcArgs); if (lastComparison != 0) { return lastComparison; } @@ -488,32 +488,32 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // FUNCTION_NAME - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.functionName = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // FUNC_ARGS - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.funcArgs = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -521,7 +521,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -563,39 +563,39 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class execute_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("execute_result"); + public static class execute_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("execute_result"); - private static final org.apache.thrift7.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift7.protocol.TField("success", org.apache.thrift7.protocol.TType.STRING, (short)0); - private static final org.apache.thrift7.protocol.TField E_FIELD_DESC = new org.apache.thrift7.protocol.TField("e", org.apache.thrift7.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); + private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); private String success; // required private DRPCExecutionException e; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), E((short)1, "e"); @@ -657,15 +657,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift7.meta_data.FieldMetaData("success", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.E, new org.apache.thrift7.meta_data.FieldMetaData("e", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(execute_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(execute_result.class, metaDataMap); } public execute_result() { @@ -860,7 +860,7 @@ public int compareTo(execute_result other) { return lastComparison; } if (is_set_success()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -870,7 +870,7 @@ public int compareTo(execute_result other) { return lastComparison; } if (is_set_e()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.e, typedOther.e); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e); if (lastComparison != 0) { return lastComparison; } @@ -882,33 +882,33 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.success = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 1: // E - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.e = new DRPCExecutionException(); this.e.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -916,7 +916,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_success()) { @@ -956,22 +956,22 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java b/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java index 2e192672ad..dc5bb4579b 100644 --- a/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java +++ b/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java @@ -42,51 +42,51 @@ public class DistributedRPCInvocations { public interface Iface { - public void result(String id, String result) throws org.apache.thrift7.TException; + public void result(String id, String result) throws org.apache.thrift.TException; - public DRPCRequest fetchRequest(String functionName) throws org.apache.thrift7.TException; + public DRPCRequest fetchRequest(String functionName) throws org.apache.thrift.TException; - public void failRequest(String id) throws org.apache.thrift7.TException; + public void failRequest(String id) throws org.apache.thrift.TException; } public interface AsyncIface { - public void result(String id, String result, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void result(String id, String result, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void fetchRequest(String functionName, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void fetchRequest(String functionName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void failRequest(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void failRequest(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; } - public static class Client extends org.apache.thrift7.TServiceClient implements Iface { - public static class Factory implements org.apache.thrift7.TServiceClientFactory { + public static class Client extends org.apache.thrift.TServiceClient implements Iface { + public static class Factory implements org.apache.thrift.TServiceClientFactory { public Factory() {} - public Client getClient(org.apache.thrift7.protocol.TProtocol prot) { + public Client getClient(org.apache.thrift.protocol.TProtocol prot) { return new Client(prot); } - public Client getClient(org.apache.thrift7.protocol.TProtocol iprot, org.apache.thrift7.protocol.TProtocol oprot) { + public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { return new Client(iprot, oprot); } } - public Client(org.apache.thrift7.protocol.TProtocol prot) + public Client(org.apache.thrift.protocol.TProtocol prot) { super(prot, prot); } - public Client(org.apache.thrift7.protocol.TProtocol iprot, org.apache.thrift7.protocol.TProtocol oprot) { + public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { super(iprot, oprot); } - public void result(String id, String result) throws org.apache.thrift7.TException + public void result(String id, String result) throws org.apache.thrift.TException { send_result(id, result); recv_result(); } - public void send_result(String id, String result) throws org.apache.thrift7.TException + public void send_result(String id, String result) throws org.apache.thrift.TException { result_args args = new result_args(); args.set_id(id); @@ -94,50 +94,50 @@ public void send_result(String id, String result) throws org.apache.thrift7.TExc sendBase("result", args); } - public void recv_result() throws org.apache.thrift7.TException + public void recv_result() throws org.apache.thrift.TException { result_result result = new result_result(); receiveBase(result, "result"); return; } - public DRPCRequest fetchRequest(String functionName) throws org.apache.thrift7.TException + public DRPCRequest fetchRequest(String functionName) throws org.apache.thrift.TException { send_fetchRequest(functionName); return recv_fetchRequest(); } - public void send_fetchRequest(String functionName) throws org.apache.thrift7.TException + public void send_fetchRequest(String functionName) throws org.apache.thrift.TException { fetchRequest_args args = new fetchRequest_args(); args.set_functionName(functionName); sendBase("fetchRequest", args); } - public DRPCRequest recv_fetchRequest() throws org.apache.thrift7.TException + public DRPCRequest recv_fetchRequest() throws org.apache.thrift.TException { fetchRequest_result result = new fetchRequest_result(); receiveBase(result, "fetchRequest"); if (result.is_set_success()) { return result.success; } - throw new org.apache.thrift7.TApplicationException(org.apache.thrift7.TApplicationException.MISSING_RESULT, "fetchRequest failed: unknown result"); + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "fetchRequest failed: unknown result"); } - public void failRequest(String id) throws org.apache.thrift7.TException + public void failRequest(String id) throws org.apache.thrift.TException { send_failRequest(id); recv_failRequest(); } - public void send_failRequest(String id) throws org.apache.thrift7.TException + public void send_failRequest(String id) throws org.apache.thrift.TException { failRequest_args args = new failRequest_args(); args.set_id(id); sendBase("failRequest", args); } - public void recv_failRequest() throws org.apache.thrift7.TException + public void recv_failRequest() throws org.apache.thrift.TException { failRequest_result result = new failRequest_result(); receiveBase(result, "failRequest"); @@ -145,41 +145,41 @@ public void recv_failRequest() throws org.apache.thrift7.TException } } - public static class AsyncClient extends org.apache.thrift7.async.TAsyncClient implements AsyncIface { - public static class Factory implements org.apache.thrift7.async.TAsyncClientFactory { - private org.apache.thrift7.async.TAsyncClientManager clientManager; - private org.apache.thrift7.protocol.TProtocolFactory protocolFactory; - public Factory(org.apache.thrift7.async.TAsyncClientManager clientManager, org.apache.thrift7.protocol.TProtocolFactory protocolFactory) { + public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { + public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { + private org.apache.thrift.async.TAsyncClientManager clientManager; + private org.apache.thrift.protocol.TProtocolFactory protocolFactory; + public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) { this.clientManager = clientManager; this.protocolFactory = protocolFactory; } - public AsyncClient getAsyncClient(org.apache.thrift7.transport.TNonblockingTransport transport) { + public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) { return new AsyncClient(protocolFactory, clientManager, transport); } } - public AsyncClient(org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.async.TAsyncClientManager clientManager, org.apache.thrift7.transport.TNonblockingTransport transport) { + public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) { super(protocolFactory, clientManager, transport); } - public void result(String id, String result, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void result(String id, String result, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); result_call method_call = new result_call(id, result, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class result_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class result_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; private String result; - public result_call(String id, String result, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public result_call(String id, String result, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; this.result = result; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("result", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("result", org.apache.thrift.protocol.TMessageType.CALL, 0)); result_args args = new result_args(); args.set_id(id); args.set_result(result); @@ -187,100 +187,100 @@ public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.ap prot.writeMessageEnd(); } - public void getResult() throws org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_result(); } } - public void fetchRequest(String functionName, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void fetchRequest(String functionName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); fetchRequest_call method_call = new fetchRequest_call(functionName, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class fetchRequest_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class fetchRequest_call extends org.apache.thrift.async.TAsyncMethodCall { private String functionName; - public fetchRequest_call(String functionName, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public fetchRequest_call(String functionName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.functionName = functionName; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("fetchRequest", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("fetchRequest", org.apache.thrift.protocol.TMessageType.CALL, 0)); fetchRequest_args args = new fetchRequest_args(); args.set_functionName(functionName); args.write(prot); prot.writeMessageEnd(); } - public DRPCRequest getResult() throws org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public DRPCRequest getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_fetchRequest(); } } - public void failRequest(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void failRequest(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); failRequest_call method_call = new failRequest_call(id, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class failRequest_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class failRequest_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; - public failRequest_call(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public failRequest_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("failRequest", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("failRequest", org.apache.thrift.protocol.TMessageType.CALL, 0)); failRequest_args args = new failRequest_args(); args.set_id(id); args.write(prot); prot.writeMessageEnd(); } - public void getResult() throws org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_failRequest(); } } } - public static class Processor extends org.apache.thrift7.TBaseProcessor implements org.apache.thrift7.TProcessor { + public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName()); public Processor(I iface) { - super(iface, getProcessMap(new HashMap>())); + super(iface, getProcessMap(new HashMap>())); } - protected Processor(I iface, Map> processMap) { + protected Processor(I iface, Map> processMap) { super(iface, getProcessMap(processMap)); } - private static Map> getProcessMap(Map> processMap) { + private static Map> getProcessMap(Map> processMap) { processMap.put("result", new result()); processMap.put("fetchRequest", new fetchRequest()); processMap.put("failRequest", new failRequest()); return processMap; } - private static class result extends org.apache.thrift7.ProcessFunction { + private static class result extends org.apache.thrift.ProcessFunction { public result() { super("result"); } @@ -289,14 +289,14 @@ protected result_args getEmptyArgsInstance() { return new result_args(); } - protected result_result getResult(I iface, result_args args) throws org.apache.thrift7.TException { + protected result_result getResult(I iface, result_args args) throws org.apache.thrift.TException { result_result result = new result_result(); iface.result(args.id, args.result); return result; } } - private static class fetchRequest extends org.apache.thrift7.ProcessFunction { + private static class fetchRequest extends org.apache.thrift.ProcessFunction { public fetchRequest() { super("fetchRequest"); } @@ -305,14 +305,14 @@ protected fetchRequest_args getEmptyArgsInstance() { return new fetchRequest_args(); } - protected fetchRequest_result getResult(I iface, fetchRequest_args args) throws org.apache.thrift7.TException { + protected fetchRequest_result getResult(I iface, fetchRequest_args args) throws org.apache.thrift.TException { fetchRequest_result result = new fetchRequest_result(); result.success = iface.fetchRequest(args.functionName); return result; } } - private static class failRequest extends org.apache.thrift7.ProcessFunction { + private static class failRequest extends org.apache.thrift.ProcessFunction { public failRequest() { super("failRequest"); } @@ -321,7 +321,7 @@ protected failRequest_args getEmptyArgsInstance() { return new failRequest_args(); } - protected failRequest_result getResult(I iface, failRequest_args args) throws org.apache.thrift7.TException { + protected failRequest_result getResult(I iface, failRequest_args args) throws org.apache.thrift.TException { failRequest_result result = new failRequest_result(); iface.failRequest(args.id); return result; @@ -330,17 +330,17 @@ protected failRequest_result getResult(I iface, failRequest_args args) throws or } - public static class result_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("result_args"); + public static class result_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("result_args"); - private static final org.apache.thrift7.protocol.TField ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("id", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField RESULT_FIELD_DESC = new org.apache.thrift7.protocol.TField("result", org.apache.thrift7.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField RESULT_FIELD_DESC = new org.apache.thrift.protocol.TField("result", org.apache.thrift.protocol.TType.STRING, (short)2); private String id; // required private String result; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"), RESULT((short)2, "result"); @@ -402,15 +402,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ID, new org.apache.thrift7.meta_data.FieldMetaData("id", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.RESULT, new org.apache.thrift7.meta_data.FieldMetaData("result", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.RESULT, new org.apache.thrift.meta_data.FieldMetaData("result", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(result_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(result_args.class, metaDataMap); } public result_args() { @@ -605,7 +605,7 @@ public int compareTo(result_args other) { return lastComparison; } if (is_set_id()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -615,7 +615,7 @@ public int compareTo(result_args other) { return lastComparison; } if (is_set_result()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.result, typedOther.result); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.result, typedOther.result); if (lastComparison != 0) { return lastComparison; } @@ -627,32 +627,32 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.id = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // RESULT - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.result = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -660,7 +660,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -702,35 +702,35 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class result_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("result_result"); + public static class result_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("result_result"); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; private static final Map byName = new HashMap(); @@ -784,11 +784,11 @@ public String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(result_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(result_result.class, metaDataMap); } public result_result() { @@ -868,18 +868,18 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -887,7 +887,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); oprot.writeFieldStop(); @@ -903,37 +903,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class fetchRequest_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("fetchRequest_args"); + public static class fetchRequest_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fetchRequest_args"); - private static final org.apache.thrift7.protocol.TField FUNCTION_NAME_FIELD_DESC = new org.apache.thrift7.protocol.TField("functionName", org.apache.thrift7.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField FUNCTION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("functionName", org.apache.thrift.protocol.TType.STRING, (short)1); private String functionName; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { FUNCTION_NAME((short)1, "functionName"); private static final Map byName = new HashMap(); @@ -992,13 +992,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.FUNCTION_NAME, new org.apache.thrift7.meta_data.FieldMetaData("functionName", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.FUNCTION_NAME, new org.apache.thrift.meta_data.FieldMetaData("functionName", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(fetchRequest_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(fetchRequest_args.class, metaDataMap); } public fetchRequest_args() { @@ -1137,7 +1137,7 @@ public int compareTo(fetchRequest_args other) { return lastComparison; } if (is_set_functionName()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.functionName, typedOther.functionName); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.functionName, typedOther.functionName); if (lastComparison != 0) { return lastComparison; } @@ -1149,25 +1149,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // FUNCTION_NAME - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.functionName = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -1175,7 +1175,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -1204,37 +1204,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class fetchRequest_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("fetchRequest_result"); + public static class fetchRequest_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fetchRequest_result"); - private static final org.apache.thrift7.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift7.protocol.TField("success", org.apache.thrift7.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); private DRPCRequest success; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"); private static final Map byName = new HashMap(); @@ -1293,13 +1293,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift7.meta_data.FieldMetaData("success", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, DRPCRequest.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DRPCRequest.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(fetchRequest_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(fetchRequest_result.class, metaDataMap); } public fetchRequest_result() { @@ -1438,7 +1438,7 @@ public int compareTo(fetchRequest_result other) { return lastComparison; } if (is_set_success()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -1450,26 +1450,26 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.success = new DRPCRequest(); this.success.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -1477,7 +1477,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_success()) { @@ -1505,37 +1505,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class failRequest_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("failRequest_args"); + public static class failRequest_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("failRequest_args"); - private static final org.apache.thrift7.protocol.TField ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("id", org.apache.thrift7.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); private String id; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"); private static final Map byName = new HashMap(); @@ -1594,13 +1594,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ID, new org.apache.thrift7.meta_data.FieldMetaData("id", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(failRequest_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(failRequest_args.class, metaDataMap); } public failRequest_args() { @@ -1739,7 +1739,7 @@ public int compareTo(failRequest_args other) { return lastComparison; } if (is_set_id()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -1751,25 +1751,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.id = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -1777,7 +1777,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -1806,35 +1806,35 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class failRequest_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("failRequest_result"); + public static class failRequest_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("failRequest_result"); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; private static final Map byName = new HashMap(); @@ -1888,11 +1888,11 @@ public String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(failRequest_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(failRequest_result.class, metaDataMap); } public failRequest_result() { @@ -1972,18 +1972,18 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -1991,7 +1991,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); oprot.writeFieldStop(); @@ -2007,22 +2007,22 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java b/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java index caf7efb68f..fdd8effc92 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java +++ b/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java @@ -38,17 +38,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ErrorInfo implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("ErrorInfo"); +public class ErrorInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorInfo"); - private static final org.apache.thrift7.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift7.protocol.TField("error", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField ERROR_TIME_SECS_FIELD_DESC = new org.apache.thrift7.protocol.TField("error_time_secs", org.apache.thrift7.protocol.TType.I32, (short)2); + private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField ERROR_TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("error_time_secs", org.apache.thrift.protocol.TType.I32, (short)2); private String error; // required private int error_time_secs; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ERROR((short)1, "error"), ERROR_TIME_SECS((short)2, "error_time_secs"); @@ -112,15 +112,15 @@ public String getFieldName() { private static final int __ERROR_TIME_SECS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ERROR, new org.apache.thrift7.meta_data.FieldMetaData("error", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.ERROR_TIME_SECS, new org.apache.thrift7.meta_data.FieldMetaData("error_time_secs", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.ERROR_TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("error_time_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(ErrorInfo.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ErrorInfo.class, metaDataMap); } public ErrorInfo() { @@ -316,7 +316,7 @@ public int compareTo(ErrorInfo other) { return lastComparison; } if (is_set_error()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.error, typedOther.error); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.error, typedOther.error); if (lastComparison != 0) { return lastComparison; } @@ -326,7 +326,7 @@ public int compareTo(ErrorInfo other) { return lastComparison; } if (is_set_error_time_secs()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.error_time_secs, typedOther.error_time_secs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.error_time_secs, typedOther.error_time_secs); if (lastComparison != 0) { return lastComparison; } @@ -338,33 +338,33 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ERROR - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.error = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // ERROR_TIME_SECS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.error_time_secs = iprot.readI32(); set_error_time_secs_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -372,7 +372,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -408,22 +408,22 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_error()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'error' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'error' is unset! Struct:" + toString()); } if (!is_set_error_time_secs()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'error_time_secs' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'error_time_secs' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -432,8 +432,8 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException 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_bit_vector = new BitSet(1); - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java index 065661f76d..c98f423cfb 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java +++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java @@ -38,17 +38,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ExecutorInfo implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("ExecutorInfo"); +public class ExecutorInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorInfo"); - private static final org.apache.thrift7.protocol.TField TASK_START_FIELD_DESC = new org.apache.thrift7.protocol.TField("task_start", org.apache.thrift7.protocol.TType.I32, (short)1); - private static final org.apache.thrift7.protocol.TField TASK_END_FIELD_DESC = new org.apache.thrift7.protocol.TField("task_end", org.apache.thrift7.protocol.TType.I32, (short)2); + private static final org.apache.thrift.protocol.TField TASK_START_FIELD_DESC = new org.apache.thrift.protocol.TField("task_start", org.apache.thrift.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField TASK_END_FIELD_DESC = new org.apache.thrift.protocol.TField("task_end", org.apache.thrift.protocol.TType.I32, (short)2); private int task_start; // required private int task_end; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TASK_START((short)1, "task_start"), TASK_END((short)2, "task_end"); @@ -113,15 +113,15 @@ public String getFieldName() { private static final int __TASK_END_ISSET_ID = 1; private BitSet __isset_bit_vector = new BitSet(2); - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.TASK_START, new org.apache.thrift7.meta_data.FieldMetaData("task_start", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.TASK_END, new org.apache.thrift7.meta_data.FieldMetaData("task_end", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TASK_START, new org.apache.thrift.meta_data.FieldMetaData("task_start", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.TASK_END, new org.apache.thrift.meta_data.FieldMetaData("task_end", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorInfo.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorInfo.class, metaDataMap); } public ExecutorInfo() { @@ -316,7 +316,7 @@ public int compareTo(ExecutorInfo other) { return lastComparison; } if (is_set_task_start()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.task_start, typedOther.task_start); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_start, typedOther.task_start); if (lastComparison != 0) { return lastComparison; } @@ -326,7 +326,7 @@ public int compareTo(ExecutorInfo other) { return lastComparison; } if (is_set_task_end()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.task_end, typedOther.task_end); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_end, typedOther.task_end); if (lastComparison != 0) { return lastComparison; } @@ -338,34 +338,34 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // TASK_START - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.task_start = iprot.readI32(); set_task_start_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // TASK_END - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.task_end = iprot.readI32(); set_task_end_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -373,7 +373,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -403,22 +403,22 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_task_start()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'task_start' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'task_start' is unset! Struct:" + toString()); } if (!is_set_task_end()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'task_end' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'task_end' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -427,8 +427,8 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException 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_bit_vector = new BitSet(1); - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java index 705f40b659..174ecff978 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java +++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java @@ -38,13 +38,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ExecutorSpecificStats extends org.apache.thrift7.TUnion { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("ExecutorSpecificStats"); - private static final org.apache.thrift7.protocol.TField BOLT_FIELD_DESC = new org.apache.thrift7.protocol.TField("bolt", org.apache.thrift7.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift7.protocol.TField SPOUT_FIELD_DESC = new org.apache.thrift7.protocol.TField("spout", org.apache.thrift7.protocol.TType.STRUCT, (short)2); +public class ExecutorSpecificStats extends org.apache.thrift.TUnion { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorSpecificStats"); + private static final org.apache.thrift.protocol.TField BOLT_FIELD_DESC = new org.apache.thrift.protocol.TField("bolt", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField SPOUT_FIELD_DESC = new org.apache.thrift.protocol.TField("spout", org.apache.thrift.protocol.TType.STRUCT, (short)2); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { BOLT((short)1, "bolt"), SPOUT((short)2, "spout"); @@ -104,15 +104,15 @@ public String getFieldName() { } } - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.BOLT, new org.apache.thrift7.meta_data.FieldMetaData("bolt", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, BoltStats.class))); - tmpMap.put(_Fields.SPOUT, new org.apache.thrift7.meta_data.FieldMetaData("spout", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, SpoutStats.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.BOLT, new org.apache.thrift.meta_data.FieldMetaData("bolt", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, BoltStats.class))); + tmpMap.put(_Fields.SPOUT, new org.apache.thrift.meta_data.FieldMetaData("spout", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SpoutStats.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorSpecificStats.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorSpecificStats.class, metaDataMap); } public ExecutorSpecificStats() { @@ -162,7 +162,7 @@ protected void checkType(_Fields setField, Object value) throws ClassCastExcepti } @Override - protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apache.thrift7.protocol.TField field) throws org.apache.thrift7.TException { + protected Object readValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException { _Fields setField = _Fields.findByThriftId(field.id); if (setField != null) { switch (setField) { @@ -173,7 +173,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac bolt.read(iprot); return bolt; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case SPOUT: @@ -183,20 +183,20 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac spout.read(iprot); return spout; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } default: throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } } @Override - protected void writeValue(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + protected void writeValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { switch (setField_) { case BOLT: BoltStats bolt = (BoltStats)value_; @@ -212,7 +212,7 @@ protected void writeValue(org.apache.thrift7.protocol.TProtocol oprot) throws or } @Override - protected org.apache.thrift7.protocol.TField getFieldDesc(_Fields setField) { + protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) { switch (setField) { case BOLT: return BOLT_FIELD_DESC; @@ -224,7 +224,7 @@ protected org.apache.thrift7.protocol.TField getFieldDesc(_Fields setField) { } @Override - protected org.apache.thrift7.protocol.TStruct getStructDesc() { + protected org.apache.thrift.protocol.TStruct getStructDesc() { return STRUCT_DESC; } @@ -290,9 +290,9 @@ public boolean equals(ExecutorSpecificStats other) { @Override public int compareTo(ExecutorSpecificStats other) { - int lastComparison = org.apache.thrift7.TBaseHelper.compareTo(getSetField(), other.getSetField()); + int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField()); if (lastComparison == 0) { - return org.apache.thrift7.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue()); + return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue()); } return lastComparison; } @@ -302,12 +302,12 @@ public int compareTo(ExecutorSpecificStats other) { public int hashCode() { HashCodeBuilder hcb = new HashCodeBuilder(); hcb.append(this.getClass().getName()); - org.apache.thrift7.TFieldIdEnum setField = getSetField(); + org.apache.thrift.TFieldIdEnum setField = getSetField(); if (setField != null) { hcb.append(setField.getThriftFieldId()); Object value = getFieldValue(); - if (value instanceof org.apache.thrift7.TEnum) { - hcb.append(((org.apache.thrift7.TEnum)getFieldValue()).getValue()); + if (value instanceof org.apache.thrift.TEnum) { + hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue()); } else { hcb.append(value); } @@ -316,8 +316,8 @@ public int hashCode() { } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -325,8 +325,8 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java index 0b2e8a5aa9..a297fa76f0 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java +++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java @@ -38,19 +38,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ExecutorStats implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("ExecutorStats"); +public class ExecutorStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorStats"); - private static final org.apache.thrift7.protocol.TField EMITTED_FIELD_DESC = new org.apache.thrift7.protocol.TField("emitted", org.apache.thrift7.protocol.TType.MAP, (short)1); - private static final org.apache.thrift7.protocol.TField TRANSFERRED_FIELD_DESC = new org.apache.thrift7.protocol.TField("transferred", org.apache.thrift7.protocol.TType.MAP, (short)2); - private static final org.apache.thrift7.protocol.TField SPECIFIC_FIELD_DESC = new org.apache.thrift7.protocol.TField("specific", org.apache.thrift7.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField EMITTED_FIELD_DESC = new org.apache.thrift.protocol.TField("emitted", org.apache.thrift.protocol.TType.MAP, (short)1); + private static final org.apache.thrift.protocol.TField TRANSFERRED_FIELD_DESC = new org.apache.thrift.protocol.TField("transferred", org.apache.thrift.protocol.TType.MAP, (short)2); + private static final org.apache.thrift.protocol.TField SPECIFIC_FIELD_DESC = new org.apache.thrift.protocol.TField("specific", org.apache.thrift.protocol.TType.STRUCT, (short)3); private Map> emitted; // required private Map> transferred; // required private ExecutorSpecificStats specific; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { EMITTED((short)1, "emitted"), TRANSFERRED((short)2, "transferred"), SPECIFIC((short)3, "specific"); @@ -115,25 +115,25 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.EMITTED, new org.apache.thrift7.meta_data.FieldMetaData("emitted", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I64))))); - tmpMap.put(_Fields.TRANSFERRED, new org.apache.thrift7.meta_data.FieldMetaData("transferred", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I64))))); - tmpMap.put(_Fields.SPECIFIC, new org.apache.thrift7.meta_data.FieldMetaData("specific", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ExecutorSpecificStats.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.EMITTED, new org.apache.thrift.meta_data.FieldMetaData("emitted", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))))); + tmpMap.put(_Fields.TRANSFERRED, new org.apache.thrift.meta_data.FieldMetaData("transferred", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))))); + tmpMap.put(_Fields.SPECIFIC, new org.apache.thrift.meta_data.FieldMetaData("specific", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorSpecificStats.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorStats.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorStats.class, metaDataMap); } public ExecutorStats() { @@ -452,7 +452,7 @@ public int compareTo(ExecutorStats other) { return lastComparison; } if (is_set_emitted()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.emitted, typedOther.emitted); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.emitted, typedOther.emitted); if (lastComparison != 0) { return lastComparison; } @@ -462,7 +462,7 @@ public int compareTo(ExecutorStats other) { return lastComparison; } if (is_set_transferred()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.transferred, typedOther.transferred); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.transferred, typedOther.transferred); if (lastComparison != 0) { return lastComparison; } @@ -472,7 +472,7 @@ public int compareTo(ExecutorStats other) { return lastComparison; } if (is_set_specific()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.specific, typedOther.specific); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.specific, typedOther.specific); if (lastComparison != 0) { return lastComparison; } @@ -484,20 +484,20 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // EMITTED - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map125 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map125 = iprot.readMapBegin(); this.emitted = new HashMap>(2*_map125.size); for (int _i126 = 0; _i126 < _map125.size; ++_i126) { @@ -505,7 +505,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. Map _val128; // required _key127 = iprot.readString(); { - org.apache.thrift7.protocol.TMap _map129 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map129 = iprot.readMapBegin(); _val128 = new HashMap(2*_map129.size); for (int _i130 = 0; _i130 < _map129.size; ++_i130) { @@ -522,13 +522,13 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // TRANSFERRED - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map133 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map133 = iprot.readMapBegin(); this.transferred = new HashMap>(2*_map133.size); for (int _i134 = 0; _i134 < _map133.size; ++_i134) { @@ -536,7 +536,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. Map _val136; // required _key135 = iprot.readString(); { - org.apache.thrift7.protocol.TMap _map137 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map137 = iprot.readMapBegin(); _val136 = new HashMap(2*_map137.size); for (int _i138 = 0; _i138 < _map137.size; ++_i138) { @@ -553,19 +553,19 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // SPECIFIC - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.specific = new ExecutorSpecificStats(); this.specific.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -573,19 +573,19 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); if (this.emitted != null) { oprot.writeFieldBegin(EMITTED_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.MAP, this.emitted.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.emitted.size())); for (Map.Entry> _iter141 : this.emitted.entrySet()) { oprot.writeString(_iter141.getKey()); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.I64, _iter141.getValue().size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter141.getValue().size())); for (Map.Entry _iter142 : _iter141.getValue().entrySet()) { oprot.writeString(_iter142.getKey()); @@ -601,12 +601,12 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.transferred != null) { oprot.writeFieldBegin(TRANSFERRED_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.MAP, this.transferred.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.transferred.size())); for (Map.Entry> _iter143 : this.transferred.entrySet()) { oprot.writeString(_iter143.getKey()); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.I64, _iter143.getValue().size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter143.getValue().size())); for (Map.Entry _iter144 : _iter143.getValue().entrySet()) { oprot.writeString(_iter144.getKey()); @@ -660,34 +660,34 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_emitted()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'emitted' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'emitted' is unset! Struct:" + toString()); } if (!is_set_transferred()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'transferred' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'transferred' is unset! Struct:" + toString()); } if (!is_set_specific()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'specific' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'specific' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java index 71c22949c4..daa9a6e2ac 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java +++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java @@ -38,15 +38,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ExecutorSummary implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("ExecutorSummary"); +public class ExecutorSummary implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorSummary"); - private static final org.apache.thrift7.protocol.TField EXECUTOR_INFO_FIELD_DESC = new org.apache.thrift7.protocol.TField("executor_info", org.apache.thrift7.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift7.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("component_id", org.apache.thrift7.protocol.TType.STRING, (short)2); - private static final org.apache.thrift7.protocol.TField HOST_FIELD_DESC = new org.apache.thrift7.protocol.TField("host", org.apache.thrift7.protocol.TType.STRING, (short)3); - private static final org.apache.thrift7.protocol.TField PORT_FIELD_DESC = new org.apache.thrift7.protocol.TField("port", org.apache.thrift7.protocol.TType.I32, (short)4); - private static final org.apache.thrift7.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift7.protocol.TField("uptime_secs", org.apache.thrift7.protocol.TType.I32, (short)5); - private static final org.apache.thrift7.protocol.TField STATS_FIELD_DESC = new org.apache.thrift7.protocol.TField("stats", org.apache.thrift7.protocol.TType.STRUCT, (short)7); + private static final org.apache.thrift.protocol.TField EXECUTOR_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("executor_info", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("component_id", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)4); + private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)5); + private static final org.apache.thrift.protocol.TField STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("stats", org.apache.thrift.protocol.TType.STRUCT, (short)7); private ExecutorInfo executor_info; // required private String component_id; // required @@ -56,7 +56,7 @@ public class ExecutorSummary implements org.apache.thrift7.TBase metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.EXECUTOR_INFO, new org.apache.thrift7.meta_data.FieldMetaData("executor_info", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ExecutorInfo.class))); - tmpMap.put(_Fields.COMPONENT_ID, new org.apache.thrift7.meta_data.FieldMetaData("component_id", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.HOST, new org.apache.thrift7.meta_data.FieldMetaData("host", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.PORT, new org.apache.thrift7.meta_data.FieldMetaData("port", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift7.meta_data.FieldMetaData("uptime_secs", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.STATS, new org.apache.thrift7.meta_data.FieldMetaData("stats", org.apache.thrift7.TFieldRequirementType.OPTIONAL, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ExecutorStats.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.EXECUTOR_INFO, new org.apache.thrift.meta_data.FieldMetaData("executor_info", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorInfo.class))); + tmpMap.put(_Fields.COMPONENT_ID, new org.apache.thrift.meta_data.FieldMetaData("component_id", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.STATS, new org.apache.thrift.meta_data.FieldMetaData("stats", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorStats.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorSummary.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorSummary.class, metaDataMap); } public ExecutorSummary() { @@ -566,7 +566,7 @@ public int compareTo(ExecutorSummary other) { return lastComparison; } if (is_set_executor_info()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.executor_info, typedOther.executor_info); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executor_info, typedOther.executor_info); if (lastComparison != 0) { return lastComparison; } @@ -576,7 +576,7 @@ public int compareTo(ExecutorSummary other) { return lastComparison; } if (is_set_component_id()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.component_id, typedOther.component_id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_id, typedOther.component_id); if (lastComparison != 0) { return lastComparison; } @@ -586,7 +586,7 @@ public int compareTo(ExecutorSummary other) { return lastComparison; } if (is_set_host()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.host, typedOther.host); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host); if (lastComparison != 0) { return lastComparison; } @@ -596,7 +596,7 @@ public int compareTo(ExecutorSummary other) { return lastComparison; } if (is_set_port()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.port, typedOther.port); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port); if (lastComparison != 0) { return lastComparison; } @@ -606,7 +606,7 @@ public int compareTo(ExecutorSummary other) { return lastComparison; } if (is_set_uptime_secs()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.uptime_secs, typedOther.uptime_secs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, typedOther.uptime_secs); if (lastComparison != 0) { return lastComparison; } @@ -616,7 +616,7 @@ public int compareTo(ExecutorSummary other) { return lastComparison; } if (is_set_stats()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.stats, typedOther.stats); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stats, typedOther.stats); if (lastComparison != 0) { return lastComparison; } @@ -628,64 +628,64 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // EXECUTOR_INFO - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.executor_info = new ExecutorInfo(); this.executor_info.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // COMPONENT_ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.component_id = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // HOST - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.host = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 4: // PORT - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.port = iprot.readI32(); set_port_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 5: // UPTIME_SECS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.uptime_secs = iprot.readI32(); set_uptime_secs_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 7: // STATS - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.stats = new ExecutorStats(); this.stats.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -693,7 +693,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -779,34 +779,34 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_executor_info()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'executor_info' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'executor_info' is unset! Struct:" + toString()); } if (!is_set_component_id()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'component_id' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'component_id' is unset! Struct:" + toString()); } if (!is_set_host()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'host' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'host' is unset! Struct:" + toString()); } if (!is_set_port()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'port' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'port' is unset! Struct:" + toString()); } if (!is_set_uptime_secs()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -815,8 +815,8 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException 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_bit_vector = new BitSet(1); - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java b/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java index 46ad461d8c..02ed3ed15a 100644 --- a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java +++ b/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java @@ -38,17 +38,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class GlobalStreamId implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("GlobalStreamId"); +public class GlobalStreamId implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobalStreamId"); - private static final org.apache.thrift7.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("componentId", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField STREAM_ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("streamId", org.apache.thrift7.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("componentId", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField STREAM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("streamId", org.apache.thrift.protocol.TType.STRING, (short)2); private String componentId; // required private String streamId; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { COMPONENT_ID((short)1, "componentId"), STREAM_ID((short)2, "streamId"); @@ -110,15 +110,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.COMPONENT_ID, new org.apache.thrift7.meta_data.FieldMetaData("componentId", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.STREAM_ID, new org.apache.thrift7.meta_data.FieldMetaData("streamId", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.COMPONENT_ID, new org.apache.thrift.meta_data.FieldMetaData("componentId", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.STREAM_ID, new org.apache.thrift.meta_data.FieldMetaData("streamId", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(GlobalStreamId.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GlobalStreamId.class, metaDataMap); } public GlobalStreamId() { @@ -313,7 +313,7 @@ public int compareTo(GlobalStreamId other) { return lastComparison; } if (is_set_componentId()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.componentId, typedOther.componentId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.componentId, typedOther.componentId); if (lastComparison != 0) { return lastComparison; } @@ -323,7 +323,7 @@ public int compareTo(GlobalStreamId other) { return lastComparison; } if (is_set_streamId()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.streamId, typedOther.streamId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.streamId, typedOther.streamId); if (lastComparison != 0) { return lastComparison; } @@ -335,32 +335,32 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // COMPONENT_ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.componentId = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // STREAM_ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.streamId = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -368,7 +368,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -410,30 +410,30 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_componentId()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'componentId' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'componentId' is unset! Struct:" + toString()); } if (!is_set_streamId()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'streamId' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'streamId' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/Grouping.java b/storm-core/src/jvm/backtype/storm/generated/Grouping.java index 7c8ef13655..48677add38 100644 --- a/storm-core/src/jvm/backtype/storm/generated/Grouping.java +++ b/storm-core/src/jvm/backtype/storm/generated/Grouping.java @@ -38,19 +38,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class Grouping extends org.apache.thrift7.TUnion { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("Grouping"); - private static final org.apache.thrift7.protocol.TField FIELDS_FIELD_DESC = new org.apache.thrift7.protocol.TField("fields", org.apache.thrift7.protocol.TType.LIST, (short)1); - private static final org.apache.thrift7.protocol.TField SHUFFLE_FIELD_DESC = new org.apache.thrift7.protocol.TField("shuffle", org.apache.thrift7.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift7.protocol.TField ALL_FIELD_DESC = new org.apache.thrift7.protocol.TField("all", org.apache.thrift7.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift7.protocol.TField NONE_FIELD_DESC = new org.apache.thrift7.protocol.TField("none", org.apache.thrift7.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift7.protocol.TField DIRECT_FIELD_DESC = new org.apache.thrift7.protocol.TField("direct", org.apache.thrift7.protocol.TType.STRUCT, (short)5); - private static final org.apache.thrift7.protocol.TField CUSTOM_OBJECT_FIELD_DESC = new org.apache.thrift7.protocol.TField("custom_object", org.apache.thrift7.protocol.TType.STRUCT, (short)6); - private static final org.apache.thrift7.protocol.TField CUSTOM_SERIALIZED_FIELD_DESC = new org.apache.thrift7.protocol.TField("custom_serialized", org.apache.thrift7.protocol.TType.STRING, (short)7); - private static final org.apache.thrift7.protocol.TField LOCAL_OR_SHUFFLE_FIELD_DESC = new org.apache.thrift7.protocol.TField("local_or_shuffle", org.apache.thrift7.protocol.TType.STRUCT, (short)8); +public class Grouping extends org.apache.thrift.TUnion { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Grouping"); + private static final org.apache.thrift.protocol.TField FIELDS_FIELD_DESC = new org.apache.thrift.protocol.TField("fields", org.apache.thrift.protocol.TType.LIST, (short)1); + private static final org.apache.thrift.protocol.TField SHUFFLE_FIELD_DESC = new org.apache.thrift.protocol.TField("shuffle", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField ALL_FIELD_DESC = new org.apache.thrift.protocol.TField("all", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField NONE_FIELD_DESC = new org.apache.thrift.protocol.TField("none", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField DIRECT_FIELD_DESC = new org.apache.thrift.protocol.TField("direct", org.apache.thrift.protocol.TType.STRUCT, (short)5); + private static final org.apache.thrift.protocol.TField CUSTOM_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("custom_object", org.apache.thrift.protocol.TType.STRUCT, (short)6); + private static final org.apache.thrift.protocol.TField CUSTOM_SERIALIZED_FIELD_DESC = new org.apache.thrift.protocol.TField("custom_serialized", org.apache.thrift.protocol.TType.STRING, (short)7); + private static final org.apache.thrift.protocol.TField LOCAL_OR_SHUFFLE_FIELD_DESC = new org.apache.thrift.protocol.TField("local_or_shuffle", org.apache.thrift.protocol.TType.STRUCT, (short)8); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { FIELDS((short)1, "fields"), SHUFFLE((short)2, "shuffle"), ALL((short)3, "all"), @@ -128,28 +128,28 @@ public String getFieldName() { } } - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.FIELDS, new org.apache.thrift7.meta_data.FieldMetaData("fields", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.ListMetaData(org.apache.thrift7.protocol.TType.LIST, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING)))); - tmpMap.put(_Fields.SHUFFLE, new org.apache.thrift7.meta_data.FieldMetaData("shuffle", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, NullStruct.class))); - tmpMap.put(_Fields.ALL, new org.apache.thrift7.meta_data.FieldMetaData("all", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, NullStruct.class))); - tmpMap.put(_Fields.NONE, new org.apache.thrift7.meta_data.FieldMetaData("none", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, NullStruct.class))); - tmpMap.put(_Fields.DIRECT, new org.apache.thrift7.meta_data.FieldMetaData("direct", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, NullStruct.class))); - tmpMap.put(_Fields.CUSTOM_OBJECT, new org.apache.thrift7.meta_data.FieldMetaData("custom_object", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, JavaObject.class))); - tmpMap.put(_Fields.CUSTOM_SERIALIZED, new org.apache.thrift7.meta_data.FieldMetaData("custom_serialized", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING , true))); - tmpMap.put(_Fields.LOCAL_OR_SHUFFLE, new org.apache.thrift7.meta_data.FieldMetaData("local_or_shuffle", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, NullStruct.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.FIELDS, new org.apache.thrift.meta_data.FieldMetaData("fields", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.SHUFFLE, new org.apache.thrift.meta_data.FieldMetaData("shuffle", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NullStruct.class))); + tmpMap.put(_Fields.ALL, new org.apache.thrift.meta_data.FieldMetaData("all", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NullStruct.class))); + tmpMap.put(_Fields.NONE, new org.apache.thrift.meta_data.FieldMetaData("none", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NullStruct.class))); + tmpMap.put(_Fields.DIRECT, new org.apache.thrift.meta_data.FieldMetaData("direct", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NullStruct.class))); + tmpMap.put(_Fields.CUSTOM_OBJECT, new org.apache.thrift.meta_data.FieldMetaData("custom_object", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, JavaObject.class))); + tmpMap.put(_Fields.CUSTOM_SERIALIZED, new org.apache.thrift.meta_data.FieldMetaData("custom_serialized", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); + tmpMap.put(_Fields.LOCAL_OR_SHUFFLE, new org.apache.thrift.meta_data.FieldMetaData("local_or_shuffle", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NullStruct.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(Grouping.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Grouping.class, metaDataMap); } public Grouping() { @@ -271,7 +271,7 @@ protected void checkType(_Fields setField, Object value) throws ClassCastExcepti } @Override - protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apache.thrift7.protocol.TField field) throws org.apache.thrift7.TException { + protected Object readValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException { _Fields setField = _Fields.findByThriftId(field.id); if (setField != null) { switch (setField) { @@ -279,7 +279,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac if (field.type == FIELDS_FIELD_DESC.type) { List fields; { - org.apache.thrift7.protocol.TList _list4 = iprot.readListBegin(); + org.apache.thrift.protocol.TList _list4 = iprot.readListBegin(); fields = new ArrayList(_list4.size); for (int _i5 = 0; _i5 < _list4.size; ++_i5) { @@ -291,7 +291,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac } return fields; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case SHUFFLE: @@ -301,7 +301,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac shuffle.read(iprot); return shuffle; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case ALL: @@ -311,7 +311,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac all.read(iprot); return all; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case NONE: @@ -321,7 +321,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac none.read(iprot); return none; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case DIRECT: @@ -331,7 +331,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac direct.read(iprot); return direct; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case CUSTOM_OBJECT: @@ -341,7 +341,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac custom_object.read(iprot); return custom_object; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case CUSTOM_SERIALIZED: @@ -350,7 +350,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac custom_serialized = iprot.readBinary(); return custom_serialized; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case LOCAL_OR_SHUFFLE: @@ -360,25 +360,25 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac local_or_shuffle.read(iprot); return local_or_shuffle; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } default: throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } } @Override - protected void writeValue(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + protected void writeValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { switch (setField_) { case FIELDS: List fields = (List)value_; { - oprot.writeListBegin(new org.apache.thrift7.protocol.TList(org.apache.thrift7.protocol.TType.STRING, fields.size())); + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, fields.size())); for (String _iter7 : fields) { oprot.writeString(_iter7); @@ -420,7 +420,7 @@ protected void writeValue(org.apache.thrift7.protocol.TProtocol oprot) throws or } @Override - protected org.apache.thrift7.protocol.TField getFieldDesc(_Fields setField) { + protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) { switch (setField) { case FIELDS: return FIELDS_FIELD_DESC; @@ -444,7 +444,7 @@ protected org.apache.thrift7.protocol.TField getFieldDesc(_Fields setField) { } @Override - protected org.apache.thrift7.protocol.TStruct getStructDesc() { + protected org.apache.thrift.protocol.TStruct getStructDesc() { return STRUCT_DESC; } @@ -543,7 +543,7 @@ public void set_custom_object(JavaObject value) { } public byte[] get_custom_serialized() { - set_custom_serialized(org.apache.thrift7.TBaseHelper.rightSize(buffer_for_custom_serialized())); + set_custom_serialized(org.apache.thrift.TBaseHelper.rightSize(buffer_for_custom_serialized())); ByteBuffer b = buffer_for_custom_serialized(); return b == null ? null : b.array(); } @@ -634,9 +634,9 @@ public boolean equals(Grouping other) { @Override public int compareTo(Grouping other) { - int lastComparison = org.apache.thrift7.TBaseHelper.compareTo(getSetField(), other.getSetField()); + int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField()); if (lastComparison == 0) { - return org.apache.thrift7.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue()); + return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue()); } return lastComparison; } @@ -646,12 +646,12 @@ public int compareTo(Grouping other) { public int hashCode() { HashCodeBuilder hcb = new HashCodeBuilder(); hcb.append(this.getClass().getName()); - org.apache.thrift7.TFieldIdEnum setField = getSetField(); + org.apache.thrift.TFieldIdEnum setField = getSetField(); if (setField != null) { hcb.append(setField.getThriftFieldId()); Object value = getFieldValue(); - if (value instanceof org.apache.thrift7.TEnum) { - hcb.append(((org.apache.thrift7.TEnum)getFieldValue()).getValue()); + if (value instanceof org.apache.thrift.TEnum) { + hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue()); } else { hcb.append(value); } @@ -660,8 +660,8 @@ public int hashCode() { } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -669,8 +669,8 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java b/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java index 695b2443c7..79d917c6b6 100644 --- a/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java +++ b/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java @@ -38,15 +38,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class InvalidTopologyException extends Exception implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("InvalidTopologyException"); +public class InvalidTopologyException extends Exception implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidTopologyException"); - private static final org.apache.thrift7.protocol.TField MSG_FIELD_DESC = new org.apache.thrift7.protocol.TField("msg", org.apache.thrift7.protocol.TType.STRING, (short)1); + 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 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.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { MSG((short)1, "msg"); private static final Map byName = new HashMap(); @@ -105,13 +105,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.MSG, new org.apache.thrift7.meta_data.FieldMetaData("msg", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 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))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(InvalidTopologyException.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InvalidTopologyException.class, metaDataMap); } public InvalidTopologyException() { @@ -250,7 +250,7 @@ public int compareTo(InvalidTopologyException other) { return lastComparison; } if (is_set_msg()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.msg, typedOther.msg); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg); if (lastComparison != 0) { return lastComparison; } @@ -262,25 +262,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // MSG - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.msg = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -288,7 +288,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -317,26 +317,26 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_msg()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/JavaObject.java b/storm-core/src/jvm/backtype/storm/generated/JavaObject.java index 0db2620ea8..8e627caf79 100644 --- a/storm-core/src/jvm/backtype/storm/generated/JavaObject.java +++ b/storm-core/src/jvm/backtype/storm/generated/JavaObject.java @@ -38,17 +38,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class JavaObject implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("JavaObject"); +public class JavaObject implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JavaObject"); - private static final org.apache.thrift7.protocol.TField FULL_CLASS_NAME_FIELD_DESC = new org.apache.thrift7.protocol.TField("full_class_name", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField ARGS_LIST_FIELD_DESC = new org.apache.thrift7.protocol.TField("args_list", org.apache.thrift7.protocol.TType.LIST, (short)2); + private static final org.apache.thrift.protocol.TField FULL_CLASS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("full_class_name", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField ARGS_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("args_list", org.apache.thrift.protocol.TType.LIST, (short)2); private String full_class_name; // required private List args_list; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { FULL_CLASS_NAME((short)1, "full_class_name"), ARGS_LIST((short)2, "args_list"); @@ -110,16 +110,16 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.FULL_CLASS_NAME, new org.apache.thrift7.meta_data.FieldMetaData("full_class_name", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.ARGS_LIST, new org.apache.thrift7.meta_data.FieldMetaData("args_list", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.ListMetaData(org.apache.thrift7.protocol.TType.LIST, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, JavaObjectArg.class)))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.FULL_CLASS_NAME, new org.apache.thrift.meta_data.FieldMetaData("full_class_name", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.ARGS_LIST, new org.apache.thrift.meta_data.FieldMetaData("args_list", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, JavaObjectArg.class)))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(JavaObject.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(JavaObject.class, metaDataMap); } public JavaObject() { @@ -333,7 +333,7 @@ public int compareTo(JavaObject other) { return lastComparison; } if (is_set_full_class_name()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.full_class_name, typedOther.full_class_name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.full_class_name, typedOther.full_class_name); if (lastComparison != 0) { return lastComparison; } @@ -343,7 +343,7 @@ public int compareTo(JavaObject other) { return lastComparison; } if (is_set_args_list()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.args_list, typedOther.args_list); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.args_list, typedOther.args_list); if (lastComparison != 0) { return lastComparison; } @@ -355,27 +355,27 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // FULL_CLASS_NAME - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.full_class_name = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // ARGS_LIST - if (field.type == org.apache.thrift7.protocol.TType.LIST) { + if (field.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift7.protocol.TList _list0 = iprot.readListBegin(); + org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); this.args_list = new ArrayList(_list0.size); for (int _i1 = 0; _i1 < _list0.size; ++_i1) { @@ -387,11 +387,11 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readListEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -399,7 +399,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -411,7 +411,7 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.args_list != null) { oprot.writeFieldBegin(ARGS_LIST_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift7.protocol.TList(org.apache.thrift7.protocol.TType.STRUCT, this.args_list.size())); + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.args_list.size())); for (JavaObjectArg _iter3 : this.args_list) { _iter3.write(oprot); @@ -448,30 +448,30 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_full_class_name()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'full_class_name' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'full_class_name' is unset! Struct:" + toString()); } if (!is_set_args_list()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'args_list' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'args_list' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/JavaObjectArg.java b/storm-core/src/jvm/backtype/storm/generated/JavaObjectArg.java index 807ddcb2d6..8ea3225cdf 100644 --- a/storm-core/src/jvm/backtype/storm/generated/JavaObjectArg.java +++ b/storm-core/src/jvm/backtype/storm/generated/JavaObjectArg.java @@ -38,17 +38,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class JavaObjectArg extends org.apache.thrift7.TUnion { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("JavaObjectArg"); - private static final org.apache.thrift7.protocol.TField INT_ARG_FIELD_DESC = new org.apache.thrift7.protocol.TField("int_arg", org.apache.thrift7.protocol.TType.I32, (short)1); - private static final org.apache.thrift7.protocol.TField LONG_ARG_FIELD_DESC = new org.apache.thrift7.protocol.TField("long_arg", org.apache.thrift7.protocol.TType.I64, (short)2); - private static final org.apache.thrift7.protocol.TField STRING_ARG_FIELD_DESC = new org.apache.thrift7.protocol.TField("string_arg", org.apache.thrift7.protocol.TType.STRING, (short)3); - private static final org.apache.thrift7.protocol.TField BOOL_ARG_FIELD_DESC = new org.apache.thrift7.protocol.TField("bool_arg", org.apache.thrift7.protocol.TType.BOOL, (short)4); - private static final org.apache.thrift7.protocol.TField BINARY_ARG_FIELD_DESC = new org.apache.thrift7.protocol.TField("binary_arg", org.apache.thrift7.protocol.TType.STRING, (short)5); - private static final org.apache.thrift7.protocol.TField DOUBLE_ARG_FIELD_DESC = new org.apache.thrift7.protocol.TField("double_arg", org.apache.thrift7.protocol.TType.DOUBLE, (short)6); +public class JavaObjectArg extends org.apache.thrift.TUnion { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JavaObjectArg"); + private static final org.apache.thrift.protocol.TField INT_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("int_arg", org.apache.thrift.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField LONG_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("long_arg", org.apache.thrift.protocol.TType.I64, (short)2); + private static final org.apache.thrift.protocol.TField STRING_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("string_arg", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField BOOL_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("bool_arg", org.apache.thrift.protocol.TType.BOOL, (short)4); + private static final org.apache.thrift.protocol.TField BINARY_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("binary_arg", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField DOUBLE_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("double_arg", org.apache.thrift.protocol.TType.DOUBLE, (short)6); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { INT_ARG((short)1, "int_arg"), LONG_ARG((short)2, "long_arg"), STRING_ARG((short)3, "string_arg"), @@ -120,23 +120,23 @@ public String getFieldName() { } } - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.INT_ARG, new org.apache.thrift7.meta_data.FieldMetaData("int_arg", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.LONG_ARG, new org.apache.thrift7.meta_data.FieldMetaData("long_arg", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I64))); - tmpMap.put(_Fields.STRING_ARG, new org.apache.thrift7.meta_data.FieldMetaData("string_arg", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.BOOL_ARG, new org.apache.thrift7.meta_data.FieldMetaData("bool_arg", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.BOOL))); - tmpMap.put(_Fields.BINARY_ARG, new org.apache.thrift7.meta_data.FieldMetaData("binary_arg", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING , true))); - tmpMap.put(_Fields.DOUBLE_ARG, new org.apache.thrift7.meta_data.FieldMetaData("double_arg", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.DOUBLE))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.INT_ARG, new org.apache.thrift.meta_data.FieldMetaData("int_arg", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.LONG_ARG, new org.apache.thrift.meta_data.FieldMetaData("long_arg", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.STRING_ARG, new org.apache.thrift.meta_data.FieldMetaData("string_arg", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.BOOL_ARG, new org.apache.thrift.meta_data.FieldMetaData("bool_arg", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.BINARY_ARG, new org.apache.thrift.meta_data.FieldMetaData("binary_arg", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); + tmpMap.put(_Fields.DOUBLE_ARG, new org.apache.thrift.meta_data.FieldMetaData("double_arg", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(JavaObjectArg.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(JavaObjectArg.class, metaDataMap); } public JavaObjectArg() { @@ -236,7 +236,7 @@ protected void checkType(_Fields setField, Object value) throws ClassCastExcepti } @Override - protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apache.thrift7.protocol.TField field) throws org.apache.thrift7.TException { + protected Object readValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException { _Fields setField = _Fields.findByThriftId(field.id); if (setField != null) { switch (setField) { @@ -246,7 +246,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac int_arg = iprot.readI32(); return int_arg; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case LONG_ARG: @@ -255,7 +255,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac long_arg = iprot.readI64(); return long_arg; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case STRING_ARG: @@ -264,7 +264,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac string_arg = iprot.readString(); return string_arg; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case BOOL_ARG: @@ -273,7 +273,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac bool_arg = iprot.readBool(); return bool_arg; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case BINARY_ARG: @@ -282,7 +282,7 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac binary_arg = iprot.readBinary(); return binary_arg; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } case DOUBLE_ARG: @@ -291,20 +291,20 @@ protected Object readValue(org.apache.thrift7.protocol.TProtocol iprot, org.apac double_arg = iprot.readDouble(); return double_arg; } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } default: throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); return null; } } @Override - protected void writeValue(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + protected void writeValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { switch (setField_) { case INT_ARG: Integer int_arg = (Integer)value_; @@ -336,7 +336,7 @@ protected void writeValue(org.apache.thrift7.protocol.TProtocol oprot) throws or } @Override - protected org.apache.thrift7.protocol.TField getFieldDesc(_Fields setField) { + protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) { switch (setField) { case INT_ARG: return INT_ARG_FIELD_DESC; @@ -356,7 +356,7 @@ protected org.apache.thrift7.protocol.TField getFieldDesc(_Fields setField) { } @Override - protected org.apache.thrift7.protocol.TStruct getStructDesc() { + protected org.apache.thrift.protocol.TStruct getStructDesc() { return STRUCT_DESC; } @@ -424,7 +424,7 @@ public void set_bool_arg(boolean value) { } public byte[] get_binary_arg() { - set_binary_arg(org.apache.thrift7.TBaseHelper.rightSize(buffer_for_binary_arg())); + set_binary_arg(org.apache.thrift.TBaseHelper.rightSize(buffer_for_binary_arg())); ByteBuffer b = buffer_for_binary_arg(); return b == null ? null : b.array(); } @@ -504,9 +504,9 @@ public boolean equals(JavaObjectArg other) { @Override public int compareTo(JavaObjectArg other) { - int lastComparison = org.apache.thrift7.TBaseHelper.compareTo(getSetField(), other.getSetField()); + int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField()); if (lastComparison == 0) { - return org.apache.thrift7.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue()); + return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue()); } return lastComparison; } @@ -516,12 +516,12 @@ public int compareTo(JavaObjectArg other) { public int hashCode() { HashCodeBuilder hcb = new HashCodeBuilder(); hcb.append(this.getClass().getName()); - org.apache.thrift7.TFieldIdEnum setField = getSetField(); + org.apache.thrift.TFieldIdEnum setField = getSetField(); if (setField != null) { hcb.append(setField.getThriftFieldId()); Object value = getFieldValue(); - if (value instanceof org.apache.thrift7.TEnum) { - hcb.append(((org.apache.thrift7.TEnum)getFieldValue()).getValue()); + if (value instanceof org.apache.thrift.TEnum) { + hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue()); } else { hcb.append(value); } @@ -530,8 +530,8 @@ public int hashCode() { } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -539,8 +539,8 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/KillOptions.java b/storm-core/src/jvm/backtype/storm/generated/KillOptions.java index eb712b7444..26dd959d48 100644 --- a/storm-core/src/jvm/backtype/storm/generated/KillOptions.java +++ b/storm-core/src/jvm/backtype/storm/generated/KillOptions.java @@ -38,15 +38,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class KillOptions implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("KillOptions"); +public class KillOptions implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KillOptions"); - private static final org.apache.thrift7.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift7.protocol.TField("wait_secs", org.apache.thrift7.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("wait_secs", org.apache.thrift.protocol.TType.I32, (short)1); private int wait_secs; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { WAIT_SECS((short)1, "wait_secs"); private static final Map byName = new HashMap(); @@ -107,13 +107,13 @@ public String getFieldName() { private static final int __WAIT_SECS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.WAIT_SECS, new org.apache.thrift7.meta_data.FieldMetaData("wait_secs", org.apache.thrift7.TFieldRequirementType.OPTIONAL, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.WAIT_SECS, new org.apache.thrift.meta_data.FieldMetaData("wait_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(KillOptions.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(KillOptions.class, metaDataMap); } public KillOptions() { @@ -245,7 +245,7 @@ public int compareTo(KillOptions other) { return lastComparison; } if (is_set_wait_secs()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.wait_secs, typedOther.wait_secs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.wait_secs, typedOther.wait_secs); if (lastComparison != 0) { return lastComparison; } @@ -257,26 +257,26 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // WAIT_SECS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.wait_secs = iprot.readI32(); set_wait_secs_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -284,7 +284,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -311,14 +311,14 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -327,8 +327,8 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException 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_bit_vector = new BitSet(1); - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java index 05cd657bec..e84e12dca6 100644 --- a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java +++ b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java @@ -42,111 +42,111 @@ public class Nimbus { public interface Iface { - public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology) throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift7.TException; + public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology) throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift.TException; - public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options) throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift7.TException; + public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options) throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift.TException; - public void killTopology(String name) throws NotAliveException, org.apache.thrift7.TException; + public void killTopology(String name) throws NotAliveException, org.apache.thrift.TException; - public void killTopologyWithOpts(String name, KillOptions options) throws NotAliveException, org.apache.thrift7.TException; + public void killTopologyWithOpts(String name, KillOptions options) throws NotAliveException, org.apache.thrift.TException; - public void activate(String name) throws NotAliveException, org.apache.thrift7.TException; + public void activate(String name) throws NotAliveException, org.apache.thrift.TException; - public void deactivate(String name) throws NotAliveException, org.apache.thrift7.TException; + public void deactivate(String name) throws NotAliveException, org.apache.thrift.TException; - public void rebalance(String name, RebalanceOptions options) throws NotAliveException, InvalidTopologyException, org.apache.thrift7.TException; + public void rebalance(String name, RebalanceOptions options) throws NotAliveException, InvalidTopologyException, org.apache.thrift.TException; - public String beginFileUpload() throws org.apache.thrift7.TException; + public String beginFileUpload() throws org.apache.thrift.TException; - public void uploadChunk(String location, ByteBuffer chunk) throws org.apache.thrift7.TException; + public void uploadChunk(String location, ByteBuffer chunk) throws org.apache.thrift.TException; - public void finishFileUpload(String location) throws org.apache.thrift7.TException; + public void finishFileUpload(String location) throws org.apache.thrift.TException; - public String beginFileDownload(String file) throws org.apache.thrift7.TException; + public String beginFileDownload(String file) throws org.apache.thrift.TException; - public ByteBuffer downloadChunk(String id) throws org.apache.thrift7.TException; + public ByteBuffer downloadChunk(String id) throws org.apache.thrift.TException; - public String getNimbusConf() throws org.apache.thrift7.TException; + public String getNimbusConf() throws org.apache.thrift.TException; - public ClusterSummary getClusterInfo() throws org.apache.thrift7.TException; + public ClusterSummary getClusterInfo() throws org.apache.thrift.TException; - public TopologyInfo getTopologyInfo(String id) throws NotAliveException, org.apache.thrift7.TException; + public TopologyInfo getTopologyInfo(String id) throws NotAliveException, org.apache.thrift.TException; - public String getTopologyConf(String id) throws NotAliveException, org.apache.thrift7.TException; + public String getTopologyConf(String id) throws NotAliveException, org.apache.thrift.TException; - public StormTopology getTopology(String id) throws NotAliveException, org.apache.thrift7.TException; + public StormTopology getTopology(String id) throws NotAliveException, org.apache.thrift.TException; - public StormTopology getUserTopology(String id) throws NotAliveException, org.apache.thrift7.TException; + public StormTopology getUserTopology(String id) throws NotAliveException, org.apache.thrift.TException; } public interface AsyncIface { - public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void killTopology(String name, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void killTopology(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void killTopologyWithOpts(String name, KillOptions options, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void killTopologyWithOpts(String name, KillOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void activate(String name, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void activate(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void deactivate(String name, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void deactivate(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void rebalance(String name, RebalanceOptions options, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void rebalance(String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void beginFileUpload(org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void beginFileUpload(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void uploadChunk(String location, ByteBuffer chunk, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void uploadChunk(String location, ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void finishFileUpload(String location, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void finishFileUpload(String location, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void beginFileDownload(String file, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void beginFileDownload(String file, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void downloadChunk(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void downloadChunk(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getNimbusConf(org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void getNimbusConf(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getClusterInfo(org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void getClusterInfo(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getTopologyInfo(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void getTopologyInfo(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getTopologyConf(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void getTopologyConf(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getTopology(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void getTopology(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getUserTopology(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException; + public void getUserTopology(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; } - public static class Client extends org.apache.thrift7.TServiceClient implements Iface { - public static class Factory implements org.apache.thrift7.TServiceClientFactory { + public static class Client extends org.apache.thrift.TServiceClient implements Iface { + public static class Factory implements org.apache.thrift.TServiceClientFactory { public Factory() {} - public Client getClient(org.apache.thrift7.protocol.TProtocol prot) { + public Client getClient(org.apache.thrift.protocol.TProtocol prot) { return new Client(prot); } - public Client getClient(org.apache.thrift7.protocol.TProtocol iprot, org.apache.thrift7.protocol.TProtocol oprot) { + public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { return new Client(iprot, oprot); } } - public Client(org.apache.thrift7.protocol.TProtocol prot) + public Client(org.apache.thrift.protocol.TProtocol prot) { super(prot, prot); } - public Client(org.apache.thrift7.protocol.TProtocol iprot, org.apache.thrift7.protocol.TProtocol oprot) { + public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { super(iprot, oprot); } - public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology) throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift7.TException + public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology) throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift.TException { send_submitTopology(name, uploadedJarLocation, jsonConf, topology); recv_submitTopology(); } - public void send_submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology) throws org.apache.thrift7.TException + public void send_submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology) throws org.apache.thrift.TException { submitTopology_args args = new submitTopology_args(); args.set_name(name); @@ -156,7 +156,7 @@ public void send_submitTopology(String name, String uploadedJarLocation, String sendBase("submitTopology", args); } - public void recv_submitTopology() throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift7.TException + public void recv_submitTopology() throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift.TException { submitTopology_result result = new submitTopology_result(); receiveBase(result, "submitTopology"); @@ -169,13 +169,13 @@ public void recv_submitTopology() throws AlreadyAliveException, InvalidTopologyE return; } - public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options) throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift7.TException + public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options) throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift.TException { send_submitTopologyWithOpts(name, uploadedJarLocation, jsonConf, topology, options); recv_submitTopologyWithOpts(); } - public void send_submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options) throws org.apache.thrift7.TException + public void send_submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options) throws org.apache.thrift.TException { submitTopologyWithOpts_args args = new submitTopologyWithOpts_args(); args.set_name(name); @@ -186,7 +186,7 @@ public void send_submitTopologyWithOpts(String name, String uploadedJarLocation, sendBase("submitTopologyWithOpts", args); } - public void recv_submitTopologyWithOpts() throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift7.TException + public void recv_submitTopologyWithOpts() throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift.TException { submitTopologyWithOpts_result result = new submitTopologyWithOpts_result(); receiveBase(result, "submitTopologyWithOpts"); @@ -199,20 +199,20 @@ public void recv_submitTopologyWithOpts() throws AlreadyAliveException, InvalidT return; } - public void killTopology(String name) throws NotAliveException, org.apache.thrift7.TException + public void killTopology(String name) throws NotAliveException, org.apache.thrift.TException { send_killTopology(name); recv_killTopology(); } - public void send_killTopology(String name) throws org.apache.thrift7.TException + public void send_killTopology(String name) throws org.apache.thrift.TException { killTopology_args args = new killTopology_args(); args.set_name(name); sendBase("killTopology", args); } - public void recv_killTopology() throws NotAliveException, org.apache.thrift7.TException + public void recv_killTopology() throws NotAliveException, org.apache.thrift.TException { killTopology_result result = new killTopology_result(); receiveBase(result, "killTopology"); @@ -222,13 +222,13 @@ public void recv_killTopology() throws NotAliveException, org.apache.thrift7.TEx return; } - public void killTopologyWithOpts(String name, KillOptions options) throws NotAliveException, org.apache.thrift7.TException + public void killTopologyWithOpts(String name, KillOptions options) throws NotAliveException, org.apache.thrift.TException { send_killTopologyWithOpts(name, options); recv_killTopologyWithOpts(); } - public void send_killTopologyWithOpts(String name, KillOptions options) throws org.apache.thrift7.TException + public void send_killTopologyWithOpts(String name, KillOptions options) throws org.apache.thrift.TException { killTopologyWithOpts_args args = new killTopologyWithOpts_args(); args.set_name(name); @@ -236,7 +236,7 @@ public void send_killTopologyWithOpts(String name, KillOptions options) throws o sendBase("killTopologyWithOpts", args); } - public void recv_killTopologyWithOpts() throws NotAliveException, org.apache.thrift7.TException + public void recv_killTopologyWithOpts() throws NotAliveException, org.apache.thrift.TException { killTopologyWithOpts_result result = new killTopologyWithOpts_result(); receiveBase(result, "killTopologyWithOpts"); @@ -246,20 +246,20 @@ public void recv_killTopologyWithOpts() throws NotAliveException, org.apache.thr return; } - public void activate(String name) throws NotAliveException, org.apache.thrift7.TException + public void activate(String name) throws NotAliveException, org.apache.thrift.TException { send_activate(name); recv_activate(); } - public void send_activate(String name) throws org.apache.thrift7.TException + public void send_activate(String name) throws org.apache.thrift.TException { activate_args args = new activate_args(); args.set_name(name); sendBase("activate", args); } - public void recv_activate() throws NotAliveException, org.apache.thrift7.TException + public void recv_activate() throws NotAliveException, org.apache.thrift.TException { activate_result result = new activate_result(); receiveBase(result, "activate"); @@ -269,20 +269,20 @@ public void recv_activate() throws NotAliveException, org.apache.thrift7.TExcept return; } - public void deactivate(String name) throws NotAliveException, org.apache.thrift7.TException + public void deactivate(String name) throws NotAliveException, org.apache.thrift.TException { send_deactivate(name); recv_deactivate(); } - public void send_deactivate(String name) throws org.apache.thrift7.TException + public void send_deactivate(String name) throws org.apache.thrift.TException { deactivate_args args = new deactivate_args(); args.set_name(name); sendBase("deactivate", args); } - public void recv_deactivate() throws NotAliveException, org.apache.thrift7.TException + public void recv_deactivate() throws NotAliveException, org.apache.thrift.TException { deactivate_result result = new deactivate_result(); receiveBase(result, "deactivate"); @@ -292,13 +292,13 @@ public void recv_deactivate() throws NotAliveException, org.apache.thrift7.TExce return; } - public void rebalance(String name, RebalanceOptions options) throws NotAliveException, InvalidTopologyException, org.apache.thrift7.TException + public void rebalance(String name, RebalanceOptions options) throws NotAliveException, InvalidTopologyException, org.apache.thrift.TException { send_rebalance(name, options); recv_rebalance(); } - public void send_rebalance(String name, RebalanceOptions options) throws org.apache.thrift7.TException + public void send_rebalance(String name, RebalanceOptions options) throws org.apache.thrift.TException { rebalance_args args = new rebalance_args(); args.set_name(name); @@ -306,7 +306,7 @@ public void send_rebalance(String name, RebalanceOptions options) throws org.apa sendBase("rebalance", args); } - public void recv_rebalance() throws NotAliveException, InvalidTopologyException, org.apache.thrift7.TException + public void recv_rebalance() throws NotAliveException, InvalidTopologyException, org.apache.thrift.TException { rebalance_result result = new rebalance_result(); receiveBase(result, "rebalance"); @@ -319,35 +319,35 @@ public void recv_rebalance() throws NotAliveException, InvalidTopologyException, return; } - public String beginFileUpload() throws org.apache.thrift7.TException + public String beginFileUpload() throws org.apache.thrift.TException { send_beginFileUpload(); return recv_beginFileUpload(); } - public void send_beginFileUpload() throws org.apache.thrift7.TException + public void send_beginFileUpload() throws org.apache.thrift.TException { beginFileUpload_args args = new beginFileUpload_args(); sendBase("beginFileUpload", args); } - public String recv_beginFileUpload() throws org.apache.thrift7.TException + public String recv_beginFileUpload() throws org.apache.thrift.TException { beginFileUpload_result result = new beginFileUpload_result(); receiveBase(result, "beginFileUpload"); if (result.is_set_success()) { return result.success; } - throw new org.apache.thrift7.TApplicationException(org.apache.thrift7.TApplicationException.MISSING_RESULT, "beginFileUpload failed: unknown result"); + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "beginFileUpload failed: unknown result"); } - public void uploadChunk(String location, ByteBuffer chunk) throws org.apache.thrift7.TException + public void uploadChunk(String location, ByteBuffer chunk) throws org.apache.thrift.TException { send_uploadChunk(location, chunk); recv_uploadChunk(); } - public void send_uploadChunk(String location, ByteBuffer chunk) throws org.apache.thrift7.TException + public void send_uploadChunk(String location, ByteBuffer chunk) throws org.apache.thrift.TException { uploadChunk_args args = new uploadChunk_args(); args.set_location(location); @@ -355,137 +355,137 @@ public void send_uploadChunk(String location, ByteBuffer chunk) throws org.apach sendBase("uploadChunk", args); } - public void recv_uploadChunk() throws org.apache.thrift7.TException + public void recv_uploadChunk() throws org.apache.thrift.TException { uploadChunk_result result = new uploadChunk_result(); receiveBase(result, "uploadChunk"); return; } - public void finishFileUpload(String location) throws org.apache.thrift7.TException + public void finishFileUpload(String location) throws org.apache.thrift.TException { send_finishFileUpload(location); recv_finishFileUpload(); } - public void send_finishFileUpload(String location) throws org.apache.thrift7.TException + public void send_finishFileUpload(String location) throws org.apache.thrift.TException { finishFileUpload_args args = new finishFileUpload_args(); args.set_location(location); sendBase("finishFileUpload", args); } - public void recv_finishFileUpload() throws org.apache.thrift7.TException + public void recv_finishFileUpload() throws org.apache.thrift.TException { finishFileUpload_result result = new finishFileUpload_result(); receiveBase(result, "finishFileUpload"); return; } - public String beginFileDownload(String file) throws org.apache.thrift7.TException + public String beginFileDownload(String file) throws org.apache.thrift.TException { send_beginFileDownload(file); return recv_beginFileDownload(); } - public void send_beginFileDownload(String file) throws org.apache.thrift7.TException + public void send_beginFileDownload(String file) throws org.apache.thrift.TException { beginFileDownload_args args = new beginFileDownload_args(); args.set_file(file); sendBase("beginFileDownload", args); } - public String recv_beginFileDownload() throws org.apache.thrift7.TException + public String recv_beginFileDownload() throws org.apache.thrift.TException { beginFileDownload_result result = new beginFileDownload_result(); receiveBase(result, "beginFileDownload"); if (result.is_set_success()) { return result.success; } - throw new org.apache.thrift7.TApplicationException(org.apache.thrift7.TApplicationException.MISSING_RESULT, "beginFileDownload failed: unknown result"); + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "beginFileDownload failed: unknown result"); } - public ByteBuffer downloadChunk(String id) throws org.apache.thrift7.TException + public ByteBuffer downloadChunk(String id) throws org.apache.thrift.TException { send_downloadChunk(id); return recv_downloadChunk(); } - public void send_downloadChunk(String id) throws org.apache.thrift7.TException + public void send_downloadChunk(String id) throws org.apache.thrift.TException { downloadChunk_args args = new downloadChunk_args(); args.set_id(id); sendBase("downloadChunk", args); } - public ByteBuffer recv_downloadChunk() throws org.apache.thrift7.TException + public ByteBuffer recv_downloadChunk() throws org.apache.thrift.TException { downloadChunk_result result = new downloadChunk_result(); receiveBase(result, "downloadChunk"); if (result.is_set_success()) { return result.success; } - throw new org.apache.thrift7.TApplicationException(org.apache.thrift7.TApplicationException.MISSING_RESULT, "downloadChunk failed: unknown result"); + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "downloadChunk failed: unknown result"); } - public String getNimbusConf() throws org.apache.thrift7.TException + public String getNimbusConf() throws org.apache.thrift.TException { send_getNimbusConf(); return recv_getNimbusConf(); } - public void send_getNimbusConf() throws org.apache.thrift7.TException + public void send_getNimbusConf() throws org.apache.thrift.TException { getNimbusConf_args args = new getNimbusConf_args(); sendBase("getNimbusConf", args); } - public String recv_getNimbusConf() throws org.apache.thrift7.TException + public String recv_getNimbusConf() throws org.apache.thrift.TException { getNimbusConf_result result = new getNimbusConf_result(); receiveBase(result, "getNimbusConf"); if (result.is_set_success()) { return result.success; } - throw new org.apache.thrift7.TApplicationException(org.apache.thrift7.TApplicationException.MISSING_RESULT, "getNimbusConf failed: unknown result"); + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getNimbusConf failed: unknown result"); } - public ClusterSummary getClusterInfo() throws org.apache.thrift7.TException + public ClusterSummary getClusterInfo() throws org.apache.thrift.TException { send_getClusterInfo(); return recv_getClusterInfo(); } - public void send_getClusterInfo() throws org.apache.thrift7.TException + public void send_getClusterInfo() throws org.apache.thrift.TException { getClusterInfo_args args = new getClusterInfo_args(); sendBase("getClusterInfo", args); } - public ClusterSummary recv_getClusterInfo() throws org.apache.thrift7.TException + public ClusterSummary recv_getClusterInfo() throws org.apache.thrift.TException { getClusterInfo_result result = new getClusterInfo_result(); receiveBase(result, "getClusterInfo"); if (result.is_set_success()) { return result.success; } - throw new org.apache.thrift7.TApplicationException(org.apache.thrift7.TApplicationException.MISSING_RESULT, "getClusterInfo failed: unknown result"); + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getClusterInfo failed: unknown result"); } - public TopologyInfo getTopologyInfo(String id) throws NotAliveException, org.apache.thrift7.TException + public TopologyInfo getTopologyInfo(String id) throws NotAliveException, org.apache.thrift.TException { send_getTopologyInfo(id); return recv_getTopologyInfo(); } - public void send_getTopologyInfo(String id) throws org.apache.thrift7.TException + public void send_getTopologyInfo(String id) throws org.apache.thrift.TException { getTopologyInfo_args args = new getTopologyInfo_args(); args.set_id(id); sendBase("getTopologyInfo", args); } - public TopologyInfo recv_getTopologyInfo() throws NotAliveException, org.apache.thrift7.TException + public TopologyInfo recv_getTopologyInfo() throws NotAliveException, org.apache.thrift.TException { getTopologyInfo_result result = new getTopologyInfo_result(); receiveBase(result, "getTopologyInfo"); @@ -495,23 +495,23 @@ public TopologyInfo recv_getTopologyInfo() throws NotAliveException, org.apache. if (result.e != null) { throw result.e; } - throw new org.apache.thrift7.TApplicationException(org.apache.thrift7.TApplicationException.MISSING_RESULT, "getTopologyInfo failed: unknown result"); + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTopologyInfo failed: unknown result"); } - public String getTopologyConf(String id) throws NotAliveException, org.apache.thrift7.TException + public String getTopologyConf(String id) throws NotAliveException, org.apache.thrift.TException { send_getTopologyConf(id); return recv_getTopologyConf(); } - public void send_getTopologyConf(String id) throws org.apache.thrift7.TException + public void send_getTopologyConf(String id) throws org.apache.thrift.TException { getTopologyConf_args args = new getTopologyConf_args(); args.set_id(id); sendBase("getTopologyConf", args); } - public String recv_getTopologyConf() throws NotAliveException, org.apache.thrift7.TException + public String recv_getTopologyConf() throws NotAliveException, org.apache.thrift.TException { getTopologyConf_result result = new getTopologyConf_result(); receiveBase(result, "getTopologyConf"); @@ -521,23 +521,23 @@ public String recv_getTopologyConf() throws NotAliveException, org.apache.thrift if (result.e != null) { throw result.e; } - throw new org.apache.thrift7.TApplicationException(org.apache.thrift7.TApplicationException.MISSING_RESULT, "getTopologyConf failed: unknown result"); + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTopologyConf failed: unknown result"); } - public StormTopology getTopology(String id) throws NotAliveException, org.apache.thrift7.TException + public StormTopology getTopology(String id) throws NotAliveException, org.apache.thrift.TException { send_getTopology(id); return recv_getTopology(); } - public void send_getTopology(String id) throws org.apache.thrift7.TException + public void send_getTopology(String id) throws org.apache.thrift.TException { getTopology_args args = new getTopology_args(); args.set_id(id); sendBase("getTopology", args); } - public StormTopology recv_getTopology() throws NotAliveException, org.apache.thrift7.TException + public StormTopology recv_getTopology() throws NotAliveException, org.apache.thrift.TException { getTopology_result result = new getTopology_result(); receiveBase(result, "getTopology"); @@ -547,23 +547,23 @@ public StormTopology recv_getTopology() throws NotAliveException, org.apache.thr if (result.e != null) { throw result.e; } - throw new org.apache.thrift7.TApplicationException(org.apache.thrift7.TApplicationException.MISSING_RESULT, "getTopology failed: unknown result"); + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTopology failed: unknown result"); } - public StormTopology getUserTopology(String id) throws NotAliveException, org.apache.thrift7.TException + public StormTopology getUserTopology(String id) throws NotAliveException, org.apache.thrift.TException { send_getUserTopology(id); return recv_getUserTopology(); } - public void send_getUserTopology(String id) throws org.apache.thrift7.TException + public void send_getUserTopology(String id) throws org.apache.thrift.TException { getUserTopology_args args = new getUserTopology_args(); args.set_id(id); sendBase("getUserTopology", args); } - public StormTopology recv_getUserTopology() throws NotAliveException, org.apache.thrift7.TException + public StormTopology recv_getUserTopology() throws NotAliveException, org.apache.thrift.TException { getUserTopology_result result = new getUserTopology_result(); receiveBase(result, "getUserTopology"); @@ -573,40 +573,40 @@ public StormTopology recv_getUserTopology() throws NotAliveException, org.apache if (result.e != null) { throw result.e; } - throw new org.apache.thrift7.TApplicationException(org.apache.thrift7.TApplicationException.MISSING_RESULT, "getUserTopology failed: unknown result"); + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUserTopology failed: unknown result"); } } - public static class AsyncClient extends org.apache.thrift7.async.TAsyncClient implements AsyncIface { - public static class Factory implements org.apache.thrift7.async.TAsyncClientFactory { - private org.apache.thrift7.async.TAsyncClientManager clientManager; - private org.apache.thrift7.protocol.TProtocolFactory protocolFactory; - public Factory(org.apache.thrift7.async.TAsyncClientManager clientManager, org.apache.thrift7.protocol.TProtocolFactory protocolFactory) { + public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { + public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { + private org.apache.thrift.async.TAsyncClientManager clientManager; + private org.apache.thrift.protocol.TProtocolFactory protocolFactory; + public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) { this.clientManager = clientManager; this.protocolFactory = protocolFactory; } - public AsyncClient getAsyncClient(org.apache.thrift7.transport.TNonblockingTransport transport) { + public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) { return new AsyncClient(protocolFactory, clientManager, transport); } } - public AsyncClient(org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.async.TAsyncClientManager clientManager, org.apache.thrift7.transport.TNonblockingTransport transport) { + public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) { super(protocolFactory, clientManager, transport); } - public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); submitTopology_call method_call = new submitTopology_call(name, uploadedJarLocation, jsonConf, topology, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class submitTopology_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class submitTopology_call extends org.apache.thrift.async.TAsyncMethodCall { private String name; private String uploadedJarLocation; private String jsonConf; private StormTopology topology; - public submitTopology_call(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public submitTopology_call(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.uploadedJarLocation = uploadedJarLocation; @@ -614,8 +614,8 @@ public submitTopology_call(String name, String uploadedJarLocation, String jsonC this.topology = topology; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("submitTopology", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("submitTopology", org.apache.thrift.protocol.TMessageType.CALL, 0)); submitTopology_args args = new submitTopology_args(); args.set_name(name); args.set_uploadedJarLocation(uploadedJarLocation); @@ -625,30 +625,30 @@ public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.ap prot.writeMessageEnd(); } - public void getResult() throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_submitTopology(); } } - public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); submitTopologyWithOpts_call method_call = new submitTopologyWithOpts_call(name, uploadedJarLocation, jsonConf, topology, options, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class submitTopologyWithOpts_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class submitTopologyWithOpts_call extends org.apache.thrift.async.TAsyncMethodCall { private String name; private String uploadedJarLocation; private String jsonConf; private StormTopology topology; private SubmitOptions options; - public submitTopologyWithOpts_call(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public submitTopologyWithOpts_call(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.uploadedJarLocation = uploadedJarLocation; @@ -657,8 +657,8 @@ public submitTopologyWithOpts_call(String name, String uploadedJarLocation, Stri this.options = options; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("submitTopologyWithOpts", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("submitTopologyWithOpts", org.apache.thrift.protocol.TMessageType.CALL, 0)); submitTopologyWithOpts_args args = new submitTopologyWithOpts_args(); args.set_name(name); args.set_uploadedJarLocation(uploadedJarLocation); @@ -669,66 +669,66 @@ public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.ap prot.writeMessageEnd(); } - public void getResult() throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws AlreadyAliveException, InvalidTopologyException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_submitTopologyWithOpts(); } } - public void killTopology(String name, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void killTopology(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); killTopology_call method_call = new killTopology_call(name, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class killTopology_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class killTopology_call extends org.apache.thrift.async.TAsyncMethodCall { private String name; - public killTopology_call(String name, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public killTopology_call(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("killTopology", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("killTopology", org.apache.thrift.protocol.TMessageType.CALL, 0)); killTopology_args args = new killTopology_args(); args.set_name(name); args.write(prot); prot.writeMessageEnd(); } - public void getResult() throws NotAliveException, org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws NotAliveException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_killTopology(); } } - public void killTopologyWithOpts(String name, KillOptions options, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void killTopologyWithOpts(String name, KillOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); killTopologyWithOpts_call method_call = new killTopologyWithOpts_call(name, options, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class killTopologyWithOpts_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class killTopologyWithOpts_call extends org.apache.thrift.async.TAsyncMethodCall { private String name; private KillOptions options; - public killTopologyWithOpts_call(String name, KillOptions options, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public killTopologyWithOpts_call(String name, KillOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.options = options; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("killTopologyWithOpts", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("killTopologyWithOpts", org.apache.thrift.protocol.TMessageType.CALL, 0)); killTopologyWithOpts_args args = new killTopologyWithOpts_args(); args.set_name(name); args.set_options(options); @@ -736,98 +736,98 @@ public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.ap prot.writeMessageEnd(); } - public void getResult() throws NotAliveException, org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws NotAliveException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_killTopologyWithOpts(); } } - public void activate(String name, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void activate(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); activate_call method_call = new activate_call(name, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class activate_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class activate_call extends org.apache.thrift.async.TAsyncMethodCall { private String name; - public activate_call(String name, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public activate_call(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("activate", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("activate", org.apache.thrift.protocol.TMessageType.CALL, 0)); activate_args args = new activate_args(); args.set_name(name); args.write(prot); prot.writeMessageEnd(); } - public void getResult() throws NotAliveException, org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws NotAliveException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_activate(); } } - public void deactivate(String name, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void deactivate(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); deactivate_call method_call = new deactivate_call(name, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class deactivate_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class deactivate_call extends org.apache.thrift.async.TAsyncMethodCall { private String name; - public deactivate_call(String name, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public deactivate_call(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("deactivate", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deactivate", org.apache.thrift.protocol.TMessageType.CALL, 0)); deactivate_args args = new deactivate_args(); args.set_name(name); args.write(prot); prot.writeMessageEnd(); } - public void getResult() throws NotAliveException, org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws NotAliveException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_deactivate(); } } - public void rebalance(String name, RebalanceOptions options, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void rebalance(String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); rebalance_call method_call = new rebalance_call(name, options, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class rebalance_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class rebalance_call extends org.apache.thrift.async.TAsyncMethodCall { private String name; private RebalanceOptions options; - public rebalance_call(String name, RebalanceOptions options, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public rebalance_call(String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.options = options; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("rebalance", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("rebalance", org.apache.thrift.protocol.TMessageType.CALL, 0)); rebalance_args args = new rebalance_args(); args.set_name(name); args.set_options(options); @@ -835,63 +835,63 @@ public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.ap prot.writeMessageEnd(); } - public void getResult() throws NotAliveException, InvalidTopologyException, org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws NotAliveException, InvalidTopologyException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_rebalance(); } } - public void beginFileUpload(org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void beginFileUpload(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); beginFileUpload_call method_call = new beginFileUpload_call(resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class beginFileUpload_call extends org.apache.thrift7.async.TAsyncMethodCall { - public beginFileUpload_call(org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public static class beginFileUpload_call extends org.apache.thrift.async.TAsyncMethodCall { + public beginFileUpload_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("beginFileUpload", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("beginFileUpload", org.apache.thrift.protocol.TMessageType.CALL, 0)); beginFileUpload_args args = new beginFileUpload_args(); args.write(prot); prot.writeMessageEnd(); } - public String getResult() throws org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public String getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_beginFileUpload(); } } - public void uploadChunk(String location, ByteBuffer chunk, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void uploadChunk(String location, ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); uploadChunk_call method_call = new uploadChunk_call(location, chunk, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class uploadChunk_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class uploadChunk_call extends org.apache.thrift.async.TAsyncMethodCall { private String location; private ByteBuffer chunk; - public uploadChunk_call(String location, ByteBuffer chunk, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public uploadChunk_call(String location, ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.location = location; this.chunk = chunk; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("uploadChunk", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("uploadChunk", org.apache.thrift.protocol.TMessageType.CALL, 0)); uploadChunk_args args = new uploadChunk_args(); args.set_location(location); args.set_chunk(chunk); @@ -899,311 +899,311 @@ public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.ap prot.writeMessageEnd(); } - public void getResult() throws org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_uploadChunk(); } } - public void finishFileUpload(String location, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void finishFileUpload(String location, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); finishFileUpload_call method_call = new finishFileUpload_call(location, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class finishFileUpload_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class finishFileUpload_call extends org.apache.thrift.async.TAsyncMethodCall { private String location; - public finishFileUpload_call(String location, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public finishFileUpload_call(String location, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.location = location; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("finishFileUpload", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("finishFileUpload", org.apache.thrift.protocol.TMessageType.CALL, 0)); finishFileUpload_args args = new finishFileUpload_args(); args.set_location(location); args.write(prot); prot.writeMessageEnd(); } - public void getResult() throws org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_finishFileUpload(); } } - public void beginFileDownload(String file, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void beginFileDownload(String file, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); beginFileDownload_call method_call = new beginFileDownload_call(file, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class beginFileDownload_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class beginFileDownload_call extends org.apache.thrift.async.TAsyncMethodCall { private String file; - public beginFileDownload_call(String file, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public beginFileDownload_call(String file, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.file = file; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("beginFileDownload", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("beginFileDownload", org.apache.thrift.protocol.TMessageType.CALL, 0)); beginFileDownload_args args = new beginFileDownload_args(); args.set_file(file); args.write(prot); prot.writeMessageEnd(); } - public String getResult() throws org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public String getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_beginFileDownload(); } } - public void downloadChunk(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void downloadChunk(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); downloadChunk_call method_call = new downloadChunk_call(id, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class downloadChunk_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class downloadChunk_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; - public downloadChunk_call(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public downloadChunk_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("downloadChunk", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("downloadChunk", org.apache.thrift.protocol.TMessageType.CALL, 0)); downloadChunk_args args = new downloadChunk_args(); args.set_id(id); args.write(prot); prot.writeMessageEnd(); } - public ByteBuffer getResult() throws org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public ByteBuffer getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_downloadChunk(); } } - public void getNimbusConf(org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void getNimbusConf(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getNimbusConf_call method_call = new getNimbusConf_call(resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getNimbusConf_call extends org.apache.thrift7.async.TAsyncMethodCall { - public getNimbusConf_call(org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public static class getNimbusConf_call extends org.apache.thrift.async.TAsyncMethodCall { + public getNimbusConf_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("getNimbusConf", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getNimbusConf", org.apache.thrift.protocol.TMessageType.CALL, 0)); getNimbusConf_args args = new getNimbusConf_args(); args.write(prot); prot.writeMessageEnd(); } - public String getResult() throws org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public String getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getNimbusConf(); } } - public void getClusterInfo(org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void getClusterInfo(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getClusterInfo_call method_call = new getClusterInfo_call(resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getClusterInfo_call extends org.apache.thrift7.async.TAsyncMethodCall { - public getClusterInfo_call(org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public static class getClusterInfo_call extends org.apache.thrift.async.TAsyncMethodCall { + public getClusterInfo_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("getClusterInfo", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getClusterInfo", org.apache.thrift.protocol.TMessageType.CALL, 0)); getClusterInfo_args args = new getClusterInfo_args(); args.write(prot); prot.writeMessageEnd(); } - public ClusterSummary getResult() throws org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public ClusterSummary getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getClusterInfo(); } } - public void getTopologyInfo(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void getTopologyInfo(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getTopologyInfo_call method_call = new getTopologyInfo_call(id, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getTopologyInfo_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class getTopologyInfo_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; - public getTopologyInfo_call(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public getTopologyInfo_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("getTopologyInfo", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getTopologyInfo", org.apache.thrift.protocol.TMessageType.CALL, 0)); getTopologyInfo_args args = new getTopologyInfo_args(); args.set_id(id); args.write(prot); prot.writeMessageEnd(); } - public TopologyInfo getResult() throws NotAliveException, org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public TopologyInfo getResult() throws NotAliveException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getTopologyInfo(); } } - public void getTopologyConf(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void getTopologyConf(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getTopologyConf_call method_call = new getTopologyConf_call(id, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getTopologyConf_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class getTopologyConf_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; - public getTopologyConf_call(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public getTopologyConf_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("getTopologyConf", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getTopologyConf", org.apache.thrift.protocol.TMessageType.CALL, 0)); getTopologyConf_args args = new getTopologyConf_args(); args.set_id(id); args.write(prot); prot.writeMessageEnd(); } - public String getResult() throws NotAliveException, org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public String getResult() throws NotAliveException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getTopologyConf(); } } - public void getTopology(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void getTopology(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getTopology_call method_call = new getTopology_call(id, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getTopology_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class getTopology_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; - public getTopology_call(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public getTopology_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("getTopology", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getTopology", org.apache.thrift.protocol.TMessageType.CALL, 0)); getTopology_args args = new getTopology_args(); args.set_id(id); args.write(prot); prot.writeMessageEnd(); } - public StormTopology getResult() throws NotAliveException, org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public StormTopology getResult() throws NotAliveException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getTopology(); } } - public void getUserTopology(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler) throws org.apache.thrift7.TException { + public void getUserTopology(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getUserTopology_call method_call = new getUserTopology_call(id, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getUserTopology_call extends org.apache.thrift7.async.TAsyncMethodCall { + public static class getUserTopology_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; - public getUserTopology_call(String id, org.apache.thrift7.async.AsyncMethodCallback resultHandler, org.apache.thrift7.async.TAsyncClient client, org.apache.thrift7.protocol.TProtocolFactory protocolFactory, org.apache.thrift7.transport.TNonblockingTransport transport) throws org.apache.thrift7.TException { + public getUserTopology_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; } - public void write_args(org.apache.thrift7.protocol.TProtocol prot) throws org.apache.thrift7.TException { - prot.writeMessageBegin(new org.apache.thrift7.protocol.TMessage("getUserTopology", org.apache.thrift7.protocol.TMessageType.CALL, 0)); + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getUserTopology", org.apache.thrift.protocol.TMessageType.CALL, 0)); getUserTopology_args args = new getUserTopology_args(); args.set_id(id); args.write(prot); prot.writeMessageEnd(); } - public StormTopology getResult() throws NotAliveException, org.apache.thrift7.TException { - if (getState() != org.apache.thrift7.async.TAsyncMethodCall.State.RESPONSE_READ) { + public StormTopology getResult() throws NotAliveException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift7.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift7.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift7.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getUserTopology(); } } } - public static class Processor extends org.apache.thrift7.TBaseProcessor implements org.apache.thrift7.TProcessor { + public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName()); public Processor(I iface) { - super(iface, getProcessMap(new HashMap>())); + super(iface, getProcessMap(new HashMap>())); } - protected Processor(I iface, Map> processMap) { + protected Processor(I iface, Map> processMap) { super(iface, getProcessMap(processMap)); } - private static Map> getProcessMap(Map> processMap) { + private static Map> getProcessMap(Map> processMap) { processMap.put("submitTopology", new submitTopology()); processMap.put("submitTopologyWithOpts", new submitTopologyWithOpts()); processMap.put("killTopology", new killTopology()); @@ -1225,7 +1225,7 @@ protected Processor(I iface, Map extends org.apache.thrift7.ProcessFunction { + private static class submitTopology extends org.apache.thrift.ProcessFunction { public submitTopology() { super("submitTopology"); } @@ -1234,7 +1234,7 @@ protected submitTopology_args getEmptyArgsInstance() { return new submitTopology_args(); } - protected submitTopology_result getResult(I iface, submitTopology_args args) throws org.apache.thrift7.TException { + protected submitTopology_result getResult(I iface, submitTopology_args args) throws org.apache.thrift.TException { submitTopology_result result = new submitTopology_result(); try { iface.submitTopology(args.name, args.uploadedJarLocation, args.jsonConf, args.topology); @@ -1247,7 +1247,7 @@ protected submitTopology_result getResult(I iface, submitTopology_args args) thr } } - private static class submitTopologyWithOpts extends org.apache.thrift7.ProcessFunction { + private static class submitTopologyWithOpts extends org.apache.thrift.ProcessFunction { public submitTopologyWithOpts() { super("submitTopologyWithOpts"); } @@ -1256,7 +1256,7 @@ protected submitTopologyWithOpts_args getEmptyArgsInstance() { return new submitTopologyWithOpts_args(); } - protected submitTopologyWithOpts_result getResult(I iface, submitTopologyWithOpts_args args) throws org.apache.thrift7.TException { + protected submitTopologyWithOpts_result getResult(I iface, submitTopologyWithOpts_args args) throws org.apache.thrift.TException { submitTopologyWithOpts_result result = new submitTopologyWithOpts_result(); try { iface.submitTopologyWithOpts(args.name, args.uploadedJarLocation, args.jsonConf, args.topology, args.options); @@ -1269,7 +1269,7 @@ protected submitTopologyWithOpts_result getResult(I iface, submitTopologyWithOpt } } - private static class killTopology extends org.apache.thrift7.ProcessFunction { + private static class killTopology extends org.apache.thrift.ProcessFunction { public killTopology() { super("killTopology"); } @@ -1278,7 +1278,7 @@ protected killTopology_args getEmptyArgsInstance() { return new killTopology_args(); } - protected killTopology_result getResult(I iface, killTopology_args args) throws org.apache.thrift7.TException { + protected killTopology_result getResult(I iface, killTopology_args args) throws org.apache.thrift.TException { killTopology_result result = new killTopology_result(); try { iface.killTopology(args.name); @@ -1289,7 +1289,7 @@ protected killTopology_result getResult(I iface, killTopology_args args) throws } } - private static class killTopologyWithOpts extends org.apache.thrift7.ProcessFunction { + private static class killTopologyWithOpts extends org.apache.thrift.ProcessFunction { public killTopologyWithOpts() { super("killTopologyWithOpts"); } @@ -1298,7 +1298,7 @@ protected killTopologyWithOpts_args getEmptyArgsInstance() { return new killTopologyWithOpts_args(); } - protected killTopologyWithOpts_result getResult(I iface, killTopologyWithOpts_args args) throws org.apache.thrift7.TException { + protected killTopologyWithOpts_result getResult(I iface, killTopologyWithOpts_args args) throws org.apache.thrift.TException { killTopologyWithOpts_result result = new killTopologyWithOpts_result(); try { iface.killTopologyWithOpts(args.name, args.options); @@ -1309,7 +1309,7 @@ protected killTopologyWithOpts_result getResult(I iface, killTopologyWithOpts_ar } } - private static class activate extends org.apache.thrift7.ProcessFunction { + private static class activate extends org.apache.thrift.ProcessFunction { public activate() { super("activate"); } @@ -1318,7 +1318,7 @@ protected activate_args getEmptyArgsInstance() { return new activate_args(); } - protected activate_result getResult(I iface, activate_args args) throws org.apache.thrift7.TException { + protected activate_result getResult(I iface, activate_args args) throws org.apache.thrift.TException { activate_result result = new activate_result(); try { iface.activate(args.name); @@ -1329,7 +1329,7 @@ protected activate_result getResult(I iface, activate_args args) throws org.apac } } - private static class deactivate extends org.apache.thrift7.ProcessFunction { + private static class deactivate extends org.apache.thrift.ProcessFunction { public deactivate() { super("deactivate"); } @@ -1338,7 +1338,7 @@ protected deactivate_args getEmptyArgsInstance() { return new deactivate_args(); } - protected deactivate_result getResult(I iface, deactivate_args args) throws org.apache.thrift7.TException { + protected deactivate_result getResult(I iface, deactivate_args args) throws org.apache.thrift.TException { deactivate_result result = new deactivate_result(); try { iface.deactivate(args.name); @@ -1349,7 +1349,7 @@ protected deactivate_result getResult(I iface, deactivate_args args) throws org. } } - private static class rebalance extends org.apache.thrift7.ProcessFunction { + private static class rebalance extends org.apache.thrift.ProcessFunction { public rebalance() { super("rebalance"); } @@ -1358,7 +1358,7 @@ protected rebalance_args getEmptyArgsInstance() { return new rebalance_args(); } - protected rebalance_result getResult(I iface, rebalance_args args) throws org.apache.thrift7.TException { + protected rebalance_result getResult(I iface, rebalance_args args) throws org.apache.thrift.TException { rebalance_result result = new rebalance_result(); try { iface.rebalance(args.name, args.options); @@ -1371,7 +1371,7 @@ protected rebalance_result getResult(I iface, rebalance_args args) throws org.ap } } - private static class beginFileUpload extends org.apache.thrift7.ProcessFunction { + private static class beginFileUpload extends org.apache.thrift.ProcessFunction { public beginFileUpload() { super("beginFileUpload"); } @@ -1380,14 +1380,14 @@ protected beginFileUpload_args getEmptyArgsInstance() { return new beginFileUpload_args(); } - protected beginFileUpload_result getResult(I iface, beginFileUpload_args args) throws org.apache.thrift7.TException { + protected beginFileUpload_result getResult(I iface, beginFileUpload_args args) throws org.apache.thrift.TException { beginFileUpload_result result = new beginFileUpload_result(); result.success = iface.beginFileUpload(); return result; } } - private static class uploadChunk extends org.apache.thrift7.ProcessFunction { + private static class uploadChunk extends org.apache.thrift.ProcessFunction { public uploadChunk() { super("uploadChunk"); } @@ -1396,14 +1396,14 @@ protected uploadChunk_args getEmptyArgsInstance() { return new uploadChunk_args(); } - protected uploadChunk_result getResult(I iface, uploadChunk_args args) throws org.apache.thrift7.TException { + protected uploadChunk_result getResult(I iface, uploadChunk_args args) throws org.apache.thrift.TException { uploadChunk_result result = new uploadChunk_result(); iface.uploadChunk(args.location, args.chunk); return result; } } - private static class finishFileUpload extends org.apache.thrift7.ProcessFunction { + private static class finishFileUpload extends org.apache.thrift.ProcessFunction { public finishFileUpload() { super("finishFileUpload"); } @@ -1412,14 +1412,14 @@ protected finishFileUpload_args getEmptyArgsInstance() { return new finishFileUpload_args(); } - protected finishFileUpload_result getResult(I iface, finishFileUpload_args args) throws org.apache.thrift7.TException { + protected finishFileUpload_result getResult(I iface, finishFileUpload_args args) throws org.apache.thrift.TException { finishFileUpload_result result = new finishFileUpload_result(); iface.finishFileUpload(args.location); return result; } } - private static class beginFileDownload extends org.apache.thrift7.ProcessFunction { + private static class beginFileDownload extends org.apache.thrift.ProcessFunction { public beginFileDownload() { super("beginFileDownload"); } @@ -1428,14 +1428,14 @@ protected beginFileDownload_args getEmptyArgsInstance() { return new beginFileDownload_args(); } - protected beginFileDownload_result getResult(I iface, beginFileDownload_args args) throws org.apache.thrift7.TException { + protected beginFileDownload_result getResult(I iface, beginFileDownload_args args) throws org.apache.thrift.TException { beginFileDownload_result result = new beginFileDownload_result(); result.success = iface.beginFileDownload(args.file); return result; } } - private static class downloadChunk extends org.apache.thrift7.ProcessFunction { + private static class downloadChunk extends org.apache.thrift.ProcessFunction { public downloadChunk() { super("downloadChunk"); } @@ -1444,14 +1444,14 @@ protected downloadChunk_args getEmptyArgsInstance() { return new downloadChunk_args(); } - protected downloadChunk_result getResult(I iface, downloadChunk_args args) throws org.apache.thrift7.TException { + protected downloadChunk_result getResult(I iface, downloadChunk_args args) throws org.apache.thrift.TException { downloadChunk_result result = new downloadChunk_result(); result.success = iface.downloadChunk(args.id); return result; } } - private static class getNimbusConf extends org.apache.thrift7.ProcessFunction { + private static class getNimbusConf extends org.apache.thrift.ProcessFunction { public getNimbusConf() { super("getNimbusConf"); } @@ -1460,14 +1460,14 @@ protected getNimbusConf_args getEmptyArgsInstance() { return new getNimbusConf_args(); } - protected getNimbusConf_result getResult(I iface, getNimbusConf_args args) throws org.apache.thrift7.TException { + protected getNimbusConf_result getResult(I iface, getNimbusConf_args args) throws org.apache.thrift.TException { getNimbusConf_result result = new getNimbusConf_result(); result.success = iface.getNimbusConf(); return result; } } - private static class getClusterInfo extends org.apache.thrift7.ProcessFunction { + private static class getClusterInfo extends org.apache.thrift.ProcessFunction { public getClusterInfo() { super("getClusterInfo"); } @@ -1476,14 +1476,14 @@ protected getClusterInfo_args getEmptyArgsInstance() { return new getClusterInfo_args(); } - protected getClusterInfo_result getResult(I iface, getClusterInfo_args args) throws org.apache.thrift7.TException { + protected getClusterInfo_result getResult(I iface, getClusterInfo_args args) throws org.apache.thrift.TException { getClusterInfo_result result = new getClusterInfo_result(); result.success = iface.getClusterInfo(); return result; } } - private static class getTopologyInfo extends org.apache.thrift7.ProcessFunction { + private static class getTopologyInfo extends org.apache.thrift.ProcessFunction { public getTopologyInfo() { super("getTopologyInfo"); } @@ -1492,7 +1492,7 @@ protected getTopologyInfo_args getEmptyArgsInstance() { return new getTopologyInfo_args(); } - protected getTopologyInfo_result getResult(I iface, getTopologyInfo_args args) throws org.apache.thrift7.TException { + protected getTopologyInfo_result getResult(I iface, getTopologyInfo_args args) throws org.apache.thrift.TException { getTopologyInfo_result result = new getTopologyInfo_result(); try { result.success = iface.getTopologyInfo(args.id); @@ -1503,7 +1503,7 @@ protected getTopologyInfo_result getResult(I iface, getTopologyInfo_args args) t } } - private static class getTopologyConf extends org.apache.thrift7.ProcessFunction { + private static class getTopologyConf extends org.apache.thrift.ProcessFunction { public getTopologyConf() { super("getTopologyConf"); } @@ -1512,7 +1512,7 @@ protected getTopologyConf_args getEmptyArgsInstance() { return new getTopologyConf_args(); } - protected getTopologyConf_result getResult(I iface, getTopologyConf_args args) throws org.apache.thrift7.TException { + protected getTopologyConf_result getResult(I iface, getTopologyConf_args args) throws org.apache.thrift.TException { getTopologyConf_result result = new getTopologyConf_result(); try { result.success = iface.getTopologyConf(args.id); @@ -1523,7 +1523,7 @@ protected getTopologyConf_result getResult(I iface, getTopologyConf_args args) t } } - private static class getTopology extends org.apache.thrift7.ProcessFunction { + private static class getTopology extends org.apache.thrift.ProcessFunction { public getTopology() { super("getTopology"); } @@ -1532,7 +1532,7 @@ protected getTopology_args getEmptyArgsInstance() { return new getTopology_args(); } - protected getTopology_result getResult(I iface, getTopology_args args) throws org.apache.thrift7.TException { + protected getTopology_result getResult(I iface, getTopology_args args) throws org.apache.thrift.TException { getTopology_result result = new getTopology_result(); try { result.success = iface.getTopology(args.id); @@ -1543,7 +1543,7 @@ protected getTopology_result getResult(I iface, getTopology_args args) throws or } } - private static class getUserTopology extends org.apache.thrift7.ProcessFunction { + private static class getUserTopology extends org.apache.thrift.ProcessFunction { public getUserTopology() { super("getUserTopology"); } @@ -1552,7 +1552,7 @@ protected getUserTopology_args getEmptyArgsInstance() { return new getUserTopology_args(); } - protected getUserTopology_result getResult(I iface, getUserTopology_args args) throws org.apache.thrift7.TException { + protected getUserTopology_result getResult(I iface, getUserTopology_args args) throws org.apache.thrift.TException { getUserTopology_result result = new getUserTopology_result(); try { result.success = iface.getUserTopology(args.id); @@ -1565,13 +1565,13 @@ protected getUserTopology_result getResult(I iface, getUserTopology_args args) t } - public static class submitTopology_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("submitTopology_args"); + public static class submitTopology_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitTopology_args"); - private static final org.apache.thrift7.protocol.TField NAME_FIELD_DESC = new org.apache.thrift7.protocol.TField("name", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField UPLOADED_JAR_LOCATION_FIELD_DESC = new org.apache.thrift7.protocol.TField("uploadedJarLocation", org.apache.thrift7.protocol.TType.STRING, (short)2); - private static final org.apache.thrift7.protocol.TField JSON_CONF_FIELD_DESC = new org.apache.thrift7.protocol.TField("jsonConf", org.apache.thrift7.protocol.TType.STRING, (short)3); - private static final org.apache.thrift7.protocol.TField TOPOLOGY_FIELD_DESC = new org.apache.thrift7.protocol.TField("topology", org.apache.thrift7.protocol.TType.STRUCT, (short)4); + 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)1); + private static final org.apache.thrift.protocol.TField UPLOADED_JAR_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("uploadedJarLocation", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField JSON_CONF_FIELD_DESC = new org.apache.thrift.protocol.TField("jsonConf", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField TOPOLOGY_FIELD_DESC = new org.apache.thrift.protocol.TField("topology", org.apache.thrift.protocol.TType.STRUCT, (short)4); private String name; // required private String uploadedJarLocation; // required @@ -1579,7 +1579,7 @@ public static class submitTopology_args implements org.apache.thrift7.TBase metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NAME, new org.apache.thrift7.meta_data.FieldMetaData("name", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.UPLOADED_JAR_LOCATION, new org.apache.thrift7.meta_data.FieldMetaData("uploadedJarLocation", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.JSON_CONF, new org.apache.thrift7.meta_data.FieldMetaData("jsonConf", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.TOPOLOGY, new org.apache.thrift7.meta_data.FieldMetaData("topology", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, StormTopology.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.UPLOADED_JAR_LOCATION, new org.apache.thrift.meta_data.FieldMetaData("uploadedJarLocation", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.JSON_CONF, new org.apache.thrift.meta_data.FieldMetaData("jsonConf", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOPOLOGY, new org.apache.thrift.meta_data.FieldMetaData("topology", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StormTopology.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(submitTopology_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitTopology_args.class, metaDataMap); } public submitTopology_args() { @@ -1966,7 +1966,7 @@ public int compareTo(submitTopology_args other) { return lastComparison; } if (is_set_name()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); if (lastComparison != 0) { return lastComparison; } @@ -1976,7 +1976,7 @@ public int compareTo(submitTopology_args other) { return lastComparison; } if (is_set_uploadedJarLocation()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.uploadedJarLocation, typedOther.uploadedJarLocation); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uploadedJarLocation, typedOther.uploadedJarLocation); if (lastComparison != 0) { return lastComparison; } @@ -1986,7 +1986,7 @@ public int compareTo(submitTopology_args other) { return lastComparison; } if (is_set_jsonConf()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.jsonConf, typedOther.jsonConf); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jsonConf, typedOther.jsonConf); if (lastComparison != 0) { return lastComparison; } @@ -1996,7 +1996,7 @@ public int compareTo(submitTopology_args other) { return lastComparison; } if (is_set_topology()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.topology, typedOther.topology); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology, typedOther.topology); if (lastComparison != 0) { return lastComparison; } @@ -2008,47 +2008,47 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // NAME - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.name = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // UPLOADED_JAR_LOCATION - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.uploadedJarLocation = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // JSON_CONF - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.jsonConf = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 4: // TOPOLOGY - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.topology = new StormTopology(); this.topology.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -2056,7 +2056,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -2124,39 +2124,39 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class submitTopology_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("submitTopology_result"); + public static class submitTopology_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitTopology_result"); - private static final org.apache.thrift7.protocol.TField E_FIELD_DESC = new org.apache.thrift7.protocol.TField("e", org.apache.thrift7.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift7.protocol.TField ITE_FIELD_DESC = new org.apache.thrift7.protocol.TField("ite", org.apache.thrift7.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField ITE_FIELD_DESC = new org.apache.thrift.protocol.TField("ite", org.apache.thrift.protocol.TType.STRUCT, (short)2); private AlreadyAliveException e; // required private InvalidTopologyException ite; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { E((short)1, "e"), ITE((short)2, "ite"); @@ -2218,15 +2218,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.E, new org.apache.thrift7.meta_data.FieldMetaData("e", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); - tmpMap.put(_Fields.ITE, new org.apache.thrift7.meta_data.FieldMetaData("ite", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + tmpMap.put(_Fields.ITE, new org.apache.thrift.meta_data.FieldMetaData("ite", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(submitTopology_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitTopology_result.class, metaDataMap); } public submitTopology_result() { @@ -2421,7 +2421,7 @@ public int compareTo(submitTopology_result other) { return lastComparison; } if (is_set_e()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.e, typedOther.e); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e); if (lastComparison != 0) { return lastComparison; } @@ -2431,7 +2431,7 @@ public int compareTo(submitTopology_result other) { return lastComparison; } if (is_set_ite()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.ite, typedOther.ite); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ite, typedOther.ite); if (lastComparison != 0) { return lastComparison; } @@ -2443,34 +2443,34 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // E - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.e = new AlreadyAliveException(); this.e.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // ITE - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.ite = new InvalidTopologyException(); this.ite.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -2478,7 +2478,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_e()) { @@ -2518,36 +2518,36 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class submitTopologyWithOpts_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("submitTopologyWithOpts_args"); + public static class submitTopologyWithOpts_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitTopologyWithOpts_args"); - private static final org.apache.thrift7.protocol.TField NAME_FIELD_DESC = new org.apache.thrift7.protocol.TField("name", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField UPLOADED_JAR_LOCATION_FIELD_DESC = new org.apache.thrift7.protocol.TField("uploadedJarLocation", org.apache.thrift7.protocol.TType.STRING, (short)2); - private static final org.apache.thrift7.protocol.TField JSON_CONF_FIELD_DESC = new org.apache.thrift7.protocol.TField("jsonConf", org.apache.thrift7.protocol.TType.STRING, (short)3); - private static final org.apache.thrift7.protocol.TField TOPOLOGY_FIELD_DESC = new org.apache.thrift7.protocol.TField("topology", org.apache.thrift7.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift7.protocol.TField OPTIONS_FIELD_DESC = new org.apache.thrift7.protocol.TField("options", org.apache.thrift7.protocol.TType.STRUCT, (short)5); + 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)1); + private static final org.apache.thrift.protocol.TField UPLOADED_JAR_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("uploadedJarLocation", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField JSON_CONF_FIELD_DESC = new org.apache.thrift.protocol.TField("jsonConf", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField TOPOLOGY_FIELD_DESC = new org.apache.thrift.protocol.TField("topology", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("options", org.apache.thrift.protocol.TType.STRUCT, (short)5); private String name; // required private String uploadedJarLocation; // required @@ -2556,7 +2556,7 @@ public static class submitTopologyWithOpts_args implements org.apache.thrift7.TB private SubmitOptions options; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { NAME((short)1, "name"), UPLOADED_JAR_LOCATION((short)2, "uploadedJarLocation"), JSON_CONF((short)3, "jsonConf"), @@ -2627,21 +2627,21 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NAME, new org.apache.thrift7.meta_data.FieldMetaData("name", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.UPLOADED_JAR_LOCATION, new org.apache.thrift7.meta_data.FieldMetaData("uploadedJarLocation", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.JSON_CONF, new org.apache.thrift7.meta_data.FieldMetaData("jsonConf", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.TOPOLOGY, new org.apache.thrift7.meta_data.FieldMetaData("topology", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, StormTopology.class))); - tmpMap.put(_Fields.OPTIONS, new org.apache.thrift7.meta_data.FieldMetaData("options", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, SubmitOptions.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.UPLOADED_JAR_LOCATION, new org.apache.thrift.meta_data.FieldMetaData("uploadedJarLocation", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.JSON_CONF, new org.apache.thrift.meta_data.FieldMetaData("jsonConf", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOPOLOGY, new org.apache.thrift.meta_data.FieldMetaData("topology", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StormTopology.class))); + tmpMap.put(_Fields.OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("options", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SubmitOptions.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(submitTopologyWithOpts_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitTopologyWithOpts_args.class, metaDataMap); } public submitTopologyWithOpts_args() { @@ -3004,7 +3004,7 @@ public int compareTo(submitTopologyWithOpts_args other) { return lastComparison; } if (is_set_name()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); if (lastComparison != 0) { return lastComparison; } @@ -3014,7 +3014,7 @@ public int compareTo(submitTopologyWithOpts_args other) { return lastComparison; } if (is_set_uploadedJarLocation()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.uploadedJarLocation, typedOther.uploadedJarLocation); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uploadedJarLocation, typedOther.uploadedJarLocation); if (lastComparison != 0) { return lastComparison; } @@ -3024,7 +3024,7 @@ public int compareTo(submitTopologyWithOpts_args other) { return lastComparison; } if (is_set_jsonConf()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.jsonConf, typedOther.jsonConf); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jsonConf, typedOther.jsonConf); if (lastComparison != 0) { return lastComparison; } @@ -3034,7 +3034,7 @@ public int compareTo(submitTopologyWithOpts_args other) { return lastComparison; } if (is_set_topology()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.topology, typedOther.topology); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology, typedOther.topology); if (lastComparison != 0) { return lastComparison; } @@ -3044,7 +3044,7 @@ public int compareTo(submitTopologyWithOpts_args other) { return lastComparison; } if (is_set_options()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.options, typedOther.options); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.options, typedOther.options); if (lastComparison != 0) { return lastComparison; } @@ -3056,55 +3056,55 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // NAME - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.name = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // UPLOADED_JAR_LOCATION - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.uploadedJarLocation = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // JSON_CONF - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.jsonConf = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 4: // TOPOLOGY - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.topology = new StormTopology(); this.topology.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 5: // OPTIONS - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.options = new SubmitOptions(); this.options.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -3112,7 +3112,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -3193,39 +3193,39 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class submitTopologyWithOpts_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("submitTopologyWithOpts_result"); + public static class submitTopologyWithOpts_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitTopologyWithOpts_result"); - private static final org.apache.thrift7.protocol.TField E_FIELD_DESC = new org.apache.thrift7.protocol.TField("e", org.apache.thrift7.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift7.protocol.TField ITE_FIELD_DESC = new org.apache.thrift7.protocol.TField("ite", org.apache.thrift7.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField ITE_FIELD_DESC = new org.apache.thrift.protocol.TField("ite", org.apache.thrift.protocol.TType.STRUCT, (short)2); private AlreadyAliveException e; // required private InvalidTopologyException ite; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { E((short)1, "e"), ITE((short)2, "ite"); @@ -3287,15 +3287,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.E, new org.apache.thrift7.meta_data.FieldMetaData("e", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); - tmpMap.put(_Fields.ITE, new org.apache.thrift7.meta_data.FieldMetaData("ite", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + tmpMap.put(_Fields.ITE, new org.apache.thrift.meta_data.FieldMetaData("ite", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(submitTopologyWithOpts_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitTopologyWithOpts_result.class, metaDataMap); } public submitTopologyWithOpts_result() { @@ -3490,7 +3490,7 @@ public int compareTo(submitTopologyWithOpts_result other) { return lastComparison; } if (is_set_e()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.e, typedOther.e); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e); if (lastComparison != 0) { return lastComparison; } @@ -3500,7 +3500,7 @@ public int compareTo(submitTopologyWithOpts_result other) { return lastComparison; } if (is_set_ite()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.ite, typedOther.ite); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ite, typedOther.ite); if (lastComparison != 0) { return lastComparison; } @@ -3512,34 +3512,34 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // E - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.e = new AlreadyAliveException(); this.e.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // ITE - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.ite = new InvalidTopologyException(); this.ite.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -3547,7 +3547,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_e()) { @@ -3587,37 +3587,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class killTopology_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("killTopology_args"); + public static class killTopology_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("killTopology_args"); - private static final org.apache.thrift7.protocol.TField NAME_FIELD_DESC = new org.apache.thrift7.protocol.TField("name", org.apache.thrift7.protocol.TType.STRING, (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)1); private String name; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { NAME((short)1, "name"); private static final Map byName = new HashMap(); @@ -3676,13 +3676,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NAME, new org.apache.thrift7.meta_data.FieldMetaData("name", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(killTopology_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(killTopology_args.class, metaDataMap); } public killTopology_args() { @@ -3821,7 +3821,7 @@ public int compareTo(killTopology_args other) { return lastComparison; } if (is_set_name()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); if (lastComparison != 0) { return lastComparison; } @@ -3833,25 +3833,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // NAME - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.name = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -3859,7 +3859,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -3888,37 +3888,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class killTopology_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("killTopology_result"); + public static class killTopology_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("killTopology_result"); - private static final org.apache.thrift7.protocol.TField E_FIELD_DESC = new org.apache.thrift7.protocol.TField("e", org.apache.thrift7.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); private NotAliveException e; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { E((short)1, "e"); private static final Map byName = new HashMap(); @@ -3977,13 +3977,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.E, new org.apache.thrift7.meta_data.FieldMetaData("e", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(killTopology_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(killTopology_result.class, metaDataMap); } public killTopology_result() { @@ -4122,7 +4122,7 @@ public int compareTo(killTopology_result other) { return lastComparison; } if (is_set_e()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.e, typedOther.e); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e); if (lastComparison != 0) { return lastComparison; } @@ -4134,26 +4134,26 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // E - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.e = new NotAliveException(); this.e.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -4161,7 +4161,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_e()) { @@ -4189,39 +4189,39 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class killTopologyWithOpts_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("killTopologyWithOpts_args"); + public static class killTopologyWithOpts_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("killTopologyWithOpts_args"); - private static final org.apache.thrift7.protocol.TField NAME_FIELD_DESC = new org.apache.thrift7.protocol.TField("name", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField OPTIONS_FIELD_DESC = new org.apache.thrift7.protocol.TField("options", org.apache.thrift7.protocol.TType.STRUCT, (short)2); + 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)1); + private static final org.apache.thrift.protocol.TField OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("options", org.apache.thrift.protocol.TType.STRUCT, (short)2); private String name; // required private KillOptions options; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { NAME((short)1, "name"), OPTIONS((short)2, "options"); @@ -4283,15 +4283,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NAME, new org.apache.thrift7.meta_data.FieldMetaData("name", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.OPTIONS, new org.apache.thrift7.meta_data.FieldMetaData("options", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, KillOptions.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("options", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, KillOptions.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(killTopologyWithOpts_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(killTopologyWithOpts_args.class, metaDataMap); } public killTopologyWithOpts_args() { @@ -4486,7 +4486,7 @@ public int compareTo(killTopologyWithOpts_args other) { return lastComparison; } if (is_set_name()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); if (lastComparison != 0) { return lastComparison; } @@ -4496,7 +4496,7 @@ public int compareTo(killTopologyWithOpts_args other) { return lastComparison; } if (is_set_options()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.options, typedOther.options); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.options, typedOther.options); if (lastComparison != 0) { return lastComparison; } @@ -4508,33 +4508,33 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // NAME - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.name = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // OPTIONS - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.options = new KillOptions(); this.options.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -4542,7 +4542,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -4584,37 +4584,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class killTopologyWithOpts_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("killTopologyWithOpts_result"); + public static class killTopologyWithOpts_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("killTopologyWithOpts_result"); - private static final org.apache.thrift7.protocol.TField E_FIELD_DESC = new org.apache.thrift7.protocol.TField("e", org.apache.thrift7.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); private NotAliveException e; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { E((short)1, "e"); private static final Map byName = new HashMap(); @@ -4673,13 +4673,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.E, new org.apache.thrift7.meta_data.FieldMetaData("e", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(killTopologyWithOpts_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(killTopologyWithOpts_result.class, metaDataMap); } public killTopologyWithOpts_result() { @@ -4818,7 +4818,7 @@ public int compareTo(killTopologyWithOpts_result other) { return lastComparison; } if (is_set_e()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.e, typedOther.e); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e); if (lastComparison != 0) { return lastComparison; } @@ -4830,26 +4830,26 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // E - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.e = new NotAliveException(); this.e.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -4857,7 +4857,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_e()) { @@ -4885,37 +4885,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class activate_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("activate_args"); + public static class activate_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("activate_args"); - private static final org.apache.thrift7.protocol.TField NAME_FIELD_DESC = new org.apache.thrift7.protocol.TField("name", org.apache.thrift7.protocol.TType.STRING, (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)1); private String name; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { NAME((short)1, "name"); private static final Map byName = new HashMap(); @@ -4974,13 +4974,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NAME, new org.apache.thrift7.meta_data.FieldMetaData("name", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(activate_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(activate_args.class, metaDataMap); } public activate_args() { @@ -5119,7 +5119,7 @@ public int compareTo(activate_args other) { return lastComparison; } if (is_set_name()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); if (lastComparison != 0) { return lastComparison; } @@ -5131,25 +5131,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // NAME - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.name = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -5157,7 +5157,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -5186,37 +5186,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class activate_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("activate_result"); + public static class activate_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("activate_result"); - private static final org.apache.thrift7.protocol.TField E_FIELD_DESC = new org.apache.thrift7.protocol.TField("e", org.apache.thrift7.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); private NotAliveException e; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { E((short)1, "e"); private static final Map byName = new HashMap(); @@ -5275,13 +5275,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.E, new org.apache.thrift7.meta_data.FieldMetaData("e", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(activate_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(activate_result.class, metaDataMap); } public activate_result() { @@ -5420,7 +5420,7 @@ public int compareTo(activate_result other) { return lastComparison; } if (is_set_e()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.e, typedOther.e); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e); if (lastComparison != 0) { return lastComparison; } @@ -5432,26 +5432,26 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // E - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.e = new NotAliveException(); this.e.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -5459,7 +5459,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_e()) { @@ -5487,37 +5487,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class deactivate_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("deactivate_args"); + public static class deactivate_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deactivate_args"); - private static final org.apache.thrift7.protocol.TField NAME_FIELD_DESC = new org.apache.thrift7.protocol.TField("name", org.apache.thrift7.protocol.TType.STRING, (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)1); private String name; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { NAME((short)1, "name"); private static final Map byName = new HashMap(); @@ -5576,13 +5576,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NAME, new org.apache.thrift7.meta_data.FieldMetaData("name", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(deactivate_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deactivate_args.class, metaDataMap); } public deactivate_args() { @@ -5721,7 +5721,7 @@ public int compareTo(deactivate_args other) { return lastComparison; } if (is_set_name()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); if (lastComparison != 0) { return lastComparison; } @@ -5733,25 +5733,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // NAME - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.name = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -5759,7 +5759,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -5788,37 +5788,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class deactivate_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("deactivate_result"); + public static class deactivate_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deactivate_result"); - private static final org.apache.thrift7.protocol.TField E_FIELD_DESC = new org.apache.thrift7.protocol.TField("e", org.apache.thrift7.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); private NotAliveException e; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { E((short)1, "e"); private static final Map byName = new HashMap(); @@ -5877,13 +5877,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.E, new org.apache.thrift7.meta_data.FieldMetaData("e", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(deactivate_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deactivate_result.class, metaDataMap); } public deactivate_result() { @@ -6022,7 +6022,7 @@ public int compareTo(deactivate_result other) { return lastComparison; } if (is_set_e()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.e, typedOther.e); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e); if (lastComparison != 0) { return lastComparison; } @@ -6034,26 +6034,26 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // E - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.e = new NotAliveException(); this.e.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -6061,7 +6061,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_e()) { @@ -6089,39 +6089,39 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class rebalance_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("rebalance_args"); + public static class rebalance_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("rebalance_args"); - private static final org.apache.thrift7.protocol.TField NAME_FIELD_DESC = new org.apache.thrift7.protocol.TField("name", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField OPTIONS_FIELD_DESC = new org.apache.thrift7.protocol.TField("options", org.apache.thrift7.protocol.TType.STRUCT, (short)2); + 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)1); + private static final org.apache.thrift.protocol.TField OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("options", org.apache.thrift.protocol.TType.STRUCT, (short)2); private String name; // required private RebalanceOptions options; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { NAME((short)1, "name"), OPTIONS((short)2, "options"); @@ -6183,15 +6183,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NAME, new org.apache.thrift7.meta_data.FieldMetaData("name", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.OPTIONS, new org.apache.thrift7.meta_data.FieldMetaData("options", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, RebalanceOptions.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("options", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, RebalanceOptions.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(rebalance_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(rebalance_args.class, metaDataMap); } public rebalance_args() { @@ -6386,7 +6386,7 @@ public int compareTo(rebalance_args other) { return lastComparison; } if (is_set_name()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); if (lastComparison != 0) { return lastComparison; } @@ -6396,7 +6396,7 @@ public int compareTo(rebalance_args other) { return lastComparison; } if (is_set_options()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.options, typedOther.options); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.options, typedOther.options); if (lastComparison != 0) { return lastComparison; } @@ -6408,33 +6408,33 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // NAME - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.name = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // OPTIONS - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.options = new RebalanceOptions(); this.options.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -6442,7 +6442,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -6484,39 +6484,39 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class rebalance_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("rebalance_result"); + public static class rebalance_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("rebalance_result"); - private static final org.apache.thrift7.protocol.TField E_FIELD_DESC = new org.apache.thrift7.protocol.TField("e", org.apache.thrift7.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift7.protocol.TField ITE_FIELD_DESC = new org.apache.thrift7.protocol.TField("ite", org.apache.thrift7.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField ITE_FIELD_DESC = new org.apache.thrift.protocol.TField("ite", org.apache.thrift.protocol.TType.STRUCT, (short)2); private NotAliveException e; // required private InvalidTopologyException ite; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { E((short)1, "e"), ITE((short)2, "ite"); @@ -6578,15 +6578,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.E, new org.apache.thrift7.meta_data.FieldMetaData("e", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); - tmpMap.put(_Fields.ITE, new org.apache.thrift7.meta_data.FieldMetaData("ite", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + tmpMap.put(_Fields.ITE, new org.apache.thrift.meta_data.FieldMetaData("ite", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(rebalance_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(rebalance_result.class, metaDataMap); } public rebalance_result() { @@ -6781,7 +6781,7 @@ public int compareTo(rebalance_result other) { return lastComparison; } if (is_set_e()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.e, typedOther.e); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e); if (lastComparison != 0) { return lastComparison; } @@ -6791,7 +6791,7 @@ public int compareTo(rebalance_result other) { return lastComparison; } if (is_set_ite()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.ite, typedOther.ite); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ite, typedOther.ite); if (lastComparison != 0) { return lastComparison; } @@ -6803,34 +6803,34 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // E - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.e = new NotAliveException(); this.e.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // ITE - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.ite = new InvalidTopologyException(); this.ite.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -6838,7 +6838,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_e()) { @@ -6878,35 +6878,35 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class beginFileUpload_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("beginFileUpload_args"); + public static class beginFileUpload_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("beginFileUpload_args"); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; private static final Map byName = new HashMap(); @@ -6960,11 +6960,11 @@ public String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(beginFileUpload_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(beginFileUpload_args.class, metaDataMap); } public beginFileUpload_args() { @@ -7044,18 +7044,18 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -7063,7 +7063,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -7080,37 +7080,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class beginFileUpload_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("beginFileUpload_result"); + public static class beginFileUpload_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("beginFileUpload_result"); - private static final org.apache.thrift7.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift7.protocol.TField("success", org.apache.thrift7.protocol.TType.STRING, (short)0); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); private String success; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"); private static final Map byName = new HashMap(); @@ -7169,13 +7169,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift7.meta_data.FieldMetaData("success", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(beginFileUpload_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(beginFileUpload_result.class, metaDataMap); } public beginFileUpload_result() { @@ -7314,7 +7314,7 @@ public int compareTo(beginFileUpload_result other) { return lastComparison; } if (is_set_success()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -7326,25 +7326,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.success = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -7352,7 +7352,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_success()) { @@ -7380,39 +7380,39 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class uploadChunk_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("uploadChunk_args"); + public static class uploadChunk_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("uploadChunk_args"); - private static final org.apache.thrift7.protocol.TField LOCATION_FIELD_DESC = new org.apache.thrift7.protocol.TField("location", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField CHUNK_FIELD_DESC = new org.apache.thrift7.protocol.TField("chunk", org.apache.thrift7.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("location", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField CHUNK_FIELD_DESC = new org.apache.thrift.protocol.TField("chunk", org.apache.thrift.protocol.TType.STRING, (short)2); private String location; // required private ByteBuffer chunk; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { LOCATION((short)1, "location"), CHUNK((short)2, "chunk"); @@ -7474,15 +7474,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.LOCATION, new org.apache.thrift7.meta_data.FieldMetaData("location", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.CHUNK, new org.apache.thrift7.meta_data.FieldMetaData("chunk", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING , true))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.LOCATION, new org.apache.thrift.meta_data.FieldMetaData("location", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.CHUNK, new org.apache.thrift.meta_data.FieldMetaData("chunk", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(uploadChunk_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(uploadChunk_args.class, metaDataMap); } public uploadChunk_args() { @@ -7505,7 +7505,7 @@ public uploadChunk_args(uploadChunk_args other) { this.location = other.location; } if (other.is_set_chunk()) { - this.chunk = org.apache.thrift7.TBaseHelper.copyBinary(other.chunk); + this.chunk = org.apache.thrift.TBaseHelper.copyBinary(other.chunk); ; } } @@ -7544,7 +7544,7 @@ public void set_location_isSet(boolean value) { } public byte[] get_chunk() { - set_chunk(org.apache.thrift7.TBaseHelper.rightSize(chunk)); + set_chunk(org.apache.thrift.TBaseHelper.rightSize(chunk)); return chunk == null ? null : chunk.array(); } @@ -7687,7 +7687,7 @@ public int compareTo(uploadChunk_args other) { return lastComparison; } if (is_set_location()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.location, typedOther.location); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.location, typedOther.location); if (lastComparison != 0) { return lastComparison; } @@ -7697,7 +7697,7 @@ public int compareTo(uploadChunk_args other) { return lastComparison; } if (is_set_chunk()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.chunk, typedOther.chunk); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.chunk, typedOther.chunk); if (lastComparison != 0) { return lastComparison; } @@ -7709,32 +7709,32 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // LOCATION - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.location = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // CHUNK - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.chunk = iprot.readBinary(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -7742,7 +7742,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -7777,42 +7777,42 @@ public String toString() { if (this.chunk == null) { sb.append("null"); } else { - org.apache.thrift7.TBaseHelper.toString(this.chunk, sb); + org.apache.thrift.TBaseHelper.toString(this.chunk, sb); } first = false; sb.append(")"); return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class uploadChunk_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("uploadChunk_result"); + public static class uploadChunk_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("uploadChunk_result"); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; private static final Map byName = new HashMap(); @@ -7866,11 +7866,11 @@ public String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(uploadChunk_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(uploadChunk_result.class, metaDataMap); } public uploadChunk_result() { @@ -7950,18 +7950,18 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -7969,7 +7969,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); oprot.writeFieldStop(); @@ -7985,37 +7985,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class finishFileUpload_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("finishFileUpload_args"); + public static class finishFileUpload_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("finishFileUpload_args"); - private static final org.apache.thrift7.protocol.TField LOCATION_FIELD_DESC = new org.apache.thrift7.protocol.TField("location", org.apache.thrift7.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("location", org.apache.thrift.protocol.TType.STRING, (short)1); private String location; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { LOCATION((short)1, "location"); private static final Map byName = new HashMap(); @@ -8074,13 +8074,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.LOCATION, new org.apache.thrift7.meta_data.FieldMetaData("location", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.LOCATION, new org.apache.thrift.meta_data.FieldMetaData("location", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(finishFileUpload_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(finishFileUpload_args.class, metaDataMap); } public finishFileUpload_args() { @@ -8219,7 +8219,7 @@ public int compareTo(finishFileUpload_args other) { return lastComparison; } if (is_set_location()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.location, typedOther.location); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.location, typedOther.location); if (lastComparison != 0) { return lastComparison; } @@ -8231,25 +8231,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // LOCATION - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.location = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -8257,7 +8257,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -8286,35 +8286,35 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class finishFileUpload_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("finishFileUpload_result"); + public static class finishFileUpload_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("finishFileUpload_result"); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; private static final Map byName = new HashMap(); @@ -8368,11 +8368,11 @@ public String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(finishFileUpload_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(finishFileUpload_result.class, metaDataMap); } public finishFileUpload_result() { @@ -8452,18 +8452,18 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -8471,7 +8471,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); oprot.writeFieldStop(); @@ -8487,37 +8487,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class beginFileDownload_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("beginFileDownload_args"); + public static class beginFileDownload_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("beginFileDownload_args"); - private static final org.apache.thrift7.protocol.TField FILE_FIELD_DESC = new org.apache.thrift7.protocol.TField("file", org.apache.thrift7.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField FILE_FIELD_DESC = new org.apache.thrift.protocol.TField("file", org.apache.thrift.protocol.TType.STRING, (short)1); private String file; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { FILE((short)1, "file"); private static final Map byName = new HashMap(); @@ -8576,13 +8576,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.FILE, new org.apache.thrift7.meta_data.FieldMetaData("file", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.FILE, new org.apache.thrift.meta_data.FieldMetaData("file", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(beginFileDownload_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(beginFileDownload_args.class, metaDataMap); } public beginFileDownload_args() { @@ -8721,7 +8721,7 @@ public int compareTo(beginFileDownload_args other) { return lastComparison; } if (is_set_file()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.file, typedOther.file); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.file, typedOther.file); if (lastComparison != 0) { return lastComparison; } @@ -8733,25 +8733,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // FILE - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.file = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -8759,7 +8759,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -8788,37 +8788,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class beginFileDownload_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("beginFileDownload_result"); + public static class beginFileDownload_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("beginFileDownload_result"); - private static final org.apache.thrift7.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift7.protocol.TField("success", org.apache.thrift7.protocol.TType.STRING, (short)0); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); private String success; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"); private static final Map byName = new HashMap(); @@ -8877,13 +8877,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift7.meta_data.FieldMetaData("success", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(beginFileDownload_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(beginFileDownload_result.class, metaDataMap); } public beginFileDownload_result() { @@ -9022,7 +9022,7 @@ public int compareTo(beginFileDownload_result other) { return lastComparison; } if (is_set_success()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -9034,25 +9034,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.success = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -9060,7 +9060,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_success()) { @@ -9088,37 +9088,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class downloadChunk_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("downloadChunk_args"); + public static class downloadChunk_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("downloadChunk_args"); - private static final org.apache.thrift7.protocol.TField ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("id", org.apache.thrift7.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); private String id; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"); private static final Map byName = new HashMap(); @@ -9177,13 +9177,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ID, new org.apache.thrift7.meta_data.FieldMetaData("id", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(downloadChunk_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(downloadChunk_args.class, metaDataMap); } public downloadChunk_args() { @@ -9322,7 +9322,7 @@ public int compareTo(downloadChunk_args other) { return lastComparison; } if (is_set_id()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -9334,25 +9334,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.id = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -9360,7 +9360,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -9389,37 +9389,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class downloadChunk_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("downloadChunk_result"); + public static class downloadChunk_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("downloadChunk_result"); - private static final org.apache.thrift7.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift7.protocol.TField("success", org.apache.thrift7.protocol.TType.STRING, (short)0); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); private ByteBuffer success; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"); private static final Map byName = new HashMap(); @@ -9478,13 +9478,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift7.meta_data.FieldMetaData("success", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING , true))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(downloadChunk_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(downloadChunk_result.class, metaDataMap); } public downloadChunk_result() { @@ -9502,7 +9502,7 @@ public downloadChunk_result( */ public downloadChunk_result(downloadChunk_result other) { if (other.is_set_success()) { - this.success = org.apache.thrift7.TBaseHelper.copyBinary(other.success); + this.success = org.apache.thrift.TBaseHelper.copyBinary(other.success); ; } } @@ -9517,7 +9517,7 @@ public void clear() { } public byte[] get_success() { - set_success(org.apache.thrift7.TBaseHelper.rightSize(success)); + set_success(org.apache.thrift.TBaseHelper.rightSize(success)); return success == null ? null : success.array(); } @@ -9633,7 +9633,7 @@ public int compareTo(downloadChunk_result other) { return lastComparison; } if (is_set_success()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -9645,25 +9645,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.success = iprot.readBinary(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -9671,7 +9671,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_success()) { @@ -9692,42 +9692,42 @@ public String toString() { if (this.success == null) { sb.append("null"); } else { - org.apache.thrift7.TBaseHelper.toString(this.success, sb); + org.apache.thrift.TBaseHelper.toString(this.success, sb); } first = false; sb.append(")"); return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class getNimbusConf_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("getNimbusConf_args"); + public static class getNimbusConf_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getNimbusConf_args"); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; private static final Map byName = new HashMap(); @@ -9781,11 +9781,11 @@ public String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(getNimbusConf_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getNimbusConf_args.class, metaDataMap); } public getNimbusConf_args() { @@ -9865,18 +9865,18 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -9884,7 +9884,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -9901,37 +9901,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class getNimbusConf_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("getNimbusConf_result"); + public static class getNimbusConf_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getNimbusConf_result"); - private static final org.apache.thrift7.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift7.protocol.TField("success", org.apache.thrift7.protocol.TType.STRING, (short)0); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); private String success; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"); private static final Map byName = new HashMap(); @@ -9990,13 +9990,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift7.meta_data.FieldMetaData("success", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(getNimbusConf_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getNimbusConf_result.class, metaDataMap); } public getNimbusConf_result() { @@ -10135,7 +10135,7 @@ public int compareTo(getNimbusConf_result other) { return lastComparison; } if (is_set_success()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -10147,25 +10147,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.success = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -10173,7 +10173,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_success()) { @@ -10201,35 +10201,35 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class getClusterInfo_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("getClusterInfo_args"); + public static class getClusterInfo_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getClusterInfo_args"); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; private static final Map byName = new HashMap(); @@ -10283,11 +10283,11 @@ public String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(getClusterInfo_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getClusterInfo_args.class, metaDataMap); } public getClusterInfo_args() { @@ -10367,18 +10367,18 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -10386,7 +10386,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -10403,37 +10403,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class getClusterInfo_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("getClusterInfo_result"); + public static class getClusterInfo_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getClusterInfo_result"); - private static final org.apache.thrift7.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift7.protocol.TField("success", org.apache.thrift7.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); private ClusterSummary success; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"); private static final Map byName = new HashMap(); @@ -10492,13 +10492,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift7.meta_data.FieldMetaData("success", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ClusterSummary.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ClusterSummary.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(getClusterInfo_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getClusterInfo_result.class, metaDataMap); } public getClusterInfo_result() { @@ -10637,7 +10637,7 @@ public int compareTo(getClusterInfo_result other) { return lastComparison; } if (is_set_success()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -10649,26 +10649,26 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.success = new ClusterSummary(); this.success.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -10676,7 +10676,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_success()) { @@ -10704,37 +10704,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class getTopologyInfo_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("getTopologyInfo_args"); + public static class getTopologyInfo_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTopologyInfo_args"); - private static final org.apache.thrift7.protocol.TField ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("id", org.apache.thrift7.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); private String id; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"); private static final Map byName = new HashMap(); @@ -10793,13 +10793,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ID, new org.apache.thrift7.meta_data.FieldMetaData("id", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(getTopologyInfo_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTopologyInfo_args.class, metaDataMap); } public getTopologyInfo_args() { @@ -10938,7 +10938,7 @@ public int compareTo(getTopologyInfo_args other) { return lastComparison; } if (is_set_id()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -10950,25 +10950,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.id = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -10976,7 +10976,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -11005,39 +11005,39 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class getTopologyInfo_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("getTopologyInfo_result"); + public static class getTopologyInfo_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTopologyInfo_result"); - private static final org.apache.thrift7.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift7.protocol.TField("success", org.apache.thrift7.protocol.TType.STRUCT, (short)0); - private static final org.apache.thrift7.protocol.TField E_FIELD_DESC = new org.apache.thrift7.protocol.TField("e", org.apache.thrift7.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); private TopologyInfo success; // required private NotAliveException e; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), E((short)1, "e"); @@ -11099,15 +11099,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift7.meta_data.FieldMetaData("success", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, TopologyInfo.class))); - tmpMap.put(_Fields.E, new org.apache.thrift7.meta_data.FieldMetaData("e", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TopologyInfo.class))); + tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(getTopologyInfo_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTopologyInfo_result.class, metaDataMap); } public getTopologyInfo_result() { @@ -11302,7 +11302,7 @@ public int compareTo(getTopologyInfo_result other) { return lastComparison; } if (is_set_success()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -11312,7 +11312,7 @@ public int compareTo(getTopologyInfo_result other) { return lastComparison; } if (is_set_e()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.e, typedOther.e); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e); if (lastComparison != 0) { return lastComparison; } @@ -11324,34 +11324,34 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.success = new TopologyInfo(); this.success.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 1: // E - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.e = new NotAliveException(); this.e.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -11359,7 +11359,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_success()) { @@ -11399,37 +11399,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class getTopologyConf_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("getTopologyConf_args"); + public static class getTopologyConf_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTopologyConf_args"); - private static final org.apache.thrift7.protocol.TField ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("id", org.apache.thrift7.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); private String id; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"); private static final Map byName = new HashMap(); @@ -11488,13 +11488,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ID, new org.apache.thrift7.meta_data.FieldMetaData("id", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(getTopologyConf_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTopologyConf_args.class, metaDataMap); } public getTopologyConf_args() { @@ -11633,7 +11633,7 @@ public int compareTo(getTopologyConf_args other) { return lastComparison; } if (is_set_id()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -11645,25 +11645,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.id = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -11671,7 +11671,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -11700,39 +11700,39 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class getTopologyConf_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("getTopologyConf_result"); + public static class getTopologyConf_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTopologyConf_result"); - private static final org.apache.thrift7.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift7.protocol.TField("success", org.apache.thrift7.protocol.TType.STRING, (short)0); - private static final org.apache.thrift7.protocol.TField E_FIELD_DESC = new org.apache.thrift7.protocol.TField("e", org.apache.thrift7.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); + private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); private String success; // required private NotAliveException e; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), E((short)1, "e"); @@ -11794,15 +11794,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift7.meta_data.FieldMetaData("success", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.E, new org.apache.thrift7.meta_data.FieldMetaData("e", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(getTopologyConf_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTopologyConf_result.class, metaDataMap); } public getTopologyConf_result() { @@ -11997,7 +11997,7 @@ public int compareTo(getTopologyConf_result other) { return lastComparison; } if (is_set_success()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -12007,7 +12007,7 @@ public int compareTo(getTopologyConf_result other) { return lastComparison; } if (is_set_e()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.e, typedOther.e); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e); if (lastComparison != 0) { return lastComparison; } @@ -12019,33 +12019,33 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.success = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 1: // E - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.e = new NotAliveException(); this.e.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -12053,7 +12053,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_success()) { @@ -12093,37 +12093,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class getTopology_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("getTopology_args"); + public static class getTopology_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTopology_args"); - private static final org.apache.thrift7.protocol.TField ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("id", org.apache.thrift7.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); private String id; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"); private static final Map byName = new HashMap(); @@ -12182,13 +12182,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ID, new org.apache.thrift7.meta_data.FieldMetaData("id", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(getTopology_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTopology_args.class, metaDataMap); } public getTopology_args() { @@ -12327,7 +12327,7 @@ public int compareTo(getTopology_args other) { return lastComparison; } if (is_set_id()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -12339,25 +12339,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.id = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -12365,7 +12365,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -12394,39 +12394,39 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class getTopology_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("getTopology_result"); + public static class getTopology_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTopology_result"); - private static final org.apache.thrift7.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift7.protocol.TField("success", org.apache.thrift7.protocol.TType.STRUCT, (short)0); - private static final org.apache.thrift7.protocol.TField E_FIELD_DESC = new org.apache.thrift7.protocol.TField("e", org.apache.thrift7.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); private StormTopology success; // required private NotAliveException e; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), E((short)1, "e"); @@ -12488,15 +12488,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift7.meta_data.FieldMetaData("success", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, StormTopology.class))); - tmpMap.put(_Fields.E, new org.apache.thrift7.meta_data.FieldMetaData("e", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StormTopology.class))); + tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(getTopology_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTopology_result.class, metaDataMap); } public getTopology_result() { @@ -12691,7 +12691,7 @@ public int compareTo(getTopology_result other) { return lastComparison; } if (is_set_success()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -12701,7 +12701,7 @@ public int compareTo(getTopology_result other) { return lastComparison; } if (is_set_e()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.e, typedOther.e); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e); if (lastComparison != 0) { return lastComparison; } @@ -12713,34 +12713,34 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.success = new StormTopology(); this.success.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 1: // E - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.e = new NotAliveException(); this.e.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -12748,7 +12748,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_success()) { @@ -12788,37 +12788,37 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class getUserTopology_args implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("getUserTopology_args"); + public static class getUserTopology_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getUserTopology_args"); - private static final org.apache.thrift7.protocol.TField ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("id", org.apache.thrift7.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); private String id; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"); private static final Map byName = new HashMap(); @@ -12877,13 +12877,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ID, new org.apache.thrift7.meta_data.FieldMetaData("id", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(getUserTopology_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUserTopology_args.class, metaDataMap); } public getUserTopology_args() { @@ -13022,7 +13022,7 @@ public int compareTo(getUserTopology_args other) { return lastComparison; } if (is_set_id()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -13034,25 +13034,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.id = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -13060,7 +13060,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -13089,39 +13089,39 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } } - public static class getUserTopology_result implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("getUserTopology_result"); + public static class getUserTopology_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getUserTopology_result"); - private static final org.apache.thrift7.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift7.protocol.TField("success", org.apache.thrift7.protocol.TType.STRUCT, (short)0); - private static final org.apache.thrift7.protocol.TField E_FIELD_DESC = new org.apache.thrift7.protocol.TField("e", org.apache.thrift7.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1); private StormTopology success; // required private NotAliveException e; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), E((short)1, "e"); @@ -13183,15 +13183,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift7.meta_data.FieldMetaData("success", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, StormTopology.class))); - tmpMap.put(_Fields.E, new org.apache.thrift7.meta_data.FieldMetaData("e", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRUCT))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StormTopology.class))); + tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(getUserTopology_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUserTopology_result.class, metaDataMap); } public getUserTopology_result() { @@ -13386,7 +13386,7 @@ public int compareTo(getUserTopology_result other) { return lastComparison; } if (is_set_success()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -13396,7 +13396,7 @@ public int compareTo(getUserTopology_result other) { return lastComparison; } if (is_set_e()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.e, typedOther.e); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e); if (lastComparison != 0) { return lastComparison; } @@ -13408,34 +13408,34 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.success = new StormTopology(); this.success.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 1: // E - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.e = new NotAliveException(); this.e.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -13443,7 +13443,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { oprot.writeStructBegin(STRUCT_DESC); if (this.is_set_success()) { @@ -13483,22 +13483,22 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java b/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java index 0a1bff6155..ce03d91092 100644 --- a/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java +++ b/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java @@ -38,15 +38,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NotAliveException extends Exception implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("NotAliveException"); +public class NotAliveException extends Exception implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotAliveException"); - private static final org.apache.thrift7.protocol.TField MSG_FIELD_DESC = new org.apache.thrift7.protocol.TField("msg", org.apache.thrift7.protocol.TType.STRING, (short)1); + 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 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.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { MSG((short)1, "msg"); private static final Map byName = new HashMap(); @@ -105,13 +105,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.MSG, new org.apache.thrift7.meta_data.FieldMetaData("msg", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 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))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(NotAliveException.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NotAliveException.class, metaDataMap); } public NotAliveException() { @@ -250,7 +250,7 @@ public int compareTo(NotAliveException other) { return lastComparison; } if (is_set_msg()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.msg, typedOther.msg); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg); if (lastComparison != 0) { return lastComparison; } @@ -262,25 +262,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // MSG - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.msg = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -288,7 +288,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -317,26 +317,26 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_msg()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/NullStruct.java b/storm-core/src/jvm/backtype/storm/generated/NullStruct.java index 9639dc26fb..960c3b225b 100644 --- a/storm-core/src/jvm/backtype/storm/generated/NullStruct.java +++ b/storm-core/src/jvm/backtype/storm/generated/NullStruct.java @@ -38,13 +38,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NullStruct implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("NullStruct"); +public class NullStruct implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NullStruct"); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; private static final Map byName = new HashMap(); @@ -98,11 +98,11 @@ public String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(NullStruct.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NullStruct.class, metaDataMap); } public NullStruct() { @@ -182,18 +182,18 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -201,7 +201,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -218,22 +218,22 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java index 78ac4ad187..9f3cbf1bae 100644 --- a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java +++ b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java @@ -38,19 +38,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RebalanceOptions implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("RebalanceOptions"); +public class RebalanceOptions implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RebalanceOptions"); - private static final org.apache.thrift7.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift7.protocol.TField("wait_secs", org.apache.thrift7.protocol.TType.I32, (short)1); - private static final org.apache.thrift7.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift7.protocol.TField("num_workers", org.apache.thrift7.protocol.TType.I32, (short)2); - private static final org.apache.thrift7.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift7.protocol.TField("num_executors", org.apache.thrift7.protocol.TType.MAP, (short)3); + private static final org.apache.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("wait_secs", org.apache.thrift.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)2); + private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.MAP, (short)3); private int wait_secs; // required private int num_workers; // required private Map num_executors; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { WAIT_SECS((short)1, "wait_secs"), NUM_WORKERS((short)2, "num_workers"), NUM_EXECUTORS((short)3, "num_executors"); @@ -118,19 +118,19 @@ public String getFieldName() { private static final int __NUM_WORKERS_ISSET_ID = 1; private BitSet __isset_bit_vector = new BitSet(2); - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.WAIT_SECS, new org.apache.thrift7.meta_data.FieldMetaData("wait_secs", org.apache.thrift7.TFieldRequirementType.OPTIONAL, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift7.meta_data.FieldMetaData("num_workers", org.apache.thrift7.TFieldRequirementType.OPTIONAL, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.thrift7.meta_data.FieldMetaData("num_executors", org.apache.thrift7.TFieldRequirementType.OPTIONAL, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32)))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.WAIT_SECS, new org.apache.thrift.meta_data.FieldMetaData("wait_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_workers", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("num_executors", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(RebalanceOptions.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RebalanceOptions.class, metaDataMap); } public RebalanceOptions() { @@ -391,7 +391,7 @@ public int compareTo(RebalanceOptions other) { return lastComparison; } if (is_set_wait_secs()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.wait_secs, typedOther.wait_secs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.wait_secs, typedOther.wait_secs); if (lastComparison != 0) { return lastComparison; } @@ -401,7 +401,7 @@ public int compareTo(RebalanceOptions other) { return lastComparison; } if (is_set_num_workers()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.num_workers, typedOther.num_workers); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, typedOther.num_workers); if (lastComparison != 0) { return lastComparison; } @@ -411,7 +411,7 @@ public int compareTo(RebalanceOptions other) { return lastComparison; } if (is_set_num_executors()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.num_executors, typedOther.num_executors); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_executors, typedOther.num_executors); if (lastComparison != 0) { return lastComparison; } @@ -423,36 +423,36 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // WAIT_SECS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.wait_secs = iprot.readI32(); set_wait_secs_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // NUM_WORKERS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.num_workers = iprot.readI32(); set_num_workers_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // NUM_EXECUTORS - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map158 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map158 = iprot.readMapBegin(); this.num_executors = new HashMap(2*_map158.size); for (int _i159 = 0; _i159 < _map158.size; ++_i159) { @@ -465,11 +465,11 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -477,7 +477,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -495,7 +495,7 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (is_set_num_executors()) { oprot.writeFieldBegin(NUM_EXECUTORS_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.I32, this.num_executors.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, this.num_executors.size())); for (Map.Entry _iter162 : this.num_executors.entrySet()) { oprot.writeString(_iter162.getKey()); @@ -540,14 +540,14 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -556,8 +556,8 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException 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_bit_vector = new BitSet(1); - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java b/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java index 1d5e5ef5c4..6390d5afbc 100644 --- a/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java +++ b/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java @@ -38,17 +38,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ShellComponent implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("ShellComponent"); +public class ShellComponent implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShellComponent"); - private static final org.apache.thrift7.protocol.TField EXECUTION_COMMAND_FIELD_DESC = new org.apache.thrift7.protocol.TField("execution_command", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField SCRIPT_FIELD_DESC = new org.apache.thrift7.protocol.TField("script", org.apache.thrift7.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField EXECUTION_COMMAND_FIELD_DESC = new org.apache.thrift.protocol.TField("execution_command", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField SCRIPT_FIELD_DESC = new org.apache.thrift.protocol.TField("script", org.apache.thrift.protocol.TType.STRING, (short)2); private String execution_command; // required private String script; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { EXECUTION_COMMAND((short)1, "execution_command"), SCRIPT((short)2, "script"); @@ -110,15 +110,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.EXECUTION_COMMAND, new org.apache.thrift7.meta_data.FieldMetaData("execution_command", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.SCRIPT, new org.apache.thrift7.meta_data.FieldMetaData("script", org.apache.thrift7.TFieldRequirementType.DEFAULT, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.EXECUTION_COMMAND, new org.apache.thrift.meta_data.FieldMetaData("execution_command", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.SCRIPT, new org.apache.thrift.meta_data.FieldMetaData("script", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(ShellComponent.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ShellComponent.class, metaDataMap); } public ShellComponent() { @@ -313,7 +313,7 @@ public int compareTo(ShellComponent other) { return lastComparison; } if (is_set_execution_command()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.execution_command, typedOther.execution_command); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.execution_command, typedOther.execution_command); if (lastComparison != 0) { return lastComparison; } @@ -323,7 +323,7 @@ public int compareTo(ShellComponent other) { return lastComparison; } if (is_set_script()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.script, typedOther.script); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.script, typedOther.script); if (lastComparison != 0) { return lastComparison; } @@ -335,32 +335,32 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // EXECUTION_COMMAND - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.execution_command = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // SCRIPT - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.script = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -368,7 +368,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -410,22 +410,22 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java index 1ed33e30fe..60028e729b 100644 --- a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java +++ b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java @@ -38,17 +38,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SpoutSpec implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("SpoutSpec"); +public class SpoutSpec implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutSpec"); - private static final org.apache.thrift7.protocol.TField SPOUT_OBJECT_FIELD_DESC = new org.apache.thrift7.protocol.TField("spout_object", org.apache.thrift7.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift7.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift7.protocol.TField("common", org.apache.thrift7.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField SPOUT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("spout_object", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift.protocol.TField("common", org.apache.thrift.protocol.TType.STRUCT, (short)2); private ComponentObject spout_object; // required private ComponentCommon common; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SPOUT_OBJECT((short)1, "spout_object"), COMMON((short)2, "common"); @@ -110,15 +110,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SPOUT_OBJECT, new org.apache.thrift7.meta_data.FieldMetaData("spout_object", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ComponentObject.class))); - tmpMap.put(_Fields.COMMON, new org.apache.thrift7.meta_data.FieldMetaData("common", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ComponentCommon.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SPOUT_OBJECT, new org.apache.thrift.meta_data.FieldMetaData("spout_object", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentObject.class))); + tmpMap.put(_Fields.COMMON, new org.apache.thrift.meta_data.FieldMetaData("common", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentCommon.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(SpoutSpec.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SpoutSpec.class, metaDataMap); } public SpoutSpec() { @@ -313,7 +313,7 @@ public int compareTo(SpoutSpec other) { return lastComparison; } if (is_set_spout_object()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.spout_object, typedOther.spout_object); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.spout_object, typedOther.spout_object); if (lastComparison != 0) { return lastComparison; } @@ -323,7 +323,7 @@ public int compareTo(SpoutSpec other) { return lastComparison; } if (is_set_common()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.common, typedOther.common); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, typedOther.common); if (lastComparison != 0) { return lastComparison; } @@ -335,34 +335,34 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // SPOUT_OBJECT - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.spout_object = new ComponentObject(); this.spout_object.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // COMMON - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.common = new ComponentCommon(); this.common.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -370,7 +370,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -412,30 +412,30 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_spout_object()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'spout_object' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'spout_object' is unset! Struct:" + toString()); } if (!is_set_common()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java index a7a5bcd3f7..284f827503 100644 --- a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java +++ b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java @@ -38,19 +38,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SpoutStats implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("SpoutStats"); +public class SpoutStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutStats"); - private static final org.apache.thrift7.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift7.protocol.TField("acked", org.apache.thrift7.protocol.TType.MAP, (short)1); - private static final org.apache.thrift7.protocol.TField FAILED_FIELD_DESC = new org.apache.thrift7.protocol.TField("failed", org.apache.thrift7.protocol.TType.MAP, (short)2); - private static final org.apache.thrift7.protocol.TField COMPLETE_MS_AVG_FIELD_DESC = new org.apache.thrift7.protocol.TField("complete_ms_avg", org.apache.thrift7.protocol.TType.MAP, (short)3); + private static final org.apache.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("acked", org.apache.thrift.protocol.TType.MAP, (short)1); + private static final org.apache.thrift.protocol.TField FAILED_FIELD_DESC = new org.apache.thrift.protocol.TField("failed", org.apache.thrift.protocol.TType.MAP, (short)2); + private static final org.apache.thrift.protocol.TField COMPLETE_MS_AVG_FIELD_DESC = new org.apache.thrift.protocol.TField("complete_ms_avg", org.apache.thrift.protocol.TType.MAP, (short)3); private Map> acked; // required private Map> failed; // required private Map> complete_ms_avg; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ACKED((short)1, "acked"), FAILED((short)2, "failed"), COMPLETE_MS_AVG((short)3, "complete_ms_avg"); @@ -115,29 +115,29 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ACKED, new org.apache.thrift7.meta_data.FieldMetaData("acked", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I64))))); - tmpMap.put(_Fields.FAILED, new org.apache.thrift7.meta_data.FieldMetaData("failed", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I64))))); - tmpMap.put(_Fields.COMPLETE_MS_AVG, new org.apache.thrift7.meta_data.FieldMetaData("complete_ms_avg", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.DOUBLE))))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ACKED, new org.apache.thrift.meta_data.FieldMetaData("acked", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))))); + tmpMap.put(_Fields.FAILED, new org.apache.thrift.meta_data.FieldMetaData("failed", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))))); + tmpMap.put(_Fields.COMPLETE_MS_AVG, new org.apache.thrift.meta_data.FieldMetaData("complete_ms_avg", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(SpoutStats.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SpoutStats.class, metaDataMap); } public SpoutStats() { @@ -490,7 +490,7 @@ public int compareTo(SpoutStats other) { return lastComparison; } if (is_set_acked()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.acked, typedOther.acked); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acked, typedOther.acked); if (lastComparison != 0) { return lastComparison; } @@ -500,7 +500,7 @@ public int compareTo(SpoutStats other) { return lastComparison; } if (is_set_failed()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.failed, typedOther.failed); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failed, typedOther.failed); if (lastComparison != 0) { return lastComparison; } @@ -510,7 +510,7 @@ public int compareTo(SpoutStats other) { return lastComparison; } if (is_set_complete_ms_avg()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.complete_ms_avg, typedOther.complete_ms_avg); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.complete_ms_avg, typedOther.complete_ms_avg); if (lastComparison != 0) { return lastComparison; } @@ -522,20 +522,20 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ACKED - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map95 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map95 = iprot.readMapBegin(); this.acked = new HashMap>(2*_map95.size); for (int _i96 = 0; _i96 < _map95.size; ++_i96) { @@ -543,7 +543,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. Map _val98; // required _key97 = iprot.readString(); { - org.apache.thrift7.protocol.TMap _map99 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map99 = iprot.readMapBegin(); _val98 = new HashMap(2*_map99.size); for (int _i100 = 0; _i100 < _map99.size; ++_i100) { @@ -560,13 +560,13 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // FAILED - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map103 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map103 = iprot.readMapBegin(); this.failed = new HashMap>(2*_map103.size); for (int _i104 = 0; _i104 < _map103.size; ++_i104) { @@ -574,7 +574,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. Map _val106; // required _key105 = iprot.readString(); { - org.apache.thrift7.protocol.TMap _map107 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map107 = iprot.readMapBegin(); _val106 = new HashMap(2*_map107.size); for (int _i108 = 0; _i108 < _map107.size; ++_i108) { @@ -591,13 +591,13 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // COMPLETE_MS_AVG - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map111 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map111 = iprot.readMapBegin(); this.complete_ms_avg = new HashMap>(2*_map111.size); for (int _i112 = 0; _i112 < _map111.size; ++_i112) { @@ -605,7 +605,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. Map _val114; // required _key113 = iprot.readString(); { - org.apache.thrift7.protocol.TMap _map115 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map115 = iprot.readMapBegin(); _val114 = new HashMap(2*_map115.size); for (int _i116 = 0; _i116 < _map115.size; ++_i116) { @@ -622,11 +622,11 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -634,19 +634,19 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); if (this.acked != null) { oprot.writeFieldBegin(ACKED_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.MAP, this.acked.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.acked.size())); for (Map.Entry> _iter119 : this.acked.entrySet()) { oprot.writeString(_iter119.getKey()); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.I64, _iter119.getValue().size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter119.getValue().size())); for (Map.Entry _iter120 : _iter119.getValue().entrySet()) { oprot.writeString(_iter120.getKey()); @@ -662,12 +662,12 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.failed != null) { oprot.writeFieldBegin(FAILED_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.MAP, this.failed.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.failed.size())); for (Map.Entry> _iter121 : this.failed.entrySet()) { oprot.writeString(_iter121.getKey()); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.I64, _iter121.getValue().size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter121.getValue().size())); for (Map.Entry _iter122 : _iter121.getValue().entrySet()) { oprot.writeString(_iter122.getKey()); @@ -683,12 +683,12 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.complete_ms_avg != null) { oprot.writeFieldBegin(COMPLETE_MS_AVG_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.MAP, this.complete_ms_avg.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.complete_ms_avg.size())); for (Map.Entry> _iter123 : this.complete_ms_avg.entrySet()) { oprot.writeString(_iter123.getKey()); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.DOUBLE, _iter123.getValue().size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter123.getValue().size())); for (Map.Entry _iter124 : _iter123.getValue().entrySet()) { oprot.writeString(_iter124.getKey()); @@ -737,34 +737,34 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_acked()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'acked' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'acked' is unset! Struct:" + toString()); } if (!is_set_failed()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'failed' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'failed' is unset! Struct:" + toString()); } if (!is_set_complete_ms_avg()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'complete_ms_avg' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'complete_ms_avg' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java index 594cc88eb8..d89f0fbc6b 100644 --- a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java +++ b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java @@ -38,17 +38,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class StateSpoutSpec implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("StateSpoutSpec"); +public class StateSpoutSpec implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StateSpoutSpec"); - private static final org.apache.thrift7.protocol.TField STATE_SPOUT_OBJECT_FIELD_DESC = new org.apache.thrift7.protocol.TField("state_spout_object", org.apache.thrift7.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift7.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift7.protocol.TField("common", org.apache.thrift7.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField STATE_SPOUT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("state_spout_object", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift.protocol.TField("common", org.apache.thrift.protocol.TType.STRUCT, (short)2); private ComponentObject state_spout_object; // required private ComponentCommon common; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { STATE_SPOUT_OBJECT((short)1, "state_spout_object"), COMMON((short)2, "common"); @@ -110,15 +110,15 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.STATE_SPOUT_OBJECT, new org.apache.thrift7.meta_data.FieldMetaData("state_spout_object", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ComponentObject.class))); - tmpMap.put(_Fields.COMMON, new org.apache.thrift7.meta_data.FieldMetaData("common", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ComponentCommon.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.STATE_SPOUT_OBJECT, new org.apache.thrift.meta_data.FieldMetaData("state_spout_object", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentObject.class))); + tmpMap.put(_Fields.COMMON, new org.apache.thrift.meta_data.FieldMetaData("common", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentCommon.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(StateSpoutSpec.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StateSpoutSpec.class, metaDataMap); } public StateSpoutSpec() { @@ -313,7 +313,7 @@ public int compareTo(StateSpoutSpec other) { return lastComparison; } if (is_set_state_spout_object()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.state_spout_object, typedOther.state_spout_object); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state_spout_object, typedOther.state_spout_object); if (lastComparison != 0) { return lastComparison; } @@ -323,7 +323,7 @@ public int compareTo(StateSpoutSpec other) { return lastComparison; } if (is_set_common()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.common, typedOther.common); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, typedOther.common); if (lastComparison != 0) { return lastComparison; } @@ -335,34 +335,34 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // STATE_SPOUT_OBJECT - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.state_spout_object = new ComponentObject(); this.state_spout_object.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // COMMON - if (field.type == org.apache.thrift7.protocol.TType.STRUCT) { + if (field.type == org.apache.thrift.protocol.TType.STRUCT) { this.common = new ComponentCommon(); this.common.read(iprot); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -370,7 +370,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -412,30 +412,30 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_state_spout_object()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'state_spout_object' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'state_spout_object' is unset! Struct:" + toString()); } if (!is_set_common()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java index b7142b587a..1ec2b9960c 100644 --- a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java +++ b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java @@ -38,19 +38,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class StormTopology implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("StormTopology"); +public class StormTopology implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormTopology"); - private static final org.apache.thrift7.protocol.TField SPOUTS_FIELD_DESC = new org.apache.thrift7.protocol.TField("spouts", org.apache.thrift7.protocol.TType.MAP, (short)1); - private static final org.apache.thrift7.protocol.TField BOLTS_FIELD_DESC = new org.apache.thrift7.protocol.TField("bolts", org.apache.thrift7.protocol.TType.MAP, (short)2); - private static final org.apache.thrift7.protocol.TField STATE_SPOUTS_FIELD_DESC = new org.apache.thrift7.protocol.TField("state_spouts", org.apache.thrift7.protocol.TType.MAP, (short)3); + private static final org.apache.thrift.protocol.TField SPOUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("spouts", org.apache.thrift.protocol.TType.MAP, (short)1); + private static final org.apache.thrift.protocol.TField BOLTS_FIELD_DESC = new org.apache.thrift.protocol.TField("bolts", org.apache.thrift.protocol.TType.MAP, (short)2); + private static final org.apache.thrift.protocol.TField STATE_SPOUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("state_spouts", org.apache.thrift.protocol.TType.MAP, (short)3); private Map spouts; // required private Map bolts; // required private Map state_spouts; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SPOUTS((short)1, "spouts"), BOLTS((short)2, "bolts"), STATE_SPOUTS((short)3, "state_spouts"); @@ -115,23 +115,23 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SPOUTS, new org.apache.thrift7.meta_data.FieldMetaData("spouts", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, SpoutSpec.class)))); - tmpMap.put(_Fields.BOLTS, new org.apache.thrift7.meta_data.FieldMetaData("bolts", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, Bolt.class)))); - tmpMap.put(_Fields.STATE_SPOUTS, new org.apache.thrift7.meta_data.FieldMetaData("state_spouts", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, StateSpoutSpec.class)))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SPOUTS, new org.apache.thrift.meta_data.FieldMetaData("spouts", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SpoutSpec.class)))); + tmpMap.put(_Fields.BOLTS, new org.apache.thrift.meta_data.FieldMetaData("bolts", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Bolt.class)))); + tmpMap.put(_Fields.STATE_SPOUTS, new org.apache.thrift.meta_data.FieldMetaData("state_spouts", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StateSpoutSpec.class)))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(StormTopology.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StormTopology.class, metaDataMap); } public StormTopology() { @@ -451,7 +451,7 @@ public int compareTo(StormTopology other) { return lastComparison; } if (is_set_spouts()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.spouts, typedOther.spouts); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.spouts, typedOther.spouts); if (lastComparison != 0) { return lastComparison; } @@ -461,7 +461,7 @@ public int compareTo(StormTopology other) { return lastComparison; } if (is_set_bolts()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.bolts, typedOther.bolts); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bolts, typedOther.bolts); if (lastComparison != 0) { return lastComparison; } @@ -471,7 +471,7 @@ public int compareTo(StormTopology other) { return lastComparison; } if (is_set_state_spouts()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.state_spouts, typedOther.state_spouts); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state_spouts, typedOther.state_spouts); if (lastComparison != 0) { return lastComparison; } @@ -483,20 +483,20 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // SPOUTS - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map22 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map22 = iprot.readMapBegin(); this.spouts = new HashMap(2*_map22.size); for (int _i23 = 0; _i23 < _map22.size; ++_i23) { @@ -510,13 +510,13 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // BOLTS - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map26 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map26 = iprot.readMapBegin(); this.bolts = new HashMap(2*_map26.size); for (int _i27 = 0; _i27 < _map26.size; ++_i27) { @@ -530,13 +530,13 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // STATE_SPOUTS - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map30 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map30 = iprot.readMapBegin(); this.state_spouts = new HashMap(2*_map30.size); for (int _i31 = 0; _i31 < _map30.size; ++_i31) { @@ -550,11 +550,11 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -562,14 +562,14 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); if (this.spouts != null) { oprot.writeFieldBegin(SPOUTS_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.STRUCT, this.spouts.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.spouts.size())); for (Map.Entry _iter34 : this.spouts.entrySet()) { oprot.writeString(_iter34.getKey()); @@ -582,7 +582,7 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.bolts != null) { oprot.writeFieldBegin(BOLTS_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.STRUCT, this.bolts.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.bolts.size())); for (Map.Entry _iter35 : this.bolts.entrySet()) { oprot.writeString(_iter35.getKey()); @@ -595,7 +595,7 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.state_spouts != null) { oprot.writeFieldBegin(STATE_SPOUTS_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.STRUCT, this.state_spouts.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.state_spouts.size())); for (Map.Entry _iter36 : this.state_spouts.entrySet()) { oprot.writeString(_iter36.getKey()); @@ -641,34 +641,34 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_spouts()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'spouts' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'spouts' is unset! Struct:" + toString()); } if (!is_set_bolts()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'bolts' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'bolts' is unset! Struct:" + toString()); } if (!is_set_state_spouts()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'state_spouts' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'state_spouts' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java index 9d6d5c7bb9..7cd9bb883e 100644 --- a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java +++ b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java @@ -38,17 +38,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class StreamInfo implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("StreamInfo"); +public class StreamInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StreamInfo"); - private static final org.apache.thrift7.protocol.TField OUTPUT_FIELDS_FIELD_DESC = new org.apache.thrift7.protocol.TField("output_fields", org.apache.thrift7.protocol.TType.LIST, (short)1); - private static final org.apache.thrift7.protocol.TField DIRECT_FIELD_DESC = new org.apache.thrift7.protocol.TField("direct", org.apache.thrift7.protocol.TType.BOOL, (short)2); + private static final org.apache.thrift.protocol.TField OUTPUT_FIELDS_FIELD_DESC = new org.apache.thrift.protocol.TField("output_fields", org.apache.thrift.protocol.TType.LIST, (short)1); + private static final org.apache.thrift.protocol.TField DIRECT_FIELD_DESC = new org.apache.thrift.protocol.TField("direct", org.apache.thrift.protocol.TType.BOOL, (short)2); private List output_fields; // required private boolean direct; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { OUTPUT_FIELDS((short)1, "output_fields"), DIRECT((short)2, "direct"); @@ -112,16 +112,16 @@ public String getFieldName() { private static final int __DIRECT_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.OUTPUT_FIELDS, new org.apache.thrift7.meta_data.FieldMetaData("output_fields", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.ListMetaData(org.apache.thrift7.protocol.TType.LIST, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING)))); - tmpMap.put(_Fields.DIRECT, new org.apache.thrift7.meta_data.FieldMetaData("direct", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.BOOL))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.OUTPUT_FIELDS, new org.apache.thrift.meta_data.FieldMetaData("output_fields", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.DIRECT, new org.apache.thrift.meta_data.FieldMetaData("direct", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(StreamInfo.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StreamInfo.class, metaDataMap); } public StreamInfo() { @@ -336,7 +336,7 @@ public int compareTo(StreamInfo other) { return lastComparison; } if (is_set_output_fields()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.output_fields, typedOther.output_fields); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.output_fields, typedOther.output_fields); if (lastComparison != 0) { return lastComparison; } @@ -346,7 +346,7 @@ public int compareTo(StreamInfo other) { return lastComparison; } if (is_set_direct()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.direct, typedOther.direct); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.direct, typedOther.direct); if (lastComparison != 0) { return lastComparison; } @@ -358,20 +358,20 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // OUTPUT_FIELDS - if (field.type == org.apache.thrift7.protocol.TType.LIST) { + if (field.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift7.protocol.TList _list8 = iprot.readListBegin(); + org.apache.thrift.protocol.TList _list8 = iprot.readListBegin(); this.output_fields = new ArrayList(_list8.size); for (int _i9 = 0; _i9 < _list8.size; ++_i9) { @@ -382,19 +382,19 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readListEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // DIRECT - if (field.type == org.apache.thrift7.protocol.TType.BOOL) { + if (field.type == org.apache.thrift.protocol.TType.BOOL) { this.direct = iprot.readBool(); set_direct_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -402,14 +402,14 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); if (this.output_fields != null) { oprot.writeFieldBegin(OUTPUT_FIELDS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift7.protocol.TList(org.apache.thrift7.protocol.TType.STRING, this.output_fields.size())); + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.output_fields.size())); for (String _iter11 : this.output_fields) { oprot.writeString(_iter11); @@ -445,22 +445,22 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_output_fields()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'output_fields' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'output_fields' is unset! Struct:" + toString()); } if (!is_set_direct()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'direct' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'direct' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -469,8 +469,8 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException 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_bit_vector = new BitSet(1); - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java index ae70ffbdd2..78d66c910a 100644 --- a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java +++ b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java @@ -38,15 +38,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SubmitOptions implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("SubmitOptions"); +public class SubmitOptions implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SubmitOptions"); - private static final org.apache.thrift7.protocol.TField INITIAL_STATUS_FIELD_DESC = new org.apache.thrift7.protocol.TField("initial_status", org.apache.thrift7.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField INITIAL_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("initial_status", org.apache.thrift.protocol.TType.I32, (short)1); private TopologyInitialStatus initial_status; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * * @see TopologyInitialStatus @@ -109,13 +109,13 @@ public String getFieldName() { // isset id assignments - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.INITIAL_STATUS, new org.apache.thrift7.meta_data.FieldMetaData("initial_status", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.EnumMetaData(org.apache.thrift7.protocol.TType.ENUM, TopologyInitialStatus.class))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.INITIAL_STATUS, new org.apache.thrift.meta_data.FieldMetaData("initial_status", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TopologyInitialStatus.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(SubmitOptions.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SubmitOptions.class, metaDataMap); } public SubmitOptions() { @@ -262,7 +262,7 @@ public int compareTo(SubmitOptions other) { return lastComparison; } if (is_set_initial_status()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.initial_status, typedOther.initial_status); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.initial_status, typedOther.initial_status); if (lastComparison != 0) { return lastComparison; } @@ -274,25 +274,25 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // INITIAL_STATUS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.initial_status = TopologyInitialStatus.findByValue(iprot.readI32()); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -300,7 +300,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -329,26 +329,26 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_initial_status()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'initial_status' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'initial_status' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java index 524b484c0f..7072cdd820 100644 --- a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java +++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java @@ -38,14 +38,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SupervisorSummary implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("SupervisorSummary"); +public class SupervisorSummary implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorSummary"); - private static final org.apache.thrift7.protocol.TField HOST_FIELD_DESC = new org.apache.thrift7.protocol.TField("host", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift7.protocol.TField("uptime_secs", org.apache.thrift7.protocol.TType.I32, (short)2); - private static final org.apache.thrift7.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift7.protocol.TField("num_workers", org.apache.thrift7.protocol.TType.I32, (short)3); - private static final org.apache.thrift7.protocol.TField NUM_USED_WORKERS_FIELD_DESC = new org.apache.thrift7.protocol.TField("num_used_workers", org.apache.thrift7.protocol.TType.I32, (short)4); - private static final org.apache.thrift7.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("supervisor_id", org.apache.thrift7.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)2); + private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField NUM_USED_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_used_workers", org.apache.thrift.protocol.TType.I32, (short)4); + private static final org.apache.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisor_id", org.apache.thrift.protocol.TType.STRING, (short)5); private String host; // required private int uptime_secs; // required @@ -54,7 +54,7 @@ public class SupervisorSummary implements org.apache.thrift7.TBase metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.HOST, new org.apache.thrift7.meta_data.FieldMetaData("host", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift7.meta_data.FieldMetaData("uptime_secs", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift7.meta_data.FieldMetaData("num_workers", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.NUM_USED_WORKERS, new org.apache.thrift7.meta_data.FieldMetaData("num_used_workers", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.SUPERVISOR_ID, new org.apache.thrift7.meta_data.FieldMetaData("supervisor_id", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_workers", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.NUM_USED_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_used_workers", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorSummary.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorSummary.class, metaDataMap); } public SupervisorSummary() { @@ -505,7 +505,7 @@ public int compareTo(SupervisorSummary other) { return lastComparison; } if (is_set_host()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.host, typedOther.host); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host); if (lastComparison != 0) { return lastComparison; } @@ -515,7 +515,7 @@ public int compareTo(SupervisorSummary other) { return lastComparison; } if (is_set_uptime_secs()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.uptime_secs, typedOther.uptime_secs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, typedOther.uptime_secs); if (lastComparison != 0) { return lastComparison; } @@ -525,7 +525,7 @@ public int compareTo(SupervisorSummary other) { return lastComparison; } if (is_set_num_workers()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.num_workers, typedOther.num_workers); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, typedOther.num_workers); if (lastComparison != 0) { return lastComparison; } @@ -535,7 +535,7 @@ public int compareTo(SupervisorSummary other) { return lastComparison; } if (is_set_num_used_workers()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.num_used_workers, typedOther.num_used_workers); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_used_workers, typedOther.num_used_workers); if (lastComparison != 0) { return lastComparison; } @@ -545,7 +545,7 @@ public int compareTo(SupervisorSummary other) { return lastComparison; } if (is_set_supervisor_id()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.supervisor_id, typedOther.supervisor_id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisor_id, typedOther.supervisor_id); if (lastComparison != 0) { return lastComparison; } @@ -557,56 +557,56 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // HOST - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.host = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // UPTIME_SECS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.uptime_secs = iprot.readI32(); set_uptime_secs_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // NUM_WORKERS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.num_workers = iprot.readI32(); set_num_workers_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 4: // NUM_USED_WORKERS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.num_used_workers = iprot.readI32(); set_num_used_workers_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 5: // SUPERVISOR_ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.supervisor_id = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -614,7 +614,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -677,34 +677,34 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_host()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'host' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'host' is unset! Struct:" + toString()); } if (!is_set_uptime_secs()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString()); } if (!is_set_num_workers()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'num_workers' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_workers' is unset! Struct:" + toString()); } if (!is_set_num_used_workers()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'num_used_workers' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_used_workers' is unset! Struct:" + toString()); } if (!is_set_supervisor_id()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'supervisor_id' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisor_id' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -713,8 +713,8 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException 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_bit_vector = new BitSet(1); - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java index c675663fd7..2ec9cb37b2 100644 --- a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java +++ b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java @@ -38,15 +38,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TopologyInfo implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("TopologyInfo"); +public class TopologyInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyInfo"); - private static final org.apache.thrift7.protocol.TField ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("id", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField NAME_FIELD_DESC = new org.apache.thrift7.protocol.TField("name", org.apache.thrift7.protocol.TType.STRING, (short)2); - private static final org.apache.thrift7.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift7.protocol.TField("uptime_secs", org.apache.thrift7.protocol.TType.I32, (short)3); - private static final org.apache.thrift7.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.thrift7.protocol.TField("executors", org.apache.thrift7.protocol.TType.LIST, (short)4); - private static final org.apache.thrift7.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift7.protocol.TField("status", org.apache.thrift7.protocol.TType.STRING, (short)5); - private static final org.apache.thrift7.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift7.protocol.TField("errors", org.apache.thrift7.protocol.TType.MAP, (short)6); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (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 UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("executors", org.apache.thrift.protocol.TType.LIST, (short)4); + private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.MAP, (short)6); private String id; // required private String name; // required @@ -56,7 +56,7 @@ public class TopologyInfo implements org.apache.thrift7.TBase> errors; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift7.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"), NAME((short)2, "name"), UPTIME_SECS((short)3, "uptime_secs"), @@ -132,27 +132,27 @@ public String getFieldName() { private static final int __UPTIME_SECS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ID, new org.apache.thrift7.meta_data.FieldMetaData("id", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.NAME, new org.apache.thrift7.meta_data.FieldMetaData("name", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift7.meta_data.FieldMetaData("uptime_secs", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.EXECUTORS, new org.apache.thrift7.meta_data.FieldMetaData("executors", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.ListMetaData(org.apache.thrift7.protocol.TType.LIST, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ExecutorSummary.class)))); - tmpMap.put(_Fields.STATUS, new org.apache.thrift7.meta_data.FieldMetaData("status", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.ERRORS, new org.apache.thrift7.meta_data.FieldMetaData("errors", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.MapMetaData(org.apache.thrift7.protocol.TType.MAP, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING), - new org.apache.thrift7.meta_data.ListMetaData(org.apache.thrift7.protocol.TType.LIST, - new org.apache.thrift7.meta_data.StructMetaData(org.apache.thrift7.protocol.TType.STRUCT, ErrorInfo.class))))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("executors", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorSummary.class)))); + tmpMap.put(_Fields.STATUS, new org.apache.thrift.meta_data.FieldMetaData("status", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.ERRORS, new org.apache.thrift.meta_data.FieldMetaData("errors", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ErrorInfo.class))))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(TopologyInfo.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologyInfo.class, metaDataMap); } public TopologyInfo() { @@ -617,7 +617,7 @@ public int compareTo(TopologyInfo other) { return lastComparison; } if (is_set_id()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -627,7 +627,7 @@ public int compareTo(TopologyInfo other) { return lastComparison; } if (is_set_name()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); if (lastComparison != 0) { return lastComparison; } @@ -637,7 +637,7 @@ public int compareTo(TopologyInfo other) { return lastComparison; } if (is_set_uptime_secs()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.uptime_secs, typedOther.uptime_secs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, typedOther.uptime_secs); if (lastComparison != 0) { return lastComparison; } @@ -647,7 +647,7 @@ public int compareTo(TopologyInfo other) { return lastComparison; } if (is_set_executors()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.executors, typedOther.executors); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executors, typedOther.executors); if (lastComparison != 0) { return lastComparison; } @@ -657,7 +657,7 @@ public int compareTo(TopologyInfo other) { return lastComparison; } if (is_set_status()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.status, typedOther.status); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, typedOther.status); if (lastComparison != 0) { return lastComparison; } @@ -667,7 +667,7 @@ public int compareTo(TopologyInfo other) { return lastComparison; } if (is_set_errors()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.errors, typedOther.errors); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errors, typedOther.errors); if (lastComparison != 0) { return lastComparison; } @@ -679,42 +679,42 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.id = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // NAME - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.name = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // UPTIME_SECS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.uptime_secs = iprot.readI32(); set_uptime_secs_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 4: // EXECUTORS - if (field.type == org.apache.thrift7.protocol.TType.LIST) { + if (field.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift7.protocol.TList _list145 = iprot.readListBegin(); + org.apache.thrift.protocol.TList _list145 = iprot.readListBegin(); this.executors = new ArrayList(_list145.size); for (int _i146 = 0; _i146 < _list145.size; ++_i146) { @@ -726,20 +726,20 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readListEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 5: // STATUS - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.status = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 6: // ERRORS - if (field.type == org.apache.thrift7.protocol.TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift7.protocol.TMap _map148 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map148 = iprot.readMapBegin(); this.errors = new HashMap>(2*_map148.size); for (int _i149 = 0; _i149 < _map148.size; ++_i149) { @@ -747,7 +747,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. List _val151; // required _key150 = iprot.readString(); { - org.apache.thrift7.protocol.TList _list152 = iprot.readListBegin(); + org.apache.thrift.protocol.TList _list152 = iprot.readListBegin(); _val151 = new ArrayList(_list152.size); for (int _i153 = 0; _i153 < _list152.size; ++_i153) { @@ -763,11 +763,11 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. iprot.readMapEnd(); } } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -775,7 +775,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -795,7 +795,7 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.executors != null) { oprot.writeFieldBegin(EXECUTORS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift7.protocol.TList(org.apache.thrift7.protocol.TType.STRUCT, this.executors.size())); + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.executors.size())); for (ExecutorSummary _iter155 : this.executors) { _iter155.write(oprot); @@ -812,12 +812,12 @@ public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache if (this.errors != null) { oprot.writeFieldBegin(ERRORS_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift7.protocol.TMap(org.apache.thrift7.protocol.TType.STRING, org.apache.thrift7.protocol.TType.LIST, this.errors.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, this.errors.size())); for (Map.Entry> _iter156 : this.errors.entrySet()) { oprot.writeString(_iter156.getKey()); { - oprot.writeListBegin(new org.apache.thrift7.protocol.TList(org.apache.thrift7.protocol.TType.STRUCT, _iter156.getValue().size())); + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter156.getValue().size())); for (ErrorInfo _iter157 : _iter156.getValue()) { _iter157.write(oprot); @@ -885,38 +885,38 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_id()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString()); } if (!is_set_name()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString()); } if (!is_set_uptime_secs()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString()); } if (!is_set_executors()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'executors' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'executors' is unset! Struct:" + toString()); } if (!is_set_status()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'status' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'status' is unset! Struct:" + toString()); } if (!is_set_errors()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'errors' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'errors' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -925,8 +925,8 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException 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_bit_vector = new BitSet(1); - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java b/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java index b5bee101bf..3936b080ac 100644 --- a/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java +++ b/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java @@ -25,9 +25,9 @@ import java.util.Map; import java.util.HashMap; -import org.apache.thrift7.TEnum; +import org.apache.thrift.TEnum; -public enum TopologyInitialStatus implements org.apache.thrift7.TEnum { +public enum TopologyInitialStatus implements org.apache.thrift.TEnum { ACTIVE(1), INACTIVE(2); diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java b/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java index c5c74209fa..97ae6d7e46 100644 --- a/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java +++ b/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java @@ -38,16 +38,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TopologySummary implements org.apache.thrift7.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift7.protocol.TStruct STRUCT_DESC = new org.apache.thrift7.protocol.TStruct("TopologySummary"); +public class TopologySummary implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologySummary"); - private static final org.apache.thrift7.protocol.TField ID_FIELD_DESC = new org.apache.thrift7.protocol.TField("id", org.apache.thrift7.protocol.TType.STRING, (short)1); - private static final org.apache.thrift7.protocol.TField NAME_FIELD_DESC = new org.apache.thrift7.protocol.TField("name", org.apache.thrift7.protocol.TType.STRING, (short)2); - private static final org.apache.thrift7.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.thrift7.protocol.TField("num_tasks", org.apache.thrift7.protocol.TType.I32, (short)3); - private static final org.apache.thrift7.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift7.protocol.TField("num_executors", org.apache.thrift7.protocol.TType.I32, (short)4); - private static final org.apache.thrift7.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift7.protocol.TField("num_workers", org.apache.thrift7.protocol.TType.I32, (short)5); - private static final org.apache.thrift7.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift7.protocol.TField("uptime_secs", org.apache.thrift7.protocol.TType.I32, (short)6); - private static final org.apache.thrift7.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift7.protocol.TField("status", org.apache.thrift7.protocol.TType.STRING, (short)7); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (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 NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_tasks", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)4); + private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)5); + private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)6); + private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRING, (short)7); private String id; // required private String name; // required @@ -58,7 +58,7 @@ public class TopologySummary implements org.apache.thrift7.TBase metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift7.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift7.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ID, new org.apache.thrift7.meta_data.FieldMetaData("id", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.NAME, new org.apache.thrift7.meta_data.FieldMetaData("name", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); - tmpMap.put(_Fields.NUM_TASKS, new org.apache.thrift7.meta_data.FieldMetaData("num_tasks", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.thrift7.meta_data.FieldMetaData("num_executors", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift7.meta_data.FieldMetaData("num_workers", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift7.meta_data.FieldMetaData("uptime_secs", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.I32))); - tmpMap.put(_Fields.STATUS, new org.apache.thrift7.meta_data.FieldMetaData("status", org.apache.thrift7.TFieldRequirementType.REQUIRED, - new org.apache.thrift7.meta_data.FieldValueMetaData(org.apache.thrift7.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.NUM_TASKS, new org.apache.thrift.meta_data.FieldMetaData("num_tasks", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("num_executors", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_workers", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.STATUS, new org.apache.thrift.meta_data.FieldMetaData("status", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift7.meta_data.FieldMetaData.addStructMetaDataMap(TopologySummary.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologySummary.class, metaDataMap); } public TopologySummary() { @@ -631,7 +631,7 @@ public int compareTo(TopologySummary other) { return lastComparison; } if (is_set_id()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -641,7 +641,7 @@ public int compareTo(TopologySummary other) { return lastComparison; } if (is_set_name()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); if (lastComparison != 0) { return lastComparison; } @@ -651,7 +651,7 @@ public int compareTo(TopologySummary other) { return lastComparison; } if (is_set_num_tasks()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.num_tasks, typedOther.num_tasks); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_tasks, typedOther.num_tasks); if (lastComparison != 0) { return lastComparison; } @@ -661,7 +661,7 @@ public int compareTo(TopologySummary other) { return lastComparison; } if (is_set_num_executors()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.num_executors, typedOther.num_executors); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_executors, typedOther.num_executors); if (lastComparison != 0) { return lastComparison; } @@ -671,7 +671,7 @@ public int compareTo(TopologySummary other) { return lastComparison; } if (is_set_num_workers()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.num_workers, typedOther.num_workers); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, typedOther.num_workers); if (lastComparison != 0) { return lastComparison; } @@ -681,7 +681,7 @@ public int compareTo(TopologySummary other) { return lastComparison; } if (is_set_uptime_secs()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.uptime_secs, typedOther.uptime_secs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, typedOther.uptime_secs); if (lastComparison != 0) { return lastComparison; } @@ -691,7 +691,7 @@ public int compareTo(TopologySummary other) { return lastComparison; } if (is_set_status()) { - lastComparison = org.apache.thrift7.TBaseHelper.compareTo(this.status, typedOther.status); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, typedOther.status); if (lastComparison != 0) { return lastComparison; } @@ -703,71 +703,71 @@ public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache.thrift7.TException { - org.apache.thrift7.protocol.TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift7.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ID - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.id = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // NAME - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.name = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // NUM_TASKS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.num_tasks = iprot.readI32(); set_num_tasks_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 4: // NUM_EXECUTORS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.num_executors = iprot.readI32(); set_num_executors_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 5: // NUM_WORKERS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.num_workers = iprot.readI32(); set_num_workers_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 6: // UPTIME_SECS - if (field.type == org.apache.thrift7.protocol.TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.uptime_secs = iprot.readI32(); set_uptime_secs_isSet(true); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 7: // STATUS - if (field.type == org.apache.thrift7.protocol.TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.status = iprot.readString(); } else { - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift7.protocol.TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -775,7 +775,7 @@ public void read(org.apache.thrift7.protocol.TProtocol iprot) throws org.apache. validate(); } - public void write(org.apache.thrift7.protocol.TProtocol oprot) throws org.apache.thrift7.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -858,42 +858,42 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift7.TException { + public void validate() throws org.apache.thrift.TException { // check for required fields if (!is_set_id()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString()); } if (!is_set_name()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString()); } if (!is_set_num_tasks()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'num_tasks' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_tasks' is unset! Struct:" + toString()); } if (!is_set_num_executors()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'num_executors' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_executors' is unset! Struct:" + toString()); } if (!is_set_num_workers()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'num_workers' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_workers' is unset! Struct:" + toString()); } if (!is_set_uptime_secs()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString()); } if (!is_set_status()) { - throw new org.apache.thrift7.protocol.TProtocolException("Required field 'status' is unset! Struct:" + toString()); + throw new org.apache.thrift.protocol.TProtocolException("Required field 'status' is unset! Struct:" + toString()); } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift7.TException te) { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -902,8 +902,8 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException 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_bit_vector = new BitSet(1); - read(new org.apache.thrift7.protocol.TCompactProtocol(new org.apache.thrift7.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift7.TException te) { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } diff --git a/storm-netty/src/jvm/backtype/storm/messaging/netty/Client.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java similarity index 99% rename from storm-netty/src/jvm/backtype/storm/messaging/netty/Client.java rename to storm-core/src/jvm/backtype/storm/messaging/netty/Client.java index ed2dc08cde..d765e7105f 100644 --- a/storm-netty/src/jvm/backtype/storm/messaging/netty/Client.java +++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java @@ -17,6 +17,17 @@ */ package backtype.storm.messaging.netty; +import backtype.storm.Config; +import backtype.storm.messaging.IConnection; +import backtype.storm.messaging.TaskMessage; +import backtype.storm.utils.Utils; +import org.jboss.netty.bootstrap.ClientBootstrap; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelFactory; +import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.net.InetSocketAddress; import java.util.Map; import java.util.Random; @@ -26,18 +37,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.jboss.netty.bootstrap.ClientBootstrap; -import org.jboss.netty.channel.Channel; -import org.jboss.netty.channel.ChannelFactory; -import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import backtype.storm.Config; -import backtype.storm.messaging.IConnection; -import backtype.storm.messaging.TaskMessage; -import backtype.storm.utils.Utils; - class Client implements IConnection { private static final Logger LOG = LoggerFactory.getLogger(Client.class); private final int max_retries; diff --git a/storm-netty/src/jvm/backtype/storm/messaging/netty/Context.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Context.java similarity index 100% rename from storm-netty/src/jvm/backtype/storm/messaging/netty/Context.java rename to storm-core/src/jvm/backtype/storm/messaging/netty/Context.java index d7a72016e0..3e09dd1c8a 100644 --- a/storm-netty/src/jvm/backtype/storm/messaging/netty/Context.java +++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Context.java @@ -17,12 +17,12 @@ */ package backtype.storm.messaging.netty; -import java.util.Map; -import java.util.Vector; - import backtype.storm.messaging.IConnection; import backtype.storm.messaging.IContext; +import java.util.Map; +import java.util.Vector; + public class Context implements IContext { @SuppressWarnings("rawtypes") private Map storm_conf; diff --git a/storm-netty/src/jvm/backtype/storm/messaging/netty/ControlMessage.java b/storm-core/src/jvm/backtype/storm/messaging/netty/ControlMessage.java similarity index 98% rename from storm-netty/src/jvm/backtype/storm/messaging/netty/ControlMessage.java rename to storm-core/src/jvm/backtype/storm/messaging/netty/ControlMessage.java index fd1e70b1e8..a552cf74ac 100644 --- a/storm-netty/src/jvm/backtype/storm/messaging/netty/ControlMessage.java +++ b/storm-core/src/jvm/backtype/storm/messaging/netty/ControlMessage.java @@ -20,7 +20,6 @@ import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBufferOutputStream; import org.jboss.netty.buffer.ChannelBuffers; -import org.jboss.netty.channel.Channel; enum ControlMessage { CLOSE_MESSAGE((short)-100), diff --git a/storm-netty/src/jvm/backtype/storm/messaging/netty/MessageBatch.java b/storm-core/src/jvm/backtype/storm/messaging/netty/MessageBatch.java similarity index 99% rename from storm-netty/src/jvm/backtype/storm/messaging/netty/MessageBatch.java rename to storm-core/src/jvm/backtype/storm/messaging/netty/MessageBatch.java index fd7b3d6780..9d287e4b5f 100644 --- a/storm-netty/src/jvm/backtype/storm/messaging/netty/MessageBatch.java +++ b/storm-core/src/jvm/backtype/storm/messaging/netty/MessageBatch.java @@ -17,14 +17,12 @@ */ package backtype.storm.messaging.netty; -import java.util.ArrayList; - +import backtype.storm.messaging.TaskMessage; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBufferOutputStream; import org.jboss.netty.buffer.ChannelBuffers; -import org.jboss.netty.channel.Channel; -import backtype.storm.messaging.TaskMessage; +import java.util.ArrayList; class MessageBatch { private int buffer_size; diff --git a/storm-netty/src/jvm/backtype/storm/messaging/netty/MessageDecoder.java b/storm-core/src/jvm/backtype/storm/messaging/netty/MessageDecoder.java similarity index 100% rename from storm-netty/src/jvm/backtype/storm/messaging/netty/MessageDecoder.java rename to storm-core/src/jvm/backtype/storm/messaging/netty/MessageDecoder.java index ac4f63dccb..3365e58171 100644 --- a/storm-netty/src/jvm/backtype/storm/messaging/netty/MessageDecoder.java +++ b/storm-core/src/jvm/backtype/storm/messaging/netty/MessageDecoder.java @@ -17,11 +17,11 @@ */ package backtype.storm.messaging.netty; +import backtype.storm.messaging.TaskMessage; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.frame.FrameDecoder; -import backtype.storm.messaging.TaskMessage; public class MessageDecoder extends FrameDecoder { /* diff --git a/storm-netty/src/jvm/backtype/storm/messaging/netty/MessageEncoder.java b/storm-core/src/jvm/backtype/storm/messaging/netty/MessageEncoder.java similarity index 100% rename from storm-netty/src/jvm/backtype/storm/messaging/netty/MessageEncoder.java rename to storm-core/src/jvm/backtype/storm/messaging/netty/MessageEncoder.java diff --git a/storm-netty/src/jvm/backtype/storm/messaging/netty/Server.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java similarity index 99% rename from storm-netty/src/jvm/backtype/storm/messaging/netty/Server.java rename to storm-core/src/jvm/backtype/storm/messaging/netty/Server.java index df6156941d..ad811b0622 100644 --- a/storm-netty/src/jvm/backtype/storm/messaging/netty/Server.java +++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java @@ -17,11 +17,10 @@ */ package backtype.storm.messaging.netty; -import java.net.InetSocketAddress; -import java.util.Map; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.Executors; - +import backtype.storm.Config; +import backtype.storm.messaging.IConnection; +import backtype.storm.messaging.TaskMessage; +import backtype.storm.utils.Utils; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelFactory; @@ -31,10 +30,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import backtype.storm.Config; -import backtype.storm.messaging.IConnection; -import backtype.storm.messaging.TaskMessage; -import backtype.storm.utils.Utils; +import java.net.InetSocketAddress; +import java.util.Map; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; class Server implements IConnection { private static final Logger LOG = LoggerFactory.getLogger(Server.class); diff --git a/storm-netty/src/jvm/backtype/storm/messaging/netty/StormClientHandler.java b/storm-core/src/jvm/backtype/storm/messaging/netty/StormClientHandler.java similarity index 91% rename from storm-netty/src/jvm/backtype/storm/messaging/netty/StormClientHandler.java rename to storm-core/src/jvm/backtype/storm/messaging/netty/StormClientHandler.java index 5dfd6d3e40..65c36a7c59 100644 --- a/storm-netty/src/jvm/backtype/storm/messaging/netty/StormClientHandler.java +++ b/storm-core/src/jvm/backtype/storm/messaging/netty/StormClientHandler.java @@ -17,20 +17,13 @@ */ package backtype.storm.messaging.netty; -import java.net.ConnectException; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.jboss.netty.channel.Channel; -import org.jboss.netty.channel.ChannelFuture; -import org.jboss.netty.channel.ChannelFutureListener; -import org.jboss.netty.channel.ChannelHandlerContext; -import org.jboss.netty.channel.ChannelStateEvent; -import org.jboss.netty.channel.ExceptionEvent; -import org.jboss.netty.channel.MessageEvent; -import org.jboss.netty.channel.SimpleChannelUpstreamHandler; +import org.jboss.netty.channel.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.net.ConnectException; +import java.util.concurrent.atomic.AtomicBoolean; + public class StormClientHandler extends SimpleChannelUpstreamHandler { private static final Logger LOG = LoggerFactory.getLogger(StormClientHandler.class); private Client client; diff --git a/storm-netty/src/jvm/backtype/storm/messaging/netty/StormClientPipelineFactory.java b/storm-core/src/jvm/backtype/storm/messaging/netty/StormClientPipelineFactory.java similarity index 100% rename from storm-netty/src/jvm/backtype/storm/messaging/netty/StormClientPipelineFactory.java rename to storm-core/src/jvm/backtype/storm/messaging/netty/StormClientPipelineFactory.java diff --git a/storm-netty/src/jvm/backtype/storm/messaging/netty/StormServerHandler.java b/storm-core/src/jvm/backtype/storm/messaging/netty/StormServerHandler.java similarity index 89% rename from storm-netty/src/jvm/backtype/storm/messaging/netty/StormServerHandler.java rename to storm-core/src/jvm/backtype/storm/messaging/netty/StormServerHandler.java index 3380e01202..093fb61ce1 100644 --- a/storm-netty/src/jvm/backtype/storm/messaging/netty/StormServerHandler.java +++ b/storm-core/src/jvm/backtype/storm/messaging/netty/StormServerHandler.java @@ -17,18 +17,12 @@ */ package backtype.storm.messaging.netty; -import java.util.concurrent.atomic.AtomicInteger; - -import org.jboss.netty.channel.Channel; -import org.jboss.netty.channel.ChannelHandlerContext; -import org.jboss.netty.channel.ChannelStateEvent; -import org.jboss.netty.channel.ExceptionEvent; -import org.jboss.netty.channel.MessageEvent; -import org.jboss.netty.channel.SimpleChannelUpstreamHandler; +import backtype.storm.messaging.TaskMessage; +import org.jboss.netty.channel.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import backtype.storm.messaging.TaskMessage; +import java.util.concurrent.atomic.AtomicInteger; class StormServerHandler extends SimpleChannelUpstreamHandler { private static final Logger LOG = LoggerFactory.getLogger(StormServerHandler.class); diff --git a/storm-netty/src/jvm/backtype/storm/messaging/netty/StormServerPipelineFactory.java b/storm-core/src/jvm/backtype/storm/messaging/netty/StormServerPipelineFactory.java similarity index 100% rename from storm-netty/src/jvm/backtype/storm/messaging/netty/StormServerPipelineFactory.java rename to storm-core/src/jvm/backtype/storm/messaging/netty/StormServerPipelineFactory.java diff --git a/storm-core/src/jvm/backtype/storm/security/auth/ITransportPlugin.java b/storm-core/src/jvm/backtype/storm/security/auth/ITransportPlugin.java index aa6c53d035..a44d115624 100644 --- a/storm-core/src/jvm/backtype/storm/security/auth/ITransportPlugin.java +++ b/storm-core/src/jvm/backtype/storm/security/auth/ITransportPlugin.java @@ -22,10 +22,10 @@ import javax.security.auth.login.Configuration; -import org.apache.thrift7.TProcessor; -import org.apache.thrift7.server.TServer; -import org.apache.thrift7.transport.TTransport; -import org.apache.thrift7.transport.TTransportException; +import org.apache.thrift.TProcessor; +import org.apache.thrift.server.TServer; +import org.apache.thrift.transport.TTransport; +import org.apache.thrift.transport.TTransportException; /** * Interface for Thrift Transport plugin diff --git a/storm-core/src/jvm/backtype/storm/security/auth/SaslTransportPlugin.java b/storm-core/src/jvm/backtype/storm/security/auth/SaslTransportPlugin.java index e2d6179892..44ab754792 100644 --- a/storm-core/src/jvm/backtype/storm/security/auth/SaslTransportPlugin.java +++ b/storm-core/src/jvm/backtype/storm/security/auth/SaslTransportPlugin.java @@ -25,18 +25,18 @@ import javax.security.auth.Subject; import javax.security.auth.login.Configuration; import javax.security.sasl.SaslServer; -import org.apache.thrift7.TException; -import org.apache.thrift7.TProcessor; -import org.apache.thrift7.protocol.TBinaryProtocol; -import org.apache.thrift7.protocol.TProtocol; -import org.apache.thrift7.server.TServer; -import org.apache.thrift7.server.TThreadPoolServer; -import org.apache.thrift7.transport.TSaslServerTransport; -import org.apache.thrift7.transport.TServerSocket; -import org.apache.thrift7.transport.TSocket; -import org.apache.thrift7.transport.TTransport; -import org.apache.thrift7.transport.TTransportException; -import org.apache.thrift7.transport.TTransportFactory; +import org.apache.thrift.TException; +import org.apache.thrift.TProcessor; +import org.apache.thrift.protocol.TBinaryProtocol; +import org.apache.thrift.protocol.TProtocol; +import org.apache.thrift.server.TServer; +import org.apache.thrift.server.TThreadPoolServer; +import org.apache.thrift.transport.TSaslServerTransport; +import org.apache.thrift.transport.TServerSocket; +import org.apache.thrift.transport.TSocket; +import org.apache.thrift.transport.TTransport; +import org.apache.thrift.transport.TTransportException; +import org.apache.thrift.transport.TTransportFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java b/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java index 099fe08eb6..5a817466e4 100644 --- a/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java +++ b/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java @@ -24,18 +24,18 @@ import java.util.Map; import javax.security.auth.login.Configuration; -import org.apache.thrift7.TException; -import org.apache.thrift7.TProcessor; -import org.apache.thrift7.protocol.TBinaryProtocol; -import org.apache.thrift7.protocol.TProtocol; -import org.apache.thrift7.server.THsHaServer; -import org.apache.thrift7.server.TServer; -import org.apache.thrift7.transport.TFramedTransport; -import org.apache.thrift7.transport.TMemoryInputTransport; -import org.apache.thrift7.transport.TNonblockingServerSocket; -import org.apache.thrift7.transport.TSocket; -import org.apache.thrift7.transport.TTransport; -import org.apache.thrift7.transport.TTransportException; +import org.apache.thrift.TException; +import org.apache.thrift.TProcessor; +import org.apache.thrift.protocol.TBinaryProtocol; +import org.apache.thrift.protocol.TProtocol; +import org.apache.thrift.server.THsHaServer; +import org.apache.thrift.server.TServer; +import org.apache.thrift.transport.TFramedTransport; +import org.apache.thrift.transport.TMemoryInputTransport; +import org.apache.thrift.transport.TNonblockingServerSocket; +import org.apache.thrift.transport.TSocket; +import org.apache.thrift.transport.TTransport; +import org.apache.thrift.transport.TTransportException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-core/src/jvm/backtype/storm/security/auth/ThriftClient.java b/storm-core/src/jvm/backtype/storm/security/auth/ThriftClient.java index e1ee01bdbb..d3971270e7 100644 --- a/storm-core/src/jvm/backtype/storm/security/auth/ThriftClient.java +++ b/storm-core/src/jvm/backtype/storm/security/auth/ThriftClient.java @@ -20,11 +20,11 @@ import java.io.IOException; import java.util.Map; import javax.security.auth.login.Configuration; -import org.apache.thrift7.protocol.TBinaryProtocol; -import org.apache.thrift7.protocol.TProtocol; -import org.apache.thrift7.transport.TSocket; -import org.apache.thrift7.transport.TTransport; -import org.apache.thrift7.transport.TTransportException; +import org.apache.thrift.protocol.TBinaryProtocol; +import org.apache.thrift.protocol.TProtocol; +import org.apache.thrift.transport.TSocket; +import org.apache.thrift.transport.TTransport; +import org.apache.thrift.transport.TTransportException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import backtype.storm.utils.Utils; diff --git a/storm-core/src/jvm/backtype/storm/security/auth/ThriftServer.java b/storm-core/src/jvm/backtype/storm/security/auth/ThriftServer.java index 6274bf537b..ec6e4ad856 100644 --- a/storm-core/src/jvm/backtype/storm/security/auth/ThriftServer.java +++ b/storm-core/src/jvm/backtype/storm/security/auth/ThriftServer.java @@ -19,8 +19,8 @@ import java.util.Map; import javax.security.auth.login.Configuration; -import org.apache.thrift7.TProcessor; -import org.apache.thrift7.server.TServer; +import org.apache.thrift.TProcessor; +import org.apache.thrift.server.TServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import backtype.storm.utils.Utils; diff --git a/storm-core/src/jvm/backtype/storm/security/auth/digest/DigestSaslTransportPlugin.java b/storm-core/src/jvm/backtype/storm/security/auth/digest/DigestSaslTransportPlugin.java index 0cd1a5a09c..4abf98bba6 100644 --- a/storm-core/src/jvm/backtype/storm/security/auth/digest/DigestSaslTransportPlugin.java +++ b/storm-core/src/jvm/backtype/storm/security/auth/digest/DigestSaslTransportPlugin.java @@ -23,11 +23,11 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.Configuration; -import org.apache.thrift7.transport.TSaslClientTransport; -import org.apache.thrift7.transport.TSaslServerTransport; -import org.apache.thrift7.transport.TTransport; -import org.apache.thrift7.transport.TTransportException; -import org.apache.thrift7.transport.TTransportFactory; +import org.apache.thrift.transport.TSaslClientTransport; +import org.apache.thrift.transport.TSaslServerTransport; +import org.apache.thrift.transport.TTransport; +import org.apache.thrift.transport.TTransportException; +import org.apache.thrift.transport.TTransportFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-core/src/jvm/backtype/storm/utils/DRPCClient.java b/storm-core/src/jvm/backtype/storm/utils/DRPCClient.java index 27edb6d35f..cf38fb821f 100644 --- a/storm-core/src/jvm/backtype/storm/utils/DRPCClient.java +++ b/storm-core/src/jvm/backtype/storm/utils/DRPCClient.java @@ -19,11 +19,11 @@ import backtype.storm.generated.DRPCExecutionException; import backtype.storm.generated.DistributedRPC; -import org.apache.thrift7.TException; -import org.apache.thrift7.protocol.TBinaryProtocol; -import org.apache.thrift7.transport.TFramedTransport; -import org.apache.thrift7.transport.TSocket; -import org.apache.thrift7.transport.TTransport; +import org.apache.thrift.TException; +import org.apache.thrift.protocol.TBinaryProtocol; +import org.apache.thrift.transport.TFramedTransport; +import org.apache.thrift.transport.TSocket; +import org.apache.thrift.transport.TTransport; public class DRPCClient implements DistributedRPC.Iface { private TTransport conn; diff --git a/storm-core/src/jvm/backtype/storm/utils/NimbusClient.java b/storm-core/src/jvm/backtype/storm/utils/NimbusClient.java index 43df83dd76..e93acc8acc 100644 --- a/storm-core/src/jvm/backtype/storm/utils/NimbusClient.java +++ b/storm-core/src/jvm/backtype/storm/utils/NimbusClient.java @@ -21,7 +21,7 @@ import backtype.storm.security.auth.ThriftClient; import backtype.storm.generated.Nimbus; import java.util.Map; -import org.apache.thrift7.transport.TTransportException; +import org.apache.thrift.transport.TTransportException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-core/src/jvm/backtype/storm/utils/Utils.java b/storm-core/src/jvm/backtype/storm/utils/Utils.java index e093065c5f..8a05fe4952 100644 --- a/storm-core/src/jvm/backtype/storm/utils/Utils.java +++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java @@ -47,7 +47,7 @@ import java.util.TreeMap; import java.util.UUID; import org.apache.commons.lang.StringUtils; -import org.apache.thrift7.TException; +import org.apache.thrift.TException; import org.json.simple.JSONValue; import org.yaml.snakeyaml.Yaml; diff --git a/storm-core/src/jvm/storm/trident/drpc/ReturnResultsReducer.java b/storm-core/src/jvm/storm/trident/drpc/ReturnResultsReducer.java index be5fa55819..4ebb667b27 100644 --- a/storm-core/src/jvm/storm/trident/drpc/ReturnResultsReducer.java +++ b/storm-core/src/jvm/storm/trident/drpc/ReturnResultsReducer.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.thrift7.TException; +import org.apache.thrift.TException; import org.json.simple.JSONValue; import storm.trident.drpc.ReturnResultsReducer.ReturnResultsState; import storm.trident.operation.MultiReducer; diff --git a/storm-core/src/jvm/storm/trident/util/TridentUtils.java b/storm-core/src/jvm/storm/trident/util/TridentUtils.java index 3499dd5130..b3ac24519f 100644 --- a/storm-core/src/jvm/storm/trident/util/TridentUtils.java +++ b/storm-core/src/jvm/storm/trident/util/TridentUtils.java @@ -29,10 +29,10 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.thrift7.TBase; -import org.apache.thrift7.TDeserializer; -import org.apache.thrift7.TException; -import org.apache.thrift7.TSerializer; +import org.apache.thrift.TBase; +import org.apache.thrift.TDeserializer; +import org.apache.thrift.TException; +import org.apache.thrift.TSerializer; import org.jgrapht.DirectedGraph; public class TridentUtils { diff --git a/storm-core/src/multilang/py/storm.py b/storm-core/src/multilang/py/storm.py index 4f5827fe25..bec3f0c213 100755 --- a/storm-core/src/multilang/py/storm.py +++ b/storm-core/src/multilang/py/storm.py @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http:# www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/multilang/rb/storm.rb b/storm-core/src/multilang/rb/storm.rb index ffc300d33c..57d45f10f9 100644 --- a/storm-core/src/multilang/rb/storm.rb +++ b/storm-core/src/multilang/rb/storm.rb @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http:# www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/src/ui/public/css/bootstrap-1.1.0.css b/storm-core/src/ui/public/css/bootstrap-1.1.0.css deleted file mode 100644 index 948d5fc937..0000000000 --- a/storm-core/src/ui/public/css/bootstrap-1.1.0.css +++ /dev/null @@ -1,1894 +0,0 @@ -/*! - * Bootstrap v1.1.0 - * - * Copyright 2011 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Mon Aug 22 23:50:35 PDT 2011 - */ -/* Reset.less - * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). - * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ -html, body { - margin: 0; - padding: 0; -} -h1, -h2, -h3, -h4, -h5, -h6, -p, -blockquote, -pre, -a, -abbr, -acronym, -address, -cite, -code, -del, -dfn, -em, -img, -q, -s, -samp, -small, -strike, -strong, -sub, -sup, -tt, -var, -dd, -dl, -dt, -li, -ol, -ul, -fieldset, -form, -label, -legend, -button, -table, -caption, -tbody, -tfoot, -thead, -tr, -th, -td { - margin: 0; - padding: 0; - border: 0; - font-weight: normal; - font-style: normal; - font-size: 100%; - line-height: 1; - font-family: inherit; -} -table { - border-collapse: collapse; - border-spacing: 0; -} -ol, ul { - list-style: none; -} -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} -header, -section, -footer, -article, -aside { - display: block; -} -/* Preboot.less - * Variables and mixins to pre-ignite any new web development project - * ------------------------------------------------------------------ */ -.clearfix { - zoom: 1; -} -.clearfix:before, .clearfix:after { - display: table; - content: ""; -} -.clearfix:after { - clear: both; -} -.center-block { - display: block; - margin: 0 auto; -} -.container { - width: 940px; - margin: 0 auto; - zoom: 1; -} -.container:before, .container:after { - display: table; - content: ""; -} -.container:after { - clear: both; -} -/* - * Scaffolding - * Basic and global styles for generating a grid system, structural layout, and page templates - * ------------------------------------------------------------------------------------------- */ -.row { - zoom: 1; -} -.row:before, .row:after { - display: table; - content: ""; -} -.row:after { - clear: both; -} -.row .span1 { - float: left; - width: 40px; - margin-left: 20px; -} -.row .span1:first-child { - margin-left: 0; -} -.row .span2 { - float: left; - width: 100px; - margin-left: 20px; -} -.row .span2:first-child { - margin-left: 0; -} -.row .span3 { - float: left; - width: 160px; - margin-left: 20px; -} -.row .span3:first-child { - margin-left: 0; -} -.row .span4 { - float: left; - width: 220px; - margin-left: 20px; -} -.row .span4:first-child { - margin-left: 0; -} -.row .span5 { - float: left; - width: 280px; - margin-left: 20px; -} -.row .span5:first-child { - margin-left: 0; -} -.row .span6 { - float: left; - width: 340px; - margin-left: 20px; -} -.row .span6:first-child { - margin-left: 0; -} -.row .span7 { - float: left; - width: 400px; - margin-left: 20px; -} -.row .span7:first-child { - margin-left: 0; -} -.row .span8 { - float: left; - width: 460px; - margin-left: 20px; -} -.row .span8:first-child { - margin-left: 0; -} -.row .span9 { - float: left; - width: 520px; - margin-left: 20px; -} -.row .span9:first-child { - margin-left: 0; -} -.row .span10 { - float: left; - width: 580px; - margin-left: 20px; -} -.row .span10:first-child { - margin-left: 0; -} -.row .span11 { - float: left; - width: 640px; - margin-left: 20px; -} -.row .span11:first-child { - margin-left: 0; -} -.row .span12 { - float: left; - width: 700px; - margin-left: 20px; -} -.row .span12:first-child { - margin-left: 0; -} -.row .span13 { - float: left; - width: 760px; - margin-left: 20px; -} -.row .span13:first-child { - margin-left: 0; -} -.row .span14 { - float: left; - width: 820px; - margin-left: 20px; -} -.row .span14:first-child { - margin-left: 0; -} -.row .span15 { - float: left; - width: 880px; - margin-left: 20px; -} -.row .span15:first-child { - margin-left: 0; -} -.row .span16 { - float: left; - width: 940px; - margin-left: 20px; -} -.row .span16:first-child { - margin-left: 0; -} -.row .offset1 { - margin-left: 80px !important; -} -.row .offset1:first-child { - margin-left: 60px !important; -} -.row .offset2 { - margin-left: 140px !important; -} -.row .offset2:first-child { - margin-left: 120px !important; -} -.row .offset3 { - margin-left: 200px !important; -} -.row .offset3:first-child { - margin-left: 180px !important; -} -.row .offset4 { - margin-left: 260px !important; -} -.row .offset4:first-child { - margin-left: 240px !important; -} -.row .offset5 { - margin-left: 320px !important; -} -.row .offset5:first-child { - margin-left: 300px !important; -} -.row .offset6 { - margin-left: 380px !important; -} -.row .offset6:first-child { - margin-left: 360px !important; -} -.row .offset7 { - margin-left: 440px !important; -} -.row .offset7:first-child { - margin-left: 420px !important; -} -.row .offset8 { - margin-left: 500px !important; -} -.row .offset8:first-child { - margin-left: 480px !important; -} -.row .offset9 { - margin-left: 500px !important; -} -.row .offset9:first-child { - margin-left: 480px !important; -} -.row .offset10 { - margin-left: 620px !important; -} -.row .offset10:first-child { - margin-left: 600px !important; -} -.row .offset11 { - margin-left: 680px !important; -} -.row .offset11:first-child { - margin-left: 660px !important; -} -.row .offset12 { - margin-left: 740px !important; -} -.row .offset12:first-child { - margin-left: 720px !important; -} -html, body { - background-color: #fff; -} -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 18px; - color: #808080; - text-rendering: optimizeLegibility; -} -div.container { - width: 940px; - margin: 0 auto; -} -div.container-fluid { - padding: 0 20px; - zoom: 1; -} -div.container-fluid:before, div.container-fluid:after { - display: table; - content: ""; -} -div.container-fluid:after { - clear: both; -} -div.container-fluid div.sidebar { - float: left; - width: 220px; -} -div.container-fluid div.content { - min-width: 700px; - max-width: 1180px; - margin-left: 240px; -} -a { - color: #0069d6; - text-decoration: none; - line-height: inherit; - font-weight: inherit; -} -a:hover { - color: #0050a3; - text-decoration: underline; -} -.btn { - cursor: pointer; - display: inline-block; - background-color: #e6e6e6; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: -moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - padding: 4px 14px; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333; - font-size: 13px; - line-height: 18px; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -webkit-transition: 0.1s linear all; - -moz-transition: 0.1s linear all; - transition: 0.1s linear all; -} -.btn:hover { - background-position: 0 -15px; - color: #333; - text-decoration: none; -} -.btn.primary, .btn.danger { - color: #fff; -} -.btn.primary:hover, .btn.danger:hover { - color: #fff; -} -.btn.primary { - background-color: #0064cd; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); - background-image: -moz-linear-gradient(#049cdb, #0064cd); - background-image: -ms-linear-gradient(#049cdb, #0064cd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); - background-image: -webkit-linear-gradient(#049cdb, #0064cd); - background-image: -o-linear-gradient(#049cdb, #0064cd); - background-image: linear-gradient(#049cdb, #0064cd); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #0064cd #0064cd #003f81; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.danger { - background-color: #9d261d; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#d83a2e), to(#9d261d)); - background-image: -moz-linear-gradient(#d83a2e, #9d261d); - background-image: -ms-linear-gradient(#d83a2e, #9d261d); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #d83a2e), color-stop(100%, #9d261d)); - background-image: -webkit-linear-gradient(#d83a2e, #9d261d); - background-image: -o-linear-gradient(#d83a2e, #9d261d); - background-image: linear-gradient(#d83a2e, #9d261d); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #9d261d #9d261d #5c1611; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.large { - font-size: 16px; - line-height: 28px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.btn.small { - padding-right: 9px; - padding-left: 9px; - font-size: 11px; -} -.btn.disabled { - background-image: none; - filter: alpha(opacity=65); - -khtml-opacity: 0.65; - -moz-opacity: 0.65; - opacity: 0.65; - cursor: default; -} -.btn:disabled { - background-image: none; - filter: alpha(opacity=65); - -khtml-opacity: 0.65; - -moz-opacity: 0.65; - opacity: 0.65; - cursor: default; -} -.btn:active { - -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); -} -button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { - padding: 0; - border: 0; -} -/* Typography.less - * Headings, body text, lists, code, and more for a versatile and durable typography system - * ---------------------------------------------------------------------------------------- */ -p { - font-size: 13px; - font-weight: normal; - line-height: 18px; - margin-bottom: 9px; -} -p small { - font-size: 11px; - color: #bfbfbf; -} -h1, -h2, -h3, -h4, -h5, -h6 { - font-weight: bold; - color: #404040; -} -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - color: #bfbfbf; -} -h1 { - margin-bottom: 18px; - font-size: 30px; - line-height: 36px; -} -h1 small { - font-size: 18px; -} -h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 14px; -} -h3, -h4, -h5, -h6 { - line-height: 36px; -} -h3 { - font-size: 18px; -} -h3 small { - font-size: 14px; -} -h4 { - font-size: 16px; -} -h4 small { - font-size: 12px; -} -h5 { - font-size: 14px; -} -h6 { - font-size: 13px; - color: #bfbfbf; - text-transform: uppercase; -} -ul, ol { - margin: 0 0 18px 25px; -} -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} -ul { - list-style: disc; -} -ol { - list-style: decimal; -} -li { - line-height: 18px; - color: #808080; -} -ul.unstyled { - list-style: none; - margin-left: 0; -} -dl { - margin-bottom: 18px; -} -dl dt, dl dd { - line-height: 18px; -} -dl dt { - font-weight: bold; -} -dl dd { - margin-left: 9px; -} -hr { - margin: 0 0 19px; - border: 0; - border-bottom: 1px solid #eee; -} -strong { - font-style: inherit; - font-weight: bold; - line-height: inherit; -} -em { - font-style: italic; - font-weight: inherit; - line-height: inherit; -} -.muted { - color: #e6e6e6; -} -blockquote { - margin-bottom: 18px; - border-left: 5px solid #eee; - padding-left: 15px; -} -blockquote p { - font-size: 14px; - font-weight: 300; - line-height: 18px; - margin-bottom: 0; -} -blockquote small { - display: block; - font-size: 12px; - font-weight: 300; - line-height: 18px; - color: #bfbfbf; -} -blockquote small:before { - content: '\2014 \00A0'; -} -address { - display: block; - line-height: 18px; - margin-bottom: 18px; -} -code, pre { - padding: 0 3px 2px; - font-family: Monaco, Andale Mono, Courier New, monospace; - font-size: 12px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -code { - background-color: #fee9cc; - color: rgba(0, 0, 0, 0.75); - padding: 1px 3px; -} -pre { - background-color: #f5f5f5; - display: block; - padding: 17px; - margin: 0 0 18px; - line-height: 18px; - font-size: 12px; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - white-space: pre-wrap; -} -/* Forms.less - * Base styles for various input types, form layouts, and states - * ------------------------------------------------------------- */ -form { - margin-bottom: 18px; -} -form fieldset { - margin-bottom: 18px; - padding-top: 18px; -} -form fieldset legend { - display: block; - margin-left: 150px; - font-size: 20px; - line-height: 1; - *margin: 0 0 5px 145px; - /* IE6-7 */ - - *line-height: 1.5; - /* IE6-7 */ - - color: #404040; -} -form .clearfix { - margin-bottom: 18px; -} -form label, -form input, -form select, -form textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: normal; -} -form label { - padding-top: 6px; - font-size: 13px; - line-height: 18px; - float: left; - width: 130px; - text-align: right; - color: #404040; -} -form div.input { - margin-left: 150px; -} -form input[type=checkbox], form input[type=radio] { - cursor: pointer; -} -form input[type=text], -form input[type=password], -form textarea, -form select, -form .uneditable-input { - display: inline-block; - width: 210px; - margin: 0; - padding: 4px; - font-size: 13px; - line-height: 18px; - height: 18px; - color: #808080; - border: 1px solid #ccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -form select, form input[type=file] { - height: 27px; - line-height: 27px; -} -form textarea { - height: auto; -} -form .uneditable-input { - background-color: #eee; - display: block; - border-color: #ccc; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); -} -form :-moz-placeholder { - color: #bfbfbf; -} -form ::-webkit-input-placeholder { - color: #bfbfbf; -} -form input[type=text], -form input[type=password], -form select, -form textarea { - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; - -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); -} -form input[type=text]:focus, form input[type=password]:focus, form textarea:focus { - outline: none; - border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); -} -form div.error { - background: #fae5e3; - padding: 10px 0; - margin: -10px 0 10px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -form div.error > label, form div.error span.help-inline, form div.error span.help-block { - color: #9d261d; -} -form div.error input[type=text], form div.error input[type=password], form div.error textarea { - border-color: #c87872; - -webkit-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); - -moz-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); - box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); -} -form div.error input[type=text]:focus, form div.error input[type=password]:focus, form div.error textarea:focus { - border-color: #b9554d; - -webkit-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); - -moz-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); - box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); -} -form div.error .input-prepend span.add-on, form div.error .input-append span.add-on { - background: #f4c8c5; - border-color: #c87872; - color: #b9554d; -} -form .input-mini, -form input.mini, -form textarea.mini, -form select.mini { - width: 60px; -} -form .input-small, -form input.small, -form textarea.small, -form select.small { - width: 90px; -} -form .input-medium, -form input.medium, -form textarea.medium, -form select.medium { - width: 150px; -} -form .input-large, -form input.large, -form textarea.large, -form select.large { - width: 210px; -} -form .input-xlarge, -form input.xlarge, -form textarea.xlarge, -form select.xlarge { - width: 270px; -} -form .input-xxlarge, -form input.xxlarge, -form textarea.xxlarge, -form select.xxlarge { - width: 530px; -} -form textarea.xxlarge { - overflow-y: scroll; -} -form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled { - background: #f5f5f5; - border-color: #ddd; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.actions { - background: #f5f5f5; - margin-top: 18px; - margin-bottom: 18px; - padding: 17px 20px 18px 150px; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; -} -.actions .secondary-action { - float: right; -} -.actions .secondary-action a { - line-height: 30px; -} -.actions .secondary-action a:hover { - text-decoration: underline; -} -.help-inline, .help-block { - font-size: 12px; - line-height: 18px; - color: #bfbfbf; -} -.help-inline { - padding-left: 5px; - *position: relative; - /* IE6-7 */ - - *top: -5px; - /* IE6-7 */ - -} -.help-block { - display: block; - max-width: 600px; -} -.inline-inputs { - color: #808080; -} -.inline-inputs span, .inline-inputs input[type=text] { - display: inline-block; -} -.inline-inputs input.mini { - width: 60px; -} -.inline-inputs input.small { - width: 90px; -} -.inline-inputs span { - padding: 0 2px 0 1px; -} -.input-prepend input[type=text], -.input-append input[type=text], -.input-prepend input[type=password], -.input-append input[type=password] { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.input-prepend .add-on, .input-append .add-on { - background: #f5f5f5; - float: left; - display: block; - width: auto; - min-width: 16px; - padding: 4px 4px 4px 5px; - color: #bfbfbf; - font-weight: normal; - line-height: 18px; - height: 18px; - text-align: center; - text-shadow: 0 1px 0 #fff; - border: 1px solid #ccc; - border-right-width: 0; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-prepend .active, .input-append .active { - background: #a9dba9; - border-color: #46a546; -} -.input-prepend .add-on { - *margin-top: 1px; - /* IE6-7 */ - -} -.input-append input[type=text], .input-append input[type=password] { - float: left; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-append .add-on { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; - border-right-width: 1px; - border-left-width: 0; -} -.inputs-list { - margin: 0 0 5px; - width: 100%; -} -.inputs-list li { - display: block; - padding: 0; - width: 100%; -} -.inputs-list li label { - display: block; - float: none; - width: auto; - padding: 0; - line-height: 18px; - text-align: left; - white-space: normal; -} -.inputs-list li label strong { - color: #808080; -} -.inputs-list li label small { - font-size: 12px; - font-weight: normal; -} -.inputs-list li ul.inputs-list { - margin-left: 25px; - margin-bottom: 10px; - padding-top: 0; -} -.inputs-list li:first-child { - padding-top: 5px; -} -.inputs-list input[type=radio], .inputs-list input[type=checkbox] { - margin-bottom: 0; -} -form.form-stacked { - padding-left: 20px; -} -form.form-stacked fieldset { - padding-top: 9px; -} -form.form-stacked legend { - margin-left: 0; -} -form.form-stacked label { - display: block; - float: none; - width: auto; - font-weight: bold; - text-align: left; - line-height: 20px; - padding-top: 0; -} -form.form-stacked .clearfix { - margin-bottom: 9px; -} -form.form-stacked .clearfix div.input { - margin-left: 0; -} -form.form-stacked .inputs-list { - margin-bottom: 0; -} -form.form-stacked .inputs-list li { - padding-top: 0; -} -form.form-stacked .inputs-list li label { - font-weight: normal; - padding-top: 0; -} -form.form-stacked div.error { - padding-top: 10px; - padding-bottom: 10px; - padding-left: 10px; - margin-top: 0; - margin-left: -10px; -} -form.form-stacked .actions { - margin-left: -20px; - padding-left: 20px; -} -/* - * Tables.less - * Tables for, you guessed it, tabular data - * ---------------------------------------- */ -table { - width: 100%; - margin-bottom: 18px; - padding: 0; - border-collapse: separate; - font-size: 13px; -} -table th, table td { - padding: 10px 10px 9px; - line-height: 13.5px; - text-align: left; - vertical-align: middle; - border-bottom: 1px solid #ddd; -} -table th { - padding-top: 9px; - font-weight: bold; - border-bottom-width: 2px; -} -.zebra-striped tbody tr:nth-child(odd) td { - background-color: #f9f9f9; -} -.zebra-striped tbody tr:hover td { - background-color: #f5f5f5; -} -.zebra-striped .header { - cursor: pointer; -} -.zebra-striped .header:after { - content: ""; - float: right; - margin-top: 7px; - border-width: 0 4px 4px; - border-style: solid; - border-color: #000 transparent; - visibility: hidden; -} -.zebra-striped .headerSortUp, .zebra-striped .headerSortDown { - background-color: rgba(141, 192, 219, 0.25); - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.zebra-striped .header:hover:after { - visibility: visible; -} -.zebra-striped .headerSortDown:after, .zebra-striped .headerSortDown:hover:after { - visibility: visible; - filter: alpha(opacity=60); - -khtml-opacity: 0.6; - -moz-opacity: 0.6; - opacity: 0.6; -} -.zebra-striped .headerSortUp:after { - border-bottom: none; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #000; - visibility: visible; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - filter: alpha(opacity=60); - -khtml-opacity: 0.6; - -moz-opacity: 0.6; - opacity: 0.6; -} -table .blue { - color: #049cdb; - border-bottom-color: #049cdb; -} -table .headerSortUp.blue, table .headerSortDown.blue { - background-color: #ade6fe; -} -table .green { - color: #46a546; - border-bottom-color: #46a546; -} -table .headerSortUp.green, table .headerSortDown.green { - background-color: #cdeacd; -} -table .red { - color: #9d261d; - border-bottom-color: #9d261d; -} -table .headerSortUp.red, table .headerSortDown.red { - background-color: #f4c8c5; -} -table .yellow { - color: #ffc40d; - border-bottom-color: #ffc40d; -} -table .headerSortUp.yellow, table .headerSortDown.yellow { - background-color: #fff6d9; -} -table .orange { - color: #f89406; - border-bottom-color: #f89406; -} -table .headerSortUp.orange, table .headerSortDown.orange { - background-color: #fee9cc; -} -table .purple { - color: #7a43b6; - border-bottom-color: #7a43b6; -} -table .headerSortUp.purple, table .headerSortDown.purple { - background-color: #e2d5f0; -} -/* Patterns.less - * Repeatable UI elements outside the base styles provided from the scaffolding - * ---------------------------------------------------------------------------- */ -.topbar { - height: 40px; - position: fixed; - top: 0; - left: 0; - right: 0; - z-index: 10000; - overflow: visible; -} -.topbar .fill { - background: #222; - background-color: #222222; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); - background-image: -moz-linear-gradient(#333333, #222222); - background-image: -ms-linear-gradient(#333333, #222222); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); - background-image: -webkit-linear-gradient(#333333, #222222); - background-image: -o-linear-gradient(#333333, #222222); - background-image: linear-gradient(#333333, #222222); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -} -.topbar a { - color: #bfbfbf; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.topbar a:hover, .topbar ul li.active a { - background-color: #333; - background-color: rgba(255, 255, 255, 0.05); - color: #ffffff; - text-decoration: none; -} -.topbar h3 { - position: relative; -} -.topbar h3 a { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; - color: #ffffff; - font-size: 20px; - font-weight: 200; - line-height: 1; -} -.topbar form { - float: left; - margin: 5px 0 0 0; - position: relative; - filter: alpha(opacity=100); - -khtml-opacity: 1; - -moz-opacity: 1; - opacity: 1; -} -.topbar form input { - background-color: #444; - background-color: rgba(255, 255, 255, 0.3); - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: normal; - font-weight: 13px; - line-height: 1; - width: 220px; - padding: 4px 9px; - color: #fff; - color: rgba(255, 255, 255, 0.75); - border: 1px solid #111; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25); - -webkit-transition: none; - -moz-transition: none; - transition: none; -} -.topbar form input:-moz-placeholder { - color: #e6e6e6; -} -.topbar form input::-webkit-input-placeholder { - color: #e6e6e6; -} -.topbar form input:hover { - background-color: #bfbfbf; - background-color: rgba(255, 255, 255, 0.5); - color: #fff; -} -.topbar form input:focus, .topbar form input.focused { - outline: none; - background-color: #fff; - color: #404040; - text-shadow: 0 1px 0 #fff; - border: 0; - padding: 5px 10px; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -} -.topbar ul { - display: block; - float: left; - margin: 0 10px 0 0; - position: relative; -} -.topbar ul.secondary-nav { - float: right; - margin-left: 10px; - margin-right: 0; -} -.topbar ul li { - display: block; - float: left; - font-size: 13px; -} -.topbar ul li a { - display: block; - float: none; - padding: 10px 10px 11px; - line-height: 19px; - text-decoration: none; -} -.topbar ul li a:hover { - color: #fff; - text-decoration: none; -} -.topbar ul li.active a { - background-color: #222; - background-color: rgba(0, 0, 0, 0.5); -} -.topbar ul.primary-nav li ul { - left: 0; -} -.topbar ul.secondary-nav li ul { - right: 0; -} -.topbar ul li.menu { - position: relative; -} -.topbar ul li.menu a.menu:after { - width: 0px; - height: 0px; - display: inline-block; - content: "↓"; - text-indent: -99999px; - vertical-align: top; - margin-top: 8px; - margin-left: 4px; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #fff; - filter: alpha(opacity=50); - -khtml-opacity: 0.5; - -moz-opacity: 0.5; - opacity: 0.5; -} -.topbar ul li.menu.open a.menu, .topbar ul li.menu.open a:hover { - background-color: #444; - background-color: rgba(255, 255, 255, 0.1); - *background-color: #444; - /* IE6-7 */ - - color: #fff; -} -.topbar ul li.menu.open ul { - display: block; -} -.topbar ul li.menu.open ul li a { - background-color: transparent; - font-weight: normal; -} -.topbar ul li.menu.open ul li a:hover { - background-color: rgba(255, 255, 255, 0.1); - *background-color: #444; - /* IE6-7 */ - - color: #fff; -} -.topbar ul li.menu.open ul li.active a { - background-color: rgba(255, 255, 255, 0.1); - font-weight: bold; -} -.topbar ul li ul { - background-color: #333; - float: left; - display: none; - position: absolute; - top: 40px; - min-width: 160px; - max-width: 220px; - _width: 160px; - margin-left: 0; - margin-right: 0; - padding: 0; - text-align: left; - border: 0; - zoom: 1; - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); -} -.topbar ul li ul li { - float: none; - clear: both; - display: block; - background: none; - font-size: 12px; -} -.topbar ul li ul li a { - display: block; - padding: 6px 15px; - clear: both; - font-weight: normal; - line-height: 19px; - color: #bbb; -} -.topbar ul li ul li a:hover { - background-color: #333; - background-color: rgba(255, 255, 255, 0.25); - color: #fff; -} -.topbar ul li ul li.divider { - height: 1px; - overflow: hidden; - background: #222; - background: rgba(0, 0, 0, 0.2); - border-bottom: 1px solid rgba(255, 255, 255, 0.1); - margin: 5px 0; -} -.topbar ul li ul li span { - clear: both; - display: block; - background: rgba(0, 0, 0, 0.2); - padding: 6px 15px; - cursor: default; - color: #808080; - border-top: 1px solid rgba(0, 0, 0, 0.2); -} -.hero-unit { - background-color: #f5f5f5; - margin-top: 60px; - margin-bottom: 30px; - padding: 60px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; -} -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; -} -footer { - margin-top: 17px; - padding-top: 17px; - border-top: 1px solid #eee; -} -.page-header { - margin-bottom: 17px; - border-bottom: 1px solid #ddd; - -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} -.page-header h1 { - margin-bottom: 8px; -} -.alert-message { - background-color: rgba(0, 0, 0, 0.15); - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15))); - background-image: -moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - background-image: -ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15))); - background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; - background-color: #e6e6e6; - margin-bottom: 18px; - padding: 8px 15px; - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); - border-bottom: 1px solid rgba(0, 0, 0, 0.3); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.alert-message p { - color: #fff; - margin-bottom: 0; -} -.alert-message p + p { - margin-top: 5px; -} -.alert-message.error { - background-color: #d83a2e; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e)); - background-image: -moz-linear-gradient(#e4776f, #d83a2e); - background-image: -ms-linear-gradient(#e4776f, #d83a2e); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e)); - background-image: -webkit-linear-gradient(#e4776f, #d83a2e); - background-image: -o-linear-gradient(#e4776f, #d83a2e); - background-image: linear-gradient(#e4776f, #d83a2e); - border-bottom-color: #b32b21; -} -.alert-message.warning { - background-color: #ffd040; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040)); - background-image: -moz-linear-gradient(#ffe38d, #ffd040); - background-image: -ms-linear-gradient(#ffe38d, #ffd040); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040)); - background-image: -webkit-linear-gradient(#ffe38d, #ffd040); - background-image: -o-linear-gradient(#ffe38d, #ffd040); - background-image: linear-gradient(#ffe38d, #ffd040); - border-bottom-color: #ffc40d; -} -.alert-message.success { - background-color: #62bc62; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62)); - background-image: -moz-linear-gradient(#97d397, #62bc62); - background-image: -ms-linear-gradient(#97d397, #62bc62); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62)); - background-image: -webkit-linear-gradient(#97d397, #62bc62); - background-image: -o-linear-gradient(#97d397, #62bc62); - background-image: linear-gradient(#97d397, #62bc62); - border-bottom-color: #46a546; -} -.alert-message.info { - background-color: #04aef4; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4)); - background-image: -moz-linear-gradient(#62cffc, #04aef4); - background-image: -ms-linear-gradient(#62cffc, #04aef4); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4)); - background-image: -webkit-linear-gradient(#62cffc, #04aef4); - background-image: -o-linear-gradient(#62cffc, #04aef4); - background-image: linear-gradient(#62cffc, #04aef4); - border-bottom-color: #049cdb; -} -.alert-message .close { - float: right; - margin-top: -2px; - color: #000; - font-size: 20px; - font-weight: bold; - text-shadow: 0 1px 0 #ffffff; - filter: alpha(opacity=20); - -khtml-opacity: 0.2; - -moz-opacity: 0.2; - opacity: 0.2; -} -.alert-message .close:hover { - text-decoration: none; - filter: alpha(opacity=40); - -khtml-opacity: 0.4; - -moz-opacity: 0.4; - opacity: 0.4; -} -.block-message { - margin-bottom: 18px; - padding: 14px; - color: #404040; - color: rgba(0, 0, 0, 0.8); - *color: #404040; - /* IE 6-7 */ - - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.block-message p { - color: #404040; - color: rgba(0, 0, 0, 0.8); - *color: #404040; - /* IE 6-7 */ - - margin-right: 30px; - margin-bottom: 0; -} -.block-message ul { - margin-bottom: 0; -} -.block-message strong { - display: block; -} -.block-message.error { - background: #f8dcda; - border: 1px solid #f4c8c5; -} -.block-message.warning { - background: #fff0c0; - border: 1px solid #ffe38d; -} -.block-message.success { - background: #dff1df; - border: 1px solid #bbe2bb; -} -.block-message.info { - background: #c7eefe; - border: 1px solid #ade6fe; -} -.tabs, .pills { - margin: 0 0 20px; - padding: 0; - zoom: 1; -} -.tabs:before, -.pills:before, -.tabs:after, -.pills:after { - display: table; - content: ""; -} -.tabs:after, .pills:after { - clear: both; -} -.tabs li, .pills li { - display: inline; -} -.tabs li a, .pills li a { - float: left; - width: auto; -} -.tabs { - width: 100%; - border-bottom: 1px solid #bfbfbf; -} -.tabs li a { - margin-bottom: -1px; - margin-right: 2px; - padding: 0 15px; - line-height: 35px; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.tabs li a:hover { - background-color: #e6e6e6; - border-bottom: 1px solid #bfbfbf; -} -.tabs li.active a { - background-color: #fff; - padding: 0 14px; - border: 1px solid #ccc; - border-bottom: 0; - color: #808080; -} -.pills li a { - margin: 5px 3px 5px 0; - padding: 0 15px; - text-shadow: 0 1px 1px #fff; - line-height: 30px; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} -.pills li a:hover { - background: #0050a3; - color: #fff; - text-decoration: none; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); -} -.pills li.active a { - background: #0069d6; - color: #fff; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); -} -.pagination { - height: 36px; - margin: 18px 0; -} -.pagination ul { - float: left; - margin: 0; - border: 1px solid #ddd; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -} -.pagination ul li { - display: inline; -} -.pagination ul li a { - float: left; - padding: 0 14px; - line-height: 34px; - border-right: 1px solid; - border-right-color: #ddd; - border-right-color: rgba(0, 0, 0, 0.15); - *border-right-color: #ddd; - /* IE6-7 */ - - text-decoration: none; -} -.pagination ul li a:hover, .pagination ul li.active a { - background-color: #c7eefe; -} -.pagination ul li.disabled a, .pagination ul li.disabled a:hover { - background-color: none; - color: #bfbfbf; -} -.pagination ul li.next a { - border: 0; -} -.well { - background-color: #f5f5f5; - margin-bottom: 20px; - padding: 19px; - min-height: 20px; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} -.modal-backdrop { - background-color: rgba(0, 0, 0, 0.5); - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 1000; -} -.modal { - position: fixed; - top: 50%; - left: 50%; - z-index: 2000; - width: 560px; - margin: -280px 0 0 -250px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - /* IE6-7 */ - - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.modal .modal-header { - border-bottom: 1px solid #eee; - padding: 5px 20px; -} -.modal .modal-header .close { - position: absolute; - right: 10px; - top: 10px; - color: #999; - line-height: 10px; - font-size: 18px; -} -.modal .modal-body { - padding: 20px; -} -.modal .modal-footer { - background-color: #f5f5f5; - padding: 14px 20px 15px; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; - zoom: 1; -} -.modal .modal-footer:before, .modal .modal-footer:after { - display: table; - content: ""; -} -.modal .modal-footer:after { - clear: both; -} -.modal .modal-footer .btn { - float: right; - margin-left: 10px; -} -.twipsy { - display: block; - position: absolute; - visibility: visible; - padding: 5px; - font-size: 11px; - z-index: 1000; - filter: alpha(opacity=80); - -khtml-opacity: 0.8; - -moz-opacity: 0.8; - opacity: 0.8; -} -.twipsy.above .twipsy-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.twipsy.left .twipsy-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.twipsy.below .twipsy-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.twipsy.right .twipsy-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.twipsy .twipsy-inner { - padding: 3px 8px; - background-color: #000; - color: white; - text-align: center; - max-width: 200px; - text-decoration: none; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.twipsy .twipsy-arrow { - position: absolute; - width: 0; - height: 0; -} -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1000; - padding: 5px; - display: none; -} -.popover.above .arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.popover.right .arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.below .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.popover.left .arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover .inner { - background-color: #333; - background-color: rgba(0, 0, 0, 0.8); - *background-color: #333; - /* IE 6-7 */ - - padding: 3px; - overflow: hidden; - width: 280px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -} -.popover .title { - background-color: #f5f5f5; - padding: 9px 15px; - line-height: 1; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - border-bottom: 1px solid #eee; -} -.popover .content { - background-color: #ffffff; - padding: 14px; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.popover .content p, .popover .content ul, .popover .content ol { - margin-bottom: 0; -} \ No newline at end of file diff --git a/storm-core/src/ui/public/css/bootstrap-1.4.0.css b/storm-core/src/ui/public/css/bootstrap-1.4.0.css new file mode 100644 index 0000000000..af65005756 --- /dev/null +++ b/storm-core/src/ui/public/css/bootstrap-1.4.0.css @@ -0,0 +1,2469 @@ +/*! + * Bootstrap v1.4.0 + * + * Copyright 2011 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + * Date: Thu Nov 3 17:06:17 PDT 2011 + */ +/* Reset.less + * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). + * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ +html, body { + margin: 0; + padding: 0; +} +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +a, +abbr, +acronym, +address, +cite, +code, +del, +dfn, +em, +img, +q, +s, +samp, +small, +strike, +strong, +sub, +sup, +tt, +var, +dd, +dl, +dt, +li, +ol, +ul, +fieldset, +form, +label, +legend, +button, +table, +caption, +tbody, +tfoot, +thead, +tr, +th, +td { + margin: 0; + padding: 0; + border: 0; + font-weight: normal; + font-style: normal; + font-size: 100%; + line-height: 1; + font-family: inherit; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +ol, ul { + list-style: none; +} +q:before, +q:after, +blockquote:before, +blockquote:after { + content: ""; +} +html { + overflow-y: scroll; + font-size: 100%; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +a:focus { + outline: thin dotted; +} +a:hover, a:active { + outline: 0; +} +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section { + display: block; +} +audio, canvas, video { + display: inline-block; + *display: inline; + *zoom: 1; +} +audio:not([controls]) { + display: none; +} +sub, sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} +sup { + top: -0.5em; +} +sub { + bottom: -0.25em; +} +img { + border: 0; + -ms-interpolation-mode: bicubic; +} +button, +input, +select, +textarea { + font-size: 100%; + margin: 0; + vertical-align: baseline; + *vertical-align: middle; +} +button, input { + line-height: normal; + *overflow: visible; +} +button::-moz-focus-inner, input::-moz-focus-inner { + border: 0; + padding: 0; +} +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; + -webkit-appearance: button; +} +input[type="search"] { + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} +textarea { + overflow: auto; + vertical-align: top; +} +/* Variables.less + * Variables to customize the look and feel of Bootstrap + * ----------------------------------------------------- */ +/* Mixins.less + * Snippets of reusable CSS to develop faster and keep code readable + * ----------------------------------------------------------------- */ +/* + * Scaffolding + * Basic and global styles for generating a grid system, structural layout, and page templates + * ------------------------------------------------------------------------------------------- */ +body { + background-color: #ffffff; + margin: 0; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + font-weight: normal; + line-height: 18px; + color: #404040; +} +.container { + width: 940px; + margin-left: auto; + margin-right: auto; + zoom: 1; +} +.container:before, .container:after { + display: table; + content: ""; + zoom: 1; +} +.container:after { + clear: both; +} +.container-fluid { + position: relative; + min-width: 940px; + padding-left: 20px; + padding-right: 20px; + zoom: 1; +} +.container-fluid:before, .container-fluid:after { + display: table; + content: ""; + zoom: 1; +} +.container-fluid:after { + clear: both; +} +.container-fluid > .sidebar { + position: absolute; + top: 0; + left: 20px; + width: 220px; +} +.container-fluid > .content { + margin-left: 240px; +} +a { + color: #0069d6; + text-decoration: none; + line-height: inherit; + font-weight: inherit; +} +a:hover { + color: #00438a; + text-decoration: underline; +} +.pull-right { + float: right; +} +.pull-left { + float: left; +} +.hide { + display: none; +} +.show { + display: block; +} +.row { + zoom: 1; + margin-left: -20px; +} +.row:before, .row:after { + display: table; + content: ""; + zoom: 1; +} +.row:after { + clear: both; +} +.row > [class*="span"] { + display: inline; + float: left; + margin-left: 20px; +} +.span1 { + width: 40px; +} +.span2 { + width: 100px; +} +.span3 { + width: 160px; +} +.span4 { + width: 220px; +} +.span5 { + width: 280px; +} +.span6 { + width: 340px; +} +.span7 { + width: 400px; +} +.span8 { + width: 460px; +} +.span9 { + width: 520px; +} +.span10 { + width: 580px; +} +.span11 { + width: 640px; +} +.span12 { + width: 700px; +} +.span13 { + width: 760px; +} +.span14 { + width: 820px; +} +.span15 { + width: 880px; +} +.span16 { + width: 940px; +} +.span17 { + width: 1000px; +} +.span18 { + width: 1060px; +} +.span19 { + width: 1120px; +} +.span20 { + width: 1180px; +} +.span21 { + width: 1240px; +} +.span22 { + width: 1300px; +} +.span23 { + width: 1360px; +} +.span24 { + width: 1420px; +} +.row > .offset1 { + margin-left: 80px; +} +.row > .offset2 { + margin-left: 140px; +} +.row > .offset3 { + margin-left: 200px; +} +.row > .offset4 { + margin-left: 260px; +} +.row > .offset5 { + margin-left: 320px; +} +.row > .offset6 { + margin-left: 380px; +} +.row > .offset7 { + margin-left: 440px; +} +.row > .offset8 { + margin-left: 500px; +} +.row > .offset9 { + margin-left: 560px; +} +.row > .offset10 { + margin-left: 620px; +} +.row > .offset11 { + margin-left: 680px; +} +.row > .offset12 { + margin-left: 740px; +} +.span-one-third { + width: 300px; +} +.span-two-thirds { + width: 620px; +} +.offset-one-third { + margin-left: 340px; +} +.offset-two-thirds { + margin-left: 660px; +} +/* Typography.less + * Headings, body text, lists, code, and more for a versatile and durable typography system + * ---------------------------------------------------------------------------------------- */ +p { + font-size: 13px; + font-weight: normal; + line-height: 18px; + margin-bottom: 9px; +} +p small { + font-size: 11px; + color: #bfbfbf; +} +h1, +h2, +h3, +h4, +h5, +h6 { + font-weight: bold; + color: #404040; +} +h1 small, +h2 small, +h3 small, +h4 small, +h5 small, +h6 small { + color: #bfbfbf; +} +h1 { + margin-bottom: 18px; + font-size: 30px; + line-height: 36px; +} +h1 small { + font-size: 18px; +} +h2 { + font-size: 24px; + line-height: 36px; +} +h2 small { + font-size: 14px; +} +h3, +h4, +h5, +h6 { + line-height: 36px; +} +h3 { + font-size: 18px; +} +h3 small { + font-size: 14px; +} +h4 { + font-size: 16px; +} +h4 small { + font-size: 12px; +} +h5 { + font-size: 14px; +} +h6 { + font-size: 13px; + color: #bfbfbf; + text-transform: uppercase; +} +ul, ol { + margin: 0 0 18px 25px; +} +ul ul, +ul ol, +ol ol, +ol ul { + margin-bottom: 0; +} +ul { + list-style: disc; +} +ol { + list-style: decimal; +} +li { + line-height: 18px; + color: #808080; +} +ul.unstyled { + list-style: none; + margin-left: 0; +} +dl { + margin-bottom: 18px; +} +dl dt, dl dd { + line-height: 18px; +} +dl dt { + font-weight: bold; +} +dl dd { + margin-left: 9px; +} +hr { + margin: 20px 0 19px; + border: 0; + border-bottom: 1px solid #eee; +} +strong { + font-style: inherit; + font-weight: bold; +} +em { + font-style: italic; + font-weight: inherit; + line-height: inherit; +} +.muted { + color: #bfbfbf; +} +blockquote { + margin-bottom: 18px; + border-left: 5px solid #eee; + padding-left: 15px; +} +blockquote p { + font-size: 14px; + font-weight: 300; + line-height: 18px; + margin-bottom: 0; +} +blockquote small { + display: block; + font-size: 12px; + font-weight: 300; + line-height: 18px; + color: #bfbfbf; +} +blockquote small:before { + content: '\2014 \00A0'; +} +address { + display: block; + line-height: 18px; + margin-bottom: 18px; +} +code, pre { + padding: 0 3px 2px; + font-family: Monaco, Andale Mono, Courier New, monospace; + font-size: 12px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +code { + background-color: #fee9cc; + color: rgba(0, 0, 0, 0.75); + padding: 1px 3px; +} +pre { + background-color: #f5f5f5; + display: block; + padding: 8.5px; + margin: 0 0 18px; + line-height: 18px; + font-size: 12px; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.15); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + white-space: pre; + white-space: pre-wrap; + word-wrap: break-word; +} +/* Forms.less + * Base styles for various input types, form layouts, and states + * ------------------------------------------------------------- */ +form { + margin-bottom: 18px; +} +fieldset { + margin-bottom: 18px; + padding-top: 18px; +} +fieldset legend { + display: block; + padding-left: 150px; + font-size: 19.5px; + line-height: 1; + color: #404040; + *padding: 0 0 5px 145px; + /* IE6-7 */ + + *line-height: 1.5; + /* IE6-7 */ + +} +form .clearfix { + margin-bottom: 18px; + zoom: 1; +} +form .clearfix:before, form .clearfix:after { + display: table; + content: ""; + zoom: 1; +} +form .clearfix:after { + clear: both; +} +label, +input, +select, +textarea { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + font-weight: normal; + line-height: normal; +} +label { + padding-top: 6px; + font-size: 13px; + line-height: 18px; + float: left; + width: 130px; + text-align: right; + color: #404040; +} +form .input { + margin-left: 150px; +} +input[type=checkbox], input[type=radio] { + cursor: pointer; +} +input, +textarea, +select, +.uneditable-input { + display: inline-block; + width: 210px; + height: 18px; + padding: 4px; + font-size: 13px; + line-height: 18px; + color: #808080; + border: 1px solid #ccc; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +select { + padding: initial; +} +input[type=checkbox], input[type=radio] { + width: auto; + height: auto; + padding: 0; + margin: 3px 0; + *margin-top: 0; + /* IE6-7 */ + + line-height: normal; + border: none; +} +input[type=file] { + background-color: #ffffff; + padding: initial; + border: initial; + line-height: initial; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +input[type=button], input[type=reset], input[type=submit] { + width: auto; + height: auto; +} +select, input[type=file] { + height: 27px; + *height: auto; + line-height: 27px; + *margin-top: 4px; + /* For IE7, add top margin to align select with labels */ + +} +select[multiple] { + height: inherit; + background-color: #ffffff; +} +textarea { + height: auto; +} +.uneditable-input { + background-color: #ffffff; + display: block; + border-color: #eee; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + cursor: not-allowed; +} +:-moz-placeholder { + color: #bfbfbf; +} +::-webkit-input-placeholder { + color: #bfbfbf; +} +input, textarea { + -webkit-transform-style: preserve-3d; + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -ms-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); +} +input:focus, textarea:focus { + outline: 0; + border-color: rgba(82, 168, 236, 0.8); + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); +} +input[type=file]:focus, input[type=checkbox]:focus, select:focus { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + outline: 1px dotted #666; +} +form .clearfix.error > label, form .clearfix.error .help-block, form .clearfix.error .help-inline { + color: #b94a48; +} +form .clearfix.error input, form .clearfix.error textarea { + color: #b94a48; + border-color: #ee5f5b; +} +form .clearfix.error input:focus, form .clearfix.error textarea:focus { + border-color: #e9322d; + -webkit-box-shadow: 0 0 6px #f8b9b7; + -moz-box-shadow: 0 0 6px #f8b9b7; + box-shadow: 0 0 6px #f8b9b7; +} +form .clearfix.error .input-prepend .add-on, form .clearfix.error .input-append .add-on { + color: #b94a48; + background-color: #fce6e6; + border-color: #b94a48; +} +form .clearfix.warning > label, form .clearfix.warning .help-block, form .clearfix.warning .help-inline { + color: #c09853; +} +form .clearfix.warning input, form .clearfix.warning textarea { + color: #c09853; + border-color: #ccae64; +} +form .clearfix.warning input:focus, form .clearfix.warning textarea:focus { + border-color: #be9a3f; + -webkit-box-shadow: 0 0 6px #e5d6b1; + -moz-box-shadow: 0 0 6px #e5d6b1; + box-shadow: 0 0 6px #e5d6b1; +} +form .clearfix.warning .input-prepend .add-on, form .clearfix.warning .input-append .add-on { + color: #c09853; + background-color: #d2b877; + border-color: #c09853; +} +form .clearfix.success > label, form .clearfix.success .help-block, form .clearfix.success .help-inline { + color: #468847; +} +form .clearfix.success input, form .clearfix.success textarea { + color: #468847; + border-color: #57a957; +} +form .clearfix.success input:focus, form .clearfix.success textarea:focus { + border-color: #458845; + -webkit-box-shadow: 0 0 6px #9acc9a; + -moz-box-shadow: 0 0 6px #9acc9a; + box-shadow: 0 0 6px #9acc9a; +} +form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-append .add-on { + color: #468847; + background-color: #bcddbc; + border-color: #468847; +} +.input-mini, +input.mini, +textarea.mini, +select.mini { + width: 60px; +} +.input-small, +input.small, +textarea.small, +select.small { + width: 90px; +} +.input-medium, +input.medium, +textarea.medium, +select.medium { + width: 150px; +} +.input-large, +input.large, +textarea.large, +select.large { + width: 210px; +} +.input-xlarge, +input.xlarge, +textarea.xlarge, +select.xlarge { + width: 270px; +} +.input-xxlarge, +input.xxlarge, +textarea.xxlarge, +select.xxlarge { + width: 530px; +} +textarea.xxlarge { + overflow-y: auto; +} +input.span1, textarea.span1 { + display: inline-block; + float: none; + width: 30px; + margin-left: 0; +} +input.span2, textarea.span2 { + display: inline-block; + float: none; + width: 90px; + margin-left: 0; +} +input.span3, textarea.span3 { + display: inline-block; + float: none; + width: 150px; + margin-left: 0; +} +input.span4, textarea.span4 { + display: inline-block; + float: none; + width: 210px; + margin-left: 0; +} +input.span5, textarea.span5 { + display: inline-block; + float: none; + width: 270px; + margin-left: 0; +} +input.span6, textarea.span6 { + display: inline-block; + float: none; + width: 330px; + margin-left: 0; +} +input.span7, textarea.span7 { + display: inline-block; + float: none; + width: 390px; + margin-left: 0; +} +input.span8, textarea.span8 { + display: inline-block; + float: none; + width: 450px; + margin-left: 0; +} +input.span9, textarea.span9 { + display: inline-block; + float: none; + width: 510px; + margin-left: 0; +} +input.span10, textarea.span10 { + display: inline-block; + float: none; + width: 570px; + margin-left: 0; +} +input.span11, textarea.span11 { + display: inline-block; + float: none; + width: 630px; + margin-left: 0; +} +input.span12, textarea.span12 { + display: inline-block; + float: none; + width: 690px; + margin-left: 0; +} +input.span13, textarea.span13 { + display: inline-block; + float: none; + width: 750px; + margin-left: 0; +} +input.span14, textarea.span14 { + display: inline-block; + float: none; + width: 810px; + margin-left: 0; +} +input.span15, textarea.span15 { + display: inline-block; + float: none; + width: 870px; + margin-left: 0; +} +input.span16, textarea.span16 { + display: inline-block; + float: none; + width: 930px; + margin-left: 0; +} +input[disabled], +select[disabled], +textarea[disabled], +input[readonly], +select[readonly], +textarea[readonly] { + background-color: #f5f5f5; + border-color: #ddd; + cursor: not-allowed; +} +.actions { + background: #f5f5f5; + margin-top: 18px; + margin-bottom: 18px; + padding: 17px 20px 18px 150px; + border-top: 1px solid #ddd; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; +} +.actions .secondary-action { + float: right; +} +.actions .secondary-action a { + line-height: 30px; +} +.actions .secondary-action a:hover { + text-decoration: underline; +} +.help-inline, .help-block { + font-size: 13px; + line-height: 18px; + color: #bfbfbf; +} +.help-inline { + padding-left: 5px; + *position: relative; + /* IE6-7 */ + + *top: -5px; + /* IE6-7 */ + +} +.help-block { + display: block; + max-width: 600px; +} +.inline-inputs { + color: #808080; +} +.inline-inputs span { + padding: 0 2px 0 1px; +} +.input-prepend input, .input-append input { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} +.input-prepend .add-on, .input-append .add-on { + position: relative; + background: #f5f5f5; + border: 1px solid #ccc; + z-index: 2; + float: left; + display: block; + width: auto; + min-width: 16px; + height: 18px; + padding: 4px 4px 4px 5px; + margin-right: -1px; + font-weight: normal; + line-height: 18px; + color: #bfbfbf; + text-align: center; + text-shadow: 0 1px 0 #ffffff; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; +} +.input-prepend .active, .input-append .active { + background: #a9dba9; + border-color: #46a546; +} +.input-prepend .add-on { + *margin-top: 1px; + /* IE6-7 */ + +} +.input-append input { + float: left; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; +} +.input-append .add-on { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; + margin-right: 0; + margin-left: -1px; +} +.inputs-list { + margin: 0 0 5px; + width: 100%; +} +.inputs-list li { + display: block; + padding: 0; + width: 100%; +} +.inputs-list label { + display: block; + float: none; + width: auto; + padding: 0; + margin-left: 20px; + line-height: 18px; + text-align: left; + white-space: normal; +} +.inputs-list label strong { + color: #808080; +} +.inputs-list label small { + font-size: 11px; + font-weight: normal; +} +.inputs-list .inputs-list { + margin-left: 25px; + margin-bottom: 10px; + padding-top: 0; +} +.inputs-list:first-child { + padding-top: 6px; +} +.inputs-list li + li { + padding-top: 2px; +} +.inputs-list input[type=radio], .inputs-list input[type=checkbox] { + margin-bottom: 0; + margin-left: -20px; + float: left; +} +.form-stacked { + padding-left: 20px; +} +.form-stacked fieldset { + padding-top: 9px; +} +.form-stacked legend { + padding-left: 0; +} +.form-stacked label { + display: block; + float: none; + width: auto; + font-weight: bold; + text-align: left; + line-height: 20px; + padding-top: 0; +} +.form-stacked .clearfix { + margin-bottom: 9px; +} +.form-stacked .clearfix div.input { + margin-left: 0; +} +.form-stacked .inputs-list { + margin-bottom: 0; +} +.form-stacked .inputs-list li { + padding-top: 0; +} +.form-stacked .inputs-list li label { + font-weight: normal; + padding-top: 0; +} +.form-stacked div.clearfix.error { + padding-top: 10px; + padding-bottom: 10px; + padding-left: 10px; + margin-top: 0; + margin-left: -10px; +} +.form-stacked .actions { + margin-left: -20px; + padding-left: 20px; +} +/* + * Tables.less + * Tables for, you guessed it, tabular data + * ---------------------------------------- */ +table { + width: 100%; + margin-bottom: 18px; + padding: 0; + font-size: 13px; + border-collapse: collapse; +} +table th, table td { + padding: 10px 10px 9px; + line-height: 18px; + text-align: left; +} +table th { + padding-top: 9px; + font-weight: bold; + vertical-align: middle; +} +table td { + vertical-align: top; + border-top: 1px solid #ddd; +} +table tbody th { + border-top: 1px solid #ddd; + vertical-align: top; +} +.condensed-table th, .condensed-table td { + padding: 5px 5px 4px; +} +.bordered-table { + border: 1px solid #ddd; + border-collapse: separate; + *border-collapse: collapse; + /* IE7, collapse table to remove spacing */ + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.bordered-table th + th, .bordered-table td + td, .bordered-table th + td { + border-left: 1px solid #ddd; +} +.bordered-table thead tr:first-child th:first-child, .bordered-table tbody tr:first-child td:first-child { + -webkit-border-radius: 4px 0 0 0; + -moz-border-radius: 4px 0 0 0; + border-radius: 4px 0 0 0; +} +.bordered-table thead tr:first-child th:last-child, .bordered-table tbody tr:first-child td:last-child { + -webkit-border-radius: 0 4px 0 0; + -moz-border-radius: 0 4px 0 0; + border-radius: 0 4px 0 0; +} +.bordered-table tbody tr:last-child td:first-child { + -webkit-border-radius: 0 0 0 4px; + -moz-border-radius: 0 0 0 4px; + border-radius: 0 0 0 4px; +} +.bordered-table tbody tr:last-child td:last-child { + -webkit-border-radius: 0 0 4px 0; + -moz-border-radius: 0 0 4px 0; + border-radius: 0 0 4px 0; +} +table .span1 { + width: 20px; +} +table .span2 { + width: 60px; +} +table .span3 { + width: 100px; +} +table .span4 { + width: 140px; +} +table .span5 { + width: 180px; +} +table .span6 { + width: 220px; +} +table .span7 { + width: 260px; +} +table .span8 { + width: 300px; +} +table .span9 { + width: 340px; +} +table .span10 { + width: 380px; +} +table .span11 { + width: 420px; +} +table .span12 { + width: 460px; +} +table .span13 { + width: 500px; +} +table .span14 { + width: 540px; +} +table .span15 { + width: 580px; +} +table .span16 { + width: 620px; +} +.zebra-striped tbody tr:nth-child(odd) td, .zebra-striped tbody tr:nth-child(odd) th { + background-color: #f9f9f9; +} +.zebra-striped tbody tr:hover td, .zebra-striped tbody tr:hover th { + background-color: #f5f5f5; +} +table .header { + cursor: pointer; +} +table .header:after { + content: ""; + float: right; + margin-top: 7px; + border-width: 0 4px 4px; + border-style: solid; + border-color: #000 transparent; + visibility: hidden; +} +table .headerSortUp, table .headerSortDown { + background-color: rgba(141, 192, 219, 0.25); + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); +} +table .header:hover:after { + visibility: visible; +} +table .headerSortDown:after, table .headerSortDown:hover:after { + visibility: visible; + filter: alpha(opacity=60); + -khtml-opacity: 0.6; + -moz-opacity: 0.6; + opacity: 0.6; +} +table .headerSortUp:after { + border-bottom: none; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #000; + visibility: visible; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + filter: alpha(opacity=60); + -khtml-opacity: 0.6; + -moz-opacity: 0.6; + opacity: 0.6; +} +table .blue { + color: #049cdb; + border-bottom-color: #049cdb; +} +table .headerSortUp.blue, table .headerSortDown.blue { + background-color: #ade6fe; +} +table .green { + color: #46a546; + border-bottom-color: #46a546; +} +table .headerSortUp.green, table .headerSortDown.green { + background-color: #cdeacd; +} +table .red { + color: #9d261d; + border-bottom-color: #9d261d; +} +table .headerSortUp.red, table .headerSortDown.red { + background-color: #f4c8c5; +} +table .yellow { + color: #ffc40d; + border-bottom-color: #ffc40d; +} +table .headerSortUp.yellow, table .headerSortDown.yellow { + background-color: #fff6d9; +} +table .orange { + color: #f89406; + border-bottom-color: #f89406; +} +table .headerSortUp.orange, table .headerSortDown.orange { + background-color: #fee9cc; +} +table .purple { + color: #7a43b6; + border-bottom-color: #7a43b6; +} +table .headerSortUp.purple, table .headerSortDown.purple { + background-color: #e2d5f0; +} +/* Patterns.less + * Repeatable UI elements outside the base styles provided from the scaffolding + * ---------------------------------------------------------------------------- */ +.topbar { + height: 40px; + position: fixed; + top: 0; + left: 0; + right: 0; + z-index: 10000; + overflow: visible; +} +.topbar a { + color: #bfbfbf; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.topbar h3 a:hover, .topbar .brand:hover, .topbar ul .active > a { + background-color: #333; + background-color: rgba(255, 255, 255, 0.05); + color: #ffffff; + text-decoration: none; +} +.topbar h3 { + position: relative; +} +.topbar h3 a, .topbar .brand { + float: left; + display: block; + padding: 8px 20px 12px; + margin-left: -20px; + color: #ffffff; + font-size: 20px; + font-weight: 200; + line-height: 1; +} +.topbar p { + margin: 0; + line-height: 40px; +} +.topbar p a:hover { + background-color: transparent; + color: #ffffff; +} +.topbar form { + float: left; + margin: 5px 0 0 0; + position: relative; + filter: alpha(opacity=100); + -khtml-opacity: 1; + -moz-opacity: 1; + opacity: 1; +} +.topbar form.pull-right { + float: right; +} +.topbar input { + background-color: #444; + background-color: rgba(255, 255, 255, 0.3); + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: normal; + font-weight: 13px; + line-height: 1; + padding: 4px 9px; + color: #ffffff; + color: rgba(255, 255, 255, 0.75); + border: 1px solid #111; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25); + -webkit-transform-style: preserve-3d; + -webkit-transition: none; + -moz-transition: none; + -ms-transition: none; + -o-transition: none; + transition: none; +} +.topbar input:-moz-placeholder { + color: #e6e6e6; +} +.topbar input::-webkit-input-placeholder { + color: #e6e6e6; +} +.topbar input:hover { + background-color: #bfbfbf; + background-color: rgba(255, 255, 255, 0.5); + color: #ffffff; +} +.topbar input:focus, .topbar input.focused { + outline: 0; + background-color: #ffffff; + color: #404040; + text-shadow: 0 1px 0 #ffffff; + border: 0; + padding: 5px 10px; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); +} +.topbar-inner, .topbar .fill { + background-color: #222; + background-color: #222222; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); + background-image: -moz-linear-gradient(top, #333333, #222222); + background-image: -ms-linear-gradient(top, #333333, #222222); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); + background-image: -webkit-linear-gradient(top, #333333, #222222); + background-image: -o-linear-gradient(top, #333333, #222222); + background-image: linear-gradient(top, #333333, #222222); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); +} +.topbar div > ul, .nav { + display: block; + float: left; + margin: 0 10px 0 0; + position: relative; + left: 0; +} +.topbar div > ul > li, .nav > li { + display: block; + float: left; +} +.topbar div > ul a, .nav a { + display: block; + float: none; + padding: 10px 10px 11px; + line-height: 19px; + text-decoration: none; +} +.topbar div > ul a:hover, .nav a:hover { + color: #ffffff; + text-decoration: none; +} +.topbar div > ul .active > a, .nav .active > a { + background-color: #222; + background-color: rgba(0, 0, 0, 0.5); +} +.topbar div > ul.secondary-nav, .nav.secondary-nav { + float: right; + margin-left: 10px; + margin-right: 0; +} +.topbar div > ul.secondary-nav .menu-dropdown, +.nav.secondary-nav .menu-dropdown, +.topbar div > ul.secondary-nav .dropdown-menu, +.nav.secondary-nav .dropdown-menu { + right: 0; + border: 0; +} +.topbar div > ul a.menu:hover, +.nav a.menu:hover, +.topbar div > ul li.open .menu, +.nav li.open .menu, +.topbar div > ul .dropdown-toggle:hover, +.nav .dropdown-toggle:hover, +.topbar div > ul .dropdown.open .dropdown-toggle, +.nav .dropdown.open .dropdown-toggle { + background: #444; + background: rgba(255, 255, 255, 0.05); +} +.topbar div > ul .menu-dropdown, +.nav .menu-dropdown, +.topbar div > ul .dropdown-menu, +.nav .dropdown-menu { + background-color: #333; +} +.topbar div > ul .menu-dropdown a.menu, +.nav .menu-dropdown a.menu, +.topbar div > ul .dropdown-menu a.menu, +.nav .dropdown-menu a.menu, +.topbar div > ul .menu-dropdown .dropdown-toggle, +.nav .menu-dropdown .dropdown-toggle, +.topbar div > ul .dropdown-menu .dropdown-toggle, +.nav .dropdown-menu .dropdown-toggle { + color: #ffffff; +} +.topbar div > ul .menu-dropdown a.menu.open, +.nav .menu-dropdown a.menu.open, +.topbar div > ul .dropdown-menu a.menu.open, +.nav .dropdown-menu a.menu.open, +.topbar div > ul .menu-dropdown .dropdown-toggle.open, +.nav .menu-dropdown .dropdown-toggle.open, +.topbar div > ul .dropdown-menu .dropdown-toggle.open, +.nav .dropdown-menu .dropdown-toggle.open { + background: #444; + background: rgba(255, 255, 255, 0.05); +} +.topbar div > ul .menu-dropdown li a, +.nav .menu-dropdown li a, +.topbar div > ul .dropdown-menu li a, +.nav .dropdown-menu li a { + color: #999; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); +} +.topbar div > ul .menu-dropdown li a:hover, +.nav .menu-dropdown li a:hover, +.topbar div > ul .dropdown-menu li a:hover, +.nav .dropdown-menu li a:hover { + background-color: #191919; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919)); + background-image: -moz-linear-gradient(top, #292929, #191919); + background-image: -ms-linear-gradient(top, #292929, #191919); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919)); + background-image: -webkit-linear-gradient(top, #292929, #191919); + background-image: -o-linear-gradient(top, #292929, #191919); + background-image: linear-gradient(top, #292929, #191919); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0); + color: #ffffff; +} +.topbar div > ul .menu-dropdown .active a, +.nav .menu-dropdown .active a, +.topbar div > ul .dropdown-menu .active a, +.nav .dropdown-menu .active a { + color: #ffffff; +} +.topbar div > ul .menu-dropdown .divider, +.nav .menu-dropdown .divider, +.topbar div > ul .dropdown-menu .divider, +.nav .dropdown-menu .divider { + background-color: #222; + border-color: #444; +} +.topbar ul .menu-dropdown li a, .topbar ul .dropdown-menu li a { + padding: 4px 15px; +} +li.menu, .dropdown { + position: relative; +} +a.menu:after, .dropdown-toggle:after { + width: 0; + height: 0; + display: inline-block; + content: "↓"; + text-indent: -99999px; + vertical-align: top; + margin-top: 8px; + margin-left: 4px; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #ffffff; + filter: alpha(opacity=50); + -khtml-opacity: 0.5; + -moz-opacity: 0.5; + opacity: 0.5; +} +.menu-dropdown, .dropdown-menu { + background-color: #ffffff; + float: left; + display: none; + position: absolute; + top: 40px; + z-index: 900; + min-width: 160px; + max-width: 220px; + _width: 160px; + margin-left: 0; + margin-right: 0; + padding: 6px 0; + zoom: 1; + border-color: #999; + border-color: rgba(0, 0, 0, 0.2); + border-style: solid; + border-width: 0 1px 1px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; +} +.menu-dropdown li, .dropdown-menu li { + float: none; + display: block; + background-color: none; +} +.menu-dropdown .divider, .dropdown-menu .divider { + height: 1px; + margin: 5px 0; + overflow: hidden; + background-color: #eee; + border-bottom: 1px solid #ffffff; +} +.topbar .dropdown-menu a, .dropdown-menu a { + display: block; + padding: 4px 15px; + clear: both; + font-weight: normal; + line-height: 18px; + color: #808080; + text-shadow: 0 1px 0 #ffffff; +} +.topbar .dropdown-menu a:hover, +.dropdown-menu a:hover, +.topbar .dropdown-menu a.hover, +.dropdown-menu a.hover { + background-color: #dddddd; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); + background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); + background-image: -ms-linear-gradient(top, #eeeeee, #dddddd); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd)); + background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); + background-image: -o-linear-gradient(top, #eeeeee, #dddddd); + background-image: linear-gradient(top, #eeeeee, #dddddd); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); + color: #404040; + text-decoration: none; + -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); +} +.open .menu, +.dropdown.open .menu, +.open .dropdown-toggle, +.dropdown.open .dropdown-toggle { + color: #ffffff; + background: #ccc; + background: rgba(0, 0, 0, 0.3); +} +.open .menu-dropdown, +.dropdown.open .menu-dropdown, +.open .dropdown-menu, +.dropdown.open .dropdown-menu { + display: block; +} +.tabs, .pills { + margin: 0 0 18px; + padding: 0; + list-style: none; + zoom: 1; +} +.tabs:before, +.pills:before, +.tabs:after, +.pills:after { + display: table; + content: ""; + zoom: 1; +} +.tabs:after, .pills:after { + clear: both; +} +.tabs > li, .pills > li { + float: left; +} +.tabs > li > a, .pills > li > a { + display: block; +} +.tabs { + border-color: #ddd; + border-style: solid; + border-width: 0 0 1px; +} +.tabs > li { + position: relative; + margin-bottom: -1px; +} +.tabs > li > a { + padding: 0 15px; + margin-right: 2px; + line-height: 34px; + border: 1px solid transparent; + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.tabs > li > a:hover { + text-decoration: none; + background-color: #eee; + border-color: #eee #eee #ddd; +} +.tabs .active > a, .tabs .active > a:hover { + color: #808080; + background-color: #ffffff; + border: 1px solid #ddd; + border-bottom-color: transparent; + cursor: default; +} +.tabs .menu-dropdown, .tabs .dropdown-menu { + top: 35px; + border-width: 1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} +.tabs a.menu:after, .tabs .dropdown-toggle:after { + border-top-color: #999; + margin-top: 15px; + margin-left: 5px; +} +.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle { + border-color: #999; +} +.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { + border-top-color: #555; +} +.pills a { + margin: 5px 3px 5px 0; + padding: 0 15px; + line-height: 30px; + text-shadow: 0 1px 1px #ffffff; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +.pills a:hover { + color: #ffffff; + text-decoration: none; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); + background-color: #00438a; +} +.pills .active a { + color: #ffffff; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); + background-color: #0069d6; +} +.pills-vertical > li { + float: none; +} +.tab-content > .tab-pane, .pill-content > .pill-pane { + display: none; +} +.tab-content > .active, .pill-content > .active { + display: block; +} +.breadcrumb { + padding: 7px 14px; + margin: 0 0 18px; + background-color: #f5f5f5; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); + background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5)); + background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); + background-image: linear-gradient(top, #ffffff, #f5f5f5); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); + border: 1px solid #ddd; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; +} +.breadcrumb li { + display: inline; + text-shadow: 0 1px 0 #ffffff; +} +.breadcrumb .divider { + padding: 0 5px; + color: #bfbfbf; +} +.breadcrumb .active a { + color: #404040; +} +.hero-unit { + background-color: #f5f5f5; + margin-bottom: 30px; + padding: 60px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.hero-unit h1 { + margin-bottom: 0; + font-size: 60px; + line-height: 1; + letter-spacing: -1px; +} +.hero-unit p { + font-size: 18px; + font-weight: 200; + line-height: 27px; +} +footer { + margin-top: 17px; + padding-top: 17px; + border-top: 1px solid #eee; +} +.page-header { + margin-bottom: 17px; + border-bottom: 1px solid #ddd; + -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +} +.page-header h1 { + margin-bottom: 8px; +} +.btn.danger, +.alert-message.danger, +.btn.danger:hover, +.alert-message.danger:hover, +.btn.error, +.alert-message.error, +.btn.error:hover, +.alert-message.error:hover, +.btn.success, +.alert-message.success, +.btn.success:hover, +.alert-message.success:hover, +.btn.info, +.alert-message.info, +.btn.info:hover, +.alert-message.info:hover { + color: #ffffff; +} +.btn .close, .alert-message .close { + font-family: Arial, sans-serif; + line-height: 18px; +} +.btn.danger, +.alert-message.danger, +.btn.error, +.alert-message.error { + background-color: #c43c35; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); + background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(top, #ee5f5b, #c43c35); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #c43c35 #c43c35 #882a25; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +.btn.success, .alert-message.success { + background-color: #57a957; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); + background-image: -moz-linear-gradient(top, #62c462, #57a957); + background-image: -ms-linear-gradient(top, #62c462, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(top, #62c462, #57a957); + background-image: -o-linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(top, #62c462, #57a957); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #57a957 #57a957 #3d773d; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +.btn.info, .alert-message.info { + background-color: #339bb9; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); + background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); + background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); + background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); + background-image: -o-linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(top, #5bc0de, #339bb9); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #339bb9 #339bb9 #22697d; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +.btn { + cursor: pointer; + display: inline-block; + background-color: #e6e6e6; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); + background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); + padding: 5px 14px 6px; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + color: #333; + font-size: 13px; + line-height: normal; + border: 1px solid #ccc; + border-bottom-color: #bbb; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-transform-style: preserve-3d; + -webkit-transition: 0.1s linear all; + -moz-transition: 0.1s linear all; + -ms-transition: 0.1s linear all; + -o-transition: 0.1s linear all; + transition: 0.1s linear all; +} +.btn:hover { + background-position: 0 -15px; + color: #333; + text-decoration: none; +} +.btn:focus { + outline: 1px dotted #666; +} +.btn.primary { + color: #ffffff; + background-color: #0064cd; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); + background-image: -moz-linear-gradient(top, #049cdb, #0064cd); + background-image: -ms-linear-gradient(top, #049cdb, #0064cd); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); + background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); + background-image: -o-linear-gradient(top, #049cdb, #0064cd); + background-image: linear-gradient(top, #049cdb, #0064cd); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #0064cd #0064cd #003f81; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +.btn.active, .btn :active { + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); +} +.btn.disabled { + cursor: default; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + filter: alpha(opacity=65); + -khtml-opacity: 0.65; + -moz-opacity: 0.65; + opacity: 0.65; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn[disabled] { + cursor: default; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + filter: alpha(opacity=65); + -khtml-opacity: 0.65; + -moz-opacity: 0.65; + opacity: 0.65; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn.large { + font-size: 15px; + line-height: normal; + padding: 9px 14px 9px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.btn.small { + padding: 7px 9px 7px; + font-size: 11px; +} +:root .alert-message, :root .btn { + border-radius: 0 \0; +} +button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { + padding: 0; + border: 0; +} +.close { + float: right; + color: #000000; + font-size: 20px; + font-weight: bold; + line-height: 13.5px; + text-shadow: 0 1px 0 #ffffff; + filter: alpha(opacity=25); + -khtml-opacity: 0.25; + -moz-opacity: 0.25; + opacity: 0.25; +} +.close:hover { + color: #000000; + text-decoration: none; + filter: alpha(opacity=40); + -khtml-opacity: 0.4; + -moz-opacity: 0.4; + opacity: 0.4; +} +.alert-message { + position: relative; + padding: 7px 15px; + margin-bottom: 18px; + color: #404040; + background-color: #eedc94; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); + background-image: -moz-linear-gradient(top, #fceec1, #eedc94); + background-image: -ms-linear-gradient(top, #fceec1, #eedc94); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94)); + background-image: -webkit-linear-gradient(top, #fceec1, #eedc94); + background-image: -o-linear-gradient(top, #fceec1, #eedc94); + background-image: linear-gradient(top, #fceec1, #eedc94); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #eedc94 #eedc94 #e4c652; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + border-width: 1px; + border-style: solid; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); +} +.alert-message .close { + margin-top: 1px; + *margin-top: 0; +} +.alert-message a { + font-weight: bold; + color: #404040; +} +.alert-message.danger p a, +.alert-message.error p a, +.alert-message.success p a, +.alert-message.info p a { + color: #ffffff; +} +.alert-message h5 { + line-height: 18px; +} +.alert-message p { + margin-bottom: 0; +} +.alert-message div { + margin-top: 5px; + margin-bottom: 2px; + line-height: 28px; +} +.alert-message .btn { + -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); + -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); +} +.alert-message.block-message { + background-image: none; + background-color: #fdf5d9; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + padding: 14px; + border-color: #fceec1; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.alert-message.block-message ul, .alert-message.block-message p { + margin-right: 30px; +} +.alert-message.block-message ul { + margin-bottom: 0; +} +.alert-message.block-message li { + color: #404040; +} +.alert-message.block-message .alert-actions { + margin-top: 5px; +} +.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info { + color: #404040; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +} +.alert-message.block-message.error { + background-color: #fddfde; + border-color: #fbc7c6; +} +.alert-message.block-message.success { + background-color: #d1eed1; + border-color: #bfe7bf; +} +.alert-message.block-message.info { + background-color: #ddf4fb; + border-color: #c6edf9; +} +.alert-message.block-message.danger p a, +.alert-message.block-message.error p a, +.alert-message.block-message.success p a, +.alert-message.block-message.info p a { + color: #404040; +} +.pagination { + height: 36px; + margin: 18px 0; +} +.pagination ul { + float: left; + margin: 0; + border: 1px solid #ddd; + border: 1px solid rgba(0, 0, 0, 0.15); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} +.pagination li { + display: inline; +} +.pagination a { + float: left; + padding: 0 14px; + line-height: 34px; + border-right: 1px solid; + border-right-color: #ddd; + border-right-color: rgba(0, 0, 0, 0.15); + *border-right-color: #ddd; + /* IE6-7 */ + + text-decoration: none; +} +.pagination a:hover, .pagination .active a { + background-color: #c7eefe; +} +.pagination .disabled a, .pagination .disabled a:hover { + background-color: transparent; + color: #bfbfbf; +} +.pagination .next a { + border: 0; +} +.well { + background-color: #f5f5f5; + margin-bottom: 20px; + padding: 19px; + min-height: 20px; + border: 1px solid #eee; + border: 1px solid rgba(0, 0, 0, 0.05); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); +} +.well blockquote { + border-color: #ddd; + border-color: rgba(0, 0, 0, 0.15); +} +.modal-backdrop { + background-color: #000000; + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 10000; +} +.modal-backdrop.fade { + opacity: 0; +} +.modal-backdrop, .modal-backdrop.fade.in { + filter: alpha(opacity=80); + -khtml-opacity: 0.8; + -moz-opacity: 0.8; + opacity: 0.8; +} +.modal { + position: fixed; + top: 50%; + left: 50%; + z-index: 11000; + width: 560px; + margin: -250px 0 0 -280px; + background-color: #ffffff; + border: 1px solid #999; + border: 1px solid rgba(0, 0, 0, 0.3); + *border: 1px solid #999; + /* IE6-7 */ + + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; +} +.modal .close { + margin-top: 7px; +} +.modal.fade { + -webkit-transform-style: preserve-3d; + -webkit-transition: opacity .3s linear, top .3s ease-out; + -moz-transition: opacity .3s linear, top .3s ease-out; + -ms-transition: opacity .3s linear, top .3s ease-out; + -o-transition: opacity .3s linear, top .3s ease-out; + transition: opacity .3s linear, top .3s ease-out; + top: -25%; +} +.modal.fade.in { + top: 50%; +} +.modal-header { + border-bottom: 1px solid #eee; + padding: 5px 15px; +} +.modal-body { + padding: 15px; +} +.modal-body form { + margin-bottom: 0; +} +.modal-footer { + background-color: #f5f5f5; + padding: 14px 15px 15px; + border-top: 1px solid #ddd; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; + zoom: 1; + margin-bottom: 0; +} +.modal-footer:before, .modal-footer:after { + display: table; + content: ""; + zoom: 1; +} +.modal-footer:after { + clear: both; +} +.modal-footer .btn { + float: right; + margin-left: 5px; +} +.modal .popover, .modal .twipsy { + z-index: 12000; +} +.twipsy { + display: block; + position: absolute; + visibility: visible; + padding: 5px; + font-size: 11px; + z-index: 1000; + filter: alpha(opacity=80); + -khtml-opacity: 0.8; + -moz-opacity: 0.8; + opacity: 0.8; +} +.twipsy.fade.in { + filter: alpha(opacity=80); + -khtml-opacity: 0.8; + -moz-opacity: 0.8; + opacity: 0.8; +} +.twipsy.above .twipsy-arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid #000000; +} +.twipsy.left .twipsy-arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-left: 5px solid #000000; +} +.twipsy.below .twipsy-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-bottom: 5px solid #000000; +} +.twipsy.right .twipsy-arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-right: 5px solid #000000; +} +.twipsy-inner { + padding: 3px 8px; + background-color: #000000; + color: white; + text-align: center; + max-width: 200px; + text-decoration: none; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.twipsy-arrow { + position: absolute; + width: 0; + height: 0; +} +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1000; + padding: 5px; + display: none; +} +.popover.above .arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid #000000; +} +.popover.right .arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-right: 5px solid #000000; +} +.popover.below .arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-bottom: 5px solid #000000; +} +.popover.left .arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-left: 5px solid #000000; +} +.popover .arrow { + position: absolute; + width: 0; + height: 0; +} +.popover .inner { + background: #000000; + background: rgba(0, 0, 0, 0.8); + padding: 3px; + overflow: hidden; + width: 280px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); +} +.popover .title { + background-color: #f5f5f5; + padding: 9px 15px; + line-height: 1; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + border-bottom: 1px solid #eee; +} +.popover .content { + background-color: #ffffff; + padding: 14px; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; +} +.popover .content p, .popover .content ul, .popover .content ol { + margin-bottom: 0; +} +.fade { + -webkit-transform-style: preserve-3d; + -webkit-transition: opacity 0.15s linear; + -moz-transition: opacity 0.15s linear; + -ms-transition: opacity 0.15s linear; + -o-transition: opacity 0.15s linear; + transition: opacity 0.15s linear; + opacity: 0; +} +.fade.in { + opacity: 1; +} +.label { + padding: 1px 3px 2px; + font-size: 9.75px; + font-weight: bold; + color: #ffffff; + text-transform: uppercase; + white-space: nowrap; + background-color: #bfbfbf; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.label.important { + background-color: #c43c35; +} +.label.warning { + background-color: #f89406; +} +.label.success { + background-color: #46a546; +} +.label.notice { + background-color: #62cffc; +} +.media-grid { + margin-left: -20px; + margin-bottom: 0; + zoom: 1; +} +.media-grid:before, .media-grid:after { + display: table; + content: ""; + zoom: 1; +} +.media-grid:after { + clear: both; +} +.media-grid li { + display: inline; +} +.media-grid a { + float: left; + padding: 4px; + margin: 0 0 18px 20px; + border: 1px solid #ddd; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); +} +.media-grid a img { + display: block; +} +.media-grid a:hover { + border-color: #0069d6; + -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); + -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); + box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); +} diff --git a/storm-core/src/ui/public/css/style.css b/storm-core/src/ui/public/css/style.css index d49231d734..6c7c119f51 100644 --- a/storm-core/src/ui/public/css/style.css +++ b/storm-core/src/ui/public/css/style.css @@ -17,4 +17,26 @@ */ .js-only { display: none; -} \ No newline at end of file +} + +body { + color: #808080; +} + +table { + border-collapse: separate; +} + +table th, table td { + line-height: 13.5px; + border-bottom: 1px solid #ddd; + border-top-style: none; +} + +table th { + border-bottom-width: 2px; +} + +.twipsy-inner { + font-size: 13px; +} diff --git a/storm-core/src/ui/public/js/bootstrap-twipsy.js b/storm-core/src/ui/public/js/bootstrap-twipsy.js new file mode 100644 index 0000000000..7f8ad0fed8 --- /dev/null +++ b/storm-core/src/ui/public/js/bootstrap-twipsy.js @@ -0,0 +1,310 @@ +/* ========================================================== + * bootstrap-twipsy.js v1.4.0 + * http://twitter.github.com/bootstrap/javascript.html#twipsy + * Adapted from the original jQuery.tipsy by Jason Frame + * ========================================================== + * Copyright 2011 Twitter, Inc. + * + * 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. + * ========================================================== */ + + +!function( $ ) { + + "use strict" + + /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) + * ======================================================= */ + + var transitionEnd + + $(document).ready(function () { + + $.support.transition = (function () { + var thisBody = document.body || document.documentElement + , thisStyle = thisBody.style + , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined + return support + })() + + // set CSS transition event type + if ( $.support.transition ) { + transitionEnd = "TransitionEnd" + if ( $.browser.webkit ) { + transitionEnd = "webkitTransitionEnd" + } else if ( $.browser.mozilla ) { + transitionEnd = "transitionend" + } else if ( $.browser.opera ) { + transitionEnd = "oTransitionEnd" + } + } + + }) + + + /* TWIPSY PUBLIC CLASS DEFINITION + * ============================== */ + + var Twipsy = function ( element, options ) { + this.$element = $(element) + this.options = options + this.enabled = true + this.fixTitle() + } + + Twipsy.prototype = { + + show: function() { + var pos + , actualWidth + , actualHeight + , placement + , $tip + , tp + + if (this.hasContent() && this.enabled) { + $tip = this.tip() + this.setContent() + + if (this.options.animate) { + $tip.addClass('fade') + } + + $tip + .remove() + .css({ top: 0, left: 0, display: 'block' }) + .prependTo(document.body) + + pos = $.extend({}, this.$element.offset(), { + width: this.$element[0].offsetWidth + , height: this.$element[0].offsetHeight + }) + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + + placement = maybeCall(this.options.placement, this, [ $tip[0], this.$element[0] ]) + + switch (placement) { + case 'below': + tp = {top: pos.top + pos.height + this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'above': + tp = {top: pos.top - actualHeight - this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'left': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth - this.options.offset} + break + case 'right': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width + this.options.offset} + break + } + + $tip + .css(tp) + .addClass(placement) + .addClass('in') + } + } + + , setContent: function () { + var $tip = this.tip() + $tip.find('.twipsy-inner')[this.options.html ? 'html' : 'text'](this.getTitle()) + $tip[0].className = 'twipsy' + } + + , hide: function() { + var that = this + , $tip = this.tip() + + $tip.removeClass('in') + + function removeElement () { + $tip.remove() + } + + $.support.transition && this.$tip.hasClass('fade') ? + $tip.bind(transitionEnd, removeElement) : + removeElement() + } + + , fixTitle: function() { + var $e = this.$element + if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') + } + } + + , hasContent: function () { + return this.getTitle() + } + + , getTitle: function() { + var title + , $e = this.$element + , o = this.options + + this.fixTitle() + + if (typeof o.title == 'string') { + title = $e.attr(o.title == 'title' ? 'data-original-title' : o.title) + } else if (typeof o.title == 'function') { + title = o.title.call($e[0]) + } + + title = ('' + title).replace(/(^\s*|\s*$)/, "") + + return title || o.fallback + } + + , tip: function() { + if (!this.$tip) { + this.$tip = $('
').html(this.options.template) + } + return this.$tip + } + + , validate: function() { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + , enable: function() { + this.enabled = true + } + + , disable: function() { + this.enabled = false + } + + , toggleEnabled: function() { + this.enabled = !this.enabled + } + + } + + + /* TWIPSY PRIVATE METHODS + * ====================== */ + + function maybeCall ( thing, ctx, args ) { + return typeof thing == 'function' ? thing.apply(ctx, args) : thing + } + + /* TWIPSY PLUGIN DEFINITION + * ======================== */ + + $.fn.twipsy = function (options) { + $.fn.twipsy.initWith.call(this, options, Twipsy, 'twipsy') + return this + } + + $.fn.twipsy.initWith = function (options, Constructor, name) { + var twipsy + , binder + , eventIn + , eventOut + + if (options === true) { + return this.data(name) + } else if (typeof options == 'string') { + twipsy = this.data(name) + if (twipsy) { + twipsy[options]() + } + return this + } + + options = $.extend({}, $.fn[name].defaults, options) + + function get(ele) { + var twipsy = $.data(ele, name) + + if (!twipsy) { + twipsy = new Constructor(ele, $.fn.twipsy.elementOptions(ele, options)) + $.data(ele, name, twipsy) + } + + return twipsy + } + + function enter() { + var twipsy = get(this) + twipsy.hoverState = 'in' + + if (options.delayIn == 0) { + twipsy.show() + } else { + twipsy.fixTitle() + setTimeout(function() { + if (twipsy.hoverState == 'in') { + twipsy.show() + } + }, options.delayIn) + } + } + + function leave() { + var twipsy = get(this) + twipsy.hoverState = 'out' + if (options.delayOut == 0) { + twipsy.hide() + } else { + setTimeout(function() { + if (twipsy.hoverState == 'out') { + twipsy.hide() + } + }, options.delayOut) + } + } + + if (!options.live) { + this.each(function() { + get(this) + }) + } + + if (options.trigger != 'manual') { + binder = options.live ? 'live' : 'bind' + eventIn = options.trigger == 'hover' ? 'mouseenter' : 'focus' + eventOut = options.trigger == 'hover' ? 'mouseleave' : 'blur' + this[binder](eventIn, enter)[binder](eventOut, leave) + } + + return this + } + + $.fn.twipsy.Twipsy = Twipsy + + $.fn.twipsy.defaults = { + animate: true + , delayIn: 0 + , delayOut: 0 + , fallback: '' + , placement: 'above' + , html: false + , live: false + , offset: 0 + , title: 'title' + , trigger: 'hover' + , template: '
' + } + + $.fn.twipsy.elementOptions = function(ele, options) { + return $.extend({}, options, $(ele).data()) + } + +}( window.jQuery || window.ender ); \ No newline at end of file diff --git a/storm-core/src/ui/public/js/script.js b/storm-core/src/ui/public/js/script.js index cc0d1161e0..e9902abb7b 100644 --- a/storm-core/src/ui/public/js/script.js +++ b/storm-core/src/ui/public/js/script.js @@ -95,4 +95,15 @@ function confirmAction(id, name, action, wait, defaultWait) { }); return false; -} \ No newline at end of file +} + +$(function () { + var placements = ['above', 'below', 'left', 'right']; + for (var i in placements) { + $('.tip.'+placements[i]).twipsy({ + live: true, + placement: placements[i], + delayIn: 1000 + }); + } +}) diff --git a/storm-core/test/clj/backtype/storm/clojure_test.clj b/storm-core/test/clj/backtype/storm/clojure_test.clj index 7cd0da2fa0..53eebe570c 100644 --- a/storm-core/test/clj/backtype/storm/clojure_test.clj +++ b/storm-core/test/clj/backtype/storm/clojure_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/cluster_test.clj b/storm-core/test/clj/backtype/storm/cluster_test.clj index 281203cffa..987429b7ef 100644 --- a/storm-core/test/clj/backtype/storm/cluster_test.clj +++ b/storm-core/test/clj/backtype/storm/cluster_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/config_test.clj b/storm-core/test/clj/backtype/storm/config_test.clj index bebf5c03bc..93c7df9397 100644 --- a/storm-core/test/clj/backtype/storm/config_test.clj +++ b/storm-core/test/clj/backtype/storm/config_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/drpc_test.clj b/storm-core/test/clj/backtype/storm/drpc_test.clj index a2286dbbc4..fbc60e6bac 100644 --- a/storm-core/test/clj/backtype/storm/drpc_test.clj +++ b/storm-core/test/clj/backtype/storm/drpc_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/fields_test.clj b/storm-core/test/clj/backtype/storm/fields_test.clj index e641fdc6af..be0fe34f10 100644 --- a/storm-core/test/clj/backtype/storm/fields_test.clj +++ b/storm-core/test/clj/backtype/storm/fields_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/grouping_test.clj b/storm-core/test/clj/backtype/storm/grouping_test.clj index a5c40a23be..bf3efe261b 100644 --- a/storm-core/test/clj/backtype/storm/grouping_test.clj +++ b/storm-core/test/clj/backtype/storm/grouping_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/integration_test.clj b/storm-core/test/clj/backtype/storm/integration_test.clj index 8629973b04..d54bd407e3 100644 --- a/storm-core/test/clj/backtype/storm/integration_test.clj +++ b/storm-core/test/clj/backtype/storm/integration_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/local_state_test.clj b/storm-core/test/clj/backtype/storm/local_state_test.clj index 4b00be73b3..ba2b969d64 100644 --- a/storm-core/test/clj/backtype/storm/local_state_test.clj +++ b/storm-core/test/clj/backtype/storm/local_state_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-netty/test/clj/backtype/storm/messaging/netty_integration_test.clj b/storm-core/test/clj/backtype/storm/messaging/netty_integration_test.clj similarity index 98% rename from storm-netty/test/clj/backtype/storm/messaging/netty_integration_test.clj rename to storm-core/test/clj/backtype/storm/messaging/netty_integration_test.clj index 0c908c51f3..31e69e8eff 100644 --- a/storm-netty/test/clj/backtype/storm/messaging/netty_integration_test.clj +++ b/storm-core/test/clj/backtype/storm/messaging/netty_integration_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-netty/test/clj/backtype/storm/messaging/netty_unit_test.clj b/storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj similarity index 99% rename from storm-netty/test/clj/backtype/storm/messaging/netty_unit_test.clj rename to storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj index 20914ef65e..f2716073d7 100644 --- a/storm-netty/test/clj/backtype/storm/messaging/netty_unit_test.clj +++ b/storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/messaging_test.clj b/storm-core/test/clj/backtype/storm/messaging_test.clj index f255b24291..94b9168673 100644 --- a/storm-core/test/clj/backtype/storm/messaging_test.clj +++ b/storm-core/test/clj/backtype/storm/messaging_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -29,7 +29,7 @@ STORM-LOCAL-MODE-ZMQ (if transport-on? true false) STORM-MESSAGING-TRANSPORT - "backtype.storm.messaging.zmq"}] + "backtype.storm.messaging.netty.Context"}] (let [topology (thrift/mk-topology {"1" (thrift/mk-spout-spec (TestWordSpout. true) :parallelism-hint 2)} {"2" (thrift/mk-bolt-spec {"1" :shuffle} (TestGlobalCount.) diff --git a/storm-core/test/clj/backtype/storm/metrics_test.clj b/storm-core/test/clj/backtype/storm/metrics_test.clj index c4c81c02c4..edd3a45c61 100644 --- a/storm-core/test/clj/backtype/storm/metrics_test.clj +++ b/storm-core/test/clj/backtype/storm/metrics_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/multilang_test.clj b/storm-core/test/clj/backtype/storm/multilang_test.clj index 85a1da13ae..ae288ec74c 100644 --- a/storm-core/test/clj/backtype/storm/multilang_test.clj +++ b/storm-core/test/clj/backtype/storm/multilang_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/nimbus_test.clj b/storm-core/test/clj/backtype/storm/nimbus_test.clj index bdb2851570..a14767ba6f 100644 --- a/storm-core/test/clj/backtype/storm/nimbus_test.clj +++ b/storm-core/test/clj/backtype/storm/nimbus_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -815,3 +815,12 @@ (nimbus/clean-inbox dir-location 10) (assert-files-in-dir []) )))) + +(deftest test-validate-topo-config-on-submit + (with-local-cluster [cluster] + (let [nimbus (:nimbus cluster) + topology (thrift/mk-topology {} {}) + bad-config {"topology.workers" "3"}] + (is (thrown-cause? InvalidTopologyException + (submit-local-topology-with-opts nimbus "test" bad-config topology + (SubmitOptions.))))))) diff --git a/storm-core/test/clj/backtype/storm/scheduler_test.clj b/storm-core/test/clj/backtype/storm/scheduler_test.clj index ac55c4be49..f8cc1ab445 100644 --- a/storm-core/test/clj/backtype/storm/scheduler_test.clj +++ b/storm-core/test/clj/backtype/storm/scheduler_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/security/auth/AuthUtils_test.clj b/storm-core/test/clj/backtype/storm/security/auth/AuthUtils_test.clj index 85fe603636..ed21904201 100644 --- a/storm-core/test/clj/backtype/storm/security/auth/AuthUtils_test.clj +++ b/storm-core/test/clj/backtype/storm/security/auth/AuthUtils_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/security/auth/ReqContext_test.clj b/storm-core/test/clj/backtype/storm/security/auth/ReqContext_test.clj index 3f71578688..ea45ddc15c 100644 --- a/storm-core/test/clj/backtype/storm/security/auth/ReqContext_test.clj +++ b/storm-core/test/clj/backtype/storm/security/auth/ReqContext_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/security/auth/SaslTransportPlugin_test.clj b/storm-core/test/clj/backtype/storm/security/auth/SaslTransportPlugin_test.clj index 20b0ae0de7..6bfa4272c8 100644 --- a/storm-core/test/clj/backtype/storm/security/auth/SaslTransportPlugin_test.clj +++ b/storm-core/test/clj/backtype/storm/security/auth/SaslTransportPlugin_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj b/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj index 636f168e0c..7dcd86d2b1 100644 --- a/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj +++ b/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -17,7 +17,7 @@ (:use [backtype.storm config]) (:use [clojure test]) (:import [backtype.storm.security.auth ThriftClient]) - (:import [org.apache.thrift7.transport TTransportException]) + (:import [org.apache.thrift.transport TTransportException]) ) (deftest test-ctor-throws-if-port-invalid diff --git a/storm-core/test/clj/backtype/storm/security/auth/ThriftServer_test.clj b/storm-core/test/clj/backtype/storm/security/auth/ThriftServer_test.clj index 015e808825..6213d4fffd 100644 --- a/storm-core/test/clj/backtype/storm/security/auth/ThriftServer_test.clj +++ b/storm-core/test/clj/backtype/storm/security/auth/ThriftServer_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -17,7 +17,7 @@ (:use [backtype.storm config]) (:use [clojure test]) (:import [backtype.storm.security.auth ThriftServer]) - (:import [org.apache.thrift7.transport TTransportException]) + (:import [org.apache.thrift.transport TTransportException]) ) (deftest test-stop-checks-for-null diff --git a/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj b/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj index 20f1af82c2..c7d7411cf0 100644 --- a/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj +++ b/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -16,8 +16,8 @@ (ns backtype.storm.security.auth.auth-test (:use [clojure test]) (:require [backtype.storm.daemon [nimbus :as nimbus]]) - (:import [org.apache.thrift7 TException]) - (:import [org.apache.thrift7.transport TTransportException]) + (:import [org.apache.thrift TException]) + (:import [org.apache.thrift.transport TTransportException]) (:import [java.nio ByteBuffer]) (:import [backtype.storm Config]) (:import [backtype.storm.utils NimbusClient]) @@ -31,7 +31,7 @@ (bootstrap) -(def nimbus-timeout (Integer. 30)) +(def nimbus-timeout (Integer. 120)) (defn mk-authorization-handler [storm-conf] (let [klassname (storm-conf NIMBUS-AUTHORIZER) diff --git a/storm-core/test/clj/backtype/storm/security/auth/jaas_digest.conf b/storm-core/test/clj/backtype/storm/security/auth/jaas_digest.conf index c51e90cf00..2a6d618ffb 100644 --- a/storm-core/test/clj/backtype/storm/security/auth/jaas_digest.conf +++ b/storm-core/test/clj/backtype/storm/security/auth/jaas_digest.conf @@ -1,3 +1,21 @@ +/* + * 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. + */ + /* This sample file illustrates how Digest authentication should be configured */ StormServer { diff --git a/storm-core/test/clj/backtype/storm/security/auth/jaas_digest_bad_password.conf b/storm-core/test/clj/backtype/storm/security/auth/jaas_digest_bad_password.conf index a5e9b52d8d..149db3fd4a 100644 --- a/storm-core/test/clj/backtype/storm/security/auth/jaas_digest_bad_password.conf +++ b/storm-core/test/clj/backtype/storm/security/auth/jaas_digest_bad_password.conf @@ -1,3 +1,21 @@ +/* + * 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. + */ + /* This sample file containes incorrect password of a user. We use this file for negative test. */ diff --git a/storm-core/test/clj/backtype/storm/security/auth/jaas_digest_missing_client.conf b/storm-core/test/clj/backtype/storm/security/auth/jaas_digest_missing_client.conf index 4caab7a232..f4f2b642ee 100644 --- a/storm-core/test/clj/backtype/storm/security/auth/jaas_digest_missing_client.conf +++ b/storm-core/test/clj/backtype/storm/security/auth/jaas_digest_missing_client.conf @@ -1,3 +1,21 @@ +/* + * 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. + */ + StormServer { org.apache.zookeeper.server.auth.DigestLoginModule required user_super="adminsecret" diff --git a/storm-core/test/clj/backtype/storm/security/auth/jaas_digest_unknown_user.conf b/storm-core/test/clj/backtype/storm/security/auth/jaas_digest_unknown_user.conf index 90cf823e3a..e03a33386b 100644 --- a/storm-core/test/clj/backtype/storm/security/auth/jaas_digest_unknown_user.conf +++ b/storm-core/test/clj/backtype/storm/security/auth/jaas_digest_unknown_user.conf @@ -1,3 +1,21 @@ +/* + * 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. + */ + /* This sample file containes an unauthorized user. We use this file for negative test. */ diff --git a/storm-core/test/clj/backtype/storm/security/serialization/BlowfishTupleSerializer_test.clj b/storm-core/test/clj/backtype/storm/security/serialization/BlowfishTupleSerializer_test.clj index 198ba80e67..b8219c011b 100644 --- a/storm-core/test/clj/backtype/storm/security/serialization/BlowfishTupleSerializer_test.clj +++ b/storm-core/test/clj/backtype/storm/security/serialization/BlowfishTupleSerializer_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/serialization/SerializationFactory_test.clj b/storm-core/test/clj/backtype/storm/serialization/SerializationFactory_test.clj index e65adcca08..0dc2ebe118 100644 --- a/storm-core/test/clj/backtype/storm/serialization/SerializationFactory_test.clj +++ b/storm-core/test/clj/backtype/storm/serialization/SerializationFactory_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/serialization_test.clj b/storm-core/test/clj/backtype/storm/serialization_test.clj index e5d9f72010..7f1c0a9e73 100644 --- a/storm-core/test/clj/backtype/storm/serialization_test.clj +++ b/storm-core/test/clj/backtype/storm/serialization_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -18,6 +18,7 @@ (:import [backtype.storm.serialization KryoTupleSerializer KryoTupleDeserializer KryoValuesSerializer KryoValuesDeserializer]) (:import [backtype.storm.testing TestSerObject TestKryoDecorator]) + (:import [backtype.storm ConfigValidation]) (:use [backtype.storm util config]) ) @@ -40,6 +41,24 @@ ([vals conf] (deserialize (serialize vals conf) conf))) +(deftest validate-kryo-conf-basic + (.validateField ConfigValidation/KryoRegValidator "test" ["a" "b" "c" {"d" "e"} {"f" "g"}])) + +(deftest validate-kryo-conf-fail + (try + (.validateField ConfigValidation/KryoRegValidator "test" {"f" "g"}) + (assert false) + (catch IllegalArgumentException e)) + (try + (.validateField ConfigValidation/KryoRegValidator "test" [1]) + (assert false) + (catch IllegalArgumentException e)) + (try + (.validateField ConfigValidation/KryoRegValidator "test" [{"a" 1}]) + (assert false) + (catch IllegalArgumentException e)) +) + (deftest test-java-serialization (letlocals (bind obj (TestSerObject. 1 2)) diff --git a/storm-core/test/clj/backtype/storm/subtopology_test.clj b/storm-core/test/clj/backtype/storm/subtopology_test.clj index f4611c3a68..1e57cbd478 100644 --- a/storm-core/test/clj/backtype/storm/subtopology_test.clj +++ b/storm-core/test/clj/backtype/storm/subtopology_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/supervisor_test.clj b/storm-core/test/clj/backtype/storm/supervisor_test.clj index 9c1a312553..9f9def98eb 100644 --- a/storm-core/test/clj/backtype/storm/supervisor_test.clj +++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/testing4j_test.clj b/storm-core/test/clj/backtype/storm/testing4j_test.clj index a64c44f4ec..bb920af7ae 100644 --- a/storm-core/test/clj/backtype/storm/testing4j_test.clj +++ b/storm-core/test/clj/backtype/storm/testing4j_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/tick_tuple_test.clj b/storm-core/test/clj/backtype/storm/tick_tuple_test.clj index f524d2b154..a21820031b 100644 --- a/storm-core/test/clj/backtype/storm/tick_tuple_test.clj +++ b/storm-core/test/clj/backtype/storm/tick_tuple_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/transactional_test.clj b/storm-core/test/clj/backtype/storm/transactional_test.clj index e7b3f2800a..c633aa163e 100644 --- a/storm-core/test/clj/backtype/storm/transactional_test.clj +++ b/storm-core/test/clj/backtype/storm/transactional_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/tuple_test.clj b/storm-core/test/clj/backtype/storm/tuple_test.clj index 7d6dd8335b..21e5920a7e 100644 --- a/storm-core/test/clj/backtype/storm/tuple_test.clj +++ b/storm-core/test/clj/backtype/storm/tuple_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/backtype/storm/utils_test.clj b/storm-core/test/clj/backtype/storm/utils_test.clj index 09a86ca47c..99bf7d113f 100644 --- a/storm-core/test/clj/backtype/storm/utils_test.clj +++ b/storm-core/test/clj/backtype/storm/utils_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, @@ -17,7 +17,7 @@ (:import [backtype.storm Config]) (:import [backtype.storm.utils NimbusClient Utils]) (:import [com.netflix.curator.retry ExponentialBackoffRetry]) - (:import [org.apache.thrift7.transport TTransportException]) + (:import [org.apache.thrift.transport TTransportException]) (:use [backtype.storm config util]) (:use [clojure test]) ) diff --git a/storm-core/test/clj/backtype/storm/versioned_store_test.clj b/storm-core/test/clj/backtype/storm/versioned_store_test.clj index c8820d9841..f8a2561143 100644 --- a/storm-core/test/clj/backtype/storm/versioned_store_test.clj +++ b/storm-core/test/clj/backtype/storm/versioned_store_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/storm/trident/integration_test.clj b/storm-core/test/clj/storm/trident/integration_test.clj index b323e5e56e..ec8d49f45a 100644 --- a/storm-core/test/clj/storm/trident/integration_test.clj +++ b/storm-core/test/clj/storm/trident/integration_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/storm/trident/state_test.clj b/storm-core/test/clj/storm/trident/state_test.clj index 433a2ace41..6e091e34f5 100644 --- a/storm-core/test/clj/storm/trident/state_test.clj +++ b/storm-core/test/clj/storm/trident/state_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/storm/trident/tuple_test.clj b/storm-core/test/clj/storm/trident/tuple_test.clj index 1fe56790e3..165f165e23 100644 --- a/storm-core/test/clj/storm/trident/tuple_test.clj +++ b/storm-core/test/clj/storm/trident/tuple_test.clj @@ -6,7 +6,7 @@ ;; "License"); you may not use this file except in compliance ;; with the License. You may obtain a copy of the License at ;; -;; http:;; www.apache.org/licenses/LICENSE-2.0 +;; http://www.apache.org/licenses/LICENSE-2.0 ;; ;; Unless required by applicable law or agreed to in writing, software ;; distributed under the License is distributed on an "AS IS" BASIS, diff --git a/storm-core/test/clj/zilch/test/mq.clj b/storm-core/test/clj/zilch/test/mq.clj deleted file mode 100644 index a93e53072c..0000000000 --- a/storm-core/test/clj/zilch/test/mq.clj +++ /dev/null @@ -1,101 +0,0 @@ -;; 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. -(ns zilch.test.mq - (:use clojure.test) - (:import [java.util Arrays UUID]) - (:require [zilch.mq :as mq])) - -(defn uuid [] (str (UUID/randomUUID))) - -(defn random-msg [] - (byte-array (map byte (for [i (range (Integer. (int (rand 100))))] - (Integer. (int (rand 100))) - )))) - -(def url - (str "inproc://" (uuid)) - ;; (str "ipc://" (uuid)) - ;; (str "tcp://127.0.0.1:" (+ 4000 (Math/round (rand 1000))))) - ) - -(deftest zilch - (testing "zilch" - (testing "should be able to" - - (testing "push / pull" - (mq/with-context context 2 - (with-open [s0 (-> context - (mq/socket mq/pull) - (mq/bind url)) - s1 (-> context - (mq/socket mq/push) - (mq/connect url))] - (let [msg (random-msg) - push (future (mq/send s1 msg)) - pull (future (mq/recv s0))] - (is (Arrays/equals msg @pull)))))) - - (testing "pub / sub" - (mq/with-context context 2 - (with-open [s0 (-> context - (mq/socket mq/pub) - (mq/bind url)) - s1 (-> context - (mq/socket mq/sub) - (mq/subscribe) - (mq/connect url))] - (let [msg (random-msg) - pub (future (mq/send s0 msg)) - sub (future (mq/recv s1))] - (is (Arrays/equals msg @sub)))))) - - (testing "pair / pair" - (mq/with-context context 2 - (with-open [s0 (-> context - (mq/socket mq/pair) - (mq/bind url)) - s1 (-> context - (mq/socket mq/pair) - (mq/connect url))] - (let [msg0 (random-msg) - pair0 (future (mq/send s0 msg0) - (mq/recv s0)) - msg1 (random-msg) - pair1 (future (mq/send s1 msg1) - (mq/recv s1))] - (is (Arrays/equals msg1 @pair0)) - (is (Arrays/equals msg0 @pair1)))))) - - (testing "req / rep" - (mq/with-context context 2 - (with-open [s0 (-> context - (mq/socket mq/rep) - (mq/bind url)) - s1 (-> context - (mq/socket mq/req) - (mq/connect url))] - (let [msg (random-msg) - req (future (mq/send s1 msg) - (mq/recv s1)) - rep (future (mq/recv s0) - (mq/send s0 msg))] - (is (Arrays/equals msg @req)))))) - - (testing "req / xrep") - - (testing "xreq / rep") - - (testing "xreq / xrep")))) diff --git a/storm-core/test/multilang/fy/bolt.fy b/storm-core/test/multilang/fy/bolt.fy index cadf9af2f1..df42a89720 100644 --- a/storm-core/test/multilang/fy/bolt.fy +++ b/storm-core/test/multilang/fy/bolt.fy @@ -1,3 +1,19 @@ +# 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. + require: "mocks" class TestBolt : Storm Bolt { diff --git a/storm-core/test/multilang/fy/mocks.fy b/storm-core/test/multilang/fy/mocks.fy index 2aa80645bb..399ce5dc4a 100644 --- a/storm-core/test/multilang/fy/mocks.fy +++ b/storm-core/test/multilang/fy/mocks.fy @@ -1,3 +1,19 @@ +# 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. + require: "../../../src/multilang/fy/storm" class MockedIO { diff --git a/storm-core/test/multilang/fy/protocol.fy b/storm-core/test/multilang/fy/protocol.fy index 2d5b28132d..fdd65a3840 100644 --- a/storm-core/test/multilang/fy/protocol.fy +++ b/storm-core/test/multilang/fy/protocol.fy @@ -1,3 +1,19 @@ +# 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. + require: "mocks" FancySpec describe: Storm Protocol with: { diff --git a/storm-dist/binary/LICENSE b/storm-dist/binary/LICENSE new file mode 100644 index 0000000000..ff9c5ea3e5 --- /dev/null +++ b/storm-dist/binary/LICENSE @@ -0,0 +1,297 @@ + + 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. + +----------------------------------------------------------------------- + +logback License + +Logback: the reliable, generic, fast and flexible logging framework. +Copyright (C) 1999-2012, QOS.ch. All rights reserved. + +This program and the accompanying materials are dual-licensed under +either the terms of the Eclipse Public License v1.0 as published by +the Eclipse Foundation + + or (per the licensee's choosing) + +under the terms of the GNU Lesser General Public License version 2.1 +as published by the Free Software Foundation. + +----------------------------------------------------------------------- + +slf4j License + +Copyright (c) 2004-2013 QOS.ch +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +----------------------------------------------------------------------- + + +For jQuery 1.6.2 (storm-core/src/ui/public/js/jquery-1.6.2.min.js) + +Copyright (c) 2009 John Resig, http://jquery.com/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +----------------------------------------------------------------------- + +For jQuery Cookies 2.2.0 (storm-core/src/ui/public/js/jquery.cookies.2.2.0.min.js) + +Copyright (c) 2005 - 2010, James Auldridge + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +----------------------------------------------------------------------- \ No newline at end of file diff --git a/storm-dist/binary/NOTICE b/storm-dist/binary/NOTICE new file mode 100644 index 0000000000..0eec4766f8 --- /dev/null +++ b/storm-dist/binary/NOTICE @@ -0,0 +1,36 @@ +Apache Storm +Copyright 2013 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + + +This product includes software developed by Nathan Marz +Copyright 2011-2013 Nathan Marz + + +This product includes software developed by Yahoo! Inc. (www.yahoo.com) +Copyright © 2012-2013 Yahoo! Inc. All rights reserved. + +YAML support provided by snakeyaml (http://code.google.com/p/snakeyaml/). +Copyright (c) 2008-2010 Andrey Somov + +The Netty transport uses Netty +(https://netty.io/) +Copyright (C) 2011 The Netty Project + +This product uses LMAX Disruptor +(http://lmax-exchange.github.io/disruptor/) +Copyright 2011 LMAX Ltd. + +This product includes the Jetty HTTP server +(http://jetty.codehaus.org/jetty/). +Copyright 1995-2006 Mort Bay Consulting Pty Ltd + +JSON (de)serialization by json-simple from +(http://code.google.com/p/json-simple). +Copyright (C) 2009 Fang Yidong and Chris Nokleberg + +Alternative collection types provided by google-collections from +http://code.google.com/p/google-collections/. +Copyright (C) 2007 Google Inc. \ No newline at end of file diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml new file mode 100644 index 0000000000..54ec172c00 --- /dev/null +++ b/storm-dist/binary/pom.xml @@ -0,0 +1,78 @@ + + + + + 4.0.0 + + storm + org.apache.storm + 0.9.1-incubating-SNAPSHOT + ../../pom.xml + + org.apache.storm + apache-storm-bin + pom + Storm Binary Distribution + Storm binary distribution + + + + org.apache.storm + storm-core + ${project.version} + + + + + apache-storm-${project.version} + + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + + + true + true + + ${project.basedir}/src/main/assembly/binary.xml + + false + + + + org.apache.maven.plugins + maven-gpg-plugin + + + package + + sign + + + + + + + diff --git a/storm-dist/binary/src/main/assembly/binary.xml b/storm-dist/binary/src/main/assembly/binary.xml new file mode 100644 index 0000000000..36a03190e7 --- /dev/null +++ b/storm-dist/binary/src/main/assembly/binary.xml @@ -0,0 +1,105 @@ + + + +bin + + tar.gz + zip + + + + + + false + lib + false + + + + + + + ${project.basedir}/../../bin + bin + + storm* + + + + ${project.basedir}/../../storm-core/src/ui/public + public + + */** + + + + + + + + + + + ${project.basedir}/../../conf/storm.yaml.example + /conf + storm.yaml + + + + ${project.basedir}/../../VERSION + / + RELEASE + true + + + + ${project.basedir}/../../logback/cluster.xml + /logback + + + + + ${project.basedir}/LICENSE + / + + + + ${project.basedir}/NOTICE + / + + + ${project.basedir}/../../README.markdown + / + + + ${project.basedir}/../../DISCLAIMER + / + + + + ${project.basedir}/../../CHANGELOG.md + / + + + diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml new file mode 100644 index 0000000000..d2a4366288 --- /dev/null +++ b/storm-dist/source/pom.xml @@ -0,0 +1,77 @@ + + + + + 4.0.0 + + storm + org.apache.storm + 0.9.1-incubating-SNAPSHOT + ../../pom.xml + + org.apache.storm + apache-storm-source + pom + Storm Source Distribution + Storm source distribution + + + + org.apache.storm + storm-core + ${project.version} + + + + + apache-storm-${project.version} + + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + + + true + true + + ${project.basedir}/src/main/assembly/source.xml + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + package + + sign + + + + + + + diff --git a/storm-dist/source/src/main/assembly/source.xml b/storm-dist/source/src/main/assembly/source.xml new file mode 100644 index 0000000000..0e70b06031 --- /dev/null +++ b/storm-dist/source/src/main/assembly/source.xml @@ -0,0 +1,42 @@ + + + + src + + tar.gz + zip + + + + ${project.basedir}/../../ + / + true + + **/*.log + **/${project.build.directory}/** + **/*.idea/** + **/*.iml/** + **/*.ipr/** + **/*.iws/** + **/.lien.*/** + + + + \ No newline at end of file diff --git a/storm-lib/project.clj b/storm-lib/project.clj deleted file mode 100644 index 4e4a1190d3..0000000000 --- a/storm-lib/project.clj +++ /dev/null @@ -1,33 +0,0 @@ -;; 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. -(def ROOT-DIR (subs *file* 0 (- (count *file*) (count "project.clj")))) -(def VERSION (-> ROOT-DIR (str "/../VERSION") slurp (.trim))) -(def MODULES (-> ROOT-DIR (str "/../MODULES") slurp (.split "\n") (#(filter (fn [m] (not= m "storm-console-logging")) %)) )) -(def DEPENDENCIES (for [m MODULES] [(symbol (str "storm/" m)) VERSION])) - -;; for lib pom.xml, change the symbol to storm/storm-liba and filter out storm-console-logging from modules - -(eval `(defproject storm/storm-lib ~VERSION - :url "http://storm-project.net" - :description "Distributed and fault-tolerant realtime computation" - :license {:name "Eclipse Public License - Version 1.0" :url "https://github.com/nathanmarz/storm/blob/master/LICENSE.html"} - :mailing-list {:name "Storm user mailing list" - :archive "https://groups.google.com/group/storm-user" - :post "storm-user@googlegroups.com"} - :dependencies [~@DEPENDENCIES] - :min-lein-version "2.0.0" - :target-path "target" - )) diff --git a/storm-netty/project.clj b/storm-netty/project.clj deleted file mode 100644 index 763bc00777..0000000000 --- a/storm-netty/project.clj +++ /dev/null @@ -1,28 +0,0 @@ -;; 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. -(def ROOT-DIR (subs *file* 0 (- (count *file*) (count "project.clj")))) -(def VERSION (-> ROOT-DIR (str "/../VERSION") slurp (.trim))) - -(eval `(defproject storm/storm-netty ~VERSION - :dependencies [[storm/storm-core ~VERSION] - [io.netty/netty "3.6.3.Final"]] - :java-source-paths ["src/jvm"] - :test-paths ["test/clj"] - :profiles {:release {}} - :jvm-opts ["-Djava.library.path=/usr/local/lib:/opt/local/lib:/usr/lib"] - :target-path "target" - :javac-options ["-target" "1.6" "-source" "1.6"] - :aot :all))