From 3357581dbd00eae6ffdb3f6833901c1eb4c56cc1 Mon Sep 17 00:00:00 2001 From: Alexander Soklakov Date: Mon, 10 Oct 2016 12:54:21 +0400 Subject: [PATCH 001/625] Post release changes. --- CHANGES | 2 ++ build.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 9f46c7971..13238e444 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ # Changelog # $Id$ +mm-dd-yy - Version 6.0.6 + 10-21-16 - Version 6.0.5 - Added client-side failover during XSession initialization for multi-router configuration. diff --git a/build.xml b/build.xml index 8a92c9971..8be01dca2 100644 --- a/build.xml +++ b/build.xml @@ -174,7 +174,7 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + From 268b9423bcd49450d8f09286d5c6ce531e92b1fd Mon Sep 17 00:00:00 2001 From: Alexander Soklakov Date: Thu, 13 Oct 2016 17:14:29 +0400 Subject: [PATCH 002/625] Fixed rules for DEB builds. --- src/build/misc/debian.in/rules | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/build/misc/debian.in/rules b/src/build/misc/debian.in/rules index a5b76384b..2565c04c1 100644 --- a/src/build/misc/debian.in/rules +++ b/src/build/misc/debian.in/rules @@ -26,9 +26,9 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ANT_COMMON_OPTIONS=\ -Dcom.mysql.cj.build.dir.driver=build/driver \ - -Dcom.mysql.cj.build.driver.version.status=@MYSQL_CJ_VERSION_STATUS@ \ - -Dcom.mysql.cj.build.driver.version.extra=@MYSQL_CJ_VERSION_EXTRA@ \ - -Dcom.mysql.cj.build.driver.version.snapshot=@MYSQL_CJ_VERSION_SNAPSHOT@ \ + -Dcom.mysql.cj.build.driver.version.status=@MYSQL_CJ_VERSION_STATUS@ \ + -Dcom.mysql.cj.build.driver.version.extra=@MYSQL_CJ_VERSION_EXTRA@ \ + -Dcom.mysql.cj.build.driver.version.snapshot=@MYSQL_CJ_VERSION_SNAPSHOT@ \ -Dcom.mysql.cj.extra.libs=@WITH_JARDEPS@ \ -Dcom.mysql.cj.build.driver.extraName=@PRODUCT_SUFFIX@ \ -Djava.awt.headless=true @@ -50,19 +50,19 @@ ANT_COM_OPT=-Dcom.mysql.cj.build.commercial=true endif %: - #dh $@ --with autoreconf - dh $@ + #dh $@ --with autoreconf + dh $@ override_dh_auto_configure: override_dh_auto_build: - echo $(PATH) - echo $(JAVA_HOME) - $(ANT_CMD) \ - $(ANT_COMMON_OPTIONS) \ - $(ANT_JAVA_OPT) \ - $(ANT_COM_OPT) \ - full-package-no-sources + echo $(PATH) + echo $(JAVA_HOME) + $(ANT_CMD) \ + $(ANT_COMMON_OPTIONS) \ + $(ANT_JAVA_OPT) \ + $(ANT_COM_OPT) \ + full-package-no-sources # Do nothing; the test suite requires a sql server, so we can't run it # as part of the build. @@ -71,7 +71,7 @@ override_dh_auto_build: # we should never need to run this for our plugin package; running it creates # a spurious shlibs file that shouldn't be there. #override_dh_shlibdeps: -# dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info +# dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info #TMP_INSTDIR = $(CURDIR)/debian/tmp # @@ -79,7 +79,7 @@ override_dh_auto_build: #TMP_PRIVATE_BINDIR = $(TMP_INSTDIR)$(PRIVATE_BINDIR) # override_dh_auto_clean: - $(ANT_CMD) clean + $(ANT_CMD) clean # #override_dh_auto_install: -# dh_auto_install -- libdir=$(PRIVATE_BINDIR) DESTDIR=$(TMP_INSTDIR) +# dh_auto_install -- libdir=$(PRIVATE_BINDIR) DESTDIR=$(TMP_INSTDIR) From c0ca9f7f628802260c1788095e92b7205595c839 Mon Sep 17 00:00:00 2001 From: Alexander Soklakov Date: Fri, 14 Oct 2016 15:36:09 +0400 Subject: [PATCH 003/625] MYSQLCONNJ-840, Reorganize X DevAPI packages. --- build.xml | 4 +- .../{mysqlx => x/devapi}/DevApiSample.java | 21 +- .../cj/{mysqlx => x}/protobuf/Mysqlx.java | 304 +-- .../protobuf/MysqlxConnection.java | 470 ++-- .../cj/{mysqlx => x}/protobuf/MysqlxCrud.java | 2402 ++++++++--------- .../protobuf/MysqlxDatatypes.java | 876 +++--- .../{mysqlx => x}/protobuf/MysqlxExpect.java | 298 +- .../cj/{mysqlx => x}/protobuf/MysqlxExpr.java | 1290 ++++----- .../{mysqlx => x}/protobuf/MysqlxNotice.java | 408 +-- .../protobuf/MysqlxResultset.java | 334 +-- .../{mysqlx => x}/protobuf/MysqlxSession.java | 312 +-- .../cj/{mysqlx => x}/protobuf/MysqlxSql.java | 196 +- .../{mysqlx => x}/protobuf/package-info.java | 2 +- src/main/doc/mysqlx-overview.html | 8 +- .../com/mysql/cj/api/x/XSessionFactory.java | 62 - .../com/mysql/cj/api/x/core/ResultCtor.java | 42 + .../result => api/x/core}/RowToElement.java | 4 +- .../mysql/cj/api/x/{ => core}/Warning.java | 7 +- .../api/x/protocol/ColToFieldTransformer.java | 35 + .../cj/api/x/protocol/DecoderFunction.java | 45 + .../x/protocol}/MessageConstants.java | 54 +- .../cj/api/x/protocol/MessageListener.java | 43 + .../io => api/x/protocol}/MessageReader.java | 8 +- .../io => api/x/protocol}/MessageWriter.java | 2 +- .../x/protocol/MetadataToRowToElement.java} | 17 +- .../io => api/x/protocol}/ResultListener.java | 12 +- .../io => api/x/protocol}/ResultStreamer.java | 4 +- .../x/protocol/XpluginStatementCommand.java | 37 + .../cj/api/{x => xdevapi}/AddStatement.java | 4 +- .../cj/api/{x => xdevapi}/BaseSession.java | 4 +- .../cj/api/{x => xdevapi}/Collection.java | 4 +- .../mysql/cj/api/{x => xdevapi}/Column.java | 2 +- .../api/{x => xdevapi}/ColumnDefinition.java | 2 +- .../CreateCollectionIndexStatement.java | 4 +- .../{x => xdevapi}/CreateTableStatement.java | 2 +- .../cj/api/{x => xdevapi}/DataStatement.java | 2 +- .../cj/api/{x => xdevapi}/DatabaseObject.java | 2 +- .../api/{x => xdevapi}/DeleteStatement.java | 2 +- .../cj/api/{x => xdevapi}/DocResult.java | 6 +- .../DropCollectionIndexStatement.java | 4 +- .../cj/api/{x => xdevapi}/Expression.java | 4 +- .../cj/api/{x => xdevapi}/FetchResult.java | 2 +- .../cj/api/{x => xdevapi}/FindStatement.java | 4 +- .../{x => xdevapi}/ForeignKeyDefinition.java | 2 +- .../api/{x => xdevapi}/InsertStatement.java | 4 +- .../cj/api/{x => xdevapi}/JsonValue.java | 4 +- .../api/{x => xdevapi}/ModifyStatement.java | 2 +- .../cj/api/{x => xdevapi}/NodeSession.java | 21 +- .../api/{x => xdevapi}/RemoveStatement.java | 2 +- .../mysql/cj/api/{x => xdevapi}/Result.java | 2 +- .../com/mysql/cj/api/{x => xdevapi}/Row.java | 4 +- .../cj/api/{x => xdevapi}/RowResult.java | 2 +- .../mysql/cj/api/{x => xdevapi}/Schema.java | 4 +- .../api/{x => xdevapi}/SelectStatement.java | 2 +- .../cj/api/{x => xdevapi}/SqlResult.java | 4 +- .../cj/api/{x => xdevapi}/SqlStatement.java | 4 +- .../cj/api/{x => xdevapi}/Statement.java | 2 +- .../mysql/cj/api/{x => xdevapi}/Table.java | 2 +- .../com/mysql/cj/api/{x => xdevapi}/Type.java | 2 +- .../api/{x => xdevapi}/UpdateStatement.java | 2 +- .../com/mysql/cj/api/xdevapi/UpdateType.java} | 11 +- .../com/mysql/cj/api/xdevapi/Warning.java | 30 + .../mysql/cj/api/{x => xdevapi}/XSession.java | 2 +- .../cj/api/{x => xdevapi}/package-info.java | 2 +- .../cj/core/conf/PropertyDefinitions.java | 10 +- .../mysql/cj/core/conf/url/ConnectionUrl.java | 6 +- ...tionUrl.java => XDevAPIConnectionUrl.java} | 16 +- .../mysql/cj/jdbc/NonRegisteringDriver.java | 4 +- .../java/com/mysql/cj/x/core/CoreWarning.java | 46 + .../core}/DatabaseObjectDescription.java | 4 +- .../cj/{mysqlx => x/core}/MysqlxSession.java | 73 +- .../io => x/core}/StatementExecuteOk.java | 5 +- .../core/XDevAPIError.java} | 10 +- .../io => x/protocol}/AsyncMessageReader.java | 47 +- .../io => x/protocol}/AsyncMessageWriter.java | 3 +- .../protocol}/DevapiRowFactory.java | 11 +- .../ErrorToFutureCompletionHandler.java | 2 +- .../io => x/protocol}/MessageBuilder.java | 86 +- .../ResultCreatingResultListener.java | 14 +- .../protocol}/ResultMessageListener.java | 32 +- .../RowWiseReducingResultListener.java | 21 +- .../protocol}/SerializingBufferWriter.java | 2 +- .../protocol}/SqlResultMessageListener.java | 21 +- .../protocol}/StatementExecuteOkBuilder.java | 28 +- .../StatementExecuteOkMessageListener.java | 18 +- .../io => x/protocol}/SyncMessageReader.java | 12 +- .../io => x/protocol}/SyncMessageWriter.java | 3 +- .../protocol}/TlsDecryptingByteChannel.java | 2 +- .../protocol}/TlsEncryptingByteChannel.java | 2 +- .../protocol/XProtocol.java} | 169 +- .../protocol/XProtocolDecoder.java} | 23 +- .../protocol/XProtocolEncoder.java} | 6 +- .../protocol/XProtocolFactory.java} | 16 +- .../protocol/XProtocolRow.java} | 14 +- .../protocol/XProtocolRowInputStream.java} | 23 +- .../devapi => xdevapi}/AbstractColumnDef.java | 6 +- .../AbstractDataResult.java | 15 +- .../devapi => xdevapi}/AbstractSession.java | 14 +- .../devapi => xdevapi}/AddStatementImpl.java | 12 +- .../devapi => xdevapi}/CollectionImpl.java | 23 +- .../{mysqlx/devapi => xdevapi}/ColumnDef.java | 6 +- .../devapi => xdevapi}/ColumnImpl.java | 6 +- .../CreateCollectionIndexStatementImpl.java | 9 +- .../CreateIndexParams.java | 10 +- .../CreateTableStatementImpl.java | 22 +- .../mysql/cj/{x/json => xdevapi}/DbDoc.java | 4 +- .../io => xdevapi}/DbDocValueFactory.java | 5 +- .../DeleteStatementImpl.java | 8 +- .../cj/{mysqlx => xdevapi}/DocFindParams.java | 6 +- .../devapi => xdevapi}/DocResultImpl.java | 10 +- .../cj/{mysqlx => xdevapi}/DocumentID.java | 2 +- .../DropCollectionIndexStatementImpl.java | 8 +- .../cj/{mysqlx => xdevapi}/ExprParser.java | 26 +- .../cj/{mysqlx => xdevapi}/ExprUnparser.java | 18 +- .../cj/{mysqlx => xdevapi}/ExprUtil.java | 18 +- .../cj/{mysqlx => xdevapi}/FilterParams.java | 10 +- .../FilterableStatement.java | 5 +- .../cj/{mysqlx => xdevapi}/FindParams.java | 6 +- .../devapi => xdevapi}/FindStatementImpl.java | 10 +- .../devapi => xdevapi}/ForeignKeyDef.java | 4 +- .../GeneratedColumnDef.java | 6 +- .../cj/{mysqlx => xdevapi}/InsertParams.java | 6 +- .../InsertStatementImpl.java | 9 +- .../cj/{x/json => xdevapi}/JsonArray.java | 6 +- .../cj/{x/json => xdevapi}/JsonLiteral.java | 6 +- .../cj/{x/json => xdevapi}/JsonNumber.java | 6 +- .../cj/{x/json => xdevapi}/JsonParser.java | 4 +- .../cj/{x/json => xdevapi}/JsonString.java | 8 +- .../ModifyStatementImpl.java | 11 +- .../devapi => xdevapi}/NodeSessionImpl.java | 4 +- .../RemoveStatementImpl.java | 10 +- .../{mysqlx/devapi => xdevapi}/RowImpl.java | 10 +- .../devapi => xdevapi}/RowResultImpl.java | 11 +- .../devapi => xdevapi}/SchemaImpl.java | 18 +- .../SelectStatementImpl.java | 10 +- .../devapi => xdevapi}/SqlDataResult.java | 6 +- .../devapi => xdevapi}/SqlResultImpl.java | 12 +- .../devapi => xdevapi}/SqlStatementImpl.java | 9 +- .../devapi => xdevapi}/SqlUpdateResult.java | 10 +- .../{mysqlx => xdevapi}/TableFindParams.java | 2 +- .../{mysqlx/devapi => xdevapi}/TableImpl.java | 18 +- .../cj/{mysqlx => xdevapi}/UpdateParams.java | 8 +- .../devapi => xdevapi}/UpdateResult.java | 11 +- .../cj/{mysqlx => xdevapi}/UpdateSpec.java | 13 +- .../UpdateStatementImpl.java | 9 +- .../VirtualNodeSession.java | 4 +- .../devapi => xdevapi}/WarningImpl.java | 12 +- .../XSessionFactory.java} | 56 +- .../XSessionImpl.java} | 10 +- .../mysql/cj/{x => xdevapi}/package-info.java | 2 +- .../cj/core/LocalizedErrorMessages.properties | 2 +- .../com/mysql/cj/core/ConnectionUrlTest.java | 10 +- .../protocol}/AsyncMessageReaderTest.java | 80 +- .../protocol}/SyncMessageReaderTest.java | 20 +- .../protocol}/SyncMessageWriterTest.java | 11 +- .../{mysqlx => xdevapi}/ExprParserTest.java | 22 +- .../cj/{x/json => xdevapi}/JsonDocTest.java | 8 +- .../testsuite/{mysqlx => x}/AsyncTests.java | 4 +- ...TestCase.java => BaseXDevAPITestCase.java} | 15 +- ...ents.java => TestXDevAPIRequirements.java} | 40 +- .../{mysqlx => x}/devapi/AsyncQueryTest.java | 56 +- .../{mysqlx => x}/devapi/BindTest.java | 12 +- .../devapi/CollectionAddTest.java | 28 +- .../devapi/CollectionFindTest.java | 44 +- .../devapi/CollectionModifyTest.java | 26 +- .../devapi/CollectionRemoveTest.java | 6 +- .../{mysqlx => x}/devapi/CollectionTest.java | 24 +- .../devapi/DevApiBaseTestCase.java | 20 +- .../{mysqlx => x}/devapi/MetadataTest.java | 22 +- .../{mysqlx => x}/devapi/NodeSessionTest.java | 28 +- .../{mysqlx => x}/devapi/ResultTest.java | 18 +- .../{mysqlx => x}/devapi/SchemaTest.java | 52 +- .../{mysqlx => x}/devapi/SessionTest.java | 28 +- .../{mysqlx => x}/devapi/TableDeleteTest.java | 8 +- .../{mysqlx => x}/devapi/TableInsertTest.java | 22 +- .../{mysqlx => x}/devapi/TableSelectTest.java | 30 +- .../{mysqlx => x}/devapi/TableTest.java | 10 +- .../{mysqlx => x}/devapi/TableUpdateTest.java | 14 +- .../{mysqlx => x}/devapi/TransactionTest.java | 10 +- .../devapi/XSessionFailoverTest.java | 20 +- .../java/testsuite/x/devapi/package-info.java | 28 + .../internal/InternalXBaseTestCase.java} | 39 +- .../internal/MysqlxSessionTest.java | 26 +- .../internal/XProtocolAsyncTest.java} | 46 +- .../internal/XProtocolAuthTest.java} | 30 +- .../internal/XProtocolTest.java} | 64 +- .../{mysqlx => x}/internal/package-info.java | 2 +- 187 files changed, 4950 insertions(+), 4729 deletions(-) rename src/demo/java/demo/{mysqlx => x/devapi}/DevApiSample.java (87%) rename src/generated/java/com/mysql/cj/{mysqlx => x}/protobuf/Mysqlx.java (85%) rename src/generated/java/com/mysql/cj/{mysqlx => x}/protobuf/MysqlxConnection.java (76%) rename src/generated/java/com/mysql/cj/{mysqlx => x}/protobuf/MysqlxCrud.java (77%) rename src/generated/java/com/mysql/cj/{mysqlx => x}/protobuf/MysqlxDatatypes.java (78%) rename src/generated/java/com/mysql/cj/{mysqlx => x}/protobuf/MysqlxExpect.java (80%) rename src/generated/java/com/mysql/cj/{mysqlx => x}/protobuf/MysqlxExpr.java (79%) rename src/generated/java/com/mysql/cj/{mysqlx => x}/protobuf/MysqlxNotice.java (81%) rename src/generated/java/com/mysql/cj/{mysqlx => x}/protobuf/MysqlxResultset.java (86%) rename src/generated/java/com/mysql/cj/{mysqlx => x}/protobuf/MysqlxSession.java (81%) rename src/generated/java/com/mysql/cj/{mysqlx => x}/protobuf/MysqlxSql.java (82%) rename src/generated/java/com/mysql/cj/{mysqlx => x}/protobuf/package-info.java (97%) delete mode 100644 src/main/java/com/mysql/cj/api/x/XSessionFactory.java create mode 100644 src/main/java/com/mysql/cj/api/x/core/ResultCtor.java rename src/main/java/com/mysql/cj/{mysqlx/result => api/x/core}/RowToElement.java (91%) rename src/main/java/com/mysql/cj/api/x/{ => core}/Warning.java (88%) create mode 100644 src/main/java/com/mysql/cj/api/x/protocol/ColToFieldTransformer.java create mode 100644 src/main/java/com/mysql/cj/api/x/protocol/DecoderFunction.java rename src/main/java/com/mysql/cj/{mysqlx/io => api/x/protocol}/MessageConstants.java (81%) create mode 100644 src/main/java/com/mysql/cj/api/x/protocol/MessageListener.java rename src/main/java/com/mysql/cj/{mysqlx/io => api/x/protocol}/MessageReader.java (95%) rename src/main/java/com/mysql/cj/{mysqlx/io => api/x/protocol}/MessageWriter.java (98%) rename src/main/java/com/mysql/cj/{x/json/package-info.java => api/x/protocol/MetadataToRowToElement.java} (74%) rename src/main/java/com/mysql/cj/{mysqlx/io => api/x/protocol}/ResultListener.java (88%) rename src/main/java/com/mysql/cj/{mysqlx/io => api/x/protocol}/ResultStreamer.java (92%) create mode 100644 src/main/java/com/mysql/cj/api/x/protocol/XpluginStatementCommand.java rename src/main/java/com/mysql/cj/api/{x => xdevapi}/AddStatement.java (95%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/BaseSession.java (97%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/Collection.java (97%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/Column.java (97%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/ColumnDefinition.java (98%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/CreateCollectionIndexStatement.java (92%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/CreateTableStatement.java (99%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/DataStatement.java (98%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/DatabaseObject.java (98%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/DeleteStatement.java (97%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/DocResult.java (88%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/DropCollectionIndexStatement.java (91%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/Expression.java (93%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/FetchResult.java (98%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/FindStatement.java (97%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/ForeignKeyDefinition.java (98%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/InsertStatement.java (93%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/JsonValue.java (91%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/ModifyStatement.java (98%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/NodeSession.java (79%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/RemoveStatement.java (97%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/Result.java (98%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/Row.java (98%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/RowResult.java (97%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/Schema.java (96%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/SelectStatement.java (98%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/SqlResult.java (92%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/SqlStatement.java (91%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/Statement.java (98%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/Table.java (98%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/Type.java (97%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/UpdateStatement.java (98%) rename src/{test/java/testsuite/mysqlx/devapi/package-info.java => main/java/com/mysql/cj/api/xdevapi/UpdateType.java} (77%) create mode 100644 src/main/java/com/mysql/cj/api/xdevapi/Warning.java rename src/main/java/com/mysql/cj/api/{x => xdevapi}/XSession.java (98%) rename src/main/java/com/mysql/cj/api/{x => xdevapi}/package-info.java (97%) rename src/main/java/com/mysql/cj/core/conf/url/{MysqlxConnectionUrl.java => XDevAPIConnectionUrl.java} (91%) create mode 100644 src/main/java/com/mysql/cj/x/core/CoreWarning.java rename src/main/java/com/mysql/cj/{mysqlx/devapi => x/core}/DatabaseObjectDescription.java (95%) rename src/main/java/com/mysql/cj/{mysqlx => x/core}/MysqlxSession.java (92%) rename src/main/java/com/mysql/cj/{core/io => x/core}/StatementExecuteOk.java (92%) rename src/main/java/com/mysql/cj/{mysqlx/MysqlxError.java => x/core/XDevAPIError.java} (91%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/AsyncMessageReader.java (94%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/AsyncMessageWriter.java (98%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => x/protocol}/DevapiRowFactory.java (86%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/ErrorToFutureCompletionHandler.java (98%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/MessageBuilder.java (83%) rename src/main/java/com/mysql/cj/{mysqlx => x/protocol}/ResultCreatingResultListener.java (89%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/ResultMessageListener.java (82%) rename src/main/java/com/mysql/cj/{mysqlx => x/protocol}/RowWiseReducingResultListener.java (83%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/SerializingBufferWriter.java (99%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/SqlResultMessageListener.java (86%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/StatementExecuteOkBuilder.java (76%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/StatementExecuteOkMessageListener.java (84%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/SyncMessageReader.java (93%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/SyncMessageWriter.java (97%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/TlsDecryptingByteChannel.java (99%) rename src/main/java/com/mysql/cj/{mysqlx/io => x/protocol}/TlsEncryptingByteChannel.java (99%) rename src/main/java/com/mysql/cj/{mysqlx/io/MysqlxProtocol.java => x/protocol/XProtocol.java} (82%) rename src/main/java/com/mysql/cj/{mysqlx/io/MysqlxDecoder.java => x/protocol/XProtocolDecoder.java} (93%) rename src/main/java/com/mysql/cj/{mysqlx/io/MysqlxEncoder.java => x/protocol/XProtocolEncoder.java} (87%) rename src/main/java/com/mysql/cj/{mysqlx/io/MysqlxProtocolFactory.java => x/protocol/XProtocolFactory.java} (93%) rename src/main/java/com/mysql/cj/{mysqlx/result/MysqlxRow.java => x/protocol/XProtocolRow.java} (86%) rename src/main/java/com/mysql/cj/{mysqlx/result/MysqlxRowInputStream.java => x/protocol/XProtocolRowInputStream.java} (79%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/AbstractColumnDef.java (98%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/AbstractDataResult.java (89%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/AbstractSession.java (95%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/AddStatementImpl.java (92%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/CollectionImpl.java (89%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/ColumnDef.java (96%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/ColumnImpl.java (98%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/CreateCollectionIndexStatementImpl.java (91%) rename src/main/java/com/mysql/cj/{mysqlx => xdevapi}/CreateIndexParams.java (90%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/CreateTableStatementImpl.java (93%) rename src/main/java/com/mysql/cj/{x/json => xdevapi}/DbDoc.java (98%) rename src/main/java/com/mysql/cj/{core/io => xdevapi}/DbDocValueFactory.java (95%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/DeleteStatementImpl.java (91%) rename src/main/java/com/mysql/cj/{mysqlx => xdevapi}/DocFindParams.java (93%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/DocResultImpl.java (83%) rename src/main/java/com/mysql/cj/{mysqlx => xdevapi}/DocumentID.java (98%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/DropCollectionIndexStatementImpl.java (92%) rename src/main/java/com/mysql/cj/{mysqlx => xdevapi}/ExprParser.java (98%) rename src/main/java/com/mysql/cj/{mysqlx => xdevapi}/ExprUnparser.java (94%) rename src/main/java/com/mysql/cj/{mysqlx => xdevapi}/ExprUtil.java (94%) rename src/main/java/com/mysql/cj/{mysqlx => xdevapi}/FilterParams.java (95%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/FilterableStatement.java (96%) rename src/main/java/com/mysql/cj/{mysqlx => xdevapi}/FindParams.java (94%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/FindStatementImpl.java (92%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/ForeignKeyDef.java (97%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/GeneratedColumnDef.java (95%) rename src/main/java/com/mysql/cj/{mysqlx => xdevapi}/InsertParams.java (94%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/InsertStatementImpl.java (92%) rename src/main/java/com/mysql/cj/{x/json => xdevapi}/JsonArray.java (93%) rename src/main/java/com/mysql/cj/{x/json => xdevapi}/JsonLiteral.java (90%) rename src/main/java/com/mysql/cj/{x/json => xdevapi}/JsonNumber.java (91%) rename src/main/java/com/mysql/cj/{x/json => xdevapi}/JsonParser.java (99%) rename src/main/java/com/mysql/cj/{x/json => xdevapi}/JsonString.java (91%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/ModifyStatementImpl.java (93%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/NodeSessionImpl.java (95%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/RemoveStatementImpl.java (89%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/RowImpl.java (95%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/RowResultImpl.java (89%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/SchemaImpl.java (93%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/SelectStatementImpl.java (92%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/SqlDataResult.java (94%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/SqlResultImpl.java (93%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/SqlStatementImpl.java (92%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/SqlUpdateResult.java (92%) rename src/main/java/com/mysql/cj/{mysqlx => xdevapi}/TableFindParams.java (98%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/TableImpl.java (91%) rename src/main/java/com/mysql/cj/{mysqlx => xdevapi}/UpdateParams.java (88%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/UpdateResult.java (86%) rename src/main/java/com/mysql/cj/{mysqlx => xdevapi}/UpdateSpec.java (82%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/UpdateStatementImpl.java (91%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/VirtualNodeSession.java (95%) rename src/main/java/com/mysql/cj/{mysqlx/devapi => xdevapi}/WarningImpl.java (80%) rename src/main/java/com/mysql/cj/{x/MysqlxSessionFactory.java => xdevapi/XSessionFactory.java} (68%) rename src/main/java/com/mysql/cj/{mysqlx/devapi/SessionImpl.java => xdevapi/XSessionImpl.java} (87%) rename src/main/java/com/mysql/cj/{x => xdevapi}/package-info.java (97%) rename src/test/java/com/mysql/cj/{mysqlx/io => x/protocol}/AsyncMessageReaderTest.java (78%) rename src/test/java/com/mysql/cj/{mysqlx/io => x/protocol}/SyncMessageReaderTest.java (93%) rename src/test/java/com/mysql/cj/{mysqlx/io => x/protocol}/SyncMessageWriterTest.java (92%) rename src/test/java/com/mysql/cj/{mysqlx => xdevapi}/ExprParserTest.java (97%) rename src/test/java/com/mysql/cj/{x/json => xdevapi}/JsonDocTest.java (99%) rename src/test/java/testsuite/{mysqlx => x}/AsyncTests.java (91%) rename src/test/java/testsuite/x/{BaseMysqlxTestCase.java => BaseXDevAPITestCase.java} (82%) rename src/test/java/testsuite/x/{TestMysqlxRequirements.java => TestXDevAPIRequirements.java} (93%) rename src/test/java/testsuite/{mysqlx => x}/devapi/AsyncQueryTest.java (89%) rename src/test/java/testsuite/{mysqlx => x}/devapi/BindTest.java (94%) rename src/test/java/testsuite/{mysqlx => x}/devapi/CollectionAddTest.java (92%) rename src/test/java/testsuite/{mysqlx => x}/devapi/CollectionFindTest.java (94%) rename src/test/java/testsuite/{mysqlx => x}/devapi/CollectionModifyTest.java (93%) rename src/test/java/testsuite/{mysqlx => x}/devapi/CollectionRemoveTest.java (95%) rename src/test/java/testsuite/{mysqlx => x}/devapi/CollectionTest.java (90%) rename src/test/java/testsuite/{mysqlx => x}/devapi/DevApiBaseTestCase.java (83%) rename src/test/java/testsuite/{mysqlx => x}/devapi/MetadataTest.java (98%) rename src/test/java/testsuite/{mysqlx => x}/devapi/NodeSessionTest.java (92%) rename src/test/java/testsuite/{mysqlx => x}/devapi/ResultTest.java (94%) rename src/test/java/testsuite/{mysqlx => x}/devapi/SchemaTest.java (94%) rename src/test/java/testsuite/{mysqlx => x}/devapi/SessionTest.java (90%) rename src/test/java/testsuite/{mysqlx => x}/devapi/TableDeleteTest.java (95%) rename src/test/java/testsuite/{mysqlx => x}/devapi/TableInsertTest.java (94%) rename src/test/java/testsuite/{mysqlx => x}/devapi/TableSelectTest.java (96%) rename src/test/java/testsuite/{mysqlx => x}/devapi/TableTest.java (95%) rename src/test/java/testsuite/{mysqlx => x}/devapi/TableUpdateTest.java (92%) rename src/test/java/testsuite/{mysqlx => x}/devapi/TransactionTest.java (92%) rename src/test/java/testsuite/{mysqlx => x}/devapi/XSessionFailoverTest.java (94%) create mode 100644 src/test/java/testsuite/x/devapi/package-info.java rename src/test/java/testsuite/{mysqlx/internal/InternalMysqlxBaseTestCase.java => x/internal/InternalXBaseTestCase.java} (81%) rename src/test/java/testsuite/{mysqlx => x}/internal/MysqlxSessionTest.java (91%) rename src/test/java/testsuite/{mysqlx/internal/MysqlxProtocolAsyncTest.java => x/internal/XProtocolAsyncTest.java} (77%) rename src/test/java/testsuite/{mysqlx/internal/MysqlxProtocolAuthTest.java => x/internal/XProtocolAuthTest.java} (87%) rename src/test/java/testsuite/{mysqlx/internal/MysqlxProtocolTest.java => x/internal/XProtocolTest.java} (94%) rename src/test/java/testsuite/{mysqlx => x}/internal/package-info.java (97%) diff --git a/build.xml b/build.xml index 8be01dca2..aef1abafb 100644 --- a/build.xml +++ b/build.xml @@ -1105,13 +1105,13 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + - + diff --git a/src/demo/java/demo/mysqlx/DevApiSample.java b/src/demo/java/demo/x/devapi/DevApiSample.java similarity index 87% rename from src/demo/java/demo/mysqlx/DevApiSample.java rename to src/demo/java/demo/x/devapi/DevApiSample.java index 69e6e1644..c8c166efe 100644 --- a/src/demo/java/demo/mysqlx/DevApiSample.java +++ b/src/demo/java/demo/x/devapi/DevApiSample.java @@ -21,24 +21,23 @@ */ -package demo.mysqlx; +package demo.x.devapi; -// Dev API interfaces -import com.mysql.cj.api.x.Collection; -import com.mysql.cj.api.x.DocResult; -import com.mysql.cj.api.x.Schema; -import com.mysql.cj.api.x.XSession; -import com.mysql.cj.x.MysqlxSessionFactory; -import com.mysql.cj.x.json.DbDoc; -import com.mysql.cj.x.json.JsonNumber; -import com.mysql.cj.x.json.JsonString; +import com.mysql.cj.api.xdevapi.Collection; +import com.mysql.cj.api.xdevapi.DocResult; +import com.mysql.cj.api.xdevapi.Schema; +import com.mysql.cj.api.xdevapi.XSession; +import com.mysql.cj.xdevapi.DbDoc; +import com.mysql.cj.xdevapi.JsonNumber; +import com.mysql.cj.xdevapi.JsonString; +import com.mysql.cj.xdevapi.XSessionFactory; /* * Sample program showing how to use Connector/J's Dev API support. */ public class DevApiSample { public static void main(String[] args) { - XSession session = new MysqlxSessionFactory().getSession("mysqlx://localhost:33060/test?user=user&password=password1234"); + XSession session = new XSessionFactory().getSession("mysqlx://localhost:33060/test?user=user&password=password1234"); System.err.println("Connected!"); Schema schema = session.getDefaultSchema(); System.err.println("Default schema is: " + schema); diff --git a/src/generated/java/com/mysql/cj/mysqlx/protobuf/Mysqlx.java b/src/generated/java/com/mysql/cj/x/protobuf/Mysqlx.java similarity index 85% rename from src/generated/java/com/mysql/cj/mysqlx/protobuf/Mysqlx.java rename to src/generated/java/com/mysql/cj/x/protobuf/Mysqlx.java index 9dde47377..77dbc14c0 100644 --- a/src/generated/java/com/mysql/cj/mysqlx/protobuf/Mysqlx.java +++ b/src/generated/java/com/mysql/cj/x/protobuf/Mysqlx.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.protobuf; +package com.mysql.cj.x.protobuf; // Generated by the protocol buffer compiler. DO NOT EDIT! // source: mysqlx.proto @@ -108,14 +108,14 @@ private ClientMessages( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_ClientMessages_descriptor; + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_ClientMessages_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_ClientMessages_fieldAccessorTable + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_ClientMessages_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages.class, com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages.Builder.class); + com.mysql.cj.x.protobuf.Mysqlx.ClientMessages.class, com.mysql.cj.x.protobuf.Mysqlx.ClientMessages.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -298,7 +298,7 @@ public Type findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.Mysqlx.ClientMessages.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -359,53 +359,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ClientMessages parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ClientMessages parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.Mysqlx.ClientMessages parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ClientMessages parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.Mysqlx.ClientMessages parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ClientMessages parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.Mysqlx.ClientMessages parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ClientMessages parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ClientMessages parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ClientMessages parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -414,7 +414,7 @@ public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.Mysqlx.ClientMessages prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -439,17 +439,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.ClientMessages) - com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessagesOrBuilder { + com.mysql.cj.x.protobuf.Mysqlx.ClientMessagesOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_ClientMessages_descriptor; + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_ClientMessages_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_ClientMessages_fieldAccessorTable + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_ClientMessages_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages.class, com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages.Builder.class); + com.mysql.cj.x.protobuf.Mysqlx.ClientMessages.class, com.mysql.cj.x.protobuf.Mysqlx.ClientMessages.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages.newBuilder() @@ -481,38 +481,38 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_ClientMessages_descriptor; + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_ClientMessages_descriptor; } - public com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages.getDefaultInstance(); + public com.mysql.cj.x.protobuf.Mysqlx.ClientMessages getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.Mysqlx.ClientMessages.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages build() { - com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages result = buildPartial(); + public com.mysql.cj.x.protobuf.Mysqlx.ClientMessages build() { + com.mysql.cj.x.protobuf.Mysqlx.ClientMessages result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages buildPartial() { - com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages result = new com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages(this); + public com.mysql.cj.x.protobuf.Mysqlx.ClientMessages buildPartial() { + com.mysql.cj.x.protobuf.Mysqlx.ClientMessages result = new com.mysql.cj.x.protobuf.Mysqlx.ClientMessages(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages)other); + if (other instanceof com.mysql.cj.x.protobuf.Mysqlx.ClientMessages) { + return mergeFrom((com.mysql.cj.x.protobuf.Mysqlx.ClientMessages)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages other) { - if (other == com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.Mysqlx.ClientMessages other) { + if (other == com.mysql.cj.x.protobuf.Mysqlx.ClientMessages.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -525,11 +525,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages parsedMessage = null; + com.mysql.cj.x.protobuf.Mysqlx.ClientMessages parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.Mysqlx.ClientMessages) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -627,14 +627,14 @@ private ServerMessages( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_ServerMessages_descriptor; + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_ServerMessages_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_ServerMessages_fieldAccessorTable + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_ServerMessages_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages.class, com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages.Builder.class); + com.mysql.cj.x.protobuf.Mysqlx.ServerMessages.class, com.mysql.cj.x.protobuf.Mysqlx.ServerMessages.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -816,7 +816,7 @@ public Type findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.Mysqlx.ServerMessages.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -877,53 +877,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ServerMessages parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ServerMessages parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.Mysqlx.ServerMessages parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ServerMessages parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.Mysqlx.ServerMessages parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ServerMessages parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.Mysqlx.ServerMessages parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ServerMessages parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ServerMessages parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.ServerMessages parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -932,7 +932,7 @@ public static com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.Mysqlx.ServerMessages prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -957,17 +957,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.ServerMessages) - com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessagesOrBuilder { + com.mysql.cj.x.protobuf.Mysqlx.ServerMessagesOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_ServerMessages_descriptor; + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_ServerMessages_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_ServerMessages_fieldAccessorTable + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_ServerMessages_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages.class, com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages.Builder.class); + com.mysql.cj.x.protobuf.Mysqlx.ServerMessages.class, com.mysql.cj.x.protobuf.Mysqlx.ServerMessages.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages.newBuilder() @@ -999,38 +999,38 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_ServerMessages_descriptor; + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_ServerMessages_descriptor; } - public com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages.getDefaultInstance(); + public com.mysql.cj.x.protobuf.Mysqlx.ServerMessages getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.Mysqlx.ServerMessages.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages build() { - com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages result = buildPartial(); + public com.mysql.cj.x.protobuf.Mysqlx.ServerMessages build() { + com.mysql.cj.x.protobuf.Mysqlx.ServerMessages result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages buildPartial() { - com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages result = new com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages(this); + public com.mysql.cj.x.protobuf.Mysqlx.ServerMessages buildPartial() { + com.mysql.cj.x.protobuf.Mysqlx.ServerMessages result = new com.mysql.cj.x.protobuf.Mysqlx.ServerMessages(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages)other); + if (other instanceof com.mysql.cj.x.protobuf.Mysqlx.ServerMessages) { + return mergeFrom((com.mysql.cj.x.protobuf.Mysqlx.ServerMessages)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages other) { - if (other == com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.Mysqlx.ServerMessages other) { + if (other == com.mysql.cj.x.protobuf.Mysqlx.ServerMessages.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -1043,11 +1043,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages parsedMessage = null; + com.mysql.cj.x.protobuf.Mysqlx.ServerMessages parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.Mysqlx.ServerMessages) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1162,14 +1162,14 @@ private Ok( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_Ok_descriptor; + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_Ok_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_Ok_fieldAccessorTable + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_Ok_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok.class, com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok.Builder.class); + com.mysql.cj.x.protobuf.Mysqlx.Ok.class, com.mysql.cj.x.protobuf.Mysqlx.Ok.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1274,53 +1274,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Ok parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Ok parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.Mysqlx.Ok parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Ok parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.Mysqlx.Ok parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Ok parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.Mysqlx.Ok parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Ok parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Ok parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Ok parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1329,7 +1329,7 @@ public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.Mysqlx.Ok prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1350,17 +1350,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Ok) - com.mysql.cj.mysqlx.protobuf.Mysqlx.OkOrBuilder { + com.mysql.cj.x.protobuf.Mysqlx.OkOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_Ok_descriptor; + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_Ok_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_Ok_fieldAccessorTable + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_Ok_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok.class, com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok.Builder.class); + com.mysql.cj.x.protobuf.Mysqlx.Ok.class, com.mysql.cj.x.protobuf.Mysqlx.Ok.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok.newBuilder() @@ -1394,23 +1394,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_Ok_descriptor; + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_Ok_descriptor; } - public com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok.getDefaultInstance(); + public com.mysql.cj.x.protobuf.Mysqlx.Ok getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.Mysqlx.Ok.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok build() { - com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok result = buildPartial(); + public com.mysql.cj.x.protobuf.Mysqlx.Ok build() { + com.mysql.cj.x.protobuf.Mysqlx.Ok result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok buildPartial() { - com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok result = new com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok(this); + public com.mysql.cj.x.protobuf.Mysqlx.Ok buildPartial() { + com.mysql.cj.x.protobuf.Mysqlx.Ok result = new com.mysql.cj.x.protobuf.Mysqlx.Ok(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1423,16 +1423,16 @@ public com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok)other); + if (other instanceof com.mysql.cj.x.protobuf.Mysqlx.Ok) { + return mergeFrom((com.mysql.cj.x.protobuf.Mysqlx.Ok)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok other) { - if (other == com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.Mysqlx.Ok other) { + if (other == com.mysql.cj.x.protobuf.Mysqlx.Ok.getDefaultInstance()) return this; if (other.hasMsg()) { bitField0_ |= 0x00000001; msg_ = other.msg_; @@ -1450,11 +1450,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok parsedMessage = null; + com.mysql.cj.x.protobuf.Mysqlx.Ok parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.Mysqlx.Ok) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1563,7 +1563,7 @@ public interface ErrorOrBuilder extends /** * optional .Mysqlx.Error.Severity severity = 1 [default = ERROR]; */ - com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity getSeverity(); + com.mysql.cj.x.protobuf.Mysqlx.Error.Severity getSeverity(); /** * required uint32 code = 2; @@ -1669,7 +1669,7 @@ private Error( } case 8: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity value = com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity.valueOf(rawValue); + com.mysql.cj.x.protobuf.Mysqlx.Error.Severity value = com.mysql.cj.x.protobuf.Mysqlx.Error.Severity.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -1709,14 +1709,14 @@ private Error( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_Error_descriptor; + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_Error_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_Error_fieldAccessorTable + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_Error_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.class, com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Builder.class); + com.mysql.cj.x.protobuf.Mysqlx.Error.class, com.mysql.cj.x.protobuf.Mysqlx.Error.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1791,7 +1791,7 @@ public Severity findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.Mysqlx.Error.getDescriptor().getEnumTypes().get(0); } private static final Severity[] VALUES = values(); @@ -1818,7 +1818,7 @@ private Severity(int index, int value) { private int bitField0_; public static final int SEVERITY_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity severity_; + private com.mysql.cj.x.protobuf.Mysqlx.Error.Severity severity_; /** * optional .Mysqlx.Error.Severity severity = 1 [default = ERROR]; */ @@ -1828,7 +1828,7 @@ public boolean hasSeverity() { /** * optional .Mysqlx.Error.Severity severity = 1 [default = ERROR]; */ - public com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity getSeverity() { + public com.mysql.cj.x.protobuf.Mysqlx.Error.Severity getSeverity() { return severity_; } @@ -1932,7 +1932,7 @@ public java.lang.String getMsg() { } private void initFields() { - severity_ = com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity.ERROR; + severity_ = com.mysql.cj.x.protobuf.Mysqlx.Error.Severity.ERROR; code_ = 0; sqlState_ = ""; msg_ = ""; @@ -2011,53 +2011,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Error parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Error parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Error parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Error parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Error parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.Mysqlx.Error parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Error parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Error parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Error parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.Mysqlx.Error parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Error parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Error parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Error parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.Mysqlx.Error parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Error parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Error parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Error parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Error parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Error parseFrom( + public static com.mysql.cj.x.protobuf.Mysqlx.Error parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2066,7 +2066,7 @@ public static com.mysql.cj.mysqlx.protobuf.Mysqlx.Error parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.Mysqlx.Error prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.Mysqlx.Error prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2096,17 +2096,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Error) - com.mysql.cj.mysqlx.protobuf.Mysqlx.ErrorOrBuilder { + com.mysql.cj.x.protobuf.Mysqlx.ErrorOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_Error_descriptor; + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_Error_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_Error_fieldAccessorTable + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_Error_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.class, com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Builder.class); + com.mysql.cj.x.protobuf.Mysqlx.Error.class, com.mysql.cj.x.protobuf.Mysqlx.Error.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.newBuilder() @@ -2129,7 +2129,7 @@ private static Builder create() { public Builder clear() { super.clear(); - severity_ = com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity.ERROR; + severity_ = com.mysql.cj.x.protobuf.Mysqlx.Error.Severity.ERROR; bitField0_ = (bitField0_ & ~0x00000001); code_ = 0; bitField0_ = (bitField0_ & ~0x00000002); @@ -2146,23 +2146,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.internal_static_Mysqlx_Error_descriptor; + return com.mysql.cj.x.protobuf.Mysqlx.internal_static_Mysqlx_Error_descriptor; } - public com.mysql.cj.mysqlx.protobuf.Mysqlx.Error getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.getDefaultInstance(); + public com.mysql.cj.x.protobuf.Mysqlx.Error getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.Mysqlx.Error.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.Mysqlx.Error build() { - com.mysql.cj.mysqlx.protobuf.Mysqlx.Error result = buildPartial(); + public com.mysql.cj.x.protobuf.Mysqlx.Error build() { + com.mysql.cj.x.protobuf.Mysqlx.Error result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.Mysqlx.Error buildPartial() { - com.mysql.cj.mysqlx.protobuf.Mysqlx.Error result = new com.mysql.cj.mysqlx.protobuf.Mysqlx.Error(this); + public com.mysql.cj.x.protobuf.Mysqlx.Error buildPartial() { + com.mysql.cj.x.protobuf.Mysqlx.Error result = new com.mysql.cj.x.protobuf.Mysqlx.Error(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2187,16 +2187,16 @@ public com.mysql.cj.mysqlx.protobuf.Mysqlx.Error buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.Mysqlx.Error) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.Mysqlx.Error)other); + if (other instanceof com.mysql.cj.x.protobuf.Mysqlx.Error) { + return mergeFrom((com.mysql.cj.x.protobuf.Mysqlx.Error)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.Mysqlx.Error other) { - if (other == com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.Mysqlx.Error other) { + if (other == com.mysql.cj.x.protobuf.Mysqlx.Error.getDefaultInstance()) return this; if (other.hasSeverity()) { setSeverity(other.getSeverity()); } @@ -2237,11 +2237,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.Mysqlx.Error parsedMessage = null; + com.mysql.cj.x.protobuf.Mysqlx.Error parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.Mysqlx.Error) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.Mysqlx.Error) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2252,7 +2252,7 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity severity_ = com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity.ERROR; + private com.mysql.cj.x.protobuf.Mysqlx.Error.Severity severity_ = com.mysql.cj.x.protobuf.Mysqlx.Error.Severity.ERROR; /** * optional .Mysqlx.Error.Severity severity = 1 [default = ERROR]; */ @@ -2262,13 +2262,13 @@ public boolean hasSeverity() { /** * optional .Mysqlx.Error.Severity severity = 1 [default = ERROR]; */ - public com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity getSeverity() { + public com.mysql.cj.x.protobuf.Mysqlx.Error.Severity getSeverity() { return severity_; } /** * optional .Mysqlx.Error.Severity severity = 1 [default = ERROR]; */ - public Builder setSeverity(com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity value) { + public Builder setSeverity(com.mysql.cj.x.protobuf.Mysqlx.Error.Severity value) { if (value == null) { throw new NullPointerException(); } @@ -2282,7 +2282,7 @@ public Builder setSeverity(com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity va */ public Builder clearSeverity() { bitField0_ = (bitField0_ & ~0x00000001); - severity_ = com.mysql.cj.mysqlx.protobuf.Mysqlx.Error.Severity.ERROR; + severity_ = com.mysql.cj.x.protobuf.Mysqlx.Error.Severity.ERROR; onChanged(); return this; } @@ -2549,13 +2549,13 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.mysql.cj.mysqlx.protobuf.MysqlxSql.getDescriptor(), - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.getDescriptor(), - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.getDescriptor(), - com.mysql.cj.mysqlx.protobuf.MysqlxSession.getDescriptor(), - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.getDescriptor(), - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.getDescriptor(), - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxSql.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxResultset.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxCrud.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxSession.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxConnection.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxExpect.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxNotice.getDescriptor(), }, assigner); internal_static_Mysqlx_ClientMessages_descriptor = getDescriptor().getMessageTypes().get(0); @@ -2581,13 +2581,13 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_Mysqlx_Error_descriptor, new java.lang.String[] { "Severity", "Code", "SqlState", "Msg", }); - com.mysql.cj.mysqlx.protobuf.MysqlxSql.getDescriptor(); - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.getDescriptor(); - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.getDescriptor(); - com.mysql.cj.mysqlx.protobuf.MysqlxSession.getDescriptor(); - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.getDescriptor(); - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.getDescriptor(); - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxSql.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxResultset.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxCrud.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxSession.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxConnection.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxExpect.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxNotice.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxConnection.java b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxConnection.java similarity index 76% rename from src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxConnection.java rename to src/generated/java/com/mysql/cj/x/protobuf/MysqlxConnection.java index efd3bbaff..8a0270772 100644 --- a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxConnection.java +++ b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxConnection.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.protobuf; +package com.mysql.cj.x.protobuf; // Generated by the protocol buffer compiler. DO NOT EDIT! // source: mysqlx_connection.proto @@ -56,11 +56,11 @@ public interface CapabilityOrBuilder extends /** * required .Mysqlx.Datatypes.Any value = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getValue(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getValue(); /** * required .Mysqlx.Datatypes.Any value = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder(); } /** * Protobuf type {@code Mysqlx.Connection.Capability} @@ -126,11 +126,11 @@ private Capability( break; } case 18: { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = value_.toBuilder(); } - value_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.PARSER, extensionRegistry); + value_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(value_); value_ = subBuilder.buildPartial(); @@ -152,14 +152,14 @@ private Capability( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capability_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capability_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capability_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capability_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.class, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.Builder.class); + com.mysql.cj.x.protobuf.MysqlxConnection.Capability.class, com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -221,7 +221,7 @@ public java.lang.String getName() { } public static final int VALUE_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value_; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value_; /** * required .Mysqlx.Datatypes.Any value = 2; */ @@ -231,19 +231,19 @@ public boolean hasValue() { /** * required .Mysqlx.Datatypes.Any value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getValue() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getValue() { return value_; } /** * required .Mysqlx.Datatypes.Any value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder() { return value_; } private void initFields() { name_ = ""; - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -305,53 +305,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capability parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capability parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capability parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capability parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capability parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capability parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capability parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capability parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capability parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capability parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -360,7 +360,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability parseFrom public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxConnection.Capability prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -382,17 +382,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Connection.Capability) - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilityOrBuilder { + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilityOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capability_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capability_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capability_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capability_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.class, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.Builder.class); + com.mysql.cj.x.protobuf.MysqlxConnection.Capability.class, com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.newBuilder() @@ -419,7 +419,7 @@ public Builder clear() { name_ = ""; bitField0_ = (bitField0_ & ~0x00000001); if (valueBuilder_ == null) { - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); } else { valueBuilder_.clear(); } @@ -433,23 +433,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capability_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capability_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxConnection.Capability getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxConnection.Capability.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability build() { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxConnection.Capability build() { + com.mysql.cj.x.protobuf.MysqlxConnection.Capability result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability result = new com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability(this); + public com.mysql.cj.x.protobuf.MysqlxConnection.Capability buildPartial() { + com.mysql.cj.x.protobuf.MysqlxConnection.Capability result = new com.mysql.cj.x.protobuf.MysqlxConnection.Capability(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -470,16 +470,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxConnection.Capability) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxConnection.Capability)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxConnection.Capability other) { + if (other == com.mysql.cj.x.protobuf.MysqlxConnection.Capability.getDefaultInstance()) return this; if (other.hasName()) { bitField0_ |= 0x00000001; name_ = other.name_; @@ -512,11 +512,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxConnection.Capability parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxConnection.Capability) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -603,9 +603,9 @@ public Builder setNameBytes( return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder> valueBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder> valueBuilder_; /** * required .Mysqlx.Datatypes.Any value = 2; */ @@ -615,7 +615,7 @@ public boolean hasValue() { /** * required .Mysqlx.Datatypes.Any value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getValue() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getValue() { if (valueBuilder_ == null) { return value_; } else { @@ -625,7 +625,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getValue() { /** * required .Mysqlx.Datatypes.Any value = 2; */ - public Builder setValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) { + public Builder setValue(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value) { if (valueBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -642,7 +642,7 @@ public Builder setValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) * required .Mysqlx.Datatypes.Any value = 2; */ public Builder setValue( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { if (valueBuilder_ == null) { value_ = builderForValue.build(); onChanged(); @@ -655,12 +655,12 @@ public Builder setValue( /** * required .Mysqlx.Datatypes.Any value = 2; */ - public Builder mergeValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) { + public Builder mergeValue(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value) { if (valueBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - value_ != com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance()) { + value_ != com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance()) { value_ = - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.newBuilder(value_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.newBuilder(value_).mergeFrom(value).buildPartial(); } else { value_ = value; } @@ -676,7 +676,7 @@ public Builder mergeValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value */ public Builder clearValue() { if (valueBuilder_ == null) { - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); onChanged(); } else { valueBuilder_.clear(); @@ -687,7 +687,7 @@ public Builder clearValue() { /** * required .Mysqlx.Datatypes.Any value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder getValueBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder getValueBuilder() { bitField0_ |= 0x00000002; onChanged(); return getValueFieldBuilder().getBuilder(); @@ -695,7 +695,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder getValueBuilder( /** * required .Mysqlx.Datatypes.Any value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder() { if (valueBuilder_ != null) { return valueBuilder_.getMessageOrBuilder(); } else { @@ -706,11 +706,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuild * required .Mysqlx.Datatypes.Any value = 2; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder> getValueFieldBuilder() { if (valueBuilder_ == null) { valueBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder>( getValue(), getParentForChildren(), isClean()); @@ -737,12 +737,12 @@ public interface CapabilitiesOrBuilder extends /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - java.util.List + java.util.List getCapabilitiesList(); /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability getCapabilities(int index); + com.mysql.cj.x.protobuf.MysqlxConnection.Capability getCapabilities(int index); /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ @@ -750,12 +750,12 @@ public interface CapabilitiesOrBuilder extends /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - java.util.List + java.util.List getCapabilitiesOrBuilderList(); /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilityOrBuilder getCapabilitiesOrBuilder( + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilityOrBuilder getCapabilitiesOrBuilder( int index); } /** @@ -816,10 +816,10 @@ private Capabilities( } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - capabilities_ = new java.util.ArrayList(); + capabilities_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - capabilities_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.PARSER, extensionRegistry)); + capabilities_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxConnection.Capability.PARSER, extensionRegistry)); break; } } @@ -839,14 +839,14 @@ private Capabilities( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capabilities_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capabilities_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capabilities_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capabilities_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.class, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.Builder.class); + com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.class, com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -865,17 +865,17 @@ public com.google.protobuf.Parser getParserForType() { } public static final int CAPABILITIES_FIELD_NUMBER = 1; - private java.util.List capabilities_; + private java.util.List capabilities_; /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public java.util.List getCapabilitiesList() { + public java.util.List getCapabilitiesList() { return capabilities_; } /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public java.util.List + public java.util.List getCapabilitiesOrBuilderList() { return capabilities_; } @@ -888,13 +888,13 @@ public int getCapabilitiesCount() { /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability getCapabilities(int index) { + public com.mysql.cj.x.protobuf.MysqlxConnection.Capability getCapabilities(int index) { return capabilities_.get(index); } /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilityOrBuilder getCapabilitiesOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxConnection.CapabilityOrBuilder getCapabilitiesOrBuilder( int index) { return capabilities_.get(index); } @@ -949,53 +949,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1004,7 +1004,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities parseFr public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1025,17 +1025,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Connection.Capabilities) - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesOrBuilder { + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capabilities_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capabilities_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capabilities_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capabilities_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.class, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.Builder.class); + com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.class, com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.newBuilder() @@ -1074,23 +1074,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capabilities_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Capabilities_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities build() { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities build() { + com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities result = new com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities(this); + public com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities buildPartial() { + com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities result = new com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities(this); int from_bitField0_ = bitField0_; if (capabilitiesBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -1106,16 +1106,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities buildPartial() } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities other) { + if (other == com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.getDefaultInstance()) return this; if (capabilitiesBuilder_ == null) { if (!other.capabilities_.isEmpty()) { if (capabilities_.isEmpty()) { @@ -1160,11 +1160,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1175,22 +1175,22 @@ public Builder mergeFrom( } private int bitField0_; - private java.util.List capabilities_ = + private java.util.List capabilities_ = java.util.Collections.emptyList(); private void ensureCapabilitiesIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - capabilities_ = new java.util.ArrayList(capabilities_); + capabilities_ = new java.util.ArrayList(capabilities_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilityOrBuilder> capabilitiesBuilder_; + com.mysql.cj.x.protobuf.MysqlxConnection.Capability, com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilityOrBuilder> capabilitiesBuilder_; /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public java.util.List getCapabilitiesList() { + public java.util.List getCapabilitiesList() { if (capabilitiesBuilder_ == null) { return java.util.Collections.unmodifiableList(capabilities_); } else { @@ -1210,7 +1210,7 @@ public int getCapabilitiesCount() { /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability getCapabilities(int index) { + public com.mysql.cj.x.protobuf.MysqlxConnection.Capability getCapabilities(int index) { if (capabilitiesBuilder_ == null) { return capabilities_.get(index); } else { @@ -1221,7 +1221,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability getCapabilities( * repeated .Mysqlx.Connection.Capability capabilities = 1; */ public Builder setCapabilities( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability value) { + int index, com.mysql.cj.x.protobuf.MysqlxConnection.Capability value) { if (capabilitiesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1238,7 +1238,7 @@ public Builder setCapabilities( * repeated .Mysqlx.Connection.Capability capabilities = 1; */ public Builder setCapabilities( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder builderForValue) { if (capabilitiesBuilder_ == null) { ensureCapabilitiesIsMutable(); capabilities_.set(index, builderForValue.build()); @@ -1251,7 +1251,7 @@ public Builder setCapabilities( /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public Builder addCapabilities(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability value) { + public Builder addCapabilities(com.mysql.cj.x.protobuf.MysqlxConnection.Capability value) { if (capabilitiesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1268,7 +1268,7 @@ public Builder addCapabilities(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Cap * repeated .Mysqlx.Connection.Capability capabilities = 1; */ public Builder addCapabilities( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability value) { + int index, com.mysql.cj.x.protobuf.MysqlxConnection.Capability value) { if (capabilitiesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1285,7 +1285,7 @@ public Builder addCapabilities( * repeated .Mysqlx.Connection.Capability capabilities = 1; */ public Builder addCapabilities( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder builderForValue) { if (capabilitiesBuilder_ == null) { ensureCapabilitiesIsMutable(); capabilities_.add(builderForValue.build()); @@ -1299,7 +1299,7 @@ public Builder addCapabilities( * repeated .Mysqlx.Connection.Capability capabilities = 1; */ public Builder addCapabilities( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder builderForValue) { if (capabilitiesBuilder_ == null) { ensureCapabilitiesIsMutable(); capabilities_.add(index, builderForValue.build()); @@ -1313,7 +1313,7 @@ public Builder addCapabilities( * repeated .Mysqlx.Connection.Capability capabilities = 1; */ public Builder addAllCapabilities( - java.lang.Iterable values) { + java.lang.Iterable values) { if (capabilitiesBuilder_ == null) { ensureCapabilitiesIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -1353,14 +1353,14 @@ public Builder removeCapabilities(int index) { /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.Builder getCapabilitiesBuilder( + public com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder getCapabilitiesBuilder( int index) { return getCapabilitiesFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilityOrBuilder getCapabilitiesOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxConnection.CapabilityOrBuilder getCapabilitiesOrBuilder( int index) { if (capabilitiesBuilder_ == null) { return capabilities_.get(index); } else { @@ -1370,7 +1370,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilityOrBuilder getCapa /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public java.util.List + public java.util.List getCapabilitiesOrBuilderList() { if (capabilitiesBuilder_ != null) { return capabilitiesBuilder_.getMessageOrBuilderList(); @@ -1381,31 +1381,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilityOrBuilder getCapa /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.Builder addCapabilitiesBuilder() { + public com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder addCapabilitiesBuilder() { return getCapabilitiesFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxConnection.Capability.getDefaultInstance()); } /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.Builder addCapabilitiesBuilder( + public com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder addCapabilitiesBuilder( int index) { return getCapabilitiesFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxConnection.Capability.getDefaultInstance()); } /** * repeated .Mysqlx.Connection.Capability capabilities = 1; */ - public java.util.List + public java.util.List getCapabilitiesBuilderList() { return getCapabilitiesFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilityOrBuilder> + com.mysql.cj.x.protobuf.MysqlxConnection.Capability, com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilityOrBuilder> getCapabilitiesFieldBuilder() { if (capabilitiesBuilder_ == null) { capabilitiesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilityOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxConnection.Capability, com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilityOrBuilder>( capabilities_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -1500,14 +1500,14 @@ private CapabilitiesGet( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesGet_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesGet_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesGet_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesGet_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet.class, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet.Builder.class); + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet.class, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1561,53 +1561,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1616,7 +1616,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet pars public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1638,17 +1638,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Connection.CapabilitiesGet) - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGetOrBuilder { + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGetOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesGet_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesGet_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesGet_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesGet_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet.class, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet.Builder.class); + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet.class, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet.newBuilder() @@ -1680,38 +1680,38 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesGet_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesGet_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet build() { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet build() { + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet result = new com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet(this); + public com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet buildPartial() { + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet result = new com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet other) { + if (other == com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -1724,11 +1724,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1760,11 +1760,11 @@ public interface CapabilitiesSetOrBuilder extends /** * required .Mysqlx.Connection.Capabilities capabilities = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities getCapabilities(); + com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities getCapabilities(); /** * required .Mysqlx.Connection.Capabilities capabilities = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesOrBuilder getCapabilitiesOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesOrBuilder getCapabilitiesOrBuilder(); } /** * Protobuf type {@code Mysqlx.Connection.CapabilitiesSet} @@ -1827,11 +1827,11 @@ private CapabilitiesSet( break; } case 10: { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = capabilities_.toBuilder(); } - capabilities_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.PARSER, extensionRegistry); + capabilities_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(capabilities_); capabilities_ = subBuilder.buildPartial(); @@ -1853,14 +1853,14 @@ private CapabilitiesSet( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesSet_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesSet_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesSet_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesSet_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet.class, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet.Builder.class); + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet.class, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1880,7 +1880,7 @@ public com.google.protobuf.Parser getParserForType() { private int bitField0_; public static final int CAPABILITIES_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities capabilities_; + private com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities capabilities_; /** * required .Mysqlx.Connection.Capabilities capabilities = 1; */ @@ -1890,18 +1890,18 @@ public boolean hasCapabilities() { /** * required .Mysqlx.Connection.Capabilities capabilities = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities getCapabilities() { + public com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities getCapabilities() { return capabilities_; } /** * required .Mysqlx.Connection.Capabilities capabilities = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesOrBuilder getCapabilitiesOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesOrBuilder getCapabilitiesOrBuilder() { return capabilities_; } private void initFields() { - capabilities_ = com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.getDefaultInstance(); + capabilities_ = com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -1952,53 +1952,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2007,7 +2007,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet pars public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2032,17 +2032,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Connection.CapabilitiesSet) - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSetOrBuilder { + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSetOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesSet_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesSet_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesSet_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesSet_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet.class, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet.Builder.class); + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet.class, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet.newBuilder() @@ -2067,7 +2067,7 @@ private static Builder create() { public Builder clear() { super.clear(); if (capabilitiesBuilder_ == null) { - capabilities_ = com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.getDefaultInstance(); + capabilities_ = com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.getDefaultInstance(); } else { capabilitiesBuilder_.clear(); } @@ -2081,23 +2081,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesSet_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_CapabilitiesSet_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet build() { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet build() { + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet result = new com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet(this); + public com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet buildPartial() { + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet result = new com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2114,16 +2114,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet buildPartia } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet other) { + if (other == com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet.getDefaultInstance()) return this; if (other.hasCapabilities()) { mergeCapabilities(other.getCapabilities()); } @@ -2147,11 +2147,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2162,9 +2162,9 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities capabilities_ = com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities capabilities_ = com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesOrBuilder> capabilitiesBuilder_; + com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities, com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.Builder, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesOrBuilder> capabilitiesBuilder_; /** * required .Mysqlx.Connection.Capabilities capabilities = 1; */ @@ -2174,7 +2174,7 @@ public boolean hasCapabilities() { /** * required .Mysqlx.Connection.Capabilities capabilities = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities getCapabilities() { + public com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities getCapabilities() { if (capabilitiesBuilder_ == null) { return capabilities_; } else { @@ -2184,7 +2184,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities getCapabilitie /** * required .Mysqlx.Connection.Capabilities capabilities = 1; */ - public Builder setCapabilities(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities value) { + public Builder setCapabilities(com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities value) { if (capabilitiesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2201,7 +2201,7 @@ public Builder setCapabilities(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Cap * required .Mysqlx.Connection.Capabilities capabilities = 1; */ public Builder setCapabilities( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.Builder builderForValue) { if (capabilitiesBuilder_ == null) { capabilities_ = builderForValue.build(); onChanged(); @@ -2214,12 +2214,12 @@ public Builder setCapabilities( /** * required .Mysqlx.Connection.Capabilities capabilities = 1; */ - public Builder mergeCapabilities(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities value) { + public Builder mergeCapabilities(com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities value) { if (capabilitiesBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - capabilities_ != com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.getDefaultInstance()) { + capabilities_ != com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.getDefaultInstance()) { capabilities_ = - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.newBuilder(capabilities_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.newBuilder(capabilities_).mergeFrom(value).buildPartial(); } else { capabilities_ = value; } @@ -2235,7 +2235,7 @@ public Builder mergeCapabilities(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.C */ public Builder clearCapabilities() { if (capabilitiesBuilder_ == null) { - capabilities_ = com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.getDefaultInstance(); + capabilities_ = com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.getDefaultInstance(); onChanged(); } else { capabilitiesBuilder_.clear(); @@ -2246,7 +2246,7 @@ public Builder clearCapabilities() { /** * required .Mysqlx.Connection.Capabilities capabilities = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.Builder getCapabilitiesBuilder() { + public com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.Builder getCapabilitiesBuilder() { bitField0_ |= 0x00000001; onChanged(); return getCapabilitiesFieldBuilder().getBuilder(); @@ -2254,7 +2254,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.Builder getCap /** * required .Mysqlx.Connection.Capabilities capabilities = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesOrBuilder getCapabilitiesOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesOrBuilder getCapabilitiesOrBuilder() { if (capabilitiesBuilder_ != null) { return capabilitiesBuilder_.getMessageOrBuilder(); } else { @@ -2265,11 +2265,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesOrBuilder getCa * required .Mysqlx.Connection.Capabilities capabilities = 1; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesOrBuilder> + com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities, com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.Builder, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesOrBuilder> getCapabilitiesFieldBuilder() { if (capabilitiesBuilder_ == null) { capabilitiesBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities, com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.Builder, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesOrBuilder>( getCapabilities(), getParentForChildren(), isClean()); @@ -2364,14 +2364,14 @@ private Close( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Close_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Close_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Close_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Close_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close.class, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close.Builder.class); + com.mysql.cj.x.protobuf.MysqlxConnection.Close.class, com.mysql.cj.x.protobuf.MysqlxConnection.Close.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2425,53 +2425,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Close parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Close parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxConnection.Close parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Close parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxConnection.Close parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Close parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxConnection.Close parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Close parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Close parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxConnection.Close parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2480,7 +2480,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxConnection.Close prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2503,17 +2503,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Connection.Close) - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CloseOrBuilder { + com.mysql.cj.x.protobuf.MysqlxConnection.CloseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Close_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Close_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Close_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Close_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close.class, com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close.Builder.class); + com.mysql.cj.x.protobuf.MysqlxConnection.Close.class, com.mysql.cj.x.protobuf.MysqlxConnection.Close.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close.newBuilder() @@ -2545,38 +2545,38 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Close_descriptor; + return com.mysql.cj.x.protobuf.MysqlxConnection.internal_static_Mysqlx_Connection_Close_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxConnection.Close getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxConnection.Close.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close build() { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxConnection.Close build() { + com.mysql.cj.x.protobuf.MysqlxConnection.Close result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close result = new com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close(this); + public com.mysql.cj.x.protobuf.MysqlxConnection.Close buildPartial() { + com.mysql.cj.x.protobuf.MysqlxConnection.Close result = new com.mysql.cj.x.protobuf.MysqlxConnection.Close(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxConnection.Close) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxConnection.Close)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxConnection.Close other) { + if (other == com.mysql.cj.x.protobuf.MysqlxConnection.Close.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -2589,11 +2589,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxConnection.Close parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Close) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxConnection.Close) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2669,7 +2669,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxDatatypes.getDescriptor(), }, assigner); internal_static_Mysqlx_Connection_Capability_descriptor = getDescriptor().getMessageTypes().get(0); @@ -2701,7 +2701,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_Mysqlx_Connection_Close_descriptor, new java.lang.String[] { }); - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxCrud.java b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxCrud.java similarity index 77% rename from src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxCrud.java rename to src/generated/java/com/mysql/cj/x/protobuf/MysqlxCrud.java index 2a9749b6e..40adb6ca8 100644 --- a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxCrud.java +++ b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxCrud.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.protobuf; +package com.mysql.cj.x.protobuf; // Generated by the protocol buffer compiler. DO NOT EDIT! // source: mysqlx_crud.proto @@ -92,7 +92,7 @@ public DataModel findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxCrud.getDescriptor().getEnumTypes().get(0); } private static final DataModel[] VALUES = values(); @@ -152,12 +152,12 @@ public interface ColumnOrBuilder extends /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - java.util.List + java.util.List getDocumentPathList(); /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath(int index); + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath(int index); /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ @@ -165,12 +165,12 @@ public interface ColumnOrBuilder extends /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - java.util.List + java.util.List getDocumentPathOrBuilderList(); /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocumentPathOrBuilder( + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocumentPathOrBuilder( int index); } /** @@ -243,10 +243,10 @@ private Column( } case 26: { if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - documentPath_ = new java.util.ArrayList(); + documentPath_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } - documentPath_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.PARSER, extensionRegistry)); + documentPath_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.PARSER, extensionRegistry)); break; } } @@ -266,14 +266,14 @@ private Column( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Column_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Column_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Column_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Column_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Column.class, com.mysql.cj.x.protobuf.MysqlxCrud.Column.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -377,17 +377,17 @@ public java.lang.String getAlias() { } public static final int DOCUMENT_PATH_FIELD_NUMBER = 3; - private java.util.List documentPath_; + private java.util.List documentPath_; /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public java.util.List getDocumentPathList() { + public java.util.List getDocumentPathList() { return documentPath_; } /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public java.util.List + public java.util.List getDocumentPathOrBuilderList() { return documentPath_; } @@ -400,13 +400,13 @@ public int getDocumentPathCount() { /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath(int index) { return documentPath_.get(index); } /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocumentPathOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocumentPathOrBuilder( int index) { return documentPath_.get(index); } @@ -477,53 +477,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Column parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Column parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Column parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Column parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Column parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Column parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Column parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Column parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Column parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Column parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -532,7 +532,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxCrud.Column prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -553,17 +553,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Crud.Column) - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ColumnOrBuilder { + com.mysql.cj.x.protobuf.MysqlxCrud.ColumnOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Column_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Column_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Column_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Column_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Column.class, com.mysql.cj.x.protobuf.MysqlxCrud.Column.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.newBuilder() @@ -606,23 +606,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Column_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Column_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Column getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxCrud.Column.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column build() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Column build() { + com.mysql.cj.x.protobuf.MysqlxCrud.Column result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column result = new com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column(this); + public com.mysql.cj.x.protobuf.MysqlxCrud.Column buildPartial() { + com.mysql.cj.x.protobuf.MysqlxCrud.Column result = new com.mysql.cj.x.protobuf.MysqlxCrud.Column(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -648,16 +648,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxCrud.Column) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxCrud.Column)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxCrud.Column other) { + if (other == com.mysql.cj.x.protobuf.MysqlxCrud.Column.getDefaultInstance()) return this; if (other.hasName()) { bitField0_ |= 0x00000001; name_ = other.name_; @@ -712,11 +712,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Column parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxCrud.Column) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -879,22 +879,22 @@ public Builder setAliasBytes( return this; } - private java.util.List documentPath_ = + private java.util.List documentPath_ = java.util.Collections.emptyList(); private void ensureDocumentPathIsMutable() { if (!((bitField0_ & 0x00000004) == 0x00000004)) { - documentPath_ = new java.util.ArrayList(documentPath_); + documentPath_ = new java.util.ArrayList(documentPath_); bitField0_ |= 0x00000004; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder> documentPathBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder> documentPathBuilder_; /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public java.util.List getDocumentPathList() { + public java.util.List getDocumentPathList() { if (documentPathBuilder_ == null) { return java.util.Collections.unmodifiableList(documentPath_); } else { @@ -914,7 +914,7 @@ public int getDocumentPathCount() { /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath(int index) { if (documentPathBuilder_ == null) { return documentPath_.get(index); } else { @@ -925,7 +925,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath( * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ public Builder setDocumentPath( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem value) { if (documentPathBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -942,7 +942,7 @@ public Builder setDocumentPath( * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ public Builder setDocumentPath( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder builderForValue) { if (documentPathBuilder_ == null) { ensureDocumentPathIsMutable(); documentPath_.set(index, builderForValue.build()); @@ -955,7 +955,7 @@ public Builder setDocumentPath( /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public Builder addDocumentPath(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem value) { + public Builder addDocumentPath(com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem value) { if (documentPathBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -972,7 +972,7 @@ public Builder addDocumentPath(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentP * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ public Builder addDocumentPath( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem value) { if (documentPathBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -989,7 +989,7 @@ public Builder addDocumentPath( * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ public Builder addDocumentPath( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder builderForValue) { if (documentPathBuilder_ == null) { ensureDocumentPathIsMutable(); documentPath_.add(builderForValue.build()); @@ -1003,7 +1003,7 @@ public Builder addDocumentPath( * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ public Builder addDocumentPath( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder builderForValue) { if (documentPathBuilder_ == null) { ensureDocumentPathIsMutable(); documentPath_.add(index, builderForValue.build()); @@ -1017,7 +1017,7 @@ public Builder addDocumentPath( * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ public Builder addAllDocumentPath( - java.lang.Iterable values) { + java.lang.Iterable values) { if (documentPathBuilder_ == null) { ensureDocumentPathIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -1057,14 +1057,14 @@ public Builder removeDocumentPath(int index) { /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder getDocumentPathBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder getDocumentPathBuilder( int index) { return getDocumentPathFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocumentPathOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocumentPathOrBuilder( int index) { if (documentPathBuilder_ == null) { return documentPath_.get(index); } else { @@ -1074,7 +1074,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocu /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public java.util.List + public java.util.List getDocumentPathOrBuilderList() { if (documentPathBuilder_ != null) { return documentPathBuilder_.getMessageOrBuilderList(); @@ -1085,31 +1085,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocu /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder addDocumentPathBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder addDocumentPathBuilder() { return getDocumentPathFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder addDocumentPathBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder addDocumentPathBuilder( int index) { return getDocumentPathFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 3; */ - public java.util.List + public java.util.List getDocumentPathBuilderList() { return getDocumentPathFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder> getDocumentPathFieldBuilder() { if (documentPathBuilder_ == null) { documentPathBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder>( documentPath_, ((bitField0_ & 0x00000004) == 0x00000004), getParentForChildren(), @@ -1141,11 +1141,11 @@ public interface ProjectionOrBuilder extends /** * required .Mysqlx.Expr.Expr source = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getSource(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getSource(); /** * required .Mysqlx.Expr.Expr source = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getSourceOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getSourceOrBuilder(); /** * optional string alias = 2; @@ -1222,11 +1222,11 @@ private Projection( break; } case 10: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = source_.toBuilder(); } - source_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); + source_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(source_); source_ = subBuilder.buildPartial(); @@ -1254,14 +1254,14 @@ private Projection( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Projection_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Projection_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Projection_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Projection_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Projection.class, com.mysql.cj.x.protobuf.MysqlxCrud.Projection.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1281,7 +1281,7 @@ public com.google.protobuf.Parser getParserForType() { private int bitField0_; public static final int SOURCE_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr source_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr source_; /** * required .Mysqlx.Expr.Expr source = 1; */ @@ -1291,13 +1291,13 @@ public boolean hasSource() { /** * required .Mysqlx.Expr.Expr source = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getSource() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getSource() { return source_; } /** * required .Mysqlx.Expr.Expr source = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getSourceOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getSourceOrBuilder() { return source_; } @@ -1344,7 +1344,7 @@ public java.lang.String getAlias() { } private void initFields() { - source_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + source_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); alias_ = ""; } private byte memoizedIsInitialized = -1; @@ -1403,53 +1403,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Projection parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Projection parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Projection parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Projection parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Projection parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Projection parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Projection parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Projection parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Projection parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Projection parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1458,7 +1458,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxCrud.Projection prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1483,17 +1483,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Crud.Projection) - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ProjectionOrBuilder { + com.mysql.cj.x.protobuf.MysqlxCrud.ProjectionOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Projection_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Projection_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Projection_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Projection_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Projection.class, com.mysql.cj.x.protobuf.MysqlxCrud.Projection.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.newBuilder() @@ -1518,7 +1518,7 @@ private static Builder create() { public Builder clear() { super.clear(); if (sourceBuilder_ == null) { - source_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + source_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); } else { sourceBuilder_.clear(); } @@ -1534,23 +1534,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Projection_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Projection_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Projection getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxCrud.Projection.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection build() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Projection build() { + com.mysql.cj.x.protobuf.MysqlxCrud.Projection result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection result = new com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection(this); + public com.mysql.cj.x.protobuf.MysqlxCrud.Projection buildPartial() { + com.mysql.cj.x.protobuf.MysqlxCrud.Projection result = new com.mysql.cj.x.protobuf.MysqlxCrud.Projection(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1571,16 +1571,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxCrud.Projection) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxCrud.Projection)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxCrud.Projection other) { + if (other == com.mysql.cj.x.protobuf.MysqlxCrud.Projection.getDefaultInstance()) return this; if (other.hasSource()) { mergeSource(other.getSource()); } @@ -1609,11 +1609,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Projection parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxCrud.Projection) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1624,9 +1624,9 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr source_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr source_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> sourceBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> sourceBuilder_; /** * required .Mysqlx.Expr.Expr source = 1; */ @@ -1636,7 +1636,7 @@ public boolean hasSource() { /** * required .Mysqlx.Expr.Expr source = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getSource() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getSource() { if (sourceBuilder_ == null) { return source_; } else { @@ -1646,7 +1646,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getSource() { /** * required .Mysqlx.Expr.Expr source = 1; */ - public Builder setSource(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder setSource(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (sourceBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1663,7 +1663,7 @@ public Builder setSource(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { * required .Mysqlx.Expr.Expr source = 1; */ public Builder setSource( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (sourceBuilder_ == null) { source_ = builderForValue.build(); onChanged(); @@ -1676,12 +1676,12 @@ public Builder setSource( /** * required .Mysqlx.Expr.Expr source = 1; */ - public Builder mergeSource(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder mergeSource(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (sourceBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - source_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { + source_ != com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { source_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.newBuilder(source_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.newBuilder(source_).mergeFrom(value).buildPartial(); } else { source_ = value; } @@ -1697,7 +1697,7 @@ public Builder mergeSource(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { */ public Builder clearSource() { if (sourceBuilder_ == null) { - source_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + source_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); onChanged(); } else { sourceBuilder_.clear(); @@ -1708,7 +1708,7 @@ public Builder clearSource() { /** * required .Mysqlx.Expr.Expr source = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getSourceBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getSourceBuilder() { bitField0_ |= 0x00000001; onChanged(); return getSourceFieldBuilder().getBuilder(); @@ -1716,7 +1716,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getSourceBuilder() { /** * required .Mysqlx.Expr.Expr source = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getSourceOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getSourceOrBuilder() { if (sourceBuilder_ != null) { return sourceBuilder_.getMessageOrBuilder(); } else { @@ -1727,11 +1727,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getSourceOrBuilder( * required .Mysqlx.Expr.Expr source = 1; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getSourceFieldBuilder() { if (sourceBuilder_ == null) { sourceBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( getSource(), getParentForChildren(), isClean()); @@ -1941,14 +1941,14 @@ private Collection( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Collection_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Collection_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Collection_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Collection_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.class, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2107,53 +2107,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Collection parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Collection parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Collection parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Collection parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Collection parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Collection parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Collection parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Collection parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Collection parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Collection parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2162,7 +2162,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxCrud.Collection prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2183,17 +2183,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Crud.Collection) - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder { + com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Collection_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Collection_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Collection_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Collection_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.class, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.newBuilder() @@ -2229,23 +2229,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Collection_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Collection_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection build() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection build() { + com.mysql.cj.x.protobuf.MysqlxCrud.Collection result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection result = new com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection(this); + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection buildPartial() { + com.mysql.cj.x.protobuf.MysqlxCrud.Collection result = new com.mysql.cj.x.protobuf.MysqlxCrud.Collection(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2262,16 +2262,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxCrud.Collection) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxCrud.Collection)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxCrud.Collection other) { + if (other == com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance()) return this; if (other.hasName()) { bitField0_ |= 0x00000001; name_ = other.name_; @@ -2298,11 +2298,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Collection parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxCrud.Collection) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2580,14 +2580,14 @@ private Limit( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Limit_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Limit_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Limit_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Limit_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Limit.class, com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2692,53 +2692,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Limit parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Limit parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Limit parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Limit parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Limit parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Limit parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Limit parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Limit parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Limit parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Limit parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2747,7 +2747,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxCrud.Limit prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2770,17 +2770,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Crud.Limit) - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder { + com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Limit_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Limit_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Limit_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Limit_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Limit.class, com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.newBuilder() @@ -2816,23 +2816,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Limit_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Limit_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Limit getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit build() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Limit build() { + com.mysql.cj.x.protobuf.MysqlxCrud.Limit result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit result = new com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit(this); + public com.mysql.cj.x.protobuf.MysqlxCrud.Limit buildPartial() { + com.mysql.cj.x.protobuf.MysqlxCrud.Limit result = new com.mysql.cj.x.protobuf.MysqlxCrud.Limit(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2849,16 +2849,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxCrud.Limit) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxCrud.Limit)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxCrud.Limit other) { + if (other == com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance()) return this; if (other.hasRowCount()) { setRowCount(other.getRowCount()); } @@ -2881,11 +2881,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Limit parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxCrud.Limit) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2982,11 +2982,11 @@ public interface OrderOrBuilder extends /** * required .Mysqlx.Expr.Expr expr = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getExpr(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getExpr(); /** * required .Mysqlx.Expr.Expr expr = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getExprOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getExprOrBuilder(); /** * optional .Mysqlx.Crud.Order.Direction direction = 2 [default = ASC]; @@ -2995,7 +2995,7 @@ public interface OrderOrBuilder extends /** * optional .Mysqlx.Crud.Order.Direction direction = 2 [default = ASC]; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direction getDirection(); + com.mysql.cj.x.protobuf.MysqlxCrud.Order.Direction getDirection(); } /** * Protobuf type {@code Mysqlx.Crud.Order} @@ -3054,11 +3054,11 @@ private Order( break; } case 10: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = expr_.toBuilder(); } - expr_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); + expr_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(expr_); expr_ = subBuilder.buildPartial(); @@ -3068,7 +3068,7 @@ private Order( } case 16: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direction value = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direction.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxCrud.Order.Direction value = com.mysql.cj.x.protobuf.MysqlxCrud.Order.Direction.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(2, rawValue); } else { @@ -3091,14 +3091,14 @@ private Order( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Order_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Order_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Order_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Order_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Order.class, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3173,7 +3173,7 @@ public Direction findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxCrud.Order.getDescriptor().getEnumTypes().get(0); } private static final Direction[] VALUES = values(); @@ -3200,7 +3200,7 @@ private Direction(int index, int value) { private int bitField0_; public static final int EXPR_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr expr_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr expr_; /** * required .Mysqlx.Expr.Expr expr = 1; */ @@ -3210,18 +3210,18 @@ public boolean hasExpr() { /** * required .Mysqlx.Expr.Expr expr = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getExpr() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getExpr() { return expr_; } /** * required .Mysqlx.Expr.Expr expr = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getExprOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getExprOrBuilder() { return expr_; } public static final int DIRECTION_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direction direction_; + private com.mysql.cj.x.protobuf.MysqlxCrud.Order.Direction direction_; /** * optional .Mysqlx.Crud.Order.Direction direction = 2 [default = ASC]; */ @@ -3231,13 +3231,13 @@ public boolean hasDirection() { /** * optional .Mysqlx.Crud.Order.Direction direction = 2 [default = ASC]; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direction getDirection() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Order.Direction getDirection() { return direction_; } private void initFields() { - expr_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); - direction_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direction.ASC; + expr_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + direction_ = com.mysql.cj.x.protobuf.MysqlxCrud.Order.Direction.ASC; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -3295,53 +3295,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Order parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Order parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Order parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Order parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Order parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Order parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Order parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Order parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Order parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Order parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3350,7 +3350,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxCrud.Order prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3371,17 +3371,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Crud.Order) - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder { + com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Order_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Order_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Order_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Order_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Order.class, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.newBuilder() @@ -3406,12 +3406,12 @@ private static Builder create() { public Builder clear() { super.clear(); if (exprBuilder_ == null) { - expr_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + expr_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); } else { exprBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - direction_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direction.ASC; + direction_ = com.mysql.cj.x.protobuf.MysqlxCrud.Order.Direction.ASC; bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -3422,23 +3422,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Order_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Order_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Order getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxCrud.Order.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order build() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Order build() { + com.mysql.cj.x.protobuf.MysqlxCrud.Order result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order result = new com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order(this); + public com.mysql.cj.x.protobuf.MysqlxCrud.Order buildPartial() { + com.mysql.cj.x.protobuf.MysqlxCrud.Order result = new com.mysql.cj.x.protobuf.MysqlxCrud.Order(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -3459,16 +3459,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxCrud.Order) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxCrud.Order)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxCrud.Order other) { + if (other == com.mysql.cj.x.protobuf.MysqlxCrud.Order.getDefaultInstance()) return this; if (other.hasExpr()) { mergeExpr(other.getExpr()); } @@ -3495,11 +3495,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Order parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxCrud.Order) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3510,9 +3510,9 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr expr_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr expr_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> exprBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> exprBuilder_; /** * required .Mysqlx.Expr.Expr expr = 1; */ @@ -3522,7 +3522,7 @@ public boolean hasExpr() { /** * required .Mysqlx.Expr.Expr expr = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getExpr() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getExpr() { if (exprBuilder_ == null) { return expr_; } else { @@ -3532,7 +3532,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getExpr() { /** * required .Mysqlx.Expr.Expr expr = 1; */ - public Builder setExpr(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder setExpr(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (exprBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -3549,7 +3549,7 @@ public Builder setExpr(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { * required .Mysqlx.Expr.Expr expr = 1; */ public Builder setExpr( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (exprBuilder_ == null) { expr_ = builderForValue.build(); onChanged(); @@ -3562,12 +3562,12 @@ public Builder setExpr( /** * required .Mysqlx.Expr.Expr expr = 1; */ - public Builder mergeExpr(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder mergeExpr(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (exprBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - expr_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { + expr_ != com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { expr_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.newBuilder(expr_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.newBuilder(expr_).mergeFrom(value).buildPartial(); } else { expr_ = value; } @@ -3583,7 +3583,7 @@ public Builder mergeExpr(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { */ public Builder clearExpr() { if (exprBuilder_ == null) { - expr_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + expr_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); onChanged(); } else { exprBuilder_.clear(); @@ -3594,7 +3594,7 @@ public Builder clearExpr() { /** * required .Mysqlx.Expr.Expr expr = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getExprBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getExprBuilder() { bitField0_ |= 0x00000001; onChanged(); return getExprFieldBuilder().getBuilder(); @@ -3602,7 +3602,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getExprBuilder() { /** * required .Mysqlx.Expr.Expr expr = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getExprOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getExprOrBuilder() { if (exprBuilder_ != null) { return exprBuilder_.getMessageOrBuilder(); } else { @@ -3613,11 +3613,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getExprOrBuilder() * required .Mysqlx.Expr.Expr expr = 1; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getExprFieldBuilder() { if (exprBuilder_ == null) { exprBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( getExpr(), getParentForChildren(), isClean()); @@ -3626,7 +3626,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getExprOrBuilder() return exprBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direction direction_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direction.ASC; + private com.mysql.cj.x.protobuf.MysqlxCrud.Order.Direction direction_ = com.mysql.cj.x.protobuf.MysqlxCrud.Order.Direction.ASC; /** * optional .Mysqlx.Crud.Order.Direction direction = 2 [default = ASC]; */ @@ -3636,13 +3636,13 @@ public boolean hasDirection() { /** * optional .Mysqlx.Crud.Order.Direction direction = 2 [default = ASC]; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direction getDirection() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Order.Direction getDirection() { return direction_; } /** * optional .Mysqlx.Crud.Order.Direction direction = 2 [default = ASC]; */ - public Builder setDirection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direction value) { + public Builder setDirection(com.mysql.cj.x.protobuf.MysqlxCrud.Order.Direction value) { if (value == null) { throw new NullPointerException(); } @@ -3656,7 +3656,7 @@ public Builder setDirection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direct */ public Builder clearDirection() { bitField0_ = (bitField0_ & ~0x00000002); - direction_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Direction.ASC; + direction_ = com.mysql.cj.x.protobuf.MysqlxCrud.Order.Direction.ASC; onChanged(); return this; } @@ -3683,11 +3683,11 @@ public interface UpdateOperationOrBuilder extends /** * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier getSource(); + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier getSource(); /** * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getSourceOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getSourceOrBuilder(); /** * required .Mysqlx.Crud.UpdateOperation.UpdateType operation = 2; @@ -3696,7 +3696,7 @@ public interface UpdateOperationOrBuilder extends /** * required .Mysqlx.Crud.UpdateOperation.UpdateType operation = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType getOperation(); + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType getOperation(); /** * optional .Mysqlx.Expr.Expr value = 3; @@ -3705,11 +3705,11 @@ public interface UpdateOperationOrBuilder extends /** * optional .Mysqlx.Expr.Expr value = 3; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getValue(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getValue(); /** * optional .Mysqlx.Expr.Expr value = 3; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder(); } /** * Protobuf type {@code Mysqlx.Crud.UpdateOperation} @@ -3774,11 +3774,11 @@ private UpdateOperation( break; } case 10: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = source_.toBuilder(); } - source_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.PARSER, extensionRegistry); + source_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(source_); source_ = subBuilder.buildPartial(); @@ -3788,7 +3788,7 @@ private UpdateOperation( } case 16: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType value = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType value = com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(2, rawValue); } else { @@ -3798,11 +3798,11 @@ private UpdateOperation( break; } case 26: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = value_.toBuilder(); } - value_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); + value_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(value_); value_ = subBuilder.buildPartial(); @@ -3824,14 +3824,14 @@ private UpdateOperation( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_UpdateOperation_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_UpdateOperation_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_UpdateOperation_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_UpdateOperation_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.class, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -4007,7 +4007,7 @@ public UpdateType findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.getDescriptor().getEnumTypes().get(0); } private static final UpdateType[] VALUES = values(); @@ -4034,7 +4034,7 @@ private UpdateType(int index, int value) { private int bitField0_; public static final int SOURCE_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier source_; + private com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier source_; /** * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ @@ -4044,18 +4044,18 @@ public boolean hasSource() { /** * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier getSource() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier getSource() { return source_; } /** * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getSourceOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getSourceOrBuilder() { return source_; } public static final int OPERATION_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType operation_; + private com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType operation_; /** * required .Mysqlx.Crud.UpdateOperation.UpdateType operation = 2; */ @@ -4065,12 +4065,12 @@ public boolean hasOperation() { /** * required .Mysqlx.Crud.UpdateOperation.UpdateType operation = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType getOperation() { + public com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType getOperation() { return operation_; } public static final int VALUE_FIELD_NUMBER = 3; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr value_; /** * optional .Mysqlx.Expr.Expr value = 3; */ @@ -4080,20 +4080,20 @@ public boolean hasValue() { /** * optional .Mysqlx.Expr.Expr value = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getValue() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getValue() { return value_; } /** * optional .Mysqlx.Expr.Expr value = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder() { return value_; } private void initFields() { - source_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); - operation_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType.SET; - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + source_ = com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); + operation_ = com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType.SET; + value_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -4168,53 +4168,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4223,7 +4223,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -4250,17 +4250,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Crud.UpdateOperation) - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperationOrBuilder { + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperationOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_UpdateOperation_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_UpdateOperation_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_UpdateOperation_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_UpdateOperation_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.class, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.newBuilder() @@ -4286,15 +4286,15 @@ private static Builder create() { public Builder clear() { super.clear(); if (sourceBuilder_ == null) { - source_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); + source_ = com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); } else { sourceBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - operation_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType.SET; + operation_ = com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType.SET; bitField0_ = (bitField0_ & ~0x00000002); if (valueBuilder_ == null) { - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); } else { valueBuilder_.clear(); } @@ -4308,23 +4308,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_UpdateOperation_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_UpdateOperation_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation build() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation build() { + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation result = new com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation(this); + public com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation buildPartial() { + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation result = new com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -4353,16 +4353,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation other) { + if (other == com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.getDefaultInstance()) return this; if (other.hasSource()) { mergeSource(other.getSource()); } @@ -4402,11 +4402,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -4417,9 +4417,9 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier source_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier source_ = com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder> sourceBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder> sourceBuilder_; /** * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ @@ -4429,7 +4429,7 @@ public boolean hasSource() { /** * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier getSource() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier getSource() { if (sourceBuilder_ == null) { return source_; } else { @@ -4439,7 +4439,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier getSource() { /** * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ - public Builder setSource(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier value) { + public Builder setSource(com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier value) { if (sourceBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4456,7 +4456,7 @@ public Builder setSource(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifie * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ public Builder setSource( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder builderForValue) { if (sourceBuilder_ == null) { source_ = builderForValue.build(); onChanged(); @@ -4469,12 +4469,12 @@ public Builder setSource( /** * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ - public Builder mergeSource(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier value) { + public Builder mergeSource(com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier value) { if (sourceBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - source_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance()) { + source_ != com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance()) { source_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.newBuilder(source_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.newBuilder(source_).mergeFrom(value).buildPartial(); } else { source_ = value; } @@ -4490,7 +4490,7 @@ public Builder mergeSource(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentif */ public Builder clearSource() { if (sourceBuilder_ == null) { - source_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); + source_ = com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); onChanged(); } else { sourceBuilder_.clear(); @@ -4501,7 +4501,7 @@ public Builder clearSource() { /** * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder getSourceBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder getSourceBuilder() { bitField0_ |= 0x00000001; onChanged(); return getSourceFieldBuilder().getBuilder(); @@ -4509,7 +4509,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder getSourc /** * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getSourceOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getSourceOrBuilder() { if (sourceBuilder_ != null) { return sourceBuilder_.getMessageOrBuilder(); } else { @@ -4520,11 +4520,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getSour * required .Mysqlx.Expr.ColumnIdentifier source = 1; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder> getSourceFieldBuilder() { if (sourceBuilder_ == null) { sourceBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder>( getSource(), getParentForChildren(), isClean()); @@ -4533,7 +4533,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getSour return sourceBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType operation_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType.SET; + private com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType operation_ = com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType.SET; /** * required .Mysqlx.Crud.UpdateOperation.UpdateType operation = 2; */ @@ -4543,13 +4543,13 @@ public boolean hasOperation() { /** * required .Mysqlx.Crud.UpdateOperation.UpdateType operation = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType getOperation() { + public com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType getOperation() { return operation_; } /** * required .Mysqlx.Crud.UpdateOperation.UpdateType operation = 2; */ - public Builder setOperation(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType value) { + public Builder setOperation(com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType value) { if (value == null) { throw new NullPointerException(); } @@ -4563,14 +4563,14 @@ public Builder setOperation(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperat */ public Builder clearOperation() { bitField0_ = (bitField0_ & ~0x00000002); - operation_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType.SET; + operation_ = com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType.SET; onChanged(); return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr value_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> valueBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> valueBuilder_; /** * optional .Mysqlx.Expr.Expr value = 3; */ @@ -4580,7 +4580,7 @@ public boolean hasValue() { /** * optional .Mysqlx.Expr.Expr value = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getValue() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getValue() { if (valueBuilder_ == null) { return value_; } else { @@ -4590,7 +4590,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getValue() { /** * optional .Mysqlx.Expr.Expr value = 3; */ - public Builder setValue(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder setValue(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (valueBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4607,7 +4607,7 @@ public Builder setValue(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { * optional .Mysqlx.Expr.Expr value = 3; */ public Builder setValue( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (valueBuilder_ == null) { value_ = builderForValue.build(); onChanged(); @@ -4620,12 +4620,12 @@ public Builder setValue( /** * optional .Mysqlx.Expr.Expr value = 3; */ - public Builder mergeValue(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder mergeValue(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (valueBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - value_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { + value_ != com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { value_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.newBuilder(value_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.newBuilder(value_).mergeFrom(value).buildPartial(); } else { value_ = value; } @@ -4641,7 +4641,7 @@ public Builder mergeValue(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { */ public Builder clearValue() { if (valueBuilder_ == null) { - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); onChanged(); } else { valueBuilder_.clear(); @@ -4652,7 +4652,7 @@ public Builder clearValue() { /** * optional .Mysqlx.Expr.Expr value = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getValueBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getValueBuilder() { bitField0_ |= 0x00000004; onChanged(); return getValueFieldBuilder().getBuilder(); @@ -4660,7 +4660,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getValueBuilder() { /** * optional .Mysqlx.Expr.Expr value = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder() { if (valueBuilder_ != null) { return valueBuilder_.getMessageOrBuilder(); } else { @@ -4671,11 +4671,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder() * optional .Mysqlx.Expr.Expr value = 3; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getValueFieldBuilder() { if (valueBuilder_ == null) { valueBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( getValue(), getParentForChildren(), isClean()); @@ -4706,11 +4706,11 @@ public interface FindOrBuilder extends /** * required .Mysqlx.Crud.Collection collection = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection(); + com.mysql.cj.x.protobuf.MysqlxCrud.Collection getCollection(); /** * required .Mysqlx.Crud.Collection collection = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder(); /** * optional .Mysqlx.Crud.DataModel data_model = 3; @@ -4719,17 +4719,17 @@ public interface FindOrBuilder extends /** * optional .Mysqlx.Crud.DataModel data_model = 3; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel getDataModel(); + com.mysql.cj.x.protobuf.MysqlxCrud.DataModel getDataModel(); /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - java.util.List + java.util.List getProjectionList(); /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection getProjection(int index); + com.mysql.cj.x.protobuf.MysqlxCrud.Projection getProjection(int index); /** * repeated .Mysqlx.Crud.Projection projection = 4; */ @@ -4737,12 +4737,12 @@ public interface FindOrBuilder extends /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - java.util.List + java.util.List getProjectionOrBuilderList(); /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ProjectionOrBuilder getProjectionOrBuilder( + com.mysql.cj.x.protobuf.MysqlxCrud.ProjectionOrBuilder getProjectionOrBuilder( int index); /** @@ -4752,21 +4752,21 @@ com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ProjectionOrBuilder getProjectionOrBuild /** * optional .Mysqlx.Expr.Expr criteria = 5; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getCriteria(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getCriteria(); /** * optional .Mysqlx.Expr.Expr criteria = 5; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder(); /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - java.util.List + java.util.List getArgsList(); /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getArgs(int index); /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ @@ -4774,12 +4774,12 @@ com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ProjectionOrBuilder getProjectionOrBuild /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - java.util.List + java.util.List getArgsOrBuilderList(); /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( + com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( int index); /** @@ -4789,21 +4789,21 @@ com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( /** * optional .Mysqlx.Crud.Limit limit = 6; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getLimit(); + com.mysql.cj.x.protobuf.MysqlxCrud.Limit getLimit(); /** * optional .Mysqlx.Crud.Limit limit = 6; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder(); /** * repeated .Mysqlx.Crud.Order order = 7; */ - java.util.List + java.util.List getOrderList(); /** * repeated .Mysqlx.Crud.Order order = 7; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getOrder(int index); + com.mysql.cj.x.protobuf.MysqlxCrud.Order getOrder(int index); /** * repeated .Mysqlx.Crud.Order order = 7; */ @@ -4811,23 +4811,23 @@ com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( /** * repeated .Mysqlx.Crud.Order order = 7; */ - java.util.List + java.util.List getOrderOrBuilderList(); /** * repeated .Mysqlx.Crud.Order order = 7; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( + com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( int index); /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - java.util.List + java.util.List getGroupingList(); /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getGrouping(int index); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getGrouping(int index); /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ @@ -4835,12 +4835,12 @@ com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - java.util.List + java.util.List getGroupingOrBuilderList(); /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getGroupingOrBuilder( + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getGroupingOrBuilder( int index); /** @@ -4850,11 +4850,11 @@ com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getGroupingOrBuilder( /** * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getGroupingCriteria(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getGroupingCriteria(); /** * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getGroupingCriteriaOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getGroupingCriteriaOrBuilder(); } /** * Protobuf type {@code Mysqlx.Crud.Find} @@ -4926,11 +4926,11 @@ private Find( break; } case 18: { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = collection_.toBuilder(); } - collection_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.PARSER, extensionRegistry); + collection_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Collection.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(collection_); collection_ = subBuilder.buildPartial(); @@ -4940,7 +4940,7 @@ private Find( } case 24: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel value = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxCrud.DataModel value = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(3, rawValue); } else { @@ -4951,18 +4951,18 @@ private Find( } case 34: { if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - projection_ = new java.util.ArrayList(); + projection_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } - projection_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.PARSER, extensionRegistry)); + projection_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Projection.PARSER, extensionRegistry)); break; } case 42: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = criteria_.toBuilder(); } - criteria_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); + criteria_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(criteria_); criteria_ = subBuilder.buildPartial(); @@ -4971,11 +4971,11 @@ private Find( break; } case 50: { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = limit_.toBuilder(); } - limit_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.PARSER, extensionRegistry); + limit_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Limit.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(limit_); limit_ = subBuilder.buildPartial(); @@ -4985,26 +4985,26 @@ private Find( } case 58: { if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { - order_ = new java.util.ArrayList(); + order_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000040; } - order_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.PARSER, extensionRegistry)); + order_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Order.PARSER, extensionRegistry)); break; } case 66: { if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { - grouping_ = new java.util.ArrayList(); + grouping_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000080; } - grouping_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry)); + grouping_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry)); break; } case 74: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; if (((bitField0_ & 0x00000010) == 0x00000010)) { subBuilder = groupingCriteria_.toBuilder(); } - groupingCriteria_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); + groupingCriteria_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(groupingCriteria_); groupingCriteria_ = subBuilder.buildPartial(); @@ -5014,10 +5014,10 @@ private Find( } case 90: { if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { - args_ = new java.util.ArrayList(); + args_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000010; } - args_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry)); + args_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry)); break; } } @@ -5046,14 +5046,14 @@ private Find( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Find_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Find_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Find_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Find_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Find.class, com.mysql.cj.x.protobuf.MysqlxCrud.Find.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -5073,7 +5073,7 @@ public com.google.protobuf.Parser getParserForType() { private int bitField0_; public static final int COLLECTION_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection collection_; + private com.mysql.cj.x.protobuf.MysqlxCrud.Collection collection_; /** * required .Mysqlx.Crud.Collection collection = 2; */ @@ -5083,18 +5083,18 @@ public boolean hasCollection() { /** * required .Mysqlx.Crud.Collection collection = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection getCollection() { return collection_; } /** * required .Mysqlx.Crud.Collection collection = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { return collection_; } public static final int DATA_MODEL_FIELD_NUMBER = 3; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel dataModel_; + private com.mysql.cj.x.protobuf.MysqlxCrud.DataModel dataModel_; /** * optional .Mysqlx.Crud.DataModel data_model = 3; */ @@ -5104,22 +5104,22 @@ public boolean hasDataModel() { /** * optional .Mysqlx.Crud.DataModel data_model = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel getDataModel() { + public com.mysql.cj.x.protobuf.MysqlxCrud.DataModel getDataModel() { return dataModel_; } public static final int PROJECTION_FIELD_NUMBER = 4; - private java.util.List projection_; + private java.util.List projection_; /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public java.util.List getProjectionList() { + public java.util.List getProjectionList() { return projection_; } /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public java.util.List + public java.util.List getProjectionOrBuilderList() { return projection_; } @@ -5132,19 +5132,19 @@ public int getProjectionCount() { /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection getProjection(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.Projection getProjection(int index) { return projection_.get(index); } /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ProjectionOrBuilder getProjectionOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.ProjectionOrBuilder getProjectionOrBuilder( int index) { return projection_.get(index); } public static final int CRITERIA_FIELD_NUMBER = 5; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr criteria_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr criteria_; /** * optional .Mysqlx.Expr.Expr criteria = 5; */ @@ -5154,28 +5154,28 @@ public boolean hasCriteria() { /** * optional .Mysqlx.Expr.Expr criteria = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getCriteria() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getCriteria() { return criteria_; } /** * optional .Mysqlx.Expr.Expr criteria = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder() { return criteria_; } public static final int ARGS_FIELD_NUMBER = 11; - private java.util.List args_; + private java.util.List args_; /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { return args_; } /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { return args_; } @@ -5188,19 +5188,19 @@ public int getArgsCount() { /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { return args_.get(index); } /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( int index) { return args_.get(index); } public static final int LIMIT_FIELD_NUMBER = 6; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit limit_; + private com.mysql.cj.x.protobuf.MysqlxCrud.Limit limit_; /** * optional .Mysqlx.Crud.Limit limit = 6; */ @@ -5210,28 +5210,28 @@ public boolean hasLimit() { /** * optional .Mysqlx.Crud.Limit limit = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getLimit() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Limit getLimit() { return limit_; } /** * optional .Mysqlx.Crud.Limit limit = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder() { return limit_; } public static final int ORDER_FIELD_NUMBER = 7; - private java.util.List order_; + private java.util.List order_; /** * repeated .Mysqlx.Crud.Order order = 7; */ - public java.util.List getOrderList() { + public java.util.List getOrderList() { return order_; } /** * repeated .Mysqlx.Crud.Order order = 7; */ - public java.util.List + public java.util.List getOrderOrBuilderList() { return order_; } @@ -5244,29 +5244,29 @@ public int getOrderCount() { /** * repeated .Mysqlx.Crud.Order order = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getOrder(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.Order getOrder(int index) { return order_.get(index); } /** * repeated .Mysqlx.Crud.Order order = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( int index) { return order_.get(index); } public static final int GROUPING_FIELD_NUMBER = 8; - private java.util.List grouping_; + private java.util.List grouping_; /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public java.util.List getGroupingList() { + public java.util.List getGroupingList() { return grouping_; } /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public java.util.List + public java.util.List getGroupingOrBuilderList() { return grouping_; } @@ -5279,19 +5279,19 @@ public int getGroupingCount() { /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getGrouping(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getGrouping(int index) { return grouping_.get(index); } /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getGroupingOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getGroupingOrBuilder( int index) { return grouping_.get(index); } public static final int GROUPING_CRITERIA_FIELD_NUMBER = 9; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr groupingCriteria_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr groupingCriteria_; /** * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ @@ -5301,26 +5301,26 @@ public boolean hasGroupingCriteria() { /** * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getGroupingCriteria() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getGroupingCriteria() { return groupingCriteria_; } /** * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getGroupingCriteriaOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getGroupingCriteriaOrBuilder() { return groupingCriteria_; } private void initFields() { - collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); - dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; projection_ = java.util.Collections.emptyList(); - criteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + criteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); args_ = java.util.Collections.emptyList(); - limit_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + limit_ = com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); order_ = java.util.Collections.emptyList(); grouping_ = java.util.Collections.emptyList(); - groupingCriteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + groupingCriteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -5469,53 +5469,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Find parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Find parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Find parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Find parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Find parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Find parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Find parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Find parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Find parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Find parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5524,7 +5524,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxCrud.Find prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -5558,17 +5558,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Crud.Find) - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.FindOrBuilder { + com.mysql.cj.x.protobuf.MysqlxCrud.FindOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Find_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Find_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Find_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Find_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Find.class, com.mysql.cj.x.protobuf.MysqlxCrud.Find.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find.newBuilder() @@ -5600,12 +5600,12 @@ private static Builder create() { public Builder clear() { super.clear(); if (collectionBuilder_ == null) { - collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); } else { collectionBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; bitField0_ = (bitField0_ & ~0x00000002); if (projectionBuilder_ == null) { projection_ = java.util.Collections.emptyList(); @@ -5614,7 +5614,7 @@ public Builder clear() { projectionBuilder_.clear(); } if (criteriaBuilder_ == null) { - criteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + criteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); } else { criteriaBuilder_.clear(); } @@ -5626,7 +5626,7 @@ public Builder clear() { argsBuilder_.clear(); } if (limitBuilder_ == null) { - limit_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + limit_ = com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); } else { limitBuilder_.clear(); } @@ -5644,7 +5644,7 @@ public Builder clear() { groupingBuilder_.clear(); } if (groupingCriteriaBuilder_ == null) { - groupingCriteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + groupingCriteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); } else { groupingCriteriaBuilder_.clear(); } @@ -5658,23 +5658,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Find_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Find_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Find getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxCrud.Find.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find build() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Find build() { + com.mysql.cj.x.protobuf.MysqlxCrud.Find result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find result = new com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find(this); + public com.mysql.cj.x.protobuf.MysqlxCrud.Find buildPartial() { + com.mysql.cj.x.protobuf.MysqlxCrud.Find result = new com.mysql.cj.x.protobuf.MysqlxCrud.Find(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -5755,16 +5755,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxCrud.Find) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxCrud.Find)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxCrud.Find other) { + if (other == com.mysql.cj.x.protobuf.MysqlxCrud.Find.getDefaultInstance()) return this; if (other.hasCollection()) { mergeCollection(other.getCollection()); } @@ -5946,11 +5946,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Find parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxCrud.Find) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -5961,9 +5961,9 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxCrud.Collection collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder> collectionBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Collection, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder> collectionBuilder_; /** * required .Mysqlx.Crud.Collection collection = 2; */ @@ -5973,7 +5973,7 @@ public boolean hasCollection() { /** * required .Mysqlx.Crud.Collection collection = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection getCollection() { if (collectionBuilder_ == null) { return collection_; } else { @@ -5983,7 +5983,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection() { /** * required .Mysqlx.Crud.Collection collection = 2; */ - public Builder setCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection value) { + public Builder setCollection(com.mysql.cj.x.protobuf.MysqlxCrud.Collection value) { if (collectionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6000,7 +6000,7 @@ public Builder setCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection * required .Mysqlx.Crud.Collection collection = 2; */ public Builder setCollection( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder builderForValue) { if (collectionBuilder_ == null) { collection_ = builderForValue.build(); onChanged(); @@ -6013,12 +6013,12 @@ public Builder setCollection( /** * required .Mysqlx.Crud.Collection collection = 2; */ - public Builder mergeCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection value) { + public Builder mergeCollection(com.mysql.cj.x.protobuf.MysqlxCrud.Collection value) { if (collectionBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - collection_ != com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance()) { + collection_ != com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance()) { collection_ = - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.newBuilder(collection_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.newBuilder(collection_).mergeFrom(value).buildPartial(); } else { collection_ = value; } @@ -6034,7 +6034,7 @@ public Builder mergeCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collectio */ public Builder clearCollection() { if (collectionBuilder_ == null) { - collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); onChanged(); } else { collectionBuilder_.clear(); @@ -6045,7 +6045,7 @@ public Builder clearCollection() { /** * required .Mysqlx.Crud.Collection collection = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder getCollectionBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder getCollectionBuilder() { bitField0_ |= 0x00000001; onChanged(); return getCollectionFieldBuilder().getBuilder(); @@ -6053,7 +6053,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder getCollectionB /** * required .Mysqlx.Crud.Collection collection = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { if (collectionBuilder_ != null) { return collectionBuilder_.getMessageOrBuilder(); } else { @@ -6064,11 +6064,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollection * required .Mysqlx.Crud.Collection collection = 2; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Collection, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder> getCollectionFieldBuilder() { if (collectionBuilder_ == null) { collectionBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Collection, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder>( getCollection(), getParentForChildren(), isClean()); @@ -6077,7 +6077,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollection return collectionBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + private com.mysql.cj.x.protobuf.MysqlxCrud.DataModel dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; /** * optional .Mysqlx.Crud.DataModel data_model = 3; */ @@ -6087,13 +6087,13 @@ public boolean hasDataModel() { /** * optional .Mysqlx.Crud.DataModel data_model = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel getDataModel() { + public com.mysql.cj.x.protobuf.MysqlxCrud.DataModel getDataModel() { return dataModel_; } /** * optional .Mysqlx.Crud.DataModel data_model = 3; */ - public Builder setDataModel(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel value) { + public Builder setDataModel(com.mysql.cj.x.protobuf.MysqlxCrud.DataModel value) { if (value == null) { throw new NullPointerException(); } @@ -6107,27 +6107,27 @@ public Builder setDataModel(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel va */ public Builder clearDataModel() { bitField0_ = (bitField0_ & ~0x00000002); - dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; onChanged(); return this; } - private java.util.List projection_ = + private java.util.List projection_ = java.util.Collections.emptyList(); private void ensureProjectionIsMutable() { if (!((bitField0_ & 0x00000004) == 0x00000004)) { - projection_ = new java.util.ArrayList(projection_); + projection_ = new java.util.ArrayList(projection_); bitField0_ |= 0x00000004; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ProjectionOrBuilder> projectionBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Projection, com.mysql.cj.x.protobuf.MysqlxCrud.Projection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.ProjectionOrBuilder> projectionBuilder_; /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public java.util.List getProjectionList() { + public java.util.List getProjectionList() { if (projectionBuilder_ == null) { return java.util.Collections.unmodifiableList(projection_); } else { @@ -6147,7 +6147,7 @@ public int getProjectionCount() { /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection getProjection(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.Projection getProjection(int index) { if (projectionBuilder_ == null) { return projection_.get(index); } else { @@ -6158,7 +6158,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection getProjection(int inde * repeated .Mysqlx.Crud.Projection projection = 4; */ public Builder setProjection( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Projection value) { if (projectionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6175,7 +6175,7 @@ public Builder setProjection( * repeated .Mysqlx.Crud.Projection projection = 4; */ public Builder setProjection( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Projection.Builder builderForValue) { if (projectionBuilder_ == null) { ensureProjectionIsMutable(); projection_.set(index, builderForValue.build()); @@ -6188,7 +6188,7 @@ public Builder setProjection( /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public Builder addProjection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection value) { + public Builder addProjection(com.mysql.cj.x.protobuf.MysqlxCrud.Projection value) { if (projectionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6205,7 +6205,7 @@ public Builder addProjection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection * repeated .Mysqlx.Crud.Projection projection = 4; */ public Builder addProjection( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Projection value) { if (projectionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6222,7 +6222,7 @@ public Builder addProjection( * repeated .Mysqlx.Crud.Projection projection = 4; */ public Builder addProjection( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Projection.Builder builderForValue) { if (projectionBuilder_ == null) { ensureProjectionIsMutable(); projection_.add(builderForValue.build()); @@ -6236,7 +6236,7 @@ public Builder addProjection( * repeated .Mysqlx.Crud.Projection projection = 4; */ public Builder addProjection( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Projection.Builder builderForValue) { if (projectionBuilder_ == null) { ensureProjectionIsMutable(); projection_.add(index, builderForValue.build()); @@ -6250,7 +6250,7 @@ public Builder addProjection( * repeated .Mysqlx.Crud.Projection projection = 4; */ public Builder addAllProjection( - java.lang.Iterable values) { + java.lang.Iterable values) { if (projectionBuilder_ == null) { ensureProjectionIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -6290,14 +6290,14 @@ public Builder removeProjection(int index) { /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.Builder getProjectionBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Projection.Builder getProjectionBuilder( int index) { return getProjectionFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ProjectionOrBuilder getProjectionOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.ProjectionOrBuilder getProjectionOrBuilder( int index) { if (projectionBuilder_ == null) { return projection_.get(index); } else { @@ -6307,7 +6307,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ProjectionOrBuilder getProjection /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public java.util.List + public java.util.List getProjectionOrBuilderList() { if (projectionBuilder_ != null) { return projectionBuilder_.getMessageOrBuilderList(); @@ -6318,31 +6318,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ProjectionOrBuilder getProjection /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.Builder addProjectionBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Projection.Builder addProjectionBuilder() { return getProjectionFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxCrud.Projection.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.Builder addProjectionBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Projection.Builder addProjectionBuilder( int index) { return getProjectionFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxCrud.Projection.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.Projection projection = 4; */ - public java.util.List + public java.util.List getProjectionBuilderList() { return getProjectionFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ProjectionOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Projection, com.mysql.cj.x.protobuf.MysqlxCrud.Projection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.ProjectionOrBuilder> getProjectionFieldBuilder() { if (projectionBuilder_ == null) { projectionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ProjectionOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Projection, com.mysql.cj.x.protobuf.MysqlxCrud.Projection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.ProjectionOrBuilder>( projection_, ((bitField0_ & 0x00000004) == 0x00000004), getParentForChildren(), @@ -6352,9 +6352,9 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection.Builder addProjectionB return projectionBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr criteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr criteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> criteriaBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> criteriaBuilder_; /** * optional .Mysqlx.Expr.Expr criteria = 5; */ @@ -6364,7 +6364,7 @@ public boolean hasCriteria() { /** * optional .Mysqlx.Expr.Expr criteria = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getCriteria() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getCriteria() { if (criteriaBuilder_ == null) { return criteria_; } else { @@ -6374,7 +6374,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getCriteria() { /** * optional .Mysqlx.Expr.Expr criteria = 5; */ - public Builder setCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder setCriteria(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (criteriaBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6391,7 +6391,7 @@ public Builder setCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { * optional .Mysqlx.Expr.Expr criteria = 5; */ public Builder setCriteria( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (criteriaBuilder_ == null) { criteria_ = builderForValue.build(); onChanged(); @@ -6404,12 +6404,12 @@ public Builder setCriteria( /** * optional .Mysqlx.Expr.Expr criteria = 5; */ - public Builder mergeCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder mergeCriteria(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (criteriaBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && - criteria_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { + criteria_ != com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { criteria_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.newBuilder(criteria_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.newBuilder(criteria_).mergeFrom(value).buildPartial(); } else { criteria_ = value; } @@ -6425,7 +6425,7 @@ public Builder mergeCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) */ public Builder clearCriteria() { if (criteriaBuilder_ == null) { - criteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + criteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); onChanged(); } else { criteriaBuilder_.clear(); @@ -6436,7 +6436,7 @@ public Builder clearCriteria() { /** * optional .Mysqlx.Expr.Expr criteria = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getCriteriaBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getCriteriaBuilder() { bitField0_ |= 0x00000008; onChanged(); return getCriteriaFieldBuilder().getBuilder(); @@ -6444,7 +6444,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getCriteriaBuilder() /** * optional .Mysqlx.Expr.Expr criteria = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder() { if (criteriaBuilder_ != null) { return criteriaBuilder_.getMessageOrBuilder(); } else { @@ -6455,11 +6455,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilde * optional .Mysqlx.Expr.Expr criteria = 5; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getCriteriaFieldBuilder() { if (criteriaBuilder_ == null) { criteriaBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( getCriteria(), getParentForChildren(), isClean()); @@ -6468,22 +6468,22 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilde return criteriaBuilder_; } - private java.util.List args_ = + private java.util.List args_ = java.util.Collections.emptyList(); private void ensureArgsIsMutable() { if (!((bitField0_ & 0x00000010) == 0x00000010)) { - args_ = new java.util.ArrayList(args_); + args_ = new java.util.ArrayList(args_); bitField0_ |= 0x00000010; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> argsBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> argsBuilder_; /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { if (argsBuilder_ == null) { return java.util.Collections.unmodifiableList(args_); } else { @@ -6503,7 +6503,7 @@ public int getArgsCount() { /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -6514,7 +6514,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { * repeated .Mysqlx.Datatypes.Scalar args = 11; */ public Builder setArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6531,7 +6531,7 @@ public Builder setArgs( * repeated .Mysqlx.Datatypes.Scalar args = 11; */ public Builder setArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.set(index, builderForValue.build()); @@ -6544,7 +6544,7 @@ public Builder setArgs( /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public Builder addArgs(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + public Builder addArgs(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6561,7 +6561,7 @@ public Builder addArgs(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value * repeated .Mysqlx.Datatypes.Scalar args = 11; */ public Builder addArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6578,7 +6578,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Scalar args = 11; */ public Builder addArgs( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(builderForValue.build()); @@ -6592,7 +6592,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Scalar args = 11; */ public Builder addArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(index, builderForValue.build()); @@ -6606,7 +6606,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Scalar args = 11; */ public Builder addAllArgs( - java.lang.Iterable values) { + java.lang.Iterable values) { if (argsBuilder_ == null) { ensureArgsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -6646,14 +6646,14 @@ public Builder removeArgs(int index) { /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder getArgsBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder getArgsBuilder( int index) { return getArgsFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -6663,7 +6663,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBui /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { if (argsBuilder_ != null) { return argsBuilder_.getMessageOrBuilderList(); @@ -6674,31 +6674,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBui /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder() { return getArgsFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder( int index) { return getArgsFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Scalar args = 11; */ - public java.util.List + public java.util.List getArgsBuilderList() { return getArgsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> getArgsFieldBuilder() { if (argsBuilder_ == null) { argsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder>( args_, ((bitField0_ & 0x00000010) == 0x00000010), getParentForChildren(), @@ -6708,9 +6708,9 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilde return argsBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit limit_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxCrud.Limit limit_ = com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder> limitBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Limit, com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder> limitBuilder_; /** * optional .Mysqlx.Crud.Limit limit = 6; */ @@ -6720,7 +6720,7 @@ public boolean hasLimit() { /** * optional .Mysqlx.Crud.Limit limit = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getLimit() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Limit getLimit() { if (limitBuilder_ == null) { return limit_; } else { @@ -6730,7 +6730,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getLimit() { /** * optional .Mysqlx.Crud.Limit limit = 6; */ - public Builder setLimit(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit value) { + public Builder setLimit(com.mysql.cj.x.protobuf.MysqlxCrud.Limit value) { if (limitBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6747,7 +6747,7 @@ public Builder setLimit(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit value) { * optional .Mysqlx.Crud.Limit limit = 6; */ public Builder setLimit( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder builderForValue) { if (limitBuilder_ == null) { limit_ = builderForValue.build(); onChanged(); @@ -6760,12 +6760,12 @@ public Builder setLimit( /** * optional .Mysqlx.Crud.Limit limit = 6; */ - public Builder mergeLimit(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit value) { + public Builder mergeLimit(com.mysql.cj.x.protobuf.MysqlxCrud.Limit value) { if (limitBuilder_ == null) { if (((bitField0_ & 0x00000020) == 0x00000020) && - limit_ != com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance()) { + limit_ != com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance()) { limit_ = - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.newBuilder(limit_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxCrud.Limit.newBuilder(limit_).mergeFrom(value).buildPartial(); } else { limit_ = value; } @@ -6781,7 +6781,7 @@ public Builder mergeLimit(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit value) { */ public Builder clearLimit() { if (limitBuilder_ == null) { - limit_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + limit_ = com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); onChanged(); } else { limitBuilder_.clear(); @@ -6792,7 +6792,7 @@ public Builder clearLimit() { /** * optional .Mysqlx.Crud.Limit limit = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder getLimitBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder getLimitBuilder() { bitField0_ |= 0x00000020; onChanged(); return getLimitFieldBuilder().getBuilder(); @@ -6800,7 +6800,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder getLimitBuilder() { /** * optional .Mysqlx.Crud.Limit limit = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder() { if (limitBuilder_ != null) { return limitBuilder_.getMessageOrBuilder(); } else { @@ -6811,11 +6811,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder( * optional .Mysqlx.Crud.Limit limit = 6; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Limit, com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder> getLimitFieldBuilder() { if (limitBuilder_ == null) { limitBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Limit, com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder>( getLimit(), getParentForChildren(), isClean()); @@ -6824,22 +6824,22 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder( return limitBuilder_; } - private java.util.List order_ = + private java.util.List order_ = java.util.Collections.emptyList(); private void ensureOrderIsMutable() { if (!((bitField0_ & 0x00000040) == 0x00000040)) { - order_ = new java.util.ArrayList(order_); + order_ = new java.util.ArrayList(order_); bitField0_ |= 0x00000040; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder> orderBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Order, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder> orderBuilder_; /** * repeated .Mysqlx.Crud.Order order = 7; */ - public java.util.List getOrderList() { + public java.util.List getOrderList() { if (orderBuilder_ == null) { return java.util.Collections.unmodifiableList(order_); } else { @@ -6859,7 +6859,7 @@ public int getOrderCount() { /** * repeated .Mysqlx.Crud.Order order = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getOrder(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.Order getOrder(int index) { if (orderBuilder_ == null) { return order_.get(index); } else { @@ -6870,7 +6870,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getOrder(int index) { * repeated .Mysqlx.Crud.Order order = 7; */ public Builder setOrder( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Order value) { if (orderBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6887,7 +6887,7 @@ public Builder setOrder( * repeated .Mysqlx.Crud.Order order = 7; */ public Builder setOrder( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder builderForValue) { if (orderBuilder_ == null) { ensureOrderIsMutable(); order_.set(index, builderForValue.build()); @@ -6900,7 +6900,7 @@ public Builder setOrder( /** * repeated .Mysqlx.Crud.Order order = 7; */ - public Builder addOrder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order value) { + public Builder addOrder(com.mysql.cj.x.protobuf.MysqlxCrud.Order value) { if (orderBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6917,7 +6917,7 @@ public Builder addOrder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order value) { * repeated .Mysqlx.Crud.Order order = 7; */ public Builder addOrder( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Order value) { if (orderBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6934,7 +6934,7 @@ public Builder addOrder( * repeated .Mysqlx.Crud.Order order = 7; */ public Builder addOrder( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder builderForValue) { if (orderBuilder_ == null) { ensureOrderIsMutable(); order_.add(builderForValue.build()); @@ -6948,7 +6948,7 @@ public Builder addOrder( * repeated .Mysqlx.Crud.Order order = 7; */ public Builder addOrder( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder builderForValue) { if (orderBuilder_ == null) { ensureOrderIsMutable(); order_.add(index, builderForValue.build()); @@ -6962,7 +6962,7 @@ public Builder addOrder( * repeated .Mysqlx.Crud.Order order = 7; */ public Builder addAllOrder( - java.lang.Iterable values) { + java.lang.Iterable values) { if (orderBuilder_ == null) { ensureOrderIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -7002,14 +7002,14 @@ public Builder removeOrder(int index) { /** * repeated .Mysqlx.Crud.Order order = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder getOrderBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder getOrderBuilder( int index) { return getOrderFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Crud.Order order = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( int index) { if (orderBuilder_ == null) { return order_.get(index); } else { @@ -7019,7 +7019,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( /** * repeated .Mysqlx.Crud.Order order = 7; */ - public java.util.List + public java.util.List getOrderOrBuilderList() { if (orderBuilder_ != null) { return orderBuilder_.getMessageOrBuilderList(); @@ -7030,31 +7030,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( /** * repeated .Mysqlx.Crud.Order order = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder addOrderBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder addOrderBuilder() { return getOrderFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxCrud.Order.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.Order order = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder addOrderBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder addOrderBuilder( int index) { return getOrderFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxCrud.Order.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.Order order = 7; */ - public java.util.List + public java.util.List getOrderBuilderList() { return getOrderFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Order, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder> getOrderFieldBuilder() { if (orderBuilder_ == null) { orderBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Order, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder>( order_, ((bitField0_ & 0x00000040) == 0x00000040), getParentForChildren(), @@ -7064,22 +7064,22 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder addOrderBuilder( return orderBuilder_; } - private java.util.List grouping_ = + private java.util.List grouping_ = java.util.Collections.emptyList(); private void ensureGroupingIsMutable() { if (!((bitField0_ & 0x00000080) == 0x00000080)) { - grouping_ = new java.util.ArrayList(grouping_); + grouping_ = new java.util.ArrayList(grouping_); bitField0_ |= 0x00000080; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> groupingBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> groupingBuilder_; /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public java.util.List getGroupingList() { + public java.util.List getGroupingList() { if (groupingBuilder_ == null) { return java.util.Collections.unmodifiableList(grouping_); } else { @@ -7099,7 +7099,7 @@ public int getGroupingCount() { /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getGrouping(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getGrouping(int index) { if (groupingBuilder_ == null) { return grouping_.get(index); } else { @@ -7110,7 +7110,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getGrouping(int index) { * repeated .Mysqlx.Expr.Expr grouping = 8; */ public Builder setGrouping( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (groupingBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -7127,7 +7127,7 @@ public Builder setGrouping( * repeated .Mysqlx.Expr.Expr grouping = 8; */ public Builder setGrouping( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (groupingBuilder_ == null) { ensureGroupingIsMutable(); grouping_.set(index, builderForValue.build()); @@ -7140,7 +7140,7 @@ public Builder setGrouping( /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public Builder addGrouping(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder addGrouping(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (groupingBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -7157,7 +7157,7 @@ public Builder addGrouping(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { * repeated .Mysqlx.Expr.Expr grouping = 8; */ public Builder addGrouping( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (groupingBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -7174,7 +7174,7 @@ public Builder addGrouping( * repeated .Mysqlx.Expr.Expr grouping = 8; */ public Builder addGrouping( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (groupingBuilder_ == null) { ensureGroupingIsMutable(); grouping_.add(builderForValue.build()); @@ -7188,7 +7188,7 @@ public Builder addGrouping( * repeated .Mysqlx.Expr.Expr grouping = 8; */ public Builder addGrouping( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (groupingBuilder_ == null) { ensureGroupingIsMutable(); grouping_.add(index, builderForValue.build()); @@ -7202,7 +7202,7 @@ public Builder addGrouping( * repeated .Mysqlx.Expr.Expr grouping = 8; */ public Builder addAllGrouping( - java.lang.Iterable values) { + java.lang.Iterable values) { if (groupingBuilder_ == null) { ensureGroupingIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -7242,14 +7242,14 @@ public Builder removeGrouping(int index) { /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getGroupingBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getGroupingBuilder( int index) { return getGroupingFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getGroupingOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getGroupingOrBuilder( int index) { if (groupingBuilder_ == null) { return grouping_.get(index); } else { @@ -7259,7 +7259,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getGroupingOrBuilde /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public java.util.List + public java.util.List getGroupingOrBuilderList() { if (groupingBuilder_ != null) { return groupingBuilder_.getMessageOrBuilderList(); @@ -7270,31 +7270,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getGroupingOrBuilde /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder addGroupingBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder addGroupingBuilder() { return getGroupingFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder addGroupingBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder addGroupingBuilder( int index) { return getGroupingFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.Expr grouping = 8; */ - public java.util.List + public java.util.List getGroupingBuilderList() { return getGroupingFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getGroupingFieldBuilder() { if (groupingBuilder_ == null) { groupingBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( grouping_, ((bitField0_ & 0x00000080) == 0x00000080), getParentForChildren(), @@ -7304,9 +7304,9 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder addGroupingBuilder( return groupingBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr groupingCriteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr groupingCriteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> groupingCriteriaBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> groupingCriteriaBuilder_; /** * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ @@ -7316,7 +7316,7 @@ public boolean hasGroupingCriteria() { /** * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getGroupingCriteria() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getGroupingCriteria() { if (groupingCriteriaBuilder_ == null) { return groupingCriteria_; } else { @@ -7326,7 +7326,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getGroupingCriteria() { /** * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ - public Builder setGroupingCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder setGroupingCriteria(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (groupingCriteriaBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -7343,7 +7343,7 @@ public Builder setGroupingCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ public Builder setGroupingCriteria( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (groupingCriteriaBuilder_ == null) { groupingCriteria_ = builderForValue.build(); onChanged(); @@ -7356,12 +7356,12 @@ public Builder setGroupingCriteria( /** * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ - public Builder mergeGroupingCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder mergeGroupingCriteria(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (groupingCriteriaBuilder_ == null) { if (((bitField0_ & 0x00000100) == 0x00000100) && - groupingCriteria_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { + groupingCriteria_ != com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { groupingCriteria_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.newBuilder(groupingCriteria_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.newBuilder(groupingCriteria_).mergeFrom(value).buildPartial(); } else { groupingCriteria_ = value; } @@ -7377,7 +7377,7 @@ public Builder mergeGroupingCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Exp */ public Builder clearGroupingCriteria() { if (groupingCriteriaBuilder_ == null) { - groupingCriteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + groupingCriteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); onChanged(); } else { groupingCriteriaBuilder_.clear(); @@ -7388,7 +7388,7 @@ public Builder clearGroupingCriteria() { /** * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getGroupingCriteriaBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getGroupingCriteriaBuilder() { bitField0_ |= 0x00000100; onChanged(); return getGroupingCriteriaFieldBuilder().getBuilder(); @@ -7396,7 +7396,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getGroupingCriteriaB /** * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getGroupingCriteriaOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getGroupingCriteriaOrBuilder() { if (groupingCriteriaBuilder_ != null) { return groupingCriteriaBuilder_.getMessageOrBuilder(); } else { @@ -7407,11 +7407,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getGroupingCriteria * optional .Mysqlx.Expr.Expr grouping_criteria = 9; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getGroupingCriteriaFieldBuilder() { if (groupingCriteriaBuilder_ == null) { groupingCriteriaBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( getGroupingCriteria(), getParentForChildren(), isClean()); @@ -7442,11 +7442,11 @@ public interface InsertOrBuilder extends /** * required .Mysqlx.Crud.Collection collection = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection(); + com.mysql.cj.x.protobuf.MysqlxCrud.Collection getCollection(); /** * required .Mysqlx.Crud.Collection collection = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder(); /** * optional .Mysqlx.Crud.DataModel data_model = 2; @@ -7455,17 +7455,17 @@ public interface InsertOrBuilder extends /** * optional .Mysqlx.Crud.DataModel data_model = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel getDataModel(); + com.mysql.cj.x.protobuf.MysqlxCrud.DataModel getDataModel(); /** * repeated .Mysqlx.Crud.Column projection = 3; */ - java.util.List + java.util.List getProjectionList(); /** * repeated .Mysqlx.Crud.Column projection = 3; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column getProjection(int index); + com.mysql.cj.x.protobuf.MysqlxCrud.Column getProjection(int index); /** * repeated .Mysqlx.Crud.Column projection = 3; */ @@ -7473,23 +7473,23 @@ public interface InsertOrBuilder extends /** * repeated .Mysqlx.Crud.Column projection = 3; */ - java.util.List + java.util.List getProjectionOrBuilderList(); /** * repeated .Mysqlx.Crud.Column projection = 3; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ColumnOrBuilder getProjectionOrBuilder( + com.mysql.cj.x.protobuf.MysqlxCrud.ColumnOrBuilder getProjectionOrBuilder( int index); /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - java.util.List + java.util.List getRowList(); /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow getRow(int index); + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow getRow(int index); /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ @@ -7497,23 +7497,23 @@ com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ColumnOrBuilder getProjectionOrBuilder( /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - java.util.List + java.util.List getRowOrBuilderList(); /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder getRowOrBuilder( + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder getRowOrBuilder( int index); /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - java.util.List + java.util.List getArgsList(); /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getArgs(int index); /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ @@ -7521,12 +7521,12 @@ com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder getRowOrBuilder /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - java.util.List + java.util.List getArgsOrBuilderList(); /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( + com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( int index); } /** @@ -7592,11 +7592,11 @@ private Insert( break; } case 10: { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = collection_.toBuilder(); } - collection_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.PARSER, extensionRegistry); + collection_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Collection.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(collection_); collection_ = subBuilder.buildPartial(); @@ -7606,7 +7606,7 @@ private Insert( } case 16: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel value = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxCrud.DataModel value = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(2, rawValue); } else { @@ -7617,26 +7617,26 @@ private Insert( } case 26: { if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - projection_ = new java.util.ArrayList(); + projection_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } - projection_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.PARSER, extensionRegistry)); + projection_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Column.PARSER, extensionRegistry)); break; } case 34: { if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - row_ = new java.util.ArrayList(); + row_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } - row_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.PARSER, extensionRegistry)); + row_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.PARSER, extensionRegistry)); break; } case 42: { if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { - args_ = new java.util.ArrayList(); + args_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000010; } - args_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry)); + args_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry)); break; } } @@ -7662,14 +7662,14 @@ private Insert( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.class, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -7694,12 +7694,12 @@ public interface TypedRowOrBuilder extends /** * repeated .Mysqlx.Expr.Expr field = 1; */ - java.util.List + java.util.List getFieldList(); /** * repeated .Mysqlx.Expr.Expr field = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getField(int index); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getField(int index); /** * repeated .Mysqlx.Expr.Expr field = 1; */ @@ -7707,12 +7707,12 @@ public interface TypedRowOrBuilder extends /** * repeated .Mysqlx.Expr.Expr field = 1; */ - java.util.List + java.util.List getFieldOrBuilderList(); /** * repeated .Mysqlx.Expr.Expr field = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getFieldOrBuilder( + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getFieldOrBuilder( int index); } /** @@ -7769,10 +7769,10 @@ private TypedRow( } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - field_ = new java.util.ArrayList(); + field_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - field_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry)); + field_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry)); break; } } @@ -7792,14 +7792,14 @@ private TypedRow( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_TypedRow_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_TypedRow_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_TypedRow_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_TypedRow_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.class, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -7818,17 +7818,17 @@ public com.google.protobuf.Parser getParserForType() { } public static final int FIELD_FIELD_NUMBER = 1; - private java.util.List field_; + private java.util.List field_; /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public java.util.List getFieldList() { + public java.util.List getFieldList() { return field_; } /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public java.util.List + public java.util.List getFieldOrBuilderList() { return field_; } @@ -7841,13 +7841,13 @@ public int getFieldCount() { /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getField(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getField(int index) { return field_.get(index); } /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getFieldOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getFieldOrBuilder( int index) { return field_.get(index); } @@ -7902,53 +7902,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -7957,7 +7957,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -7974,17 +7974,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Crud.Insert.TypedRow) - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder { + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_TypedRow_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_TypedRow_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_TypedRow_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_TypedRow_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.class, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.newBuilder() @@ -8023,23 +8023,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_TypedRow_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_TypedRow_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow build() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow build() { + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow result = new com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow(this); + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow buildPartial() { + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow result = new com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow(this); int from_bitField0_ = bitField0_; if (fieldBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -8055,16 +8055,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow other) { + if (other == com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.getDefaultInstance()) return this; if (fieldBuilder_ == null) { if (!other.field_.isEmpty()) { if (field_.isEmpty()) { @@ -8109,11 +8109,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -8124,22 +8124,22 @@ public Builder mergeFrom( } private int bitField0_; - private java.util.List field_ = + private java.util.List field_ = java.util.Collections.emptyList(); private void ensureFieldIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - field_ = new java.util.ArrayList(field_); + field_ = new java.util.ArrayList(field_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> fieldBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> fieldBuilder_; /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public java.util.List getFieldList() { + public java.util.List getFieldList() { if (fieldBuilder_ == null) { return java.util.Collections.unmodifiableList(field_); } else { @@ -8159,7 +8159,7 @@ public int getFieldCount() { /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getField(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getField(int index) { if (fieldBuilder_ == null) { return field_.get(index); } else { @@ -8170,7 +8170,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getField(int index) { * repeated .Mysqlx.Expr.Expr field = 1; */ public Builder setField( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (fieldBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -8187,7 +8187,7 @@ public Builder setField( * repeated .Mysqlx.Expr.Expr field = 1; */ public Builder setField( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (fieldBuilder_ == null) { ensureFieldIsMutable(); field_.set(index, builderForValue.build()); @@ -8200,7 +8200,7 @@ public Builder setField( /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public Builder addField(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder addField(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (fieldBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -8217,7 +8217,7 @@ public Builder addField(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { * repeated .Mysqlx.Expr.Expr field = 1; */ public Builder addField( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (fieldBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -8234,7 +8234,7 @@ public Builder addField( * repeated .Mysqlx.Expr.Expr field = 1; */ public Builder addField( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (fieldBuilder_ == null) { ensureFieldIsMutable(); field_.add(builderForValue.build()); @@ -8248,7 +8248,7 @@ public Builder addField( * repeated .Mysqlx.Expr.Expr field = 1; */ public Builder addField( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (fieldBuilder_ == null) { ensureFieldIsMutable(); field_.add(index, builderForValue.build()); @@ -8262,7 +8262,7 @@ public Builder addField( * repeated .Mysqlx.Expr.Expr field = 1; */ public Builder addAllField( - java.lang.Iterable values) { + java.lang.Iterable values) { if (fieldBuilder_ == null) { ensureFieldIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -8302,14 +8302,14 @@ public Builder removeField(int index) { /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getFieldBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getFieldBuilder( int index) { return getFieldFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getFieldOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getFieldOrBuilder( int index) { if (fieldBuilder_ == null) { return field_.get(index); } else { @@ -8319,7 +8319,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getFieldOrBuilder( /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public java.util.List + public java.util.List getFieldOrBuilderList() { if (fieldBuilder_ != null) { return fieldBuilder_.getMessageOrBuilderList(); @@ -8330,31 +8330,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getFieldOrBuilder( /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder addFieldBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder addFieldBuilder() { return getFieldFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder addFieldBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder addFieldBuilder( int index) { return getFieldFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.Expr field = 1; */ - public java.util.List + public java.util.List getFieldBuilderList() { return getFieldFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getFieldFieldBuilder() { if (fieldBuilder_ == null) { fieldBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( field_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -8377,7 +8377,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder addFieldBuilder( private int bitField0_; public static final int COLLECTION_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection collection_; + private com.mysql.cj.x.protobuf.MysqlxCrud.Collection collection_; /** * required .Mysqlx.Crud.Collection collection = 1; */ @@ -8387,18 +8387,18 @@ public boolean hasCollection() { /** * required .Mysqlx.Crud.Collection collection = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection getCollection() { return collection_; } /** * required .Mysqlx.Crud.Collection collection = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { return collection_; } public static final int DATA_MODEL_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel dataModel_; + private com.mysql.cj.x.protobuf.MysqlxCrud.DataModel dataModel_; /** * optional .Mysqlx.Crud.DataModel data_model = 2; */ @@ -8408,22 +8408,22 @@ public boolean hasDataModel() { /** * optional .Mysqlx.Crud.DataModel data_model = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel getDataModel() { + public com.mysql.cj.x.protobuf.MysqlxCrud.DataModel getDataModel() { return dataModel_; } public static final int PROJECTION_FIELD_NUMBER = 3; - private java.util.List projection_; + private java.util.List projection_; /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public java.util.List getProjectionList() { + public java.util.List getProjectionList() { return projection_; } /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public java.util.List + public java.util.List getProjectionOrBuilderList() { return projection_; } @@ -8436,29 +8436,29 @@ public int getProjectionCount() { /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column getProjection(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.Column getProjection(int index) { return projection_.get(index); } /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ColumnOrBuilder getProjectionOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.ColumnOrBuilder getProjectionOrBuilder( int index) { return projection_.get(index); } public static final int ROW_FIELD_NUMBER = 4; - private java.util.List row_; + private java.util.List row_; /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public java.util.List getRowList() { + public java.util.List getRowList() { return row_; } /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public java.util.List + public java.util.List getRowOrBuilderList() { return row_; } @@ -8471,29 +8471,29 @@ public int getRowCount() { /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow getRow(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow getRow(int index) { return row_.get(index); } /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder getRowOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder getRowOrBuilder( int index) { return row_.get(index); } public static final int ARGS_FIELD_NUMBER = 5; - private java.util.List args_; + private java.util.List args_; /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { return args_; } /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { return args_; } @@ -8506,20 +8506,20 @@ public int getArgsCount() { /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { return args_.get(index); } /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( int index) { return args_.get(index); } private void initFields() { - collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); - dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; projection_ = java.util.Collections.emptyList(); row_ = java.util.Collections.emptyList(); args_ = java.util.Collections.emptyList(); @@ -8619,53 +8619,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Insert parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -8674,7 +8674,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxCrud.Insert prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -8701,17 +8701,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Crud.Insert) - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.InsertOrBuilder { + com.mysql.cj.x.protobuf.MysqlxCrud.InsertOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.class, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.newBuilder() @@ -8739,12 +8739,12 @@ private static Builder create() { public Builder clear() { super.clear(); if (collectionBuilder_ == null) { - collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); } else { collectionBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; bitField0_ = (bitField0_ & ~0x00000002); if (projectionBuilder_ == null) { projection_ = java.util.Collections.emptyList(); @@ -8773,23 +8773,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Insert_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxCrud.Insert.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert build() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert build() { + com.mysql.cj.x.protobuf.MysqlxCrud.Insert result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert result = new com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert(this); + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert buildPartial() { + com.mysql.cj.x.protobuf.MysqlxCrud.Insert result = new com.mysql.cj.x.protobuf.MysqlxCrud.Insert(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -8837,16 +8837,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxCrud.Insert) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxCrud.Insert)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxCrud.Insert other) { + if (other == com.mysql.cj.x.protobuf.MysqlxCrud.Insert.getDefaultInstance()) return this; if (other.hasCollection()) { mergeCollection(other.getCollection()); } @@ -8969,11 +8969,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Insert parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxCrud.Insert) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -8984,9 +8984,9 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxCrud.Collection collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder> collectionBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Collection, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder> collectionBuilder_; /** * required .Mysqlx.Crud.Collection collection = 1; */ @@ -8996,7 +8996,7 @@ public boolean hasCollection() { /** * required .Mysqlx.Crud.Collection collection = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection getCollection() { if (collectionBuilder_ == null) { return collection_; } else { @@ -9006,7 +9006,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection() { /** * required .Mysqlx.Crud.Collection collection = 1; */ - public Builder setCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection value) { + public Builder setCollection(com.mysql.cj.x.protobuf.MysqlxCrud.Collection value) { if (collectionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -9023,7 +9023,7 @@ public Builder setCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection * required .Mysqlx.Crud.Collection collection = 1; */ public Builder setCollection( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder builderForValue) { if (collectionBuilder_ == null) { collection_ = builderForValue.build(); onChanged(); @@ -9036,12 +9036,12 @@ public Builder setCollection( /** * required .Mysqlx.Crud.Collection collection = 1; */ - public Builder mergeCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection value) { + public Builder mergeCollection(com.mysql.cj.x.protobuf.MysqlxCrud.Collection value) { if (collectionBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - collection_ != com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance()) { + collection_ != com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance()) { collection_ = - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.newBuilder(collection_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.newBuilder(collection_).mergeFrom(value).buildPartial(); } else { collection_ = value; } @@ -9057,7 +9057,7 @@ public Builder mergeCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collectio */ public Builder clearCollection() { if (collectionBuilder_ == null) { - collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); onChanged(); } else { collectionBuilder_.clear(); @@ -9068,7 +9068,7 @@ public Builder clearCollection() { /** * required .Mysqlx.Crud.Collection collection = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder getCollectionBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder getCollectionBuilder() { bitField0_ |= 0x00000001; onChanged(); return getCollectionFieldBuilder().getBuilder(); @@ -9076,7 +9076,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder getCollectionB /** * required .Mysqlx.Crud.Collection collection = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { if (collectionBuilder_ != null) { return collectionBuilder_.getMessageOrBuilder(); } else { @@ -9087,11 +9087,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollection * required .Mysqlx.Crud.Collection collection = 1; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Collection, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder> getCollectionFieldBuilder() { if (collectionBuilder_ == null) { collectionBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Collection, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder>( getCollection(), getParentForChildren(), isClean()); @@ -9100,7 +9100,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollection return collectionBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + private com.mysql.cj.x.protobuf.MysqlxCrud.DataModel dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; /** * optional .Mysqlx.Crud.DataModel data_model = 2; */ @@ -9110,13 +9110,13 @@ public boolean hasDataModel() { /** * optional .Mysqlx.Crud.DataModel data_model = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel getDataModel() { + public com.mysql.cj.x.protobuf.MysqlxCrud.DataModel getDataModel() { return dataModel_; } /** * optional .Mysqlx.Crud.DataModel data_model = 2; */ - public Builder setDataModel(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel value) { + public Builder setDataModel(com.mysql.cj.x.protobuf.MysqlxCrud.DataModel value) { if (value == null) { throw new NullPointerException(); } @@ -9130,27 +9130,27 @@ public Builder setDataModel(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel va */ public Builder clearDataModel() { bitField0_ = (bitField0_ & ~0x00000002); - dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; onChanged(); return this; } - private java.util.List projection_ = + private java.util.List projection_ = java.util.Collections.emptyList(); private void ensureProjectionIsMutable() { if (!((bitField0_ & 0x00000004) == 0x00000004)) { - projection_ = new java.util.ArrayList(projection_); + projection_ = new java.util.ArrayList(projection_); bitField0_ |= 0x00000004; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ColumnOrBuilder> projectionBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Column, com.mysql.cj.x.protobuf.MysqlxCrud.Column.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.ColumnOrBuilder> projectionBuilder_; /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public java.util.List getProjectionList() { + public java.util.List getProjectionList() { if (projectionBuilder_ == null) { return java.util.Collections.unmodifiableList(projection_); } else { @@ -9170,7 +9170,7 @@ public int getProjectionCount() { /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column getProjection(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.Column getProjection(int index) { if (projectionBuilder_ == null) { return projection_.get(index); } else { @@ -9181,7 +9181,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column getProjection(int index) { * repeated .Mysqlx.Crud.Column projection = 3; */ public Builder setProjection( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Column value) { if (projectionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -9198,7 +9198,7 @@ public Builder setProjection( * repeated .Mysqlx.Crud.Column projection = 3; */ public Builder setProjection( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Column.Builder builderForValue) { if (projectionBuilder_ == null) { ensureProjectionIsMutable(); projection_.set(index, builderForValue.build()); @@ -9211,7 +9211,7 @@ public Builder setProjection( /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public Builder addProjection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column value) { + public Builder addProjection(com.mysql.cj.x.protobuf.MysqlxCrud.Column value) { if (projectionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -9228,7 +9228,7 @@ public Builder addProjection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column valu * repeated .Mysqlx.Crud.Column projection = 3; */ public Builder addProjection( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Column value) { if (projectionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -9245,7 +9245,7 @@ public Builder addProjection( * repeated .Mysqlx.Crud.Column projection = 3; */ public Builder addProjection( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Column.Builder builderForValue) { if (projectionBuilder_ == null) { ensureProjectionIsMutable(); projection_.add(builderForValue.build()); @@ -9259,7 +9259,7 @@ public Builder addProjection( * repeated .Mysqlx.Crud.Column projection = 3; */ public Builder addProjection( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Column.Builder builderForValue) { if (projectionBuilder_ == null) { ensureProjectionIsMutable(); projection_.add(index, builderForValue.build()); @@ -9273,7 +9273,7 @@ public Builder addProjection( * repeated .Mysqlx.Crud.Column projection = 3; */ public Builder addAllProjection( - java.lang.Iterable values) { + java.lang.Iterable values) { if (projectionBuilder_ == null) { ensureProjectionIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -9313,14 +9313,14 @@ public Builder removeProjection(int index) { /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.Builder getProjectionBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Column.Builder getProjectionBuilder( int index) { return getProjectionFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ColumnOrBuilder getProjectionOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.ColumnOrBuilder getProjectionOrBuilder( int index) { if (projectionBuilder_ == null) { return projection_.get(index); } else { @@ -9330,7 +9330,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ColumnOrBuilder getProjectionOrBu /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public java.util.List + public java.util.List getProjectionOrBuilderList() { if (projectionBuilder_ != null) { return projectionBuilder_.getMessageOrBuilderList(); @@ -9341,31 +9341,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ColumnOrBuilder getProjectionOrBu /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.Builder addProjectionBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Column.Builder addProjectionBuilder() { return getProjectionFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxCrud.Column.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.Builder addProjectionBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Column.Builder addProjectionBuilder( int index) { return getProjectionFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxCrud.Column.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.Column projection = 3; */ - public java.util.List + public java.util.List getProjectionBuilderList() { return getProjectionFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ColumnOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Column, com.mysql.cj.x.protobuf.MysqlxCrud.Column.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.ColumnOrBuilder> getProjectionFieldBuilder() { if (projectionBuilder_ == null) { projectionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.ColumnOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Column, com.mysql.cj.x.protobuf.MysqlxCrud.Column.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.ColumnOrBuilder>( projection_, ((bitField0_ & 0x00000004) == 0x00000004), getParentForChildren(), @@ -9375,22 +9375,22 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column.Builder addProjectionBuild return projectionBuilder_; } - private java.util.List row_ = + private java.util.List row_ = java.util.Collections.emptyList(); private void ensureRowIsMutable() { if (!((bitField0_ & 0x00000008) == 0x00000008)) { - row_ = new java.util.ArrayList(row_); + row_ = new java.util.ArrayList(row_); bitField0_ |= 0x00000008; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder> rowBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder> rowBuilder_; /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public java.util.List getRowList() { + public java.util.List getRowList() { if (rowBuilder_ == null) { return java.util.Collections.unmodifiableList(row_); } else { @@ -9410,7 +9410,7 @@ public int getRowCount() { /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow getRow(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow getRow(int index) { if (rowBuilder_ == null) { return row_.get(index); } else { @@ -9421,7 +9421,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow getRow(int index) * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ public Builder setRow( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow value) { if (rowBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -9438,7 +9438,7 @@ public Builder setRow( * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ public Builder setRow( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.Builder builderForValue) { if (rowBuilder_ == null) { ensureRowIsMutable(); row_.set(index, builderForValue.build()); @@ -9451,7 +9451,7 @@ public Builder setRow( /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public Builder addRow(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow value) { + public Builder addRow(com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow value) { if (rowBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -9468,7 +9468,7 @@ public Builder addRow(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow va * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ public Builder addRow( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow value) { if (rowBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -9485,7 +9485,7 @@ public Builder addRow( * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ public Builder addRow( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.Builder builderForValue) { if (rowBuilder_ == null) { ensureRowIsMutable(); row_.add(builderForValue.build()); @@ -9499,7 +9499,7 @@ public Builder addRow( * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ public Builder addRow( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.Builder builderForValue) { if (rowBuilder_ == null) { ensureRowIsMutable(); row_.add(index, builderForValue.build()); @@ -9513,7 +9513,7 @@ public Builder addRow( * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ public Builder addAllRow( - java.lang.Iterable values) { + java.lang.Iterable values) { if (rowBuilder_ == null) { ensureRowIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -9553,14 +9553,14 @@ public Builder removeRow(int index) { /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.Builder getRowBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.Builder getRowBuilder( int index) { return getRowFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder getRowOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder getRowOrBuilder( int index) { if (rowBuilder_ == null) { return row_.get(index); } else { @@ -9570,7 +9570,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder getRowOr /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public java.util.List + public java.util.List getRowOrBuilderList() { if (rowBuilder_ != null) { return rowBuilder_.getMessageOrBuilderList(); @@ -9581,31 +9581,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder getRowOr /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.Builder addRowBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.Builder addRowBuilder() { return getRowFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.Builder addRowBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.Builder addRowBuilder( int index) { return getRowFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.Insert.TypedRow row = 4; */ - public java.util.List + public java.util.List getRowBuilderList() { return getRowFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder> getRowFieldBuilder() { if (rowBuilder_ == null) { rowBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRowOrBuilder>( row_, ((bitField0_ & 0x00000008) == 0x00000008), getParentForChildren(), @@ -9615,22 +9615,22 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow.Builder addRowBui return rowBuilder_; } - private java.util.List args_ = + private java.util.List args_ = java.util.Collections.emptyList(); private void ensureArgsIsMutable() { if (!((bitField0_ & 0x00000010) == 0x00000010)) { - args_ = new java.util.ArrayList(args_); + args_ = new java.util.ArrayList(args_); bitField0_ |= 0x00000010; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> argsBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> argsBuilder_; /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { if (argsBuilder_ == null) { return java.util.Collections.unmodifiableList(args_); } else { @@ -9650,7 +9650,7 @@ public int getArgsCount() { /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -9661,7 +9661,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { * repeated .Mysqlx.Datatypes.Scalar args = 5; */ public Builder setArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -9678,7 +9678,7 @@ public Builder setArgs( * repeated .Mysqlx.Datatypes.Scalar args = 5; */ public Builder setArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.set(index, builderForValue.build()); @@ -9691,7 +9691,7 @@ public Builder setArgs( /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public Builder addArgs(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + public Builder addArgs(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -9708,7 +9708,7 @@ public Builder addArgs(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value * repeated .Mysqlx.Datatypes.Scalar args = 5; */ public Builder addArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -9725,7 +9725,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Scalar args = 5; */ public Builder addArgs( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(builderForValue.build()); @@ -9739,7 +9739,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Scalar args = 5; */ public Builder addArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(index, builderForValue.build()); @@ -9753,7 +9753,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Scalar args = 5; */ public Builder addAllArgs( - java.lang.Iterable values) { + java.lang.Iterable values) { if (argsBuilder_ == null) { ensureArgsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -9793,14 +9793,14 @@ public Builder removeArgs(int index) { /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder getArgsBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder getArgsBuilder( int index) { return getArgsFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -9810,7 +9810,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBui /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { if (argsBuilder_ != null) { return argsBuilder_.getMessageOrBuilderList(); @@ -9821,31 +9821,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBui /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder() { return getArgsFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder( int index) { return getArgsFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Scalar args = 5; */ - public java.util.List + public java.util.List getArgsBuilderList() { return getArgsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> getArgsFieldBuilder() { if (argsBuilder_ == null) { argsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder>( args_, ((bitField0_ & 0x00000010) == 0x00000010), getParentForChildren(), @@ -9877,11 +9877,11 @@ public interface UpdateOrBuilder extends /** * required .Mysqlx.Crud.Collection collection = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection(); + com.mysql.cj.x.protobuf.MysqlxCrud.Collection getCollection(); /** * required .Mysqlx.Crud.Collection collection = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder(); /** * optional .Mysqlx.Crud.DataModel data_model = 3; @@ -9890,7 +9890,7 @@ public interface UpdateOrBuilder extends /** * optional .Mysqlx.Crud.DataModel data_model = 3; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel getDataModel(); + com.mysql.cj.x.protobuf.MysqlxCrud.DataModel getDataModel(); /** * optional .Mysqlx.Expr.Expr criteria = 4; @@ -9899,21 +9899,21 @@ public interface UpdateOrBuilder extends /** * optional .Mysqlx.Expr.Expr criteria = 4; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getCriteria(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getCriteria(); /** * optional .Mysqlx.Expr.Expr criteria = 4; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder(); /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - java.util.List + java.util.List getArgsList(); /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getArgs(int index); /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ @@ -9921,12 +9921,12 @@ public interface UpdateOrBuilder extends /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - java.util.List + java.util.List getArgsOrBuilderList(); /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( + com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( int index); /** @@ -9936,21 +9936,21 @@ com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( /** * optional .Mysqlx.Crud.Limit limit = 5; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getLimit(); + com.mysql.cj.x.protobuf.MysqlxCrud.Limit getLimit(); /** * optional .Mysqlx.Crud.Limit limit = 5; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder(); /** * repeated .Mysqlx.Crud.Order order = 6; */ - java.util.List + java.util.List getOrderList(); /** * repeated .Mysqlx.Crud.Order order = 6; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getOrder(int index); + com.mysql.cj.x.protobuf.MysqlxCrud.Order getOrder(int index); /** * repeated .Mysqlx.Crud.Order order = 6; */ @@ -9958,23 +9958,23 @@ com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( /** * repeated .Mysqlx.Crud.Order order = 6; */ - java.util.List + java.util.List getOrderOrBuilderList(); /** * repeated .Mysqlx.Crud.Order order = 6; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( + com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( int index); /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - java.util.List + java.util.List getOperationList(); /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation getOperation(int index); + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation getOperation(int index); /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ @@ -9982,12 +9982,12 @@ com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - java.util.List + java.util.List getOperationOrBuilderList(); /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperationOrBuilder getOperationOrBuilder( + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperationOrBuilder getOperationOrBuilder( int index); } /** @@ -10055,11 +10055,11 @@ private Update( break; } case 18: { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = collection_.toBuilder(); } - collection_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.PARSER, extensionRegistry); + collection_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Collection.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(collection_); collection_ = subBuilder.buildPartial(); @@ -10069,7 +10069,7 @@ private Update( } case 24: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel value = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxCrud.DataModel value = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(3, rawValue); } else { @@ -10079,11 +10079,11 @@ private Update( break; } case 34: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = criteria_.toBuilder(); } - criteria_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); + criteria_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(criteria_); criteria_ = subBuilder.buildPartial(); @@ -10092,11 +10092,11 @@ private Update( break; } case 42: { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = limit_.toBuilder(); } - limit_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.PARSER, extensionRegistry); + limit_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Limit.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(limit_); limit_ = subBuilder.buildPartial(); @@ -10106,26 +10106,26 @@ private Update( } case 50: { if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - order_ = new java.util.ArrayList(); + order_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000020; } - order_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.PARSER, extensionRegistry)); + order_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Order.PARSER, extensionRegistry)); break; } case 58: { if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { - operation_ = new java.util.ArrayList(); + operation_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000040; } - operation_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.PARSER, extensionRegistry)); + operation_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.PARSER, extensionRegistry)); break; } case 66: { if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - args_ = new java.util.ArrayList(); + args_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } - args_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry)); + args_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry)); break; } } @@ -10151,14 +10151,14 @@ private Update( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Update_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Update_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Update_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Update_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Update.class, com.mysql.cj.x.protobuf.MysqlxCrud.Update.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -10178,7 +10178,7 @@ public com.google.protobuf.Parser getParserForType() { private int bitField0_; public static final int COLLECTION_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection collection_; + private com.mysql.cj.x.protobuf.MysqlxCrud.Collection collection_; /** * required .Mysqlx.Crud.Collection collection = 2; */ @@ -10188,18 +10188,18 @@ public boolean hasCollection() { /** * required .Mysqlx.Crud.Collection collection = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection getCollection() { return collection_; } /** * required .Mysqlx.Crud.Collection collection = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { return collection_; } public static final int DATA_MODEL_FIELD_NUMBER = 3; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel dataModel_; + private com.mysql.cj.x.protobuf.MysqlxCrud.DataModel dataModel_; /** * optional .Mysqlx.Crud.DataModel data_model = 3; */ @@ -10209,12 +10209,12 @@ public boolean hasDataModel() { /** * optional .Mysqlx.Crud.DataModel data_model = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel getDataModel() { + public com.mysql.cj.x.protobuf.MysqlxCrud.DataModel getDataModel() { return dataModel_; } public static final int CRITERIA_FIELD_NUMBER = 4; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr criteria_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr criteria_; /** * optional .Mysqlx.Expr.Expr criteria = 4; */ @@ -10224,28 +10224,28 @@ public boolean hasCriteria() { /** * optional .Mysqlx.Expr.Expr criteria = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getCriteria() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getCriteria() { return criteria_; } /** * optional .Mysqlx.Expr.Expr criteria = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder() { return criteria_; } public static final int ARGS_FIELD_NUMBER = 8; - private java.util.List args_; + private java.util.List args_; /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { return args_; } /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { return args_; } @@ -10258,19 +10258,19 @@ public int getArgsCount() { /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { return args_.get(index); } /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( int index) { return args_.get(index); } public static final int LIMIT_FIELD_NUMBER = 5; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit limit_; + private com.mysql.cj.x.protobuf.MysqlxCrud.Limit limit_; /** * optional .Mysqlx.Crud.Limit limit = 5; */ @@ -10280,28 +10280,28 @@ public boolean hasLimit() { /** * optional .Mysqlx.Crud.Limit limit = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getLimit() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Limit getLimit() { return limit_; } /** * optional .Mysqlx.Crud.Limit limit = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder() { return limit_; } public static final int ORDER_FIELD_NUMBER = 6; - private java.util.List order_; + private java.util.List order_; /** * repeated .Mysqlx.Crud.Order order = 6; */ - public java.util.List getOrderList() { + public java.util.List getOrderList() { return order_; } /** * repeated .Mysqlx.Crud.Order order = 6; */ - public java.util.List + public java.util.List getOrderOrBuilderList() { return order_; } @@ -10314,29 +10314,29 @@ public int getOrderCount() { /** * repeated .Mysqlx.Crud.Order order = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getOrder(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.Order getOrder(int index) { return order_.get(index); } /** * repeated .Mysqlx.Crud.Order order = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( int index) { return order_.get(index); } public static final int OPERATION_FIELD_NUMBER = 7; - private java.util.List operation_; + private java.util.List operation_; /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public java.util.List getOperationList() { + public java.util.List getOperationList() { return operation_; } /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public java.util.List + public java.util.List getOperationOrBuilderList() { return operation_; } @@ -10349,23 +10349,23 @@ public int getOperationCount() { /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation getOperation(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation getOperation(int index) { return operation_.get(index); } /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperationOrBuilder getOperationOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperationOrBuilder getOperationOrBuilder( int index) { return operation_.get(index); } private void initFields() { - collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); - dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; - criteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; + criteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); args_ = java.util.Collections.emptyList(); - limit_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + limit_ = com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); order_ = java.util.Collections.emptyList(); operation_ = java.util.Collections.emptyList(); } @@ -10490,53 +10490,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Update parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Update parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Update parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Update parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Update parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Update parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Update parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Update parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Update parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Update parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -10545,7 +10545,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxCrud.Update prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -10574,17 +10574,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Crud.Update) - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOrBuilder { + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Update_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Update_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Update_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Update_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Update.class, com.mysql.cj.x.protobuf.MysqlxCrud.Update.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update.newBuilder() @@ -10614,15 +10614,15 @@ private static Builder create() { public Builder clear() { super.clear(); if (collectionBuilder_ == null) { - collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); } else { collectionBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; bitField0_ = (bitField0_ & ~0x00000002); if (criteriaBuilder_ == null) { - criteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + criteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); } else { criteriaBuilder_.clear(); } @@ -10634,7 +10634,7 @@ public Builder clear() { argsBuilder_.clear(); } if (limitBuilder_ == null) { - limit_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + limit_ = com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); } else { limitBuilder_.clear(); } @@ -10660,23 +10660,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Update_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Update_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Update getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxCrud.Update.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update build() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Update build() { + com.mysql.cj.x.protobuf.MysqlxCrud.Update result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update result = new com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update(this); + public com.mysql.cj.x.protobuf.MysqlxCrud.Update buildPartial() { + com.mysql.cj.x.protobuf.MysqlxCrud.Update result = new com.mysql.cj.x.protobuf.MysqlxCrud.Update(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -10740,16 +10740,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxCrud.Update) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxCrud.Update)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxCrud.Update other) { + if (other == com.mysql.cj.x.protobuf.MysqlxCrud.Update.getDefaultInstance()) return this; if (other.hasCollection()) { mergeCollection(other.getCollection()); } @@ -10890,11 +10890,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Update parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxCrud.Update) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -10905,9 +10905,9 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxCrud.Collection collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder> collectionBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Collection, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder> collectionBuilder_; /** * required .Mysqlx.Crud.Collection collection = 2; */ @@ -10917,7 +10917,7 @@ public boolean hasCollection() { /** * required .Mysqlx.Crud.Collection collection = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection getCollection() { if (collectionBuilder_ == null) { return collection_; } else { @@ -10927,7 +10927,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection() { /** * required .Mysqlx.Crud.Collection collection = 2; */ - public Builder setCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection value) { + public Builder setCollection(com.mysql.cj.x.protobuf.MysqlxCrud.Collection value) { if (collectionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -10944,7 +10944,7 @@ public Builder setCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection * required .Mysqlx.Crud.Collection collection = 2; */ public Builder setCollection( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder builderForValue) { if (collectionBuilder_ == null) { collection_ = builderForValue.build(); onChanged(); @@ -10957,12 +10957,12 @@ public Builder setCollection( /** * required .Mysqlx.Crud.Collection collection = 2; */ - public Builder mergeCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection value) { + public Builder mergeCollection(com.mysql.cj.x.protobuf.MysqlxCrud.Collection value) { if (collectionBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - collection_ != com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance()) { + collection_ != com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance()) { collection_ = - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.newBuilder(collection_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.newBuilder(collection_).mergeFrom(value).buildPartial(); } else { collection_ = value; } @@ -10978,7 +10978,7 @@ public Builder mergeCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collectio */ public Builder clearCollection() { if (collectionBuilder_ == null) { - collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); onChanged(); } else { collectionBuilder_.clear(); @@ -10989,7 +10989,7 @@ public Builder clearCollection() { /** * required .Mysqlx.Crud.Collection collection = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder getCollectionBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder getCollectionBuilder() { bitField0_ |= 0x00000001; onChanged(); return getCollectionFieldBuilder().getBuilder(); @@ -10997,7 +10997,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder getCollectionB /** * required .Mysqlx.Crud.Collection collection = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { if (collectionBuilder_ != null) { return collectionBuilder_.getMessageOrBuilder(); } else { @@ -11008,11 +11008,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollection * required .Mysqlx.Crud.Collection collection = 2; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Collection, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder> getCollectionFieldBuilder() { if (collectionBuilder_ == null) { collectionBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Collection, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder>( getCollection(), getParentForChildren(), isClean()); @@ -11021,7 +11021,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollection return collectionBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + private com.mysql.cj.x.protobuf.MysqlxCrud.DataModel dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; /** * optional .Mysqlx.Crud.DataModel data_model = 3; */ @@ -11031,13 +11031,13 @@ public boolean hasDataModel() { /** * optional .Mysqlx.Crud.DataModel data_model = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel getDataModel() { + public com.mysql.cj.x.protobuf.MysqlxCrud.DataModel getDataModel() { return dataModel_; } /** * optional .Mysqlx.Crud.DataModel data_model = 3; */ - public Builder setDataModel(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel value) { + public Builder setDataModel(com.mysql.cj.x.protobuf.MysqlxCrud.DataModel value) { if (value == null) { throw new NullPointerException(); } @@ -11051,14 +11051,14 @@ public Builder setDataModel(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel va */ public Builder clearDataModel() { bitField0_ = (bitField0_ & ~0x00000002); - dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; onChanged(); return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr criteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr criteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> criteriaBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> criteriaBuilder_; /** * optional .Mysqlx.Expr.Expr criteria = 4; */ @@ -11068,7 +11068,7 @@ public boolean hasCriteria() { /** * optional .Mysqlx.Expr.Expr criteria = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getCriteria() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getCriteria() { if (criteriaBuilder_ == null) { return criteria_; } else { @@ -11078,7 +11078,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getCriteria() { /** * optional .Mysqlx.Expr.Expr criteria = 4; */ - public Builder setCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder setCriteria(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (criteriaBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11095,7 +11095,7 @@ public Builder setCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { * optional .Mysqlx.Expr.Expr criteria = 4; */ public Builder setCriteria( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (criteriaBuilder_ == null) { criteria_ = builderForValue.build(); onChanged(); @@ -11108,12 +11108,12 @@ public Builder setCriteria( /** * optional .Mysqlx.Expr.Expr criteria = 4; */ - public Builder mergeCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder mergeCriteria(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (criteriaBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - criteria_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { + criteria_ != com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { criteria_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.newBuilder(criteria_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.newBuilder(criteria_).mergeFrom(value).buildPartial(); } else { criteria_ = value; } @@ -11129,7 +11129,7 @@ public Builder mergeCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) */ public Builder clearCriteria() { if (criteriaBuilder_ == null) { - criteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + criteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); onChanged(); } else { criteriaBuilder_.clear(); @@ -11140,7 +11140,7 @@ public Builder clearCriteria() { /** * optional .Mysqlx.Expr.Expr criteria = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getCriteriaBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getCriteriaBuilder() { bitField0_ |= 0x00000004; onChanged(); return getCriteriaFieldBuilder().getBuilder(); @@ -11148,7 +11148,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getCriteriaBuilder() /** * optional .Mysqlx.Expr.Expr criteria = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder() { if (criteriaBuilder_ != null) { return criteriaBuilder_.getMessageOrBuilder(); } else { @@ -11159,11 +11159,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilde * optional .Mysqlx.Expr.Expr criteria = 4; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getCriteriaFieldBuilder() { if (criteriaBuilder_ == null) { criteriaBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( getCriteria(), getParentForChildren(), isClean()); @@ -11172,22 +11172,22 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilde return criteriaBuilder_; } - private java.util.List args_ = + private java.util.List args_ = java.util.Collections.emptyList(); private void ensureArgsIsMutable() { if (!((bitField0_ & 0x00000008) == 0x00000008)) { - args_ = new java.util.ArrayList(args_); + args_ = new java.util.ArrayList(args_); bitField0_ |= 0x00000008; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> argsBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> argsBuilder_; /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { if (argsBuilder_ == null) { return java.util.Collections.unmodifiableList(args_); } else { @@ -11207,7 +11207,7 @@ public int getArgsCount() { /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -11218,7 +11218,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { * repeated .Mysqlx.Datatypes.Scalar args = 8; */ public Builder setArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11235,7 +11235,7 @@ public Builder setArgs( * repeated .Mysqlx.Datatypes.Scalar args = 8; */ public Builder setArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.set(index, builderForValue.build()); @@ -11248,7 +11248,7 @@ public Builder setArgs( /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public Builder addArgs(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + public Builder addArgs(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11265,7 +11265,7 @@ public Builder addArgs(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value * repeated .Mysqlx.Datatypes.Scalar args = 8; */ public Builder addArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11282,7 +11282,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Scalar args = 8; */ public Builder addArgs( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(builderForValue.build()); @@ -11296,7 +11296,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Scalar args = 8; */ public Builder addArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(index, builderForValue.build()); @@ -11310,7 +11310,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Scalar args = 8; */ public Builder addAllArgs( - java.lang.Iterable values) { + java.lang.Iterable values) { if (argsBuilder_ == null) { ensureArgsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -11350,14 +11350,14 @@ public Builder removeArgs(int index) { /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder getArgsBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder getArgsBuilder( int index) { return getArgsFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -11367,7 +11367,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBui /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { if (argsBuilder_ != null) { return argsBuilder_.getMessageOrBuilderList(); @@ -11378,31 +11378,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBui /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder() { return getArgsFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder( int index) { return getArgsFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Scalar args = 8; */ - public java.util.List + public java.util.List getArgsBuilderList() { return getArgsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> getArgsFieldBuilder() { if (argsBuilder_ == null) { argsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder>( args_, ((bitField0_ & 0x00000008) == 0x00000008), getParentForChildren(), @@ -11412,9 +11412,9 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilde return argsBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit limit_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxCrud.Limit limit_ = com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder> limitBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Limit, com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder> limitBuilder_; /** * optional .Mysqlx.Crud.Limit limit = 5; */ @@ -11424,7 +11424,7 @@ public boolean hasLimit() { /** * optional .Mysqlx.Crud.Limit limit = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getLimit() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Limit getLimit() { if (limitBuilder_ == null) { return limit_; } else { @@ -11434,7 +11434,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getLimit() { /** * optional .Mysqlx.Crud.Limit limit = 5; */ - public Builder setLimit(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit value) { + public Builder setLimit(com.mysql.cj.x.protobuf.MysqlxCrud.Limit value) { if (limitBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11451,7 +11451,7 @@ public Builder setLimit(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit value) { * optional .Mysqlx.Crud.Limit limit = 5; */ public Builder setLimit( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder builderForValue) { if (limitBuilder_ == null) { limit_ = builderForValue.build(); onChanged(); @@ -11464,12 +11464,12 @@ public Builder setLimit( /** * optional .Mysqlx.Crud.Limit limit = 5; */ - public Builder mergeLimit(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit value) { + public Builder mergeLimit(com.mysql.cj.x.protobuf.MysqlxCrud.Limit value) { if (limitBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && - limit_ != com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance()) { + limit_ != com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance()) { limit_ = - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.newBuilder(limit_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxCrud.Limit.newBuilder(limit_).mergeFrom(value).buildPartial(); } else { limit_ = value; } @@ -11485,7 +11485,7 @@ public Builder mergeLimit(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit value) { */ public Builder clearLimit() { if (limitBuilder_ == null) { - limit_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + limit_ = com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); onChanged(); } else { limitBuilder_.clear(); @@ -11496,7 +11496,7 @@ public Builder clearLimit() { /** * optional .Mysqlx.Crud.Limit limit = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder getLimitBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder getLimitBuilder() { bitField0_ |= 0x00000010; onChanged(); return getLimitFieldBuilder().getBuilder(); @@ -11504,7 +11504,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder getLimitBuilder() { /** * optional .Mysqlx.Crud.Limit limit = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder() { if (limitBuilder_ != null) { return limitBuilder_.getMessageOrBuilder(); } else { @@ -11515,11 +11515,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder( * optional .Mysqlx.Crud.Limit limit = 5; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Limit, com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder> getLimitFieldBuilder() { if (limitBuilder_ == null) { limitBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Limit, com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder>( getLimit(), getParentForChildren(), isClean()); @@ -11528,22 +11528,22 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder( return limitBuilder_; } - private java.util.List order_ = + private java.util.List order_ = java.util.Collections.emptyList(); private void ensureOrderIsMutable() { if (!((bitField0_ & 0x00000020) == 0x00000020)) { - order_ = new java.util.ArrayList(order_); + order_ = new java.util.ArrayList(order_); bitField0_ |= 0x00000020; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder> orderBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Order, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder> orderBuilder_; /** * repeated .Mysqlx.Crud.Order order = 6; */ - public java.util.List getOrderList() { + public java.util.List getOrderList() { if (orderBuilder_ == null) { return java.util.Collections.unmodifiableList(order_); } else { @@ -11563,7 +11563,7 @@ public int getOrderCount() { /** * repeated .Mysqlx.Crud.Order order = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getOrder(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.Order getOrder(int index) { if (orderBuilder_ == null) { return order_.get(index); } else { @@ -11574,7 +11574,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getOrder(int index) { * repeated .Mysqlx.Crud.Order order = 6; */ public Builder setOrder( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Order value) { if (orderBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11591,7 +11591,7 @@ public Builder setOrder( * repeated .Mysqlx.Crud.Order order = 6; */ public Builder setOrder( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder builderForValue) { if (orderBuilder_ == null) { ensureOrderIsMutable(); order_.set(index, builderForValue.build()); @@ -11604,7 +11604,7 @@ public Builder setOrder( /** * repeated .Mysqlx.Crud.Order order = 6; */ - public Builder addOrder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order value) { + public Builder addOrder(com.mysql.cj.x.protobuf.MysqlxCrud.Order value) { if (orderBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11621,7 +11621,7 @@ public Builder addOrder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order value) { * repeated .Mysqlx.Crud.Order order = 6; */ public Builder addOrder( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Order value) { if (orderBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11638,7 +11638,7 @@ public Builder addOrder( * repeated .Mysqlx.Crud.Order order = 6; */ public Builder addOrder( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder builderForValue) { if (orderBuilder_ == null) { ensureOrderIsMutable(); order_.add(builderForValue.build()); @@ -11652,7 +11652,7 @@ public Builder addOrder( * repeated .Mysqlx.Crud.Order order = 6; */ public Builder addOrder( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder builderForValue) { if (orderBuilder_ == null) { ensureOrderIsMutable(); order_.add(index, builderForValue.build()); @@ -11666,7 +11666,7 @@ public Builder addOrder( * repeated .Mysqlx.Crud.Order order = 6; */ public Builder addAllOrder( - java.lang.Iterable values) { + java.lang.Iterable values) { if (orderBuilder_ == null) { ensureOrderIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -11706,14 +11706,14 @@ public Builder removeOrder(int index) { /** * repeated .Mysqlx.Crud.Order order = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder getOrderBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder getOrderBuilder( int index) { return getOrderFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Crud.Order order = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( int index) { if (orderBuilder_ == null) { return order_.get(index); } else { @@ -11723,7 +11723,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( /** * repeated .Mysqlx.Crud.Order order = 6; */ - public java.util.List + public java.util.List getOrderOrBuilderList() { if (orderBuilder_ != null) { return orderBuilder_.getMessageOrBuilderList(); @@ -11734,31 +11734,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( /** * repeated .Mysqlx.Crud.Order order = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder addOrderBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder addOrderBuilder() { return getOrderFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxCrud.Order.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.Order order = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder addOrderBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder addOrderBuilder( int index) { return getOrderFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxCrud.Order.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.Order order = 6; */ - public java.util.List + public java.util.List getOrderBuilderList() { return getOrderFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Order, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder> getOrderFieldBuilder() { if (orderBuilder_ == null) { orderBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Order, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder>( order_, ((bitField0_ & 0x00000020) == 0x00000020), getParentForChildren(), @@ -11768,22 +11768,22 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder addOrderBuilder( return orderBuilder_; } - private java.util.List operation_ = + private java.util.List operation_ = java.util.Collections.emptyList(); private void ensureOperationIsMutable() { if (!((bitField0_ & 0x00000040) == 0x00000040)) { - operation_ = new java.util.ArrayList(operation_); + operation_ = new java.util.ArrayList(operation_); bitField0_ |= 0x00000040; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperationOrBuilder> operationBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperationOrBuilder> operationBuilder_; /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public java.util.List getOperationList() { + public java.util.List getOperationList() { if (operationBuilder_ == null) { return java.util.Collections.unmodifiableList(operation_); } else { @@ -11803,7 +11803,7 @@ public int getOperationCount() { /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation getOperation(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation getOperation(int index) { if (operationBuilder_ == null) { return operation_.get(index); } else { @@ -11814,7 +11814,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation getOperation(int * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ public Builder setOperation( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation value) { if (operationBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11831,7 +11831,7 @@ public Builder setOperation( * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ public Builder setOperation( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.Builder builderForValue) { if (operationBuilder_ == null) { ensureOperationIsMutable(); operation_.set(index, builderForValue.build()); @@ -11844,7 +11844,7 @@ public Builder setOperation( /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public Builder addOperation(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation value) { + public Builder addOperation(com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation value) { if (operationBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11861,7 +11861,7 @@ public Builder addOperation(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperat * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ public Builder addOperation( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation value) { if (operationBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11878,7 +11878,7 @@ public Builder addOperation( * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ public Builder addOperation( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.Builder builderForValue) { if (operationBuilder_ == null) { ensureOperationIsMutable(); operation_.add(builderForValue.build()); @@ -11892,7 +11892,7 @@ public Builder addOperation( * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ public Builder addOperation( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.Builder builderForValue) { if (operationBuilder_ == null) { ensureOperationIsMutable(); operation_.add(index, builderForValue.build()); @@ -11906,7 +11906,7 @@ public Builder addOperation( * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ public Builder addAllOperation( - java.lang.Iterable values) { + java.lang.Iterable values) { if (operationBuilder_ == null) { ensureOperationIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -11946,14 +11946,14 @@ public Builder removeOperation(int index) { /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.Builder getOperationBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.Builder getOperationBuilder( int index) { return getOperationFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperationOrBuilder getOperationOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperationOrBuilder getOperationOrBuilder( int index) { if (operationBuilder_ == null) { return operation_.get(index); } else { @@ -11963,7 +11963,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperationOrBuilder getOpera /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public java.util.List + public java.util.List getOperationOrBuilderList() { if (operationBuilder_ != null) { return operationBuilder_.getMessageOrBuilderList(); @@ -11974,31 +11974,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperationOrBuilder getOpera /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.Builder addOperationBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.Builder addOperationBuilder() { return getOperationFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.Builder addOperationBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.Builder addOperationBuilder( int index) { return getOperationFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.UpdateOperation operation = 7; */ - public java.util.List + public java.util.List getOperationBuilderList() { return getOperationFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperationOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperationOrBuilder> getOperationFieldBuilder() { if (operationBuilder_ == null) { operationBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperationOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperationOrBuilder>( operation_, ((bitField0_ & 0x00000040) == 0x00000040), getParentForChildren(), @@ -12030,11 +12030,11 @@ public interface DeleteOrBuilder extends /** * required .Mysqlx.Crud.Collection collection = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection(); + com.mysql.cj.x.protobuf.MysqlxCrud.Collection getCollection(); /** * required .Mysqlx.Crud.Collection collection = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder(); /** * optional .Mysqlx.Crud.DataModel data_model = 2; @@ -12043,7 +12043,7 @@ public interface DeleteOrBuilder extends /** * optional .Mysqlx.Crud.DataModel data_model = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel getDataModel(); + com.mysql.cj.x.protobuf.MysqlxCrud.DataModel getDataModel(); /** * optional .Mysqlx.Expr.Expr criteria = 3; @@ -12052,21 +12052,21 @@ public interface DeleteOrBuilder extends /** * optional .Mysqlx.Expr.Expr criteria = 3; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getCriteria(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getCriteria(); /** * optional .Mysqlx.Expr.Expr criteria = 3; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder(); /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - java.util.List + java.util.List getArgsList(); /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getArgs(int index); /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ @@ -12074,12 +12074,12 @@ public interface DeleteOrBuilder extends /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - java.util.List + java.util.List getArgsOrBuilderList(); /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( + com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( int index); /** @@ -12089,21 +12089,21 @@ com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( /** * optional .Mysqlx.Crud.Limit limit = 4; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getLimit(); + com.mysql.cj.x.protobuf.MysqlxCrud.Limit getLimit(); /** * optional .Mysqlx.Crud.Limit limit = 4; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder(); /** * repeated .Mysqlx.Crud.Order order = 5; */ - java.util.List + java.util.List getOrderList(); /** * repeated .Mysqlx.Crud.Order order = 5; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getOrder(int index); + com.mysql.cj.x.protobuf.MysqlxCrud.Order getOrder(int index); /** * repeated .Mysqlx.Crud.Order order = 5; */ @@ -12111,12 +12111,12 @@ com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( /** * repeated .Mysqlx.Crud.Order order = 5; */ - java.util.List + java.util.List getOrderOrBuilderList(); /** * repeated .Mysqlx.Crud.Order order = 5; */ - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( + com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( int index); } /** @@ -12183,11 +12183,11 @@ private Delete( break; } case 10: { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = collection_.toBuilder(); } - collection_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.PARSER, extensionRegistry); + collection_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Collection.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(collection_); collection_ = subBuilder.buildPartial(); @@ -12197,7 +12197,7 @@ private Delete( } case 16: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel value = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxCrud.DataModel value = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(2, rawValue); } else { @@ -12207,11 +12207,11 @@ private Delete( break; } case 26: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = criteria_.toBuilder(); } - criteria_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); + criteria_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(criteria_); criteria_ = subBuilder.buildPartial(); @@ -12220,11 +12220,11 @@ private Delete( break; } case 34: { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = limit_.toBuilder(); } - limit_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.PARSER, extensionRegistry); + limit_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Limit.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(limit_); limit_ = subBuilder.buildPartial(); @@ -12234,18 +12234,18 @@ private Delete( } case 42: { if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - order_ = new java.util.ArrayList(); + order_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000020; } - order_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.PARSER, extensionRegistry)); + order_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxCrud.Order.PARSER, extensionRegistry)); break; } case 50: { if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - args_ = new java.util.ArrayList(); + args_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } - args_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry)); + args_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry)); break; } } @@ -12268,14 +12268,14 @@ private Delete( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Delete_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Delete_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Delete_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Delete_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Delete.class, com.mysql.cj.x.protobuf.MysqlxCrud.Delete.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -12295,7 +12295,7 @@ public com.google.protobuf.Parser getParserForType() { private int bitField0_; public static final int COLLECTION_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection collection_; + private com.mysql.cj.x.protobuf.MysqlxCrud.Collection collection_; /** * required .Mysqlx.Crud.Collection collection = 1; */ @@ -12305,18 +12305,18 @@ public boolean hasCollection() { /** * required .Mysqlx.Crud.Collection collection = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection getCollection() { return collection_; } /** * required .Mysqlx.Crud.Collection collection = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { return collection_; } public static final int DATA_MODEL_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel dataModel_; + private com.mysql.cj.x.protobuf.MysqlxCrud.DataModel dataModel_; /** * optional .Mysqlx.Crud.DataModel data_model = 2; */ @@ -12326,12 +12326,12 @@ public boolean hasDataModel() { /** * optional .Mysqlx.Crud.DataModel data_model = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel getDataModel() { + public com.mysql.cj.x.protobuf.MysqlxCrud.DataModel getDataModel() { return dataModel_; } public static final int CRITERIA_FIELD_NUMBER = 3; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr criteria_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr criteria_; /** * optional .Mysqlx.Expr.Expr criteria = 3; */ @@ -12341,28 +12341,28 @@ public boolean hasCriteria() { /** * optional .Mysqlx.Expr.Expr criteria = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getCriteria() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getCriteria() { return criteria_; } /** * optional .Mysqlx.Expr.Expr criteria = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder() { return criteria_; } public static final int ARGS_FIELD_NUMBER = 6; - private java.util.List args_; + private java.util.List args_; /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { return args_; } /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { return args_; } @@ -12375,19 +12375,19 @@ public int getArgsCount() { /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { return args_.get(index); } /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( int index) { return args_.get(index); } public static final int LIMIT_FIELD_NUMBER = 4; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit limit_; + private com.mysql.cj.x.protobuf.MysqlxCrud.Limit limit_; /** * optional .Mysqlx.Crud.Limit limit = 4; */ @@ -12397,28 +12397,28 @@ public boolean hasLimit() { /** * optional .Mysqlx.Crud.Limit limit = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getLimit() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Limit getLimit() { return limit_; } /** * optional .Mysqlx.Crud.Limit limit = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder() { return limit_; } public static final int ORDER_FIELD_NUMBER = 5; - private java.util.List order_; + private java.util.List order_; /** * repeated .Mysqlx.Crud.Order order = 5; */ - public java.util.List getOrderList() { + public java.util.List getOrderList() { return order_; } /** * repeated .Mysqlx.Crud.Order order = 5; */ - public java.util.List + public java.util.List getOrderOrBuilderList() { return order_; } @@ -12431,23 +12431,23 @@ public int getOrderCount() { /** * repeated .Mysqlx.Crud.Order order = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getOrder(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.Order getOrder(int index) { return order_.get(index); } /** * repeated .Mysqlx.Crud.Order order = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( int index) { return order_.get(index); } private void initFields() { - collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); - dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; - criteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; + criteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); args_ = java.util.Collections.emptyList(); - limit_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + limit_ = com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); order_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; @@ -12558,53 +12558,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Delete parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Delete parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Delete parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Delete parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Delete parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Delete parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxCrud.Delete parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Delete parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Delete parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxCrud.Delete parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -12613,7 +12613,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxCrud.Delete prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -12641,17 +12641,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Crud.Delete) - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DeleteOrBuilder { + com.mysql.cj.x.protobuf.MysqlxCrud.DeleteOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Delete_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Delete_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Delete_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Delete_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete.class, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete.Builder.class); + com.mysql.cj.x.protobuf.MysqlxCrud.Delete.class, com.mysql.cj.x.protobuf.MysqlxCrud.Delete.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete.newBuilder() @@ -12680,15 +12680,15 @@ private static Builder create() { public Builder clear() { super.clear(); if (collectionBuilder_ == null) { - collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); } else { collectionBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; bitField0_ = (bitField0_ & ~0x00000002); if (criteriaBuilder_ == null) { - criteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + criteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); } else { criteriaBuilder_.clear(); } @@ -12700,7 +12700,7 @@ public Builder clear() { argsBuilder_.clear(); } if (limitBuilder_ == null) { - limit_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + limit_ = com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); } else { limitBuilder_.clear(); } @@ -12720,23 +12720,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Delete_descriptor; + return com.mysql.cj.x.protobuf.MysqlxCrud.internal_static_Mysqlx_Crud_Delete_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Delete getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxCrud.Delete.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete build() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxCrud.Delete build() { + com.mysql.cj.x.protobuf.MysqlxCrud.Delete result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete result = new com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete(this); + public com.mysql.cj.x.protobuf.MysqlxCrud.Delete buildPartial() { + com.mysql.cj.x.protobuf.MysqlxCrud.Delete result = new com.mysql.cj.x.protobuf.MysqlxCrud.Delete(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -12791,16 +12791,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxCrud.Delete) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxCrud.Delete)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxCrud.Delete other) { + if (other == com.mysql.cj.x.protobuf.MysqlxCrud.Delete.getDefaultInstance()) return this; if (other.hasCollection()) { mergeCollection(other.getCollection()); } @@ -12909,11 +12909,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxCrud.Delete parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxCrud.Delete) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -12924,9 +12924,9 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxCrud.Collection collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder> collectionBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Collection, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder> collectionBuilder_; /** * required .Mysqlx.Crud.Collection collection = 1; */ @@ -12936,7 +12936,7 @@ public boolean hasCollection() { /** * required .Mysqlx.Crud.Collection collection = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection getCollection() { if (collectionBuilder_ == null) { return collection_; } else { @@ -12946,7 +12946,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection getCollection() { /** * required .Mysqlx.Crud.Collection collection = 1; */ - public Builder setCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection value) { + public Builder setCollection(com.mysql.cj.x.protobuf.MysqlxCrud.Collection value) { if (collectionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12963,7 +12963,7 @@ public Builder setCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection * required .Mysqlx.Crud.Collection collection = 1; */ public Builder setCollection( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder builderForValue) { if (collectionBuilder_ == null) { collection_ = builderForValue.build(); onChanged(); @@ -12976,12 +12976,12 @@ public Builder setCollection( /** * required .Mysqlx.Crud.Collection collection = 1; */ - public Builder mergeCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection value) { + public Builder mergeCollection(com.mysql.cj.x.protobuf.MysqlxCrud.Collection value) { if (collectionBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - collection_ != com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance()) { + collection_ != com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance()) { collection_ = - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.newBuilder(collection_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxCrud.Collection.newBuilder(collection_).mergeFrom(value).buildPartial(); } else { collection_ = value; } @@ -12997,7 +12997,7 @@ public Builder mergeCollection(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collectio */ public Builder clearCollection() { if (collectionBuilder_ == null) { - collection_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.getDefaultInstance(); + collection_ = com.mysql.cj.x.protobuf.MysqlxCrud.Collection.getDefaultInstance(); onChanged(); } else { collectionBuilder_.clear(); @@ -13008,7 +13008,7 @@ public Builder clearCollection() { /** * required .Mysqlx.Crud.Collection collection = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder getCollectionBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder getCollectionBuilder() { bitField0_ |= 0x00000001; onChanged(); return getCollectionFieldBuilder().getBuilder(); @@ -13016,7 +13016,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder getCollectionB /** * required .Mysqlx.Crud.Collection collection = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder getCollectionOrBuilder() { if (collectionBuilder_ != null) { return collectionBuilder_.getMessageOrBuilder(); } else { @@ -13027,11 +13027,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollection * required .Mysqlx.Crud.Collection collection = 1; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Collection, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder> getCollectionFieldBuilder() { if (collectionBuilder_ == null) { collectionBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Collection, com.mysql.cj.x.protobuf.MysqlxCrud.Collection.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.CollectionOrBuilder>( getCollection(), getParentForChildren(), isClean()); @@ -13040,7 +13040,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.CollectionOrBuilder getCollection return collectionBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + private com.mysql.cj.x.protobuf.MysqlxCrud.DataModel dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; /** * optional .Mysqlx.Crud.DataModel data_model = 2; */ @@ -13050,13 +13050,13 @@ public boolean hasDataModel() { /** * optional .Mysqlx.Crud.DataModel data_model = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel getDataModel() { + public com.mysql.cj.x.protobuf.MysqlxCrud.DataModel getDataModel() { return dataModel_; } /** * optional .Mysqlx.Crud.DataModel data_model = 2; */ - public Builder setDataModel(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel value) { + public Builder setDataModel(com.mysql.cj.x.protobuf.MysqlxCrud.DataModel value) { if (value == null) { throw new NullPointerException(); } @@ -13070,14 +13070,14 @@ public Builder setDataModel(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel va */ public Builder clearDataModel() { bitField0_ = (bitField0_ & ~0x00000002); - dataModel_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel.DOCUMENT; + dataModel_ = com.mysql.cj.x.protobuf.MysqlxCrud.DataModel.DOCUMENT; onChanged(); return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr criteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr criteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> criteriaBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> criteriaBuilder_; /** * optional .Mysqlx.Expr.Expr criteria = 3; */ @@ -13087,7 +13087,7 @@ public boolean hasCriteria() { /** * optional .Mysqlx.Expr.Expr criteria = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getCriteria() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getCriteria() { if (criteriaBuilder_ == null) { return criteria_; } else { @@ -13097,7 +13097,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getCriteria() { /** * optional .Mysqlx.Expr.Expr criteria = 3; */ - public Builder setCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder setCriteria(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (criteriaBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13114,7 +13114,7 @@ public Builder setCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { * optional .Mysqlx.Expr.Expr criteria = 3; */ public Builder setCriteria( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (criteriaBuilder_ == null) { criteria_ = builderForValue.build(); onChanged(); @@ -13127,12 +13127,12 @@ public Builder setCriteria( /** * optional .Mysqlx.Expr.Expr criteria = 3; */ - public Builder mergeCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder mergeCriteria(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (criteriaBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - criteria_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { + criteria_ != com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { criteria_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.newBuilder(criteria_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.newBuilder(criteria_).mergeFrom(value).buildPartial(); } else { criteria_ = value; } @@ -13148,7 +13148,7 @@ public Builder mergeCriteria(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) */ public Builder clearCriteria() { if (criteriaBuilder_ == null) { - criteria_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + criteria_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); onChanged(); } else { criteriaBuilder_.clear(); @@ -13159,7 +13159,7 @@ public Builder clearCriteria() { /** * optional .Mysqlx.Expr.Expr criteria = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getCriteriaBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getCriteriaBuilder() { bitField0_ |= 0x00000004; onChanged(); return getCriteriaFieldBuilder().getBuilder(); @@ -13167,7 +13167,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getCriteriaBuilder() /** * optional .Mysqlx.Expr.Expr criteria = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilder() { if (criteriaBuilder_ != null) { return criteriaBuilder_.getMessageOrBuilder(); } else { @@ -13178,11 +13178,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilde * optional .Mysqlx.Expr.Expr criteria = 3; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getCriteriaFieldBuilder() { if (criteriaBuilder_ == null) { criteriaBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( getCriteria(), getParentForChildren(), isClean()); @@ -13191,22 +13191,22 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getCriteriaOrBuilde return criteriaBuilder_; } - private java.util.List args_ = + private java.util.List args_ = java.util.Collections.emptyList(); private void ensureArgsIsMutable() { if (!((bitField0_ & 0x00000008) == 0x00000008)) { - args_ = new java.util.ArrayList(args_); + args_ = new java.util.ArrayList(args_); bitField0_ |= 0x00000008; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> argsBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> argsBuilder_; /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { if (argsBuilder_ == null) { return java.util.Collections.unmodifiableList(args_); } else { @@ -13226,7 +13226,7 @@ public int getArgsCount() { /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -13237,7 +13237,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getArgs(int index) { * repeated .Mysqlx.Datatypes.Scalar args = 6; */ public Builder setArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13254,7 +13254,7 @@ public Builder setArgs( * repeated .Mysqlx.Datatypes.Scalar args = 6; */ public Builder setArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.set(index, builderForValue.build()); @@ -13267,7 +13267,7 @@ public Builder setArgs( /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public Builder addArgs(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + public Builder addArgs(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13284,7 +13284,7 @@ public Builder addArgs(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value * repeated .Mysqlx.Datatypes.Scalar args = 6; */ public Builder addArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13301,7 +13301,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Scalar args = 6; */ public Builder addArgs( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(builderForValue.build()); @@ -13315,7 +13315,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Scalar args = 6; */ public Builder addArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(index, builderForValue.build()); @@ -13329,7 +13329,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Scalar args = 6; */ public Builder addAllArgs( - java.lang.Iterable values) { + java.lang.Iterable values) { if (argsBuilder_ == null) { ensureArgsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -13369,14 +13369,14 @@ public Builder removeArgs(int index) { /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder getArgsBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder getArgsBuilder( int index) { return getArgsFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBuilder( int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -13386,7 +13386,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBui /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { if (argsBuilder_ != null) { return argsBuilder_.getMessageOrBuilderList(); @@ -13397,31 +13397,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getArgsOrBui /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder() { return getArgsFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilder( int index) { return getArgsFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Scalar args = 6; */ - public java.util.List + public java.util.List getArgsBuilderList() { return getArgsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> getArgsFieldBuilder() { if (argsBuilder_ == null) { argsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder>( args_, ((bitField0_ & 0x00000008) == 0x00000008), getParentForChildren(), @@ -13431,9 +13431,9 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder addArgsBuilde return argsBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit limit_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxCrud.Limit limit_ = com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder> limitBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Limit, com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder> limitBuilder_; /** * optional .Mysqlx.Crud.Limit limit = 4; */ @@ -13443,7 +13443,7 @@ public boolean hasLimit() { /** * optional .Mysqlx.Crud.Limit limit = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getLimit() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Limit getLimit() { if (limitBuilder_ == null) { return limit_; } else { @@ -13453,7 +13453,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit getLimit() { /** * optional .Mysqlx.Crud.Limit limit = 4; */ - public Builder setLimit(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit value) { + public Builder setLimit(com.mysql.cj.x.protobuf.MysqlxCrud.Limit value) { if (limitBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13470,7 +13470,7 @@ public Builder setLimit(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit value) { * optional .Mysqlx.Crud.Limit limit = 4; */ public Builder setLimit( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder builderForValue) { if (limitBuilder_ == null) { limit_ = builderForValue.build(); onChanged(); @@ -13483,12 +13483,12 @@ public Builder setLimit( /** * optional .Mysqlx.Crud.Limit limit = 4; */ - public Builder mergeLimit(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit value) { + public Builder mergeLimit(com.mysql.cj.x.protobuf.MysqlxCrud.Limit value) { if (limitBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && - limit_ != com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance()) { + limit_ != com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance()) { limit_ = - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.newBuilder(limit_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxCrud.Limit.newBuilder(limit_).mergeFrom(value).buildPartial(); } else { limit_ = value; } @@ -13504,7 +13504,7 @@ public Builder mergeLimit(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit value) { */ public Builder clearLimit() { if (limitBuilder_ == null) { - limit_ = com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.getDefaultInstance(); + limit_ = com.mysql.cj.x.protobuf.MysqlxCrud.Limit.getDefaultInstance(); onChanged(); } else { limitBuilder_.clear(); @@ -13515,7 +13515,7 @@ public Builder clearLimit() { /** * optional .Mysqlx.Crud.Limit limit = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder getLimitBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder getLimitBuilder() { bitField0_ |= 0x00000010; onChanged(); return getLimitFieldBuilder().getBuilder(); @@ -13523,7 +13523,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder getLimitBuilder() { /** * optional .Mysqlx.Crud.Limit limit = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder() { if (limitBuilder_ != null) { return limitBuilder_.getMessageOrBuilder(); } else { @@ -13534,11 +13534,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder( * optional .Mysqlx.Crud.Limit limit = 4; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Limit, com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder> getLimitFieldBuilder() { if (limitBuilder_ == null) { limitBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Limit, com.mysql.cj.x.protobuf.MysqlxCrud.Limit.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.LimitOrBuilder>( getLimit(), getParentForChildren(), isClean()); @@ -13547,22 +13547,22 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.LimitOrBuilder getLimitOrBuilder( return limitBuilder_; } - private java.util.List order_ = + private java.util.List order_ = java.util.Collections.emptyList(); private void ensureOrderIsMutable() { if (!((bitField0_ & 0x00000020) == 0x00000020)) { - order_ = new java.util.ArrayList(order_); + order_ = new java.util.ArrayList(order_); bitField0_ |= 0x00000020; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder> orderBuilder_; + com.mysql.cj.x.protobuf.MysqlxCrud.Order, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder> orderBuilder_; /** * repeated .Mysqlx.Crud.Order order = 5; */ - public java.util.List getOrderList() { + public java.util.List getOrderList() { if (orderBuilder_ == null) { return java.util.Collections.unmodifiableList(order_); } else { @@ -13582,7 +13582,7 @@ public int getOrderCount() { /** * repeated .Mysqlx.Crud.Order order = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getOrder(int index) { + public com.mysql.cj.x.protobuf.MysqlxCrud.Order getOrder(int index) { if (orderBuilder_ == null) { return order_.get(index); } else { @@ -13593,7 +13593,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order getOrder(int index) { * repeated .Mysqlx.Crud.Order order = 5; */ public Builder setOrder( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Order value) { if (orderBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13610,7 +13610,7 @@ public Builder setOrder( * repeated .Mysqlx.Crud.Order order = 5; */ public Builder setOrder( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder builderForValue) { if (orderBuilder_ == null) { ensureOrderIsMutable(); order_.set(index, builderForValue.build()); @@ -13623,7 +13623,7 @@ public Builder setOrder( /** * repeated .Mysqlx.Crud.Order order = 5; */ - public Builder addOrder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order value) { + public Builder addOrder(com.mysql.cj.x.protobuf.MysqlxCrud.Order value) { if (orderBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13640,7 +13640,7 @@ public Builder addOrder(com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order value) { * repeated .Mysqlx.Crud.Order order = 5; */ public Builder addOrder( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order value) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Order value) { if (orderBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13657,7 +13657,7 @@ public Builder addOrder( * repeated .Mysqlx.Crud.Order order = 5; */ public Builder addOrder( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder builderForValue) { if (orderBuilder_ == null) { ensureOrderIsMutable(); order_.add(builderForValue.build()); @@ -13671,7 +13671,7 @@ public Builder addOrder( * repeated .Mysqlx.Crud.Order order = 5; */ public Builder addOrder( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder builderForValue) { if (orderBuilder_ == null) { ensureOrderIsMutable(); order_.add(index, builderForValue.build()); @@ -13685,7 +13685,7 @@ public Builder addOrder( * repeated .Mysqlx.Crud.Order order = 5; */ public Builder addAllOrder( - java.lang.Iterable values) { + java.lang.Iterable values) { if (orderBuilder_ == null) { ensureOrderIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -13725,14 +13725,14 @@ public Builder removeOrder(int index) { /** * repeated .Mysqlx.Crud.Order order = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder getOrderBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder getOrderBuilder( int index) { return getOrderFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Crud.Order order = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( int index) { if (orderBuilder_ == null) { return order_.get(index); } else { @@ -13742,7 +13742,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( /** * repeated .Mysqlx.Crud.Order order = 5; */ - public java.util.List + public java.util.List getOrderOrBuilderList() { if (orderBuilder_ != null) { return orderBuilder_.getMessageOrBuilderList(); @@ -13753,31 +13753,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder getOrderOrBuilder( /** * repeated .Mysqlx.Crud.Order order = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder addOrderBuilder() { + public com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder addOrderBuilder() { return getOrderFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxCrud.Order.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.Order order = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder addOrderBuilder( + public com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder addOrderBuilder( int index) { return getOrderFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxCrud.Order.getDefaultInstance()); } /** * repeated .Mysqlx.Crud.Order order = 5; */ - public java.util.List + public java.util.List getOrderBuilderList() { return getOrderFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder> + com.mysql.cj.x.protobuf.MysqlxCrud.Order, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder> getOrderFieldBuilder() { if (orderBuilder_ == null) { orderBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxCrud.OrderOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxCrud.Order, com.mysql.cj.x.protobuf.MysqlxCrud.Order.Builder, com.mysql.cj.x.protobuf.MysqlxCrud.OrderOrBuilder>( order_, ((bitField0_ & 0x00000020) == 0x00000020), getParentForChildren(), @@ -13924,8 +13924,8 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.getDescriptor(), - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxExpr.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxDatatypes.getDescriptor(), }, assigner); internal_static_Mysqlx_Crud_Column_descriptor = getDescriptor().getMessageTypes().get(0); @@ -13993,8 +13993,8 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_Mysqlx_Crud_Delete_descriptor, new java.lang.String[] { "Collection", "DataModel", "Criteria", "Args", "Limit", "Order", }); - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.getDescriptor(); - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxExpr.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxDatatypes.java b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxDatatypes.java similarity index 78% rename from src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxDatatypes.java rename to src/generated/java/com/mysql/cj/x/protobuf/MysqlxDatatypes.java index c3854c51b..2b5bb3023 100644 --- a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxDatatypes.java +++ b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxDatatypes.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.protobuf; +package com.mysql.cj.x.protobuf; // Generated by the protocol buffer compiler. DO NOT EDIT! // source: mysqlx_datatypes.proto @@ -42,7 +42,7 @@ public interface ScalarOrBuilder extends /** * required .Mysqlx.Datatypes.Scalar.Type type = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type getType(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Type getType(); /** * optional sint64 v_signed_int = 2; @@ -77,7 +77,7 @@ public interface ScalarOrBuilder extends * 4 is unused, was Null which doesn't have a storage anymore * */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets getVOctets(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets getVOctets(); /** * optional .Mysqlx.Datatypes.Scalar.Octets v_octets = 5; * @@ -85,7 +85,7 @@ public interface ScalarOrBuilder extends * 4 is unused, was Null which doesn't have a storage anymore * */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder getVOctetsOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder getVOctetsOrBuilder(); /** * optional double v_double = 6; @@ -121,11 +121,11 @@ public interface ScalarOrBuilder extends /** * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String getVString(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String getVString(); /** * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder getVStringOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder getVStringOrBuilder(); } /** * Protobuf type {@code Mysqlx.Datatypes.Scalar} @@ -185,7 +185,7 @@ private Scalar( } case 8: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type value = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Type value = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -205,11 +205,11 @@ private Scalar( break; } case 42: { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = vOctets_.toBuilder(); } - vOctets_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.PARSER, extensionRegistry); + vOctets_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(vOctets_); vOctets_ = subBuilder.buildPartial(); @@ -233,11 +233,11 @@ private Scalar( break; } case 74: { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.Builder subBuilder = null; if (((bitField0_ & 0x00000080) == 0x00000080)) { subBuilder = vString_.toBuilder(); } - vString_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.PARSER, extensionRegistry); + vString_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(vString_); vString_ = subBuilder.buildPartial(); @@ -259,14 +259,14 @@ private Scalar( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -395,7 +395,7 @@ public Type findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -522,14 +522,14 @@ private String( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_String_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_String_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_String_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_String_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -634,53 +634,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -689,7 +689,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String parseFr public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -710,17 +710,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Datatypes.Scalar.String) - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_String_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_String_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_String_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_String_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.newBuilder() @@ -756,23 +756,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_String_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_String_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String build() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String build() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String result = new com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String(this); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String buildPartial() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String result = new com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -789,16 +789,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String buildPartial() } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String other) { + if (other == com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance()) return this; if (other.hasValue()) { setValue(other.getValue()); } @@ -821,11 +821,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1017,14 +1017,14 @@ private Octets( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_Octets_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_Octets_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_Octets_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_Octets_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1129,53 +1129,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1184,7 +1184,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets parseFr public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1206,17 +1206,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Datatypes.Scalar.Octets) - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_Octets_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_Octets_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_Octets_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_Octets_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.newBuilder() @@ -1252,23 +1252,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_Octets_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_Octets_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets build() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets build() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets result = new com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets(this); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets buildPartial() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets result = new com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1285,16 +1285,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets buildPartial() } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets other) { + if (other == com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance()) return this; if (other.hasValue()) { setValue(other.getValue()); } @@ -1317,11 +1317,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1412,7 +1412,7 @@ public Builder clearContentType() { private int bitField0_; public static final int TYPE_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type type_; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Type type_; /** * required .Mysqlx.Datatypes.Scalar.Type type = 1; */ @@ -1422,7 +1422,7 @@ public boolean hasType() { /** * required .Mysqlx.Datatypes.Scalar.Type type = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type getType() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Type getType() { return type_; } @@ -1457,7 +1457,7 @@ public long getVUnsignedInt() { } public static final int V_OCTETS_FIELD_NUMBER = 5; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets vOctets_; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets vOctets_; /** * optional .Mysqlx.Datatypes.Scalar.Octets v_octets = 5; * @@ -1475,7 +1475,7 @@ public boolean hasVOctets() { * 4 is unused, was Null which doesn't have a storage anymore * */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets getVOctets() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets getVOctets() { return vOctets_; } /** @@ -1485,7 +1485,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets getVOctets() { * 4 is unused, was Null which doesn't have a storage anymore * */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder getVOctetsOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder getVOctetsOrBuilder() { return vOctets_; } @@ -1535,7 +1535,7 @@ public boolean getVBool() { } public static final int V_STRING_FIELD_NUMBER = 9; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String vString_; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String vString_; /** * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ @@ -1545,25 +1545,25 @@ public boolean hasVString() { /** * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String getVString() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String getVString() { return vString_; } /** * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder getVStringOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder getVStringOrBuilder() { return vString_; } private void initFields() { - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type.V_SINT; + type_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Type.V_SINT; vSignedInt_ = 0L; vUnsignedInt_ = 0L; - vOctets_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance(); + vOctets_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance(); vDouble_ = 0D; vFloat_ = 0F; vBool_ = false; - vString_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance(); + vString_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -1671,53 +1671,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1726,7 +1726,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1747,17 +1747,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Datatypes.Scalar) - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder { + com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.newBuilder() @@ -1782,14 +1782,14 @@ private static Builder create() { public Builder clear() { super.clear(); - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type.V_SINT; + type_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Type.V_SINT; bitField0_ = (bitField0_ & ~0x00000001); vSignedInt_ = 0L; bitField0_ = (bitField0_ & ~0x00000002); vUnsignedInt_ = 0L; bitField0_ = (bitField0_ & ~0x00000004); if (vOctetsBuilder_ == null) { - vOctets_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance(); + vOctets_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance(); } else { vOctetsBuilder_.clear(); } @@ -1801,7 +1801,7 @@ public Builder clear() { vBool_ = false; bitField0_ = (bitField0_ & ~0x00000040); if (vStringBuilder_ == null) { - vString_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance(); + vString_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance(); } else { vStringBuilder_.clear(); } @@ -1815,23 +1815,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Scalar_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar build() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar build() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar result = new com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar(this); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar buildPartial() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar result = new com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1880,16 +1880,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar other) { + if (other == com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -1942,11 +1942,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1957,7 +1957,7 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type type_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type.V_SINT; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Type type_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Type.V_SINT; /** * required .Mysqlx.Datatypes.Scalar.Type type = 1; */ @@ -1967,13 +1967,13 @@ public boolean hasType() { /** * required .Mysqlx.Datatypes.Scalar.Type type = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type getType() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Type getType() { return type_; } /** * required .Mysqlx.Datatypes.Scalar.Type type = 1; */ - public Builder setType(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type value) { + public Builder setType(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Type value) { if (value == null) { throw new NullPointerException(); } @@ -1987,7 +1987,7 @@ public Builder setType(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Type.V_SINT; + type_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Type.V_SINT; onChanged(); return this; } @@ -2056,9 +2056,9 @@ public Builder clearVUnsignedInt() { return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets vOctets_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets vOctets_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder> vOctetsBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder> vOctetsBuilder_; /** * optional .Mysqlx.Datatypes.Scalar.Octets v_octets = 5; * @@ -2076,7 +2076,7 @@ public boolean hasVOctets() { * 4 is unused, was Null which doesn't have a storage anymore * */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets getVOctets() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets getVOctets() { if (vOctetsBuilder_ == null) { return vOctets_; } else { @@ -2090,7 +2090,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets getVOctets() { * 4 is unused, was Null which doesn't have a storage anymore * */ - public Builder setVOctets(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets value) { + public Builder setVOctets(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets value) { if (vOctetsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2111,7 +2111,7 @@ public Builder setVOctets(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Oc * */ public Builder setVOctets( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.Builder builderForValue) { if (vOctetsBuilder_ == null) { vOctets_ = builderForValue.build(); onChanged(); @@ -2128,12 +2128,12 @@ public Builder setVOctets( * 4 is unused, was Null which doesn't have a storage anymore * */ - public Builder mergeVOctets(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets value) { + public Builder mergeVOctets(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets value) { if (vOctetsBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && - vOctets_ != com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance()) { + vOctets_ != com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance()) { vOctets_ = - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.newBuilder(vOctets_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.newBuilder(vOctets_).mergeFrom(value).buildPartial(); } else { vOctets_ = value; } @@ -2153,7 +2153,7 @@ public Builder mergeVOctets(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar. */ public Builder clearVOctets() { if (vOctetsBuilder_ == null) { - vOctets_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance(); + vOctets_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.getDefaultInstance(); onChanged(); } else { vOctetsBuilder_.clear(); @@ -2168,7 +2168,7 @@ public Builder clearVOctets() { * 4 is unused, was Null which doesn't have a storage anymore * */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.Builder getVOctetsBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.Builder getVOctetsBuilder() { bitField0_ |= 0x00000008; onChanged(); return getVOctetsFieldBuilder().getBuilder(); @@ -2180,7 +2180,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.Builder getVOc * 4 is unused, was Null which doesn't have a storage anymore * */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder getVOctetsOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder getVOctetsOrBuilder() { if (vOctetsBuilder_ != null) { return vOctetsBuilder_.getMessageOrBuilder(); } else { @@ -2195,11 +2195,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder getVO * */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder> getVOctetsFieldBuilder() { if (vOctetsBuilder_ == null) { vOctetsBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.OctetsOrBuilder>( getVOctets(), getParentForChildren(), isClean()); @@ -2304,9 +2304,9 @@ public Builder clearVBool() { return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String vString_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String vString_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder> vStringBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder> vStringBuilder_; /** * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ @@ -2316,7 +2316,7 @@ public boolean hasVString() { /** * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String getVString() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String getVString() { if (vStringBuilder_ == null) { return vString_; } else { @@ -2326,7 +2326,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String getVString() { /** * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ - public Builder setVString(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String value) { + public Builder setVString(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String value) { if (vStringBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2343,7 +2343,7 @@ public Builder setVString(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.St * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ public Builder setVString( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.Builder builderForValue) { if (vStringBuilder_ == null) { vString_ = builderForValue.build(); onChanged(); @@ -2356,12 +2356,12 @@ public Builder setVString( /** * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ - public Builder mergeVString(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String value) { + public Builder mergeVString(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String value) { if (vStringBuilder_ == null) { if (((bitField0_ & 0x00000080) == 0x00000080) && - vString_ != com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance()) { + vString_ != com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance()) { vString_ = - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.newBuilder(vString_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.newBuilder(vString_).mergeFrom(value).buildPartial(); } else { vString_ = value; } @@ -2377,7 +2377,7 @@ public Builder mergeVString(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar. */ public Builder clearVString() { if (vStringBuilder_ == null) { - vString_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance(); + vString_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.getDefaultInstance(); onChanged(); } else { vStringBuilder_.clear(); @@ -2388,7 +2388,7 @@ public Builder clearVString() { /** * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.Builder getVStringBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.Builder getVStringBuilder() { bitField0_ |= 0x00000080; onChanged(); return getVStringFieldBuilder().getBuilder(); @@ -2396,7 +2396,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.Builder getVSt /** * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder getVStringOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder getVStringOrBuilder() { if (vStringBuilder_ != null) { return vStringBuilder_.getMessageOrBuilder(); } else { @@ -2407,11 +2407,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder getVS * optional .Mysqlx.Datatypes.Scalar.String v_string = 9; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder> getVStringFieldBuilder() { if (vStringBuilder_ == null) { vStringBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.String.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.String.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.StringOrBuilder>( getVString(), getParentForChildren(), isClean()); @@ -2438,12 +2438,12 @@ public interface ObjectOrBuilder extends /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - java.util.List + java.util.List getFldList(); /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField getFld(int index); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField getFld(int index); /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ @@ -2451,12 +2451,12 @@ public interface ObjectOrBuilder extends /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - java.util.List + java.util.List getFldOrBuilderList(); /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder getFldOrBuilder( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder getFldOrBuilder( int index); } /** @@ -2517,10 +2517,10 @@ private Object( } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - fld_ = new java.util.ArrayList(); + fld_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - fld_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.PARSER, extensionRegistry)); + fld_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.PARSER, extensionRegistry)); break; } } @@ -2540,14 +2540,14 @@ private Object( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2590,11 +2590,11 @@ public interface ObjectFieldOrBuilder extends /** * required .Mysqlx.Datatypes.Any value = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getValue(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getValue(); /** * required .Mysqlx.Datatypes.Any value = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder(); } /** * Protobuf type {@code Mysqlx.Datatypes.Object.ObjectField} @@ -2655,11 +2655,11 @@ private ObjectField( break; } case 18: { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = value_.toBuilder(); } - value_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.PARSER, extensionRegistry); + value_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(value_); value_ = subBuilder.buildPartial(); @@ -2681,14 +2681,14 @@ private ObjectField( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_ObjectField_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_ObjectField_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_ObjectField_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_ObjectField_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2750,7 +2750,7 @@ public java.lang.String getKey() { } public static final int VALUE_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value_; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value_; /** * required .Mysqlx.Datatypes.Any value = 2; */ @@ -2760,19 +2760,19 @@ public boolean hasValue() { /** * required .Mysqlx.Datatypes.Any value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getValue() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getValue() { return value_; } /** * required .Mysqlx.Datatypes.Any value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder() { return value_; } private void initFields() { key_ = ""; - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2834,53 +2834,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2889,7 +2889,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField pa public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2906,17 +2906,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Datatypes.Object.ObjectField) - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_ObjectField_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_ObjectField_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_ObjectField_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_ObjectField_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.newBuilder() @@ -2943,7 +2943,7 @@ public Builder clear() { key_ = ""; bitField0_ = (bitField0_ & ~0x00000001); if (valueBuilder_ == null) { - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); } else { valueBuilder_.clear(); } @@ -2957,23 +2957,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_ObjectField_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_ObjectField_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField build() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField build() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField result = new com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField(this); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField buildPartial() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField result = new com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2994,16 +2994,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField buildPart } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField other) { + if (other == com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.getDefaultInstance()) return this; if (other.hasKey()) { bitField0_ |= 0x00000001; key_ = other.key_; @@ -3036,11 +3036,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3127,9 +3127,9 @@ public Builder setKeyBytes( return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder> valueBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder> valueBuilder_; /** * required .Mysqlx.Datatypes.Any value = 2; */ @@ -3139,7 +3139,7 @@ public boolean hasValue() { /** * required .Mysqlx.Datatypes.Any value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getValue() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getValue() { if (valueBuilder_ == null) { return value_; } else { @@ -3149,7 +3149,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getValue() { /** * required .Mysqlx.Datatypes.Any value = 2; */ - public Builder setValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) { + public Builder setValue(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value) { if (valueBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -3166,7 +3166,7 @@ public Builder setValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) * required .Mysqlx.Datatypes.Any value = 2; */ public Builder setValue( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { if (valueBuilder_ == null) { value_ = builderForValue.build(); onChanged(); @@ -3179,12 +3179,12 @@ public Builder setValue( /** * required .Mysqlx.Datatypes.Any value = 2; */ - public Builder mergeValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) { + public Builder mergeValue(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value) { if (valueBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - value_ != com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance()) { + value_ != com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance()) { value_ = - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.newBuilder(value_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.newBuilder(value_).mergeFrom(value).buildPartial(); } else { value_ = value; } @@ -3200,7 +3200,7 @@ public Builder mergeValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value */ public Builder clearValue() { if (valueBuilder_ == null) { - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); onChanged(); } else { valueBuilder_.clear(); @@ -3211,7 +3211,7 @@ public Builder clearValue() { /** * required .Mysqlx.Datatypes.Any value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder getValueBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder getValueBuilder() { bitField0_ |= 0x00000002; onChanged(); return getValueFieldBuilder().getBuilder(); @@ -3219,7 +3219,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder getValueBuilder( /** * required .Mysqlx.Datatypes.Any value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder() { if (valueBuilder_ != null) { return valueBuilder_.getMessageOrBuilder(); } else { @@ -3230,11 +3230,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuild * required .Mysqlx.Datatypes.Any value = 2; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder> getValueFieldBuilder() { if (valueBuilder_ == null) { valueBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder>( getValue(), getParentForChildren(), isClean()); @@ -3255,17 +3255,17 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuild } public static final int FLD_FIELD_NUMBER = 1; - private java.util.List fld_; + private java.util.List fld_; /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public java.util.List getFldList() { + public java.util.List getFldList() { return fld_; } /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public java.util.List + public java.util.List getFldOrBuilderList() { return fld_; } @@ -3278,13 +3278,13 @@ public int getFldCount() { /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField getFld(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField getFld(int index) { return fld_.get(index); } /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder getFldOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder getFldOrBuilder( int index) { return fld_.get(index); } @@ -3339,53 +3339,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Object parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3394,7 +3394,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3415,17 +3415,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Datatypes.Object) - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ObjectOrBuilder { + com.mysql.cj.x.protobuf.MysqlxDatatypes.ObjectOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.newBuilder() @@ -3464,23 +3464,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Object_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object build() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object build() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object result = new com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object(this); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object buildPartial() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object result = new com.mysql.cj.x.protobuf.MysqlxDatatypes.Object(this); int from_bitField0_ = bitField0_; if (fldBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -3496,16 +3496,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxDatatypes.Object) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxDatatypes.Object)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object other) { + if (other == com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.getDefaultInstance()) return this; if (fldBuilder_ == null) { if (!other.fld_.isEmpty()) { if (fld_.isEmpty()) { @@ -3550,11 +3550,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxDatatypes.Object) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3565,22 +3565,22 @@ public Builder mergeFrom( } private int bitField0_; - private java.util.List fld_ = + private java.util.List fld_ = java.util.Collections.emptyList(); private void ensureFldIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - fld_ = new java.util.ArrayList(fld_); + fld_ = new java.util.ArrayList(fld_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder> fldBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder> fldBuilder_; /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public java.util.List getFldList() { + public java.util.List getFldList() { if (fldBuilder_ == null) { return java.util.Collections.unmodifiableList(fld_); } else { @@ -3600,7 +3600,7 @@ public int getFldCount() { /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField getFld(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField getFld(int index) { if (fldBuilder_ == null) { return fld_.get(index); } else { @@ -3611,7 +3611,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField getFld(in * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ public Builder setFld( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField value) { if (fldBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -3628,7 +3628,7 @@ public Builder setFld( * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ public Builder setFld( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.Builder builderForValue) { if (fldBuilder_ == null) { ensureFldIsMutable(); fld_.set(index, builderForValue.build()); @@ -3641,7 +3641,7 @@ public Builder setFld( /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public Builder addFld(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField value) { + public Builder addFld(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField value) { if (fldBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -3658,7 +3658,7 @@ public Builder addFld(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.Object * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ public Builder addFld( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField value) { if (fldBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -3675,7 +3675,7 @@ public Builder addFld( * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ public Builder addFld( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.Builder builderForValue) { if (fldBuilder_ == null) { ensureFldIsMutable(); fld_.add(builderForValue.build()); @@ -3689,7 +3689,7 @@ public Builder addFld( * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ public Builder addFld( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.Builder builderForValue) { if (fldBuilder_ == null) { ensureFldIsMutable(); fld_.add(index, builderForValue.build()); @@ -3703,7 +3703,7 @@ public Builder addFld( * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ public Builder addAllFld( - java.lang.Iterable values) { + java.lang.Iterable values) { if (fldBuilder_ == null) { ensureFldIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -3743,14 +3743,14 @@ public Builder removeFld(int index) { /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.Builder getFldBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.Builder getFldBuilder( int index) { return getFldFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder getFldOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder getFldOrBuilder( int index) { if (fldBuilder_ == null) { return fld_.get(index); } else { @@ -3760,7 +3760,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public java.util.List + public java.util.List getFldOrBuilderList() { if (fldBuilder_ != null) { return fldBuilder_.getMessageOrBuilderList(); @@ -3771,31 +3771,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.Builder addFldBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.Builder addFldBuilder() { return getFldFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.Builder addFldBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.Builder addFldBuilder( int index) { return getFldFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Object.ObjectField fld = 1; */ - public java.util.List + public java.util.List getFldBuilderList() { return getFldFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder> getFldFieldBuilder() { if (fldBuilder_ == null) { fldBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectFieldOrBuilder>( fld_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -3823,12 +3823,12 @@ public interface ArrayOrBuilder extends /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - java.util.List + java.util.List getValueList(); /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getValue(int index); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getValue(int index); /** * repeated .Mysqlx.Datatypes.Any value = 1; */ @@ -3836,12 +3836,12 @@ public interface ArrayOrBuilder extends /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - java.util.List + java.util.List getValueOrBuilderList(); /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder( + com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder( int index); } /** @@ -3902,10 +3902,10 @@ private Array( } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - value_ = new java.util.ArrayList(); + value_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - value_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.PARSER, extensionRegistry)); + value_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.PARSER, extensionRegistry)); break; } } @@ -3925,14 +3925,14 @@ private Array( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Array_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Array_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Array_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Array_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3951,17 +3951,17 @@ public com.google.protobuf.Parser getParserForType() { } public static final int VALUE_FIELD_NUMBER = 1; - private java.util.List value_; + private java.util.List value_; /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public java.util.List getValueList() { + public java.util.List getValueList() { return value_; } /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public java.util.List + public java.util.List getValueOrBuilderList() { return value_; } @@ -3974,13 +3974,13 @@ public int getValueCount() { /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getValue(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getValue(int index) { return value_.get(index); } /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder( int index) { return value_.get(index); } @@ -4035,53 +4035,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Array parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Array parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Array parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Array parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Array parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Array parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Array parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Array parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Array parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Array parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4090,7 +4090,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxDatatypes.Array prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -4111,17 +4111,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Datatypes.Array) - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ArrayOrBuilder { + com.mysql.cj.x.protobuf.MysqlxDatatypes.ArrayOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Array_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Array_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Array_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Array_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.newBuilder() @@ -4160,23 +4160,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Array_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Array_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Array getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array build() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Array build() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array result = new com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array(this); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Array buildPartial() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array result = new com.mysql.cj.x.protobuf.MysqlxDatatypes.Array(this); int from_bitField0_ = bitField0_; if (valueBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -4192,16 +4192,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxDatatypes.Array) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxDatatypes.Array)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxDatatypes.Array other) { + if (other == com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.getDefaultInstance()) return this; if (valueBuilder_ == null) { if (!other.value_.isEmpty()) { if (value_.isEmpty()) { @@ -4246,11 +4246,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxDatatypes.Array) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -4261,22 +4261,22 @@ public Builder mergeFrom( } private int bitField0_; - private java.util.List value_ = + private java.util.List value_ = java.util.Collections.emptyList(); private void ensureValueIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - value_ = new java.util.ArrayList(value_); + value_ = new java.util.ArrayList(value_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder> valueBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder> valueBuilder_; /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public java.util.List getValueList() { + public java.util.List getValueList() { if (valueBuilder_ == null) { return java.util.Collections.unmodifiableList(value_); } else { @@ -4296,7 +4296,7 @@ public int getValueCount() { /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getValue(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getValue(int index) { if (valueBuilder_ == null) { return value_.get(index); } else { @@ -4307,7 +4307,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getValue(int index) { * repeated .Mysqlx.Datatypes.Any value = 1; */ public Builder setValue( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value) { if (valueBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4324,7 +4324,7 @@ public Builder setValue( * repeated .Mysqlx.Datatypes.Any value = 1; */ public Builder setValue( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { if (valueBuilder_ == null) { ensureValueIsMutable(); value_.set(index, builderForValue.build()); @@ -4337,7 +4337,7 @@ public Builder setValue( /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public Builder addValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) { + public Builder addValue(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value) { if (valueBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4354,7 +4354,7 @@ public Builder addValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) * repeated .Mysqlx.Datatypes.Any value = 1; */ public Builder addValue( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value) { if (valueBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4371,7 +4371,7 @@ public Builder addValue( * repeated .Mysqlx.Datatypes.Any value = 1; */ public Builder addValue( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { if (valueBuilder_ == null) { ensureValueIsMutable(); value_.add(builderForValue.build()); @@ -4385,7 +4385,7 @@ public Builder addValue( * repeated .Mysqlx.Datatypes.Any value = 1; */ public Builder addValue( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { if (valueBuilder_ == null) { ensureValueIsMutable(); value_.add(index, builderForValue.build()); @@ -4399,7 +4399,7 @@ public Builder addValue( * repeated .Mysqlx.Datatypes.Any value = 1; */ public Builder addAllValue( - java.lang.Iterable values) { + java.lang.Iterable values) { if (valueBuilder_ == null) { ensureValueIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -4439,14 +4439,14 @@ public Builder removeValue(int index) { /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder getValueBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder getValueBuilder( int index) { return getValueFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder( int index) { if (valueBuilder_ == null) { return value_.get(index); } else { @@ -4456,7 +4456,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuild /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public java.util.List + public java.util.List getValueOrBuilderList() { if (valueBuilder_ != null) { return valueBuilder_.getMessageOrBuilderList(); @@ -4467,31 +4467,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuild /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder addValueBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder addValueBuilder() { return getValueFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder addValueBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder addValueBuilder( int index) { return getValueFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Any value = 1; */ - public java.util.List + public java.util.List getValueBuilderList() { return getValueFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder> getValueFieldBuilder() { if (valueBuilder_ == null) { valueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder>( value_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -4523,7 +4523,7 @@ public interface AnyOrBuilder extends /** * required .Mysqlx.Datatypes.Any.Type type = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type getType(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Type getType(); /** * optional .Mysqlx.Datatypes.Scalar scalar = 2; @@ -4532,11 +4532,11 @@ public interface AnyOrBuilder extends /** * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getScalar(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getScalar(); /** * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getScalarOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getScalarOrBuilder(); /** * optional .Mysqlx.Datatypes.Object obj = 3; @@ -4545,11 +4545,11 @@ public interface AnyOrBuilder extends /** * optional .Mysqlx.Datatypes.Object obj = 3; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object getObj(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object getObj(); /** * optional .Mysqlx.Datatypes.Object obj = 3; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ObjectOrBuilder getObjOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.ObjectOrBuilder getObjOrBuilder(); /** * optional .Mysqlx.Datatypes.Array array = 4; @@ -4558,11 +4558,11 @@ public interface AnyOrBuilder extends /** * optional .Mysqlx.Datatypes.Array array = 4; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array getArray(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array getArray(); /** * optional .Mysqlx.Datatypes.Array array = 4; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ArrayOrBuilder getArrayOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.ArrayOrBuilder getArrayOrBuilder(); } /** * Protobuf type {@code Mysqlx.Datatypes.Any} @@ -4622,7 +4622,7 @@ private Any( } case 8: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type value = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Type value = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -4632,11 +4632,11 @@ private Any( break; } case 18: { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = scalar_.toBuilder(); } - scalar_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry); + scalar_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(scalar_); scalar_ = subBuilder.buildPartial(); @@ -4645,11 +4645,11 @@ private Any( break; } case 26: { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = obj_.toBuilder(); } - obj_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.PARSER, extensionRegistry); + obj_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(obj_); obj_ = subBuilder.buildPartial(); @@ -4658,11 +4658,11 @@ private Any( break; } case 34: { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = array_.toBuilder(); } - array_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.PARSER, extensionRegistry); + array_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(array_); array_ = subBuilder.buildPartial(); @@ -4684,14 +4684,14 @@ private Any( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Any_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Any_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Any_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Any_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -4775,7 +4775,7 @@ public Type findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -4802,7 +4802,7 @@ private Type(int index, int value) { private int bitField0_; public static final int TYPE_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type type_; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Type type_; /** * required .Mysqlx.Datatypes.Any.Type type = 1; */ @@ -4812,12 +4812,12 @@ public boolean hasType() { /** * required .Mysqlx.Datatypes.Any.Type type = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type getType() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Type getType() { return type_; } public static final int SCALAR_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar scalar_; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar scalar_; /** * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ @@ -4827,18 +4827,18 @@ public boolean hasScalar() { /** * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getScalar() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getScalar() { return scalar_; } /** * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getScalarOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getScalarOrBuilder() { return scalar_; } public static final int OBJ_FIELD_NUMBER = 3; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object obj_; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Object obj_; /** * optional .Mysqlx.Datatypes.Object obj = 3; */ @@ -4848,18 +4848,18 @@ public boolean hasObj() { /** * optional .Mysqlx.Datatypes.Object obj = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object getObj() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object getObj() { return obj_; } /** * optional .Mysqlx.Datatypes.Object obj = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ObjectOrBuilder getObjOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ObjectOrBuilder getObjOrBuilder() { return obj_; } public static final int ARRAY_FIELD_NUMBER = 4; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array array_; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Array array_; /** * optional .Mysqlx.Datatypes.Array array = 4; */ @@ -4869,21 +4869,21 @@ public boolean hasArray() { /** * optional .Mysqlx.Datatypes.Array array = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array getArray() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Array getArray() { return array_; } /** * optional .Mysqlx.Datatypes.Array array = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ArrayOrBuilder getArrayOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ArrayOrBuilder getArrayOrBuilder() { return array_; } private void initFields() { - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type.SCALAR; - scalar_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); - obj_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.getDefaultInstance(); - array_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.getDefaultInstance(); + type_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Type.SCALAR; + scalar_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + obj_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.getDefaultInstance(); + array_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -4969,53 +4969,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Any parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Any parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Any parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Any parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Any parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Any parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Any parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Any parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Any parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxDatatypes.Any parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5024,7 +5024,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -5045,17 +5045,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Datatypes.Any) - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder { + com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Any_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Any_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Any_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Any_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.class, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder.class); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.class, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.newBuilder() @@ -5081,22 +5081,22 @@ private static Builder create() { public Builder clear() { super.clear(); - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type.SCALAR; + type_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Type.SCALAR; bitField0_ = (bitField0_ & ~0x00000001); if (scalarBuilder_ == null) { - scalar_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + scalar_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); } else { scalarBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000002); if (objBuilder_ == null) { - obj_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.getDefaultInstance(); + obj_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.getDefaultInstance(); } else { objBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000004); if (arrayBuilder_ == null) { - array_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.getDefaultInstance(); + array_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.getDefaultInstance(); } else { arrayBuilder_.clear(); } @@ -5110,23 +5110,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Any_descriptor; + return com.mysql.cj.x.protobuf.MysqlxDatatypes.internal_static_Mysqlx_Datatypes_Any_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any build() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any build() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any result = new com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any(this); + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any buildPartial() { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any result = new com.mysql.cj.x.protobuf.MysqlxDatatypes.Any(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -5163,16 +5163,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxDatatypes.Any) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxDatatypes.Any)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any other) { + if (other == com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -5219,11 +5219,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxDatatypes.Any) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -5234,7 +5234,7 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type type_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type.SCALAR; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Type type_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Type.SCALAR; /** * required .Mysqlx.Datatypes.Any.Type type = 1; */ @@ -5244,13 +5244,13 @@ public boolean hasType() { /** * required .Mysqlx.Datatypes.Any.Type type = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type getType() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Type getType() { return type_; } /** * required .Mysqlx.Datatypes.Any.Type type = 1; */ - public Builder setType(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type value) { + public Builder setType(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Type value) { if (value == null) { throw new NullPointerException(); } @@ -5264,14 +5264,14 @@ public Builder setType(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type val */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Type.SCALAR; + type_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Type.SCALAR; onChanged(); return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar scalar_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar scalar_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> scalarBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> scalarBuilder_; /** * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ @@ -5281,7 +5281,7 @@ public boolean hasScalar() { /** * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getScalar() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getScalar() { if (scalarBuilder_ == null) { return scalar_; } else { @@ -5291,7 +5291,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getScalar() { /** * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ - public Builder setScalar(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + public Builder setScalar(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (scalarBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5308,7 +5308,7 @@ public Builder setScalar(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar val * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ public Builder setScalar( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (scalarBuilder_ == null) { scalar_ = builderForValue.build(); onChanged(); @@ -5321,12 +5321,12 @@ public Builder setScalar( /** * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ - public Builder mergeScalar(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + public Builder mergeScalar(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (scalarBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - scalar_ != com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()) { + scalar_ != com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()) { scalar_ = - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.newBuilder(scalar_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.newBuilder(scalar_).mergeFrom(value).buildPartial(); } else { scalar_ = value; } @@ -5342,7 +5342,7 @@ public Builder mergeScalar(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar v */ public Builder clearScalar() { if (scalarBuilder_ == null) { - scalar_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + scalar_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); onChanged(); } else { scalarBuilder_.clear(); @@ -5353,7 +5353,7 @@ public Builder clearScalar() { /** * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder getScalarBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder getScalarBuilder() { bitField0_ |= 0x00000002; onChanged(); return getScalarFieldBuilder().getBuilder(); @@ -5361,7 +5361,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder getScalarBuil /** * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getScalarOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getScalarOrBuilder() { if (scalarBuilder_ != null) { return scalarBuilder_.getMessageOrBuilder(); } else { @@ -5372,11 +5372,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getScalarOrB * optional .Mysqlx.Datatypes.Scalar scalar = 2; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> getScalarFieldBuilder() { if (scalarBuilder_ == null) { scalarBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder>( getScalar(), getParentForChildren(), isClean()); @@ -5385,9 +5385,9 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getScalarOrB return scalarBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object obj_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Object obj_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ObjectOrBuilder> objBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ObjectOrBuilder> objBuilder_; /** * optional .Mysqlx.Datatypes.Object obj = 3; */ @@ -5397,7 +5397,7 @@ public boolean hasObj() { /** * optional .Mysqlx.Datatypes.Object obj = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object getObj() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object getObj() { if (objBuilder_ == null) { return obj_; } else { @@ -5407,7 +5407,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object getObj() { /** * optional .Mysqlx.Datatypes.Object obj = 3; */ - public Builder setObj(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object value) { + public Builder setObj(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object value) { if (objBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5424,7 +5424,7 @@ public Builder setObj(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object value) * optional .Mysqlx.Datatypes.Object obj = 3; */ public Builder setObj( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.Builder builderForValue) { if (objBuilder_ == null) { obj_ = builderForValue.build(); onChanged(); @@ -5437,12 +5437,12 @@ public Builder setObj( /** * optional .Mysqlx.Datatypes.Object obj = 3; */ - public Builder mergeObj(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object value) { + public Builder mergeObj(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object value) { if (objBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - obj_ != com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.getDefaultInstance()) { + obj_ != com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.getDefaultInstance()) { obj_ = - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.newBuilder(obj_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.newBuilder(obj_).mergeFrom(value).buildPartial(); } else { obj_ = value; } @@ -5458,7 +5458,7 @@ public Builder mergeObj(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object valu */ public Builder clearObj() { if (objBuilder_ == null) { - obj_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.getDefaultInstance(); + obj_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.getDefaultInstance(); onChanged(); } else { objBuilder_.clear(); @@ -5469,7 +5469,7 @@ public Builder clearObj() { /** * optional .Mysqlx.Datatypes.Object obj = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.Builder getObjBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.Builder getObjBuilder() { bitField0_ |= 0x00000004; onChanged(); return getObjFieldBuilder().getBuilder(); @@ -5477,7 +5477,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.Builder getObjBuilder /** * optional .Mysqlx.Datatypes.Object obj = 3; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ObjectOrBuilder getObjOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ObjectOrBuilder getObjOrBuilder() { if (objBuilder_ != null) { return objBuilder_.getMessageOrBuilder(); } else { @@ -5488,11 +5488,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ObjectOrBuilder getObjOrBuil * optional .Mysqlx.Datatypes.Object obj = 3; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ObjectOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ObjectOrBuilder> getObjFieldBuilder() { if (objBuilder_ == null) { objBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ObjectOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object, com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ObjectOrBuilder>( getObj(), getParentForChildren(), isClean()); @@ -5501,9 +5501,9 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ObjectOrBuilder getObjOrBuil return objBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array array_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Array array_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ArrayOrBuilder> arrayBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array, com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ArrayOrBuilder> arrayBuilder_; /** * optional .Mysqlx.Datatypes.Array array = 4; */ @@ -5513,7 +5513,7 @@ public boolean hasArray() { /** * optional .Mysqlx.Datatypes.Array array = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array getArray() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Array getArray() { if (arrayBuilder_ == null) { return array_; } else { @@ -5523,7 +5523,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array getArray() { /** * optional .Mysqlx.Datatypes.Array array = 4; */ - public Builder setArray(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array value) { + public Builder setArray(com.mysql.cj.x.protobuf.MysqlxDatatypes.Array value) { if (arrayBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5540,7 +5540,7 @@ public Builder setArray(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array value * optional .Mysqlx.Datatypes.Array array = 4; */ public Builder setArray( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.Builder builderForValue) { if (arrayBuilder_ == null) { array_ = builderForValue.build(); onChanged(); @@ -5553,12 +5553,12 @@ public Builder setArray( /** * optional .Mysqlx.Datatypes.Array array = 4; */ - public Builder mergeArray(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array value) { + public Builder mergeArray(com.mysql.cj.x.protobuf.MysqlxDatatypes.Array value) { if (arrayBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && - array_ != com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.getDefaultInstance()) { + array_ != com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.getDefaultInstance()) { array_ = - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.newBuilder(array_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.newBuilder(array_).mergeFrom(value).buildPartial(); } else { array_ = value; } @@ -5574,7 +5574,7 @@ public Builder mergeArray(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array val */ public Builder clearArray() { if (arrayBuilder_ == null) { - array_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.getDefaultInstance(); + array_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.getDefaultInstance(); onChanged(); } else { arrayBuilder_.clear(); @@ -5585,7 +5585,7 @@ public Builder clearArray() { /** * optional .Mysqlx.Datatypes.Array array = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.Builder getArrayBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.Builder getArrayBuilder() { bitField0_ |= 0x00000008; onChanged(); return getArrayFieldBuilder().getBuilder(); @@ -5593,7 +5593,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.Builder getArrayBuilde /** * optional .Mysqlx.Datatypes.Array array = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ArrayOrBuilder getArrayOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ArrayOrBuilder getArrayOrBuilder() { if (arrayBuilder_ != null) { return arrayBuilder_.getMessageOrBuilder(); } else { @@ -5604,11 +5604,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ArrayOrBuilder getArrayOrBui * optional .Mysqlx.Datatypes.Array array = 4; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ArrayOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array, com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ArrayOrBuilder> getArrayFieldBuilder() { if (arrayBuilder_ == null) { arrayBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ArrayOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array, com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ArrayOrBuilder>( getArray(), getParentForChildren(), isClean()); diff --git a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxExpect.java b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxExpect.java similarity index 80% rename from src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxExpect.java rename to src/generated/java/com/mysql/cj/x/protobuf/MysqlxExpect.java index 4b42c0d2f..407fb2f8c 100644 --- a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxExpect.java +++ b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxExpect.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.protobuf; +package com.mysql.cj.x.protobuf; // Generated by the protocol buffer compiler. DO NOT EDIT! // source: mysqlx_expect.proto @@ -42,17 +42,17 @@ public interface OpenOrBuilder extends /** * optional .Mysqlx.Expect.Open.CtxOperation op = 1 [default = EXPECT_CTX_COPY_PREV]; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation getOp(); + com.mysql.cj.x.protobuf.MysqlxExpect.Open.CtxOperation getOp(); /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - java.util.List + java.util.List getCondList(); /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition getCond(int index); + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition getCond(int index); /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ @@ -60,12 +60,12 @@ public interface OpenOrBuilder extends /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - java.util.List + java.util.List getCondOrBuilderList(); /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.ConditionOrBuilder getCondOrBuilder( + com.mysql.cj.x.protobuf.MysqlxExpect.Open.ConditionOrBuilder getCondOrBuilder( int index); } /** @@ -129,7 +129,7 @@ private Open( } case 8: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation value = com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxExpect.Open.CtxOperation value = com.mysql.cj.x.protobuf.MysqlxExpect.Open.CtxOperation.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -140,10 +140,10 @@ private Open( } case 18: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - cond_ = new java.util.ArrayList(); + cond_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } - cond_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.PARSER, extensionRegistry)); + cond_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.PARSER, extensionRegistry)); break; } } @@ -163,14 +163,14 @@ private Open( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpect.Open.class, com.mysql.cj.x.protobuf.MysqlxExpect.Open.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -261,7 +261,7 @@ public CtxOperation findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxExpect.Open.getDescriptor().getEnumTypes().get(0); } private static final CtxOperation[] VALUES = values(); @@ -315,7 +315,7 @@ public interface ConditionOrBuilder extends /** * optional .Mysqlx.Expect.Open.Condition.ConditionOperation op = 3 [default = EXPECT_OP_SET]; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.ConditionOperation getOp(); + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.ConditionOperation getOp(); } /** * Protobuf type {@code Mysqlx.Expect.Open.Condition} @@ -381,7 +381,7 @@ private Condition( } case 24: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.ConditionOperation value = com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.ConditionOperation.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.ConditionOperation value = com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.ConditionOperation.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(3, rawValue); } else { @@ -404,14 +404,14 @@ private Condition( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_Condition_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_Condition_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_Condition_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_Condition_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.class, com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -506,7 +506,7 @@ public ConditionOperation findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.getDescriptor().getEnumTypes().get(0); } private static final ConditionOperation[] VALUES = values(); @@ -563,7 +563,7 @@ public com.google.protobuf.ByteString getConditionValue() { } public static final int OP_FIELD_NUMBER = 3; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.ConditionOperation op_; + private com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.ConditionOperation op_; /** * optional .Mysqlx.Expect.Open.Condition.ConditionOperation op = 3 [default = EXPECT_OP_SET]; */ @@ -573,14 +573,14 @@ public boolean hasOp() { /** * optional .Mysqlx.Expect.Open.Condition.ConditionOperation op = 3 [default = EXPECT_OP_SET]; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.ConditionOperation getOp() { + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.ConditionOperation getOp() { return op_; } private void initFields() { conditionKey_ = 0; conditionValue_ = com.google.protobuf.ByteString.EMPTY; - op_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.ConditionOperation.EXPECT_OP_SET; + op_ = com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.ConditionOperation.EXPECT_OP_SET; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -641,53 +641,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -696,7 +696,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition parseFrom public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -713,17 +713,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Expect.Open.Condition) - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.ConditionOrBuilder { + com.mysql.cj.x.protobuf.MysqlxExpect.Open.ConditionOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_Condition_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_Condition_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_Condition_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_Condition_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.class, com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.newBuilder() @@ -750,7 +750,7 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000001); conditionValue_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000002); - op_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.ConditionOperation.EXPECT_OP_SET; + op_ = com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.ConditionOperation.EXPECT_OP_SET; bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -761,23 +761,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_Condition_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_Condition_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition build() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition build() { + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition result = new com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition(this); + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition buildPartial() { + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition result = new com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -798,16 +798,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition other) { + if (other == com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.getDefaultInstance()) return this; if (other.hasConditionKey()) { setConditionKey(other.getConditionKey()); } @@ -833,11 +833,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -915,7 +915,7 @@ public Builder clearConditionValue() { return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.ConditionOperation op_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.ConditionOperation.EXPECT_OP_SET; + private com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.ConditionOperation op_ = com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.ConditionOperation.EXPECT_OP_SET; /** * optional .Mysqlx.Expect.Open.Condition.ConditionOperation op = 3 [default = EXPECT_OP_SET]; */ @@ -925,13 +925,13 @@ public boolean hasOp() { /** * optional .Mysqlx.Expect.Open.Condition.ConditionOperation op = 3 [default = EXPECT_OP_SET]; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.ConditionOperation getOp() { + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.ConditionOperation getOp() { return op_; } /** * optional .Mysqlx.Expect.Open.Condition.ConditionOperation op = 3 [default = EXPECT_OP_SET]; */ - public Builder setOp(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.ConditionOperation value) { + public Builder setOp(com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.ConditionOperation value) { if (value == null) { throw new NullPointerException(); } @@ -945,7 +945,7 @@ public Builder setOp(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.Co */ public Builder clearOp() { bitField0_ = (bitField0_ & ~0x00000004); - op_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.ConditionOperation.EXPECT_OP_SET; + op_ = com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.ConditionOperation.EXPECT_OP_SET; onChanged(); return this; } @@ -963,7 +963,7 @@ public Builder clearOp() { private int bitField0_; public static final int OP_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation op_; + private com.mysql.cj.x.protobuf.MysqlxExpect.Open.CtxOperation op_; /** * optional .Mysqlx.Expect.Open.CtxOperation op = 1 [default = EXPECT_CTX_COPY_PREV]; */ @@ -973,22 +973,22 @@ public boolean hasOp() { /** * optional .Mysqlx.Expect.Open.CtxOperation op = 1 [default = EXPECT_CTX_COPY_PREV]; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation getOp() { + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.CtxOperation getOp() { return op_; } public static final int COND_FIELD_NUMBER = 2; - private java.util.List cond_; + private java.util.List cond_; /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public java.util.List getCondList() { + public java.util.List getCondList() { return cond_; } /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public java.util.List + public java.util.List getCondOrBuilderList() { return cond_; } @@ -1001,19 +1001,19 @@ public int getCondCount() { /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition getCond(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition getCond(int index) { return cond_.get(index); } /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.ConditionOrBuilder getCondOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.ConditionOrBuilder getCondOrBuilder( int index) { return cond_.get(index); } private void initFields() { - op_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation.EXPECT_CTX_COPY_PREV; + op_ = com.mysql.cj.x.protobuf.MysqlxExpect.Open.CtxOperation.EXPECT_CTX_COPY_PREV; cond_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; @@ -1070,53 +1070,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Open parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1125,7 +1125,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxExpect.Open prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1149,17 +1149,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Expect.Open) - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.OpenOrBuilder { + com.mysql.cj.x.protobuf.MysqlxExpect.OpenOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpect.Open.class, com.mysql.cj.x.protobuf.MysqlxExpect.Open.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.newBuilder() @@ -1183,7 +1183,7 @@ private static Builder create() { public Builder clear() { super.clear(); - op_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation.EXPECT_CTX_COPY_PREV; + op_ = com.mysql.cj.x.protobuf.MysqlxExpect.Open.CtxOperation.EXPECT_CTX_COPY_PREV; bitField0_ = (bitField0_ & ~0x00000001); if (condBuilder_ == null) { cond_ = java.util.Collections.emptyList(); @@ -1200,23 +1200,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Open_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxExpect.Open getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxExpect.Open.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open build() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxExpect.Open build() { + com.mysql.cj.x.protobuf.MysqlxExpect.Open result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open result = new com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open(this); + public com.mysql.cj.x.protobuf.MysqlxExpect.Open buildPartial() { + com.mysql.cj.x.protobuf.MysqlxExpect.Open result = new com.mysql.cj.x.protobuf.MysqlxExpect.Open(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1238,16 +1238,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxExpect.Open) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxExpect.Open)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxExpect.Open other) { + if (other == com.mysql.cj.x.protobuf.MysqlxExpect.Open.getDefaultInstance()) return this; if (other.hasOp()) { setOp(other.getOp()); } @@ -1295,11 +1295,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxExpect.Open parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxExpect.Open) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1310,7 +1310,7 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation op_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation.EXPECT_CTX_COPY_PREV; + private com.mysql.cj.x.protobuf.MysqlxExpect.Open.CtxOperation op_ = com.mysql.cj.x.protobuf.MysqlxExpect.Open.CtxOperation.EXPECT_CTX_COPY_PREV; /** * optional .Mysqlx.Expect.Open.CtxOperation op = 1 [default = EXPECT_CTX_COPY_PREV]; */ @@ -1320,13 +1320,13 @@ public boolean hasOp() { /** * optional .Mysqlx.Expect.Open.CtxOperation op = 1 [default = EXPECT_CTX_COPY_PREV]; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation getOp() { + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.CtxOperation getOp() { return op_; } /** * optional .Mysqlx.Expect.Open.CtxOperation op = 1 [default = EXPECT_CTX_COPY_PREV]; */ - public Builder setOp(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation value) { + public Builder setOp(com.mysql.cj.x.protobuf.MysqlxExpect.Open.CtxOperation value) { if (value == null) { throw new NullPointerException(); } @@ -1340,27 +1340,27 @@ public Builder setOp(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation */ public Builder clearOp() { bitField0_ = (bitField0_ & ~0x00000001); - op_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.CtxOperation.EXPECT_CTX_COPY_PREV; + op_ = com.mysql.cj.x.protobuf.MysqlxExpect.Open.CtxOperation.EXPECT_CTX_COPY_PREV; onChanged(); return this; } - private java.util.List cond_ = + private java.util.List cond_ = java.util.Collections.emptyList(); private void ensureCondIsMutable() { if (!((bitField0_ & 0x00000002) == 0x00000002)) { - cond_ = new java.util.ArrayList(cond_); + cond_ = new java.util.ArrayList(cond_); bitField0_ |= 0x00000002; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.ConditionOrBuilder> condBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition, com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.Builder, com.mysql.cj.x.protobuf.MysqlxExpect.Open.ConditionOrBuilder> condBuilder_; /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public java.util.List getCondList() { + public java.util.List getCondList() { if (condBuilder_ == null) { return java.util.Collections.unmodifiableList(cond_); } else { @@ -1380,7 +1380,7 @@ public int getCondCount() { /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition getCond(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition getCond(int index) { if (condBuilder_ == null) { return cond_.get(index); } else { @@ -1391,7 +1391,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition getCond(int inde * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ public Builder setCond( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition value) { if (condBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1408,7 +1408,7 @@ public Builder setCond( * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ public Builder setCond( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.Builder builderForValue) { if (condBuilder_ == null) { ensureCondIsMutable(); cond_.set(index, builderForValue.build()); @@ -1421,7 +1421,7 @@ public Builder setCond( /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public Builder addCond(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition value) { + public Builder addCond(com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition value) { if (condBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1438,7 +1438,7 @@ public Builder addCond(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ public Builder addCond( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition value) { if (condBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1455,7 +1455,7 @@ public Builder addCond( * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ public Builder addCond( - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.Builder builderForValue) { if (condBuilder_ == null) { ensureCondIsMutable(); cond_.add(builderForValue.build()); @@ -1469,7 +1469,7 @@ public Builder addCond( * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ public Builder addCond( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.Builder builderForValue) { if (condBuilder_ == null) { ensureCondIsMutable(); cond_.add(index, builderForValue.build()); @@ -1483,7 +1483,7 @@ public Builder addCond( * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ public Builder addAllCond( - java.lang.Iterable values) { + java.lang.Iterable values) { if (condBuilder_ == null) { ensureCondIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -1523,14 +1523,14 @@ public Builder removeCond(int index) { /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.Builder getCondBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.Builder getCondBuilder( int index) { return getCondFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.ConditionOrBuilder getCondOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.ConditionOrBuilder getCondOrBuilder( int index) { if (condBuilder_ == null) { return cond_.get(index); } else { @@ -1540,7 +1540,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.ConditionOrBuilder getCond /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public java.util.List + public java.util.List getCondOrBuilderList() { if (condBuilder_ != null) { return condBuilder_.getMessageOrBuilderList(); @@ -1551,31 +1551,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.ConditionOrBuilder getCond /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.Builder addCondBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.Builder addCondBuilder() { return getCondFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.getDefaultInstance()); } /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.Builder addCondBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.Builder addCondBuilder( int index) { return getCondFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.getDefaultInstance()); } /** * repeated .Mysqlx.Expect.Open.Condition cond = 2; */ - public java.util.List + public java.util.List getCondBuilderList() { return getCondFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.ConditionOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition, com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.Builder, com.mysql.cj.x.protobuf.MysqlxExpect.Open.ConditionOrBuilder> getCondFieldBuilder() { if (condBuilder_ == null) { condBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.Condition.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Open.ConditionOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition, com.mysql.cj.x.protobuf.MysqlxExpect.Open.Condition.Builder, com.mysql.cj.x.protobuf.MysqlxExpect.Open.ConditionOrBuilder>( cond_, ((bitField0_ & 0x00000002) == 0x00000002), getParentForChildren(), @@ -1672,14 +1672,14 @@ private Close( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Close_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Close_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Close_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Close_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpect.Close.class, com.mysql.cj.x.protobuf.MysqlxExpect.Close.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1733,53 +1733,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Close parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Close parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxExpect.Close parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Close parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpect.Close parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Close parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpect.Close parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Close parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Close parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpect.Close parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1788,7 +1788,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxExpect.Close prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1812,17 +1812,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Expect.Close) - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.CloseOrBuilder { + com.mysql.cj.x.protobuf.MysqlxExpect.CloseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Close_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Close_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Close_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Close_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpect.Close.class, com.mysql.cj.x.protobuf.MysqlxExpect.Close.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close.newBuilder() @@ -1854,38 +1854,38 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Close_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpect.internal_static_Mysqlx_Expect_Close_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxExpect.Close getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxExpect.Close.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close build() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxExpect.Close build() { + com.mysql.cj.x.protobuf.MysqlxExpect.Close result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close result = new com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close(this); + public com.mysql.cj.x.protobuf.MysqlxExpect.Close buildPartial() { + com.mysql.cj.x.protobuf.MysqlxExpect.Close result = new com.mysql.cj.x.protobuf.MysqlxExpect.Close(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxExpect.Close) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxExpect.Close)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxExpect.Close other) { + if (other == com.mysql.cj.x.protobuf.MysqlxExpect.Close.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -1898,11 +1898,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxExpect.Close parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxExpect.Close) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxExpect.Close) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { diff --git a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxExpr.java b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxExpr.java similarity index 79% rename from src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxExpr.java rename to src/generated/java/com/mysql/cj/x/protobuf/MysqlxExpr.java index bc462fc53..bf041674a 100644 --- a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxExpr.java +++ b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxExpr.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.protobuf; +package com.mysql.cj.x.protobuf; // Generated by the protocol buffer compiler. DO NOT EDIT! // source: mysqlx_expr.proto @@ -42,7 +42,7 @@ public interface ExprOrBuilder extends /** * required .Mysqlx.Expr.Expr.Type type = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type getType(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Type getType(); /** * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; @@ -51,11 +51,11 @@ public interface ExprOrBuilder extends /** * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier getIdentifier(); + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier getIdentifier(); /** * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getIdentifierOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getIdentifierOrBuilder(); /** * optional string variable = 3; @@ -78,11 +78,11 @@ public interface ExprOrBuilder extends /** * optional .Mysqlx.Datatypes.Scalar literal = 4; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getLiteral(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getLiteral(); /** * optional .Mysqlx.Datatypes.Scalar literal = 4; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getLiteralOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getLiteralOrBuilder(); /** * optional .Mysqlx.Expr.FunctionCall function_call = 5; @@ -91,11 +91,11 @@ public interface ExprOrBuilder extends /** * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall getFunctionCall(); + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall getFunctionCall(); /** * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCallOrBuilder getFunctionCallOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCallOrBuilder getFunctionCallOrBuilder(); /** * optional .Mysqlx.Expr.Operator operator = 6; @@ -104,11 +104,11 @@ public interface ExprOrBuilder extends /** * optional .Mysqlx.Expr.Operator operator = 6; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator getOperator(); + com.mysql.cj.x.protobuf.MysqlxExpr.Operator getOperator(); /** * optional .Mysqlx.Expr.Operator operator = 6; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.OperatorOrBuilder getOperatorOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.OperatorOrBuilder getOperatorOrBuilder(); /** * optional uint32 position = 7; @@ -126,11 +126,11 @@ public interface ExprOrBuilder extends /** * optional .Mysqlx.Expr.Object object = 8; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object getObject(); + com.mysql.cj.x.protobuf.MysqlxExpr.Object getObject(); /** * optional .Mysqlx.Expr.Object object = 8; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ObjectOrBuilder getObjectOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.ObjectOrBuilder getObjectOrBuilder(); /** * optional .Mysqlx.Expr.Array array = 9; @@ -139,11 +139,11 @@ public interface ExprOrBuilder extends /** * optional .Mysqlx.Expr.Array array = 9; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array getArray(); + com.mysql.cj.x.protobuf.MysqlxExpr.Array getArray(); /** * optional .Mysqlx.Expr.Array array = 9; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ArrayOrBuilder getArrayOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.ArrayOrBuilder getArrayOrBuilder(); } /** * Protobuf type {@code Mysqlx.Expr.Expr} @@ -215,7 +215,7 @@ private Expr( } case 8: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type value = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Type value = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -225,11 +225,11 @@ private Expr( break; } case 18: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = identifier_.toBuilder(); } - identifier_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.PARSER, extensionRegistry); + identifier_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(identifier_); identifier_ = subBuilder.buildPartial(); @@ -244,11 +244,11 @@ private Expr( break; } case 34: { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = literal_.toBuilder(); } - literal_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry); + literal_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(literal_); literal_ = subBuilder.buildPartial(); @@ -257,11 +257,11 @@ private Expr( break; } case 42: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.Builder subBuilder = null; if (((bitField0_ & 0x00000010) == 0x00000010)) { subBuilder = functionCall_.toBuilder(); } - functionCall_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.PARSER, extensionRegistry); + functionCall_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(functionCall_); functionCall_ = subBuilder.buildPartial(); @@ -270,11 +270,11 @@ private Expr( break; } case 50: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Operator.Builder subBuilder = null; if (((bitField0_ & 0x00000020) == 0x00000020)) { subBuilder = operator_.toBuilder(); } - operator_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.PARSER, extensionRegistry); + operator_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Operator.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(operator_); operator_ = subBuilder.buildPartial(); @@ -288,11 +288,11 @@ private Expr( break; } case 66: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Object.Builder subBuilder = null; if (((bitField0_ & 0x00000080) == 0x00000080)) { subBuilder = object_.toBuilder(); } - object_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.PARSER, extensionRegistry); + object_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Object.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(object_); object_ = subBuilder.buildPartial(); @@ -301,11 +301,11 @@ private Expr( break; } case 74: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Array.Builder subBuilder = null; if (((bitField0_ & 0x00000100) == 0x00000100)) { subBuilder = array_.toBuilder(); } - array_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.PARSER, extensionRegistry); + array_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Array.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(array_); array_ = subBuilder.buildPartial(); @@ -327,14 +327,14 @@ private Expr( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Expr_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Expr_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Expr_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Expr_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.class, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -463,7 +463,7 @@ public Type findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -490,7 +490,7 @@ private Type(int index, int value) { private int bitField0_; public static final int TYPE_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type type_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Type type_; /** * required .Mysqlx.Expr.Expr.Type type = 1; */ @@ -500,12 +500,12 @@ public boolean hasType() { /** * required .Mysqlx.Expr.Expr.Type type = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type getType() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Type getType() { return type_; } public static final int IDENTIFIER_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier identifier_; + private com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier identifier_; /** * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ @@ -515,13 +515,13 @@ public boolean hasIdentifier() { /** * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier getIdentifier() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier getIdentifier() { return identifier_; } /** * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getIdentifierOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getIdentifierOrBuilder() { return identifier_; } @@ -568,7 +568,7 @@ public java.lang.String getVariable() { } public static final int LITERAL_FIELD_NUMBER = 4; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar literal_; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar literal_; /** * optional .Mysqlx.Datatypes.Scalar literal = 4; */ @@ -578,18 +578,18 @@ public boolean hasLiteral() { /** * optional .Mysqlx.Datatypes.Scalar literal = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getLiteral() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getLiteral() { return literal_; } /** * optional .Mysqlx.Datatypes.Scalar literal = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getLiteralOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getLiteralOrBuilder() { return literal_; } public static final int FUNCTION_CALL_FIELD_NUMBER = 5; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall functionCall_; + private com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall functionCall_; /** * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ @@ -599,18 +599,18 @@ public boolean hasFunctionCall() { /** * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall getFunctionCall() { + public com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall getFunctionCall() { return functionCall_; } /** * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCallOrBuilder getFunctionCallOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCallOrBuilder getFunctionCallOrBuilder() { return functionCall_; } public static final int OPERATOR_FIELD_NUMBER = 6; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator operator_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Operator operator_; /** * optional .Mysqlx.Expr.Operator operator = 6; */ @@ -620,13 +620,13 @@ public boolean hasOperator() { /** * optional .Mysqlx.Expr.Operator operator = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator getOperator() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Operator getOperator() { return operator_; } /** * optional .Mysqlx.Expr.Operator operator = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.OperatorOrBuilder getOperatorOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.OperatorOrBuilder getOperatorOrBuilder() { return operator_; } @@ -646,7 +646,7 @@ public int getPosition() { } public static final int OBJECT_FIELD_NUMBER = 8; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object object_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Object object_; /** * optional .Mysqlx.Expr.Object object = 8; */ @@ -656,18 +656,18 @@ public boolean hasObject() { /** * optional .Mysqlx.Expr.Object object = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object getObject() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Object getObject() { return object_; } /** * optional .Mysqlx.Expr.Object object = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ObjectOrBuilder getObjectOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ObjectOrBuilder getObjectOrBuilder() { return object_; } public static final int ARRAY_FIELD_NUMBER = 9; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array array_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Array array_; /** * optional .Mysqlx.Expr.Array array = 9; */ @@ -677,26 +677,26 @@ public boolean hasArray() { /** * optional .Mysqlx.Expr.Array array = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array getArray() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Array getArray() { return array_; } /** * optional .Mysqlx.Expr.Array array = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ArrayOrBuilder getArrayOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ArrayOrBuilder getArrayOrBuilder() { return array_; } private void initFields() { - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type.IDENT; - identifier_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); + type_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Type.IDENT; + identifier_ = com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); variable_ = ""; - literal_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); - functionCall_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance(); - operator_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.getDefaultInstance(); + literal_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + functionCall_ = com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance(); + operator_ = com.mysql.cj.x.protobuf.MysqlxExpr.Operator.getDefaultInstance(); position_ = 0; - object_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.getDefaultInstance(); - array_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.getDefaultInstance(); + object_ = com.mysql.cj.x.protobuf.MysqlxExpr.Object.getDefaultInstance(); + array_ = com.mysql.cj.x.protobuf.MysqlxExpr.Array.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -835,53 +835,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Expr parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Expr parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Expr parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Expr parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Expr parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Expr parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Expr parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Expr parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Expr parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Expr parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -890,7 +890,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxExpr.Expr prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -923,17 +923,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Expr.Expr) - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder { + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Expr_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Expr_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Expr_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Expr_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.class, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.newBuilder() @@ -962,10 +962,10 @@ private static Builder create() { public Builder clear() { super.clear(); - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type.IDENT; + type_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Type.IDENT; bitField0_ = (bitField0_ & ~0x00000001); if (identifierBuilder_ == null) { - identifier_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); + identifier_ = com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); } else { identifierBuilder_.clear(); } @@ -973,19 +973,19 @@ public Builder clear() { variable_ = ""; bitField0_ = (bitField0_ & ~0x00000004); if (literalBuilder_ == null) { - literal_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + literal_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); } else { literalBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000008); if (functionCallBuilder_ == null) { - functionCall_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance(); + functionCall_ = com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance(); } else { functionCallBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000010); if (operatorBuilder_ == null) { - operator_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.getDefaultInstance(); + operator_ = com.mysql.cj.x.protobuf.MysqlxExpr.Operator.getDefaultInstance(); } else { operatorBuilder_.clear(); } @@ -993,13 +993,13 @@ public Builder clear() { position_ = 0; bitField0_ = (bitField0_ & ~0x00000040); if (objectBuilder_ == null) { - object_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.getDefaultInstance(); + object_ = com.mysql.cj.x.protobuf.MysqlxExpr.Object.getDefaultInstance(); } else { objectBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000080); if (arrayBuilder_ == null) { - array_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.getDefaultInstance(); + array_ = com.mysql.cj.x.protobuf.MysqlxExpr.Array.getDefaultInstance(); } else { arrayBuilder_.clear(); } @@ -1013,23 +1013,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Expr_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Expr_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr build() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr build() { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr result = new com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr(this); + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr buildPartial() { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr result = new com.mysql.cj.x.protobuf.MysqlxExpr.Expr(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1098,16 +1098,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxExpr.Expr) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxExpr.Expr)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxExpr.Expr other) { + if (other == com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -1189,11 +1189,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxExpr.Expr) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1204,7 +1204,7 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type type_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type.IDENT; + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Type type_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Type.IDENT; /** * required .Mysqlx.Expr.Expr.Type type = 1; */ @@ -1214,13 +1214,13 @@ public boolean hasType() { /** * required .Mysqlx.Expr.Expr.Type type = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type getType() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Type getType() { return type_; } /** * required .Mysqlx.Expr.Expr.Type type = 1; */ - public Builder setType(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type value) { + public Builder setType(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Type value) { if (value == null) { throw new NullPointerException(); } @@ -1234,14 +1234,14 @@ public Builder setType(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type value) */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Type.IDENT; + type_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Type.IDENT; onChanged(); return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier identifier_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier identifier_ = com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder> identifierBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder> identifierBuilder_; /** * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ @@ -1251,7 +1251,7 @@ public boolean hasIdentifier() { /** * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier getIdentifier() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier getIdentifier() { if (identifierBuilder_ == null) { return identifier_; } else { @@ -1261,7 +1261,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier getIdentifier() /** * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ - public Builder setIdentifier(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier value) { + public Builder setIdentifier(com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier value) { if (identifierBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1278,7 +1278,7 @@ public Builder setIdentifier(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdent * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ public Builder setIdentifier( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder builderForValue) { if (identifierBuilder_ == null) { identifier_ = builderForValue.build(); onChanged(); @@ -1291,12 +1291,12 @@ public Builder setIdentifier( /** * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ - public Builder mergeIdentifier(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier value) { + public Builder mergeIdentifier(com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier value) { if (identifierBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - identifier_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance()) { + identifier_ != com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance()) { identifier_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.newBuilder(identifier_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.newBuilder(identifier_).mergeFrom(value).buildPartial(); } else { identifier_ = value; } @@ -1312,7 +1312,7 @@ public Builder mergeIdentifier(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIde */ public Builder clearIdentifier() { if (identifierBuilder_ == null) { - identifier_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); + identifier_ = com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); onChanged(); } else { identifierBuilder_.clear(); @@ -1323,7 +1323,7 @@ public Builder clearIdentifier() { /** * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder getIdentifierBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder getIdentifierBuilder() { bitField0_ |= 0x00000002; onChanged(); return getIdentifierFieldBuilder().getBuilder(); @@ -1331,7 +1331,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder getIdent /** * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getIdentifierOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getIdentifierOrBuilder() { if (identifierBuilder_ != null) { return identifierBuilder_.getMessageOrBuilder(); } else { @@ -1342,11 +1342,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder getIden * optional .Mysqlx.Expr.ColumnIdentifier identifier = 2; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder> getIdentifierFieldBuilder() { if (identifierBuilder_ == null) { identifierBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder>( getIdentifier(), getParentForChildren(), isClean()); @@ -1431,9 +1431,9 @@ public Builder setVariableBytes( return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar literal_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar literal_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> literalBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> literalBuilder_; /** * optional .Mysqlx.Datatypes.Scalar literal = 4; */ @@ -1443,7 +1443,7 @@ public boolean hasLiteral() { /** * optional .Mysqlx.Datatypes.Scalar literal = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getLiteral() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getLiteral() { if (literalBuilder_ == null) { return literal_; } else { @@ -1453,7 +1453,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getLiteral() { /** * optional .Mysqlx.Datatypes.Scalar literal = 4; */ - public Builder setLiteral(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + public Builder setLiteral(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (literalBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1470,7 +1470,7 @@ public Builder setLiteral(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar va * optional .Mysqlx.Datatypes.Scalar literal = 4; */ public Builder setLiteral( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (literalBuilder_ == null) { literal_ = builderForValue.build(); onChanged(); @@ -1483,12 +1483,12 @@ public Builder setLiteral( /** * optional .Mysqlx.Datatypes.Scalar literal = 4; */ - public Builder mergeLiteral(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + public Builder mergeLiteral(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (literalBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && - literal_ != com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()) { + literal_ != com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()) { literal_ = - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.newBuilder(literal_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.newBuilder(literal_).mergeFrom(value).buildPartial(); } else { literal_ = value; } @@ -1504,7 +1504,7 @@ public Builder mergeLiteral(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar */ public Builder clearLiteral() { if (literalBuilder_ == null) { - literal_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + literal_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); onChanged(); } else { literalBuilder_.clear(); @@ -1515,7 +1515,7 @@ public Builder clearLiteral() { /** * optional .Mysqlx.Datatypes.Scalar literal = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder getLiteralBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder getLiteralBuilder() { bitField0_ |= 0x00000008; onChanged(); return getLiteralFieldBuilder().getBuilder(); @@ -1523,7 +1523,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder getLiteralBui /** * optional .Mysqlx.Datatypes.Scalar literal = 4; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getLiteralOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getLiteralOrBuilder() { if (literalBuilder_ != null) { return literalBuilder_.getMessageOrBuilder(); } else { @@ -1534,11 +1534,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getLiteralOr * optional .Mysqlx.Datatypes.Scalar literal = 4; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> getLiteralFieldBuilder() { if (literalBuilder_ == null) { literalBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder>( getLiteral(), getParentForChildren(), isClean()); @@ -1547,9 +1547,9 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getLiteralOr return literalBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall functionCall_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall functionCall_ = com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCallOrBuilder> functionCallBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall, com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCallOrBuilder> functionCallBuilder_; /** * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ @@ -1559,7 +1559,7 @@ public boolean hasFunctionCall() { /** * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall getFunctionCall() { + public com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall getFunctionCall() { if (functionCallBuilder_ == null) { return functionCall_; } else { @@ -1569,7 +1569,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall getFunctionCall() { /** * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ - public Builder setFunctionCall(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall value) { + public Builder setFunctionCall(com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall value) { if (functionCallBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1586,7 +1586,7 @@ public Builder setFunctionCall(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionC * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ public Builder setFunctionCall( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.Builder builderForValue) { if (functionCallBuilder_ == null) { functionCall_ = builderForValue.build(); onChanged(); @@ -1599,12 +1599,12 @@ public Builder setFunctionCall( /** * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ - public Builder mergeFunctionCall(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall value) { + public Builder mergeFunctionCall(com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall value) { if (functionCallBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && - functionCall_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance()) { + functionCall_ != com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance()) { functionCall_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.newBuilder(functionCall_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.newBuilder(functionCall_).mergeFrom(value).buildPartial(); } else { functionCall_ = value; } @@ -1620,7 +1620,7 @@ public Builder mergeFunctionCall(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Functio */ public Builder clearFunctionCall() { if (functionCallBuilder_ == null) { - functionCall_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance(); + functionCall_ = com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance(); onChanged(); } else { functionCallBuilder_.clear(); @@ -1631,7 +1631,7 @@ public Builder clearFunctionCall() { /** * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.Builder getFunctionCallBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.Builder getFunctionCallBuilder() { bitField0_ |= 0x00000010; onChanged(); return getFunctionCallFieldBuilder().getBuilder(); @@ -1639,7 +1639,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.Builder getFunctionC /** * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCallOrBuilder getFunctionCallOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCallOrBuilder getFunctionCallOrBuilder() { if (functionCallBuilder_ != null) { return functionCallBuilder_.getMessageOrBuilder(); } else { @@ -1650,11 +1650,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCallOrBuilder getFunction * optional .Mysqlx.Expr.FunctionCall function_call = 5; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCallOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall, com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCallOrBuilder> getFunctionCallFieldBuilder() { if (functionCallBuilder_ == null) { functionCallBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCallOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall, com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCallOrBuilder>( getFunctionCall(), getParentForChildren(), isClean()); @@ -1663,9 +1663,9 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCallOrBuilder getFunction return functionCallBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator operator_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.Operator operator_ = com.mysql.cj.x.protobuf.MysqlxExpr.Operator.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.OperatorOrBuilder> operatorBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Operator, com.mysql.cj.x.protobuf.MysqlxExpr.Operator.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.OperatorOrBuilder> operatorBuilder_; /** * optional .Mysqlx.Expr.Operator operator = 6; */ @@ -1675,7 +1675,7 @@ public boolean hasOperator() { /** * optional .Mysqlx.Expr.Operator operator = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator getOperator() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Operator getOperator() { if (operatorBuilder_ == null) { return operator_; } else { @@ -1685,7 +1685,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator getOperator() { /** * optional .Mysqlx.Expr.Operator operator = 6; */ - public Builder setOperator(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator value) { + public Builder setOperator(com.mysql.cj.x.protobuf.MysqlxExpr.Operator value) { if (operatorBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1702,7 +1702,7 @@ public Builder setOperator(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator valu * optional .Mysqlx.Expr.Operator operator = 6; */ public Builder setOperator( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Operator.Builder builderForValue) { if (operatorBuilder_ == null) { operator_ = builderForValue.build(); onChanged(); @@ -1715,12 +1715,12 @@ public Builder setOperator( /** * optional .Mysqlx.Expr.Operator operator = 6; */ - public Builder mergeOperator(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator value) { + public Builder mergeOperator(com.mysql.cj.x.protobuf.MysqlxExpr.Operator value) { if (operatorBuilder_ == null) { if (((bitField0_ & 0x00000020) == 0x00000020) && - operator_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.getDefaultInstance()) { + operator_ != com.mysql.cj.x.protobuf.MysqlxExpr.Operator.getDefaultInstance()) { operator_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.newBuilder(operator_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.Operator.newBuilder(operator_).mergeFrom(value).buildPartial(); } else { operator_ = value; } @@ -1736,7 +1736,7 @@ public Builder mergeOperator(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator va */ public Builder clearOperator() { if (operatorBuilder_ == null) { - operator_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.getDefaultInstance(); + operator_ = com.mysql.cj.x.protobuf.MysqlxExpr.Operator.getDefaultInstance(); onChanged(); } else { operatorBuilder_.clear(); @@ -1747,7 +1747,7 @@ public Builder clearOperator() { /** * optional .Mysqlx.Expr.Operator operator = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.Builder getOperatorBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Operator.Builder getOperatorBuilder() { bitField0_ |= 0x00000020; onChanged(); return getOperatorFieldBuilder().getBuilder(); @@ -1755,7 +1755,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.Builder getOperatorBuild /** * optional .Mysqlx.Expr.Operator operator = 6; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.OperatorOrBuilder getOperatorOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.OperatorOrBuilder getOperatorOrBuilder() { if (operatorBuilder_ != null) { return operatorBuilder_.getMessageOrBuilder(); } else { @@ -1766,11 +1766,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.OperatorOrBuilder getOperatorOrBu * optional .Mysqlx.Expr.Operator operator = 6; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.OperatorOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Operator, com.mysql.cj.x.protobuf.MysqlxExpr.Operator.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.OperatorOrBuilder> getOperatorFieldBuilder() { if (operatorBuilder_ == null) { operatorBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.OperatorOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Operator, com.mysql.cj.x.protobuf.MysqlxExpr.Operator.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.OperatorOrBuilder>( getOperator(), getParentForChildren(), isClean()); @@ -1811,9 +1811,9 @@ public Builder clearPosition() { return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object object_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.Object object_ = com.mysql.cj.x.protobuf.MysqlxExpr.Object.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ObjectOrBuilder> objectBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Object, com.mysql.cj.x.protobuf.MysqlxExpr.Object.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ObjectOrBuilder> objectBuilder_; /** * optional .Mysqlx.Expr.Object object = 8; */ @@ -1823,7 +1823,7 @@ public boolean hasObject() { /** * optional .Mysqlx.Expr.Object object = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object getObject() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Object getObject() { if (objectBuilder_ == null) { return object_; } else { @@ -1833,7 +1833,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object getObject() { /** * optional .Mysqlx.Expr.Object object = 8; */ - public Builder setObject(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object value) { + public Builder setObject(com.mysql.cj.x.protobuf.MysqlxExpr.Object value) { if (objectBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1850,7 +1850,7 @@ public Builder setObject(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object value) { * optional .Mysqlx.Expr.Object object = 8; */ public Builder setObject( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Object.Builder builderForValue) { if (objectBuilder_ == null) { object_ = builderForValue.build(); onChanged(); @@ -1863,12 +1863,12 @@ public Builder setObject( /** * optional .Mysqlx.Expr.Object object = 8; */ - public Builder mergeObject(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object value) { + public Builder mergeObject(com.mysql.cj.x.protobuf.MysqlxExpr.Object value) { if (objectBuilder_ == null) { if (((bitField0_ & 0x00000080) == 0x00000080) && - object_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.getDefaultInstance()) { + object_ != com.mysql.cj.x.protobuf.MysqlxExpr.Object.getDefaultInstance()) { object_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.newBuilder(object_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.Object.newBuilder(object_).mergeFrom(value).buildPartial(); } else { object_ = value; } @@ -1884,7 +1884,7 @@ public Builder mergeObject(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object value) */ public Builder clearObject() { if (objectBuilder_ == null) { - object_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.getDefaultInstance(); + object_ = com.mysql.cj.x.protobuf.MysqlxExpr.Object.getDefaultInstance(); onChanged(); } else { objectBuilder_.clear(); @@ -1895,7 +1895,7 @@ public Builder clearObject() { /** * optional .Mysqlx.Expr.Object object = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.Builder getObjectBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Object.Builder getObjectBuilder() { bitField0_ |= 0x00000080; onChanged(); return getObjectFieldBuilder().getBuilder(); @@ -1903,7 +1903,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.Builder getObjectBuilder() /** * optional .Mysqlx.Expr.Object object = 8; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ObjectOrBuilder getObjectOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ObjectOrBuilder getObjectOrBuilder() { if (objectBuilder_ != null) { return objectBuilder_.getMessageOrBuilder(); } else { @@ -1914,11 +1914,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ObjectOrBuilder getObjectOrBuilde * optional .Mysqlx.Expr.Object object = 8; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ObjectOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Object, com.mysql.cj.x.protobuf.MysqlxExpr.Object.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ObjectOrBuilder> getObjectFieldBuilder() { if (objectBuilder_ == null) { objectBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ObjectOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Object, com.mysql.cj.x.protobuf.MysqlxExpr.Object.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ObjectOrBuilder>( getObject(), getParentForChildren(), isClean()); @@ -1927,9 +1927,9 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ObjectOrBuilder getObjectOrBuilde return objectBuilder_; } - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array array_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.Array array_ = com.mysql.cj.x.protobuf.MysqlxExpr.Array.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ArrayOrBuilder> arrayBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Array, com.mysql.cj.x.protobuf.MysqlxExpr.Array.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ArrayOrBuilder> arrayBuilder_; /** * optional .Mysqlx.Expr.Array array = 9; */ @@ -1939,7 +1939,7 @@ public boolean hasArray() { /** * optional .Mysqlx.Expr.Array array = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array getArray() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Array getArray() { if (arrayBuilder_ == null) { return array_; } else { @@ -1949,7 +1949,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array getArray() { /** * optional .Mysqlx.Expr.Array array = 9; */ - public Builder setArray(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array value) { + public Builder setArray(com.mysql.cj.x.protobuf.MysqlxExpr.Array value) { if (arrayBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1966,7 +1966,7 @@ public Builder setArray(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array value) { * optional .Mysqlx.Expr.Array array = 9; */ public Builder setArray( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Array.Builder builderForValue) { if (arrayBuilder_ == null) { array_ = builderForValue.build(); onChanged(); @@ -1979,12 +1979,12 @@ public Builder setArray( /** * optional .Mysqlx.Expr.Array array = 9; */ - public Builder mergeArray(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array value) { + public Builder mergeArray(com.mysql.cj.x.protobuf.MysqlxExpr.Array value) { if (arrayBuilder_ == null) { if (((bitField0_ & 0x00000100) == 0x00000100) && - array_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.getDefaultInstance()) { + array_ != com.mysql.cj.x.protobuf.MysqlxExpr.Array.getDefaultInstance()) { array_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.newBuilder(array_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.Array.newBuilder(array_).mergeFrom(value).buildPartial(); } else { array_ = value; } @@ -2000,7 +2000,7 @@ public Builder mergeArray(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array value) { */ public Builder clearArray() { if (arrayBuilder_ == null) { - array_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.getDefaultInstance(); + array_ = com.mysql.cj.x.protobuf.MysqlxExpr.Array.getDefaultInstance(); onChanged(); } else { arrayBuilder_.clear(); @@ -2011,7 +2011,7 @@ public Builder clearArray() { /** * optional .Mysqlx.Expr.Array array = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.Builder getArrayBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Array.Builder getArrayBuilder() { bitField0_ |= 0x00000100; onChanged(); return getArrayFieldBuilder().getBuilder(); @@ -2019,7 +2019,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.Builder getArrayBuilder() { /** * optional .Mysqlx.Expr.Array array = 9; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ArrayOrBuilder getArrayOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ArrayOrBuilder getArrayOrBuilder() { if (arrayBuilder_ != null) { return arrayBuilder_.getMessageOrBuilder(); } else { @@ -2030,11 +2030,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ArrayOrBuilder getArrayOrBuilder( * optional .Mysqlx.Expr.Array array = 9; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ArrayOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Array, com.mysql.cj.x.protobuf.MysqlxExpr.Array.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ArrayOrBuilder> getArrayFieldBuilder() { if (arrayBuilder_ == null) { arrayBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ArrayOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Array, com.mysql.cj.x.protobuf.MysqlxExpr.Array.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ArrayOrBuilder>( getArray(), getParentForChildren(), isClean()); @@ -2171,14 +2171,14 @@ private Identifier( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Identifier_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Identifier_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Identifier_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Identifier_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.class, com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2337,53 +2337,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Identifier parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Identifier parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Identifier parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Identifier parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Identifier parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Identifier parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Identifier parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Identifier parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Identifier parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Identifier parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2392,7 +2392,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxExpr.Identifier prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2416,17 +2416,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Expr.Identifier) - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.IdentifierOrBuilder { + com.mysql.cj.x.protobuf.MysqlxExpr.IdentifierOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Identifier_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Identifier_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Identifier_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Identifier_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.class, com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.newBuilder() @@ -2462,23 +2462,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Identifier_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Identifier_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxExpr.Identifier getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier build() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxExpr.Identifier build() { + com.mysql.cj.x.protobuf.MysqlxExpr.Identifier result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier result = new com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier(this); + public com.mysql.cj.x.protobuf.MysqlxExpr.Identifier buildPartial() { + com.mysql.cj.x.protobuf.MysqlxExpr.Identifier result = new com.mysql.cj.x.protobuf.MysqlxExpr.Identifier(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2495,16 +2495,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxExpr.Identifier) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxExpr.Identifier)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxExpr.Identifier other) { + if (other == com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.getDefaultInstance()) return this; if (other.hasName()) { bitField0_ |= 0x00000001; name_ = other.name_; @@ -2531,11 +2531,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Identifier parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxExpr.Identifier) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2720,7 +2720,7 @@ public interface DocumentPathItemOrBuilder extends /** * required .Mysqlx.Expr.DocumentPathItem.Type type = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Type getType(); + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Type getType(); /** * optional string value = 2; @@ -2808,7 +2808,7 @@ private DocumentPathItem( } case 8: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Type value = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Type.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Type value = com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -2842,14 +2842,14 @@ private DocumentPathItem( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_DocumentPathItem_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_DocumentPathItem_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_DocumentPathItem_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_DocumentPathItem_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.class, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2991,7 +2991,7 @@ public Type findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -3018,7 +3018,7 @@ private Type(int index, int value) { private int bitField0_; public static final int TYPE_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Type type_; + private com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Type type_; /** * required .Mysqlx.Expr.DocumentPathItem.Type type = 1; */ @@ -3028,7 +3028,7 @@ public boolean hasType() { /** * required .Mysqlx.Expr.DocumentPathItem.Type type = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Type getType() { + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Type getType() { return type_; } @@ -3090,7 +3090,7 @@ public int getIndex() { } private void initFields() { - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Type.MEMBER; + type_ = com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Type.MEMBER; value_ = ""; index_ = 0; } @@ -3153,53 +3153,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3208,7 +3208,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem parseFrom public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3234,17 +3234,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Expr.DocumentPathItem) - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder { + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_DocumentPathItem_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_DocumentPathItem_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_DocumentPathItem_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_DocumentPathItem_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.class, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.newBuilder() @@ -3267,7 +3267,7 @@ private static Builder create() { public Builder clear() { super.clear(); - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Type.MEMBER; + type_ = com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Type.MEMBER; bitField0_ = (bitField0_ & ~0x00000001); value_ = ""; bitField0_ = (bitField0_ & ~0x00000002); @@ -3282,23 +3282,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_DocumentPathItem_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_DocumentPathItem_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem build() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem build() { + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem result = new com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem(this); + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem buildPartial() { + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem result = new com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -3319,16 +3319,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem other) { + if (other == com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -3356,11 +3356,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3371,7 +3371,7 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Type type_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Type.MEMBER; + private com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Type type_ = com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Type.MEMBER; /** * required .Mysqlx.Expr.DocumentPathItem.Type type = 1; */ @@ -3381,13 +3381,13 @@ public boolean hasType() { /** * required .Mysqlx.Expr.DocumentPathItem.Type type = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Type getType() { + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Type getType() { return type_; } /** * required .Mysqlx.Expr.DocumentPathItem.Type type = 1; */ - public Builder setType(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Type value) { + public Builder setType(com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Type value) { if (value == null) { throw new NullPointerException(); } @@ -3401,7 +3401,7 @@ public Builder setType(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem. */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Type.MEMBER; + type_ = com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Type.MEMBER; onChanged(); return this; } @@ -3532,12 +3532,12 @@ public interface ColumnIdentifierOrBuilder extends /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - java.util.List + java.util.List getDocumentPathList(); /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath(int index); + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath(int index); /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ @@ -3545,12 +3545,12 @@ public interface ColumnIdentifierOrBuilder extends /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - java.util.List + java.util.List getDocumentPathOrBuilderList(); /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocumentPathOrBuilder( + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocumentPathOrBuilder( int index); /** @@ -3666,10 +3666,10 @@ private ColumnIdentifier( } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - documentPath_ = new java.util.ArrayList(); + documentPath_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - documentPath_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.PARSER, extensionRegistry)); + documentPath_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.PARSER, extensionRegistry)); break; } case 18: { @@ -3707,14 +3707,14 @@ private ColumnIdentifier( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_ColumnIdentifier_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_ColumnIdentifier_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_ColumnIdentifier_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_ColumnIdentifier_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.class, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3734,17 +3734,17 @@ public com.google.protobuf.Parser getParserForType() { private int bitField0_; public static final int DOCUMENT_PATH_FIELD_NUMBER = 1; - private java.util.List documentPath_; + private java.util.List documentPath_; /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public java.util.List getDocumentPathList() { + public java.util.List getDocumentPathList() { return documentPath_; } /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public java.util.List + public java.util.List getDocumentPathOrBuilderList() { return documentPath_; } @@ -3757,13 +3757,13 @@ public int getDocumentPathCount() { /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath(int index) { return documentPath_.get(index); } /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocumentPathOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocumentPathOrBuilder( int index) { return documentPath_.get(index); } @@ -3968,53 +3968,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4023,7 +4023,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier parseFrom public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -4057,17 +4057,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Expr.ColumnIdentifier) - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder { + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifierOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_ColumnIdentifier_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_ColumnIdentifier_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_ColumnIdentifier_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_ColumnIdentifier_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.class, com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.newBuilder() @@ -4112,23 +4112,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_ColumnIdentifier_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_ColumnIdentifier_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier build() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier build() { + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier result = new com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier(this); + public com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier buildPartial() { + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier result = new com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (documentPathBuilder_ == null) { @@ -4158,16 +4158,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier other) { + if (other == com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier.getDefaultInstance()) return this; if (documentPathBuilder_ == null) { if (!other.documentPath_.isEmpty()) { if (documentPath_.isEmpty()) { @@ -4227,11 +4227,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -4242,22 +4242,22 @@ public Builder mergeFrom( } private int bitField0_; - private java.util.List documentPath_ = + private java.util.List documentPath_ = java.util.Collections.emptyList(); private void ensureDocumentPathIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - documentPath_ = new java.util.ArrayList(documentPath_); + documentPath_ = new java.util.ArrayList(documentPath_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder> documentPathBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder> documentPathBuilder_; /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public java.util.List getDocumentPathList() { + public java.util.List getDocumentPathList() { if (documentPathBuilder_ == null) { return java.util.Collections.unmodifiableList(documentPath_); } else { @@ -4277,7 +4277,7 @@ public int getDocumentPathCount() { /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath(int index) { if (documentPathBuilder_ == null) { return documentPath_.get(index); } else { @@ -4288,7 +4288,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem getDocumentPath( * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ public Builder setDocumentPath( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem value) { if (documentPathBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4305,7 +4305,7 @@ public Builder setDocumentPath( * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ public Builder setDocumentPath( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder builderForValue) { if (documentPathBuilder_ == null) { ensureDocumentPathIsMutable(); documentPath_.set(index, builderForValue.build()); @@ -4318,7 +4318,7 @@ public Builder setDocumentPath( /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public Builder addDocumentPath(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem value) { + public Builder addDocumentPath(com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem value) { if (documentPathBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4335,7 +4335,7 @@ public Builder addDocumentPath(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentP * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ public Builder addDocumentPath( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem value) { if (documentPathBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4352,7 +4352,7 @@ public Builder addDocumentPath( * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ public Builder addDocumentPath( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder builderForValue) { if (documentPathBuilder_ == null) { ensureDocumentPathIsMutable(); documentPath_.add(builderForValue.build()); @@ -4366,7 +4366,7 @@ public Builder addDocumentPath( * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ public Builder addDocumentPath( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder builderForValue) { if (documentPathBuilder_ == null) { ensureDocumentPathIsMutable(); documentPath_.add(index, builderForValue.build()); @@ -4380,7 +4380,7 @@ public Builder addDocumentPath( * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ public Builder addAllDocumentPath( - java.lang.Iterable values) { + java.lang.Iterable values) { if (documentPathBuilder_ == null) { ensureDocumentPathIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -4420,14 +4420,14 @@ public Builder removeDocumentPath(int index) { /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder getDocumentPathBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder getDocumentPathBuilder( int index) { return getDocumentPathFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocumentPathOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocumentPathOrBuilder( int index) { if (documentPathBuilder_ == null) { return documentPath_.get(index); } else { @@ -4437,7 +4437,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocu /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public java.util.List + public java.util.List getDocumentPathOrBuilderList() { if (documentPathBuilder_ != null) { return documentPathBuilder_.getMessageOrBuilderList(); @@ -4448,31 +4448,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder getDocu /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder addDocumentPathBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder addDocumentPathBuilder() { return getDocumentPathFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder addDocumentPathBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder addDocumentPathBuilder( int index) { return getDocumentPathFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.DocumentPathItem document_path = 1; */ - public java.util.List + public java.util.List getDocumentPathBuilderList() { return getDocumentPathFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder> getDocumentPathFieldBuilder() { if (documentPathBuilder_ == null) { documentPathBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItemOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItemOrBuilder>( documentPath_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -4732,21 +4732,21 @@ public interface FunctionCallOrBuilder extends /** * required .Mysqlx.Expr.Identifier name = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier getName(); + com.mysql.cj.x.protobuf.MysqlxExpr.Identifier getName(); /** * required .Mysqlx.Expr.Identifier name = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.IdentifierOrBuilder getNameOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.IdentifierOrBuilder getNameOrBuilder(); /** * repeated .Mysqlx.Expr.Expr param = 2; */ - java.util.List + java.util.List getParamList(); /** * repeated .Mysqlx.Expr.Expr param = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getParam(int index); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getParam(int index); /** * repeated .Mysqlx.Expr.Expr param = 2; */ @@ -4754,12 +4754,12 @@ public interface FunctionCallOrBuilder extends /** * repeated .Mysqlx.Expr.Expr param = 2; */ - java.util.List + java.util.List getParamOrBuilderList(); /** * repeated .Mysqlx.Expr.Expr param = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( int index); } /** @@ -4821,11 +4821,11 @@ private FunctionCall( break; } case 10: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = name_.toBuilder(); } - name_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.PARSER, extensionRegistry); + name_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(name_); name_ = subBuilder.buildPartial(); @@ -4835,10 +4835,10 @@ private FunctionCall( } case 18: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - param_ = new java.util.ArrayList(); + param_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } - param_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry)); + param_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry)); break; } } @@ -4858,14 +4858,14 @@ private FunctionCall( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_FunctionCall_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_FunctionCall_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_FunctionCall_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_FunctionCall_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.class, com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -4885,7 +4885,7 @@ public com.google.protobuf.Parser getParserForType() { private int bitField0_; public static final int NAME_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier name_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Identifier name_; /** * required .Mysqlx.Expr.Identifier name = 1; */ @@ -4895,28 +4895,28 @@ public boolean hasName() { /** * required .Mysqlx.Expr.Identifier name = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier getName() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Identifier getName() { return name_; } /** * required .Mysqlx.Expr.Identifier name = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.IdentifierOrBuilder getNameOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.IdentifierOrBuilder getNameOrBuilder() { return name_; } public static final int PARAM_FIELD_NUMBER = 2; - private java.util.List param_; + private java.util.List param_; /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public java.util.List getParamList() { + public java.util.List getParamList() { return param_; } /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public java.util.List + public java.util.List getParamOrBuilderList() { return param_; } @@ -4929,19 +4929,19 @@ public int getParamCount() { /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getParam(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getParam(int index) { return param_.get(index); } /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( int index) { return param_.get(index); } private void initFields() { - name_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.getDefaultInstance(); + name_ = com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.getDefaultInstance(); param_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; @@ -5006,53 +5006,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5061,7 +5061,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -5084,17 +5084,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Expr.FunctionCall) - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCallOrBuilder { + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCallOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_FunctionCall_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_FunctionCall_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_FunctionCall_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_FunctionCall_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.class, com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.newBuilder() @@ -5120,7 +5120,7 @@ private static Builder create() { public Builder clear() { super.clear(); if (nameBuilder_ == null) { - name_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.getDefaultInstance(); + name_ = com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.getDefaultInstance(); } else { nameBuilder_.clear(); } @@ -5140,23 +5140,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_FunctionCall_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_FunctionCall_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall build() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall build() { + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall result = new com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall(this); + public com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall buildPartial() { + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall result = new com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -5182,16 +5182,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall other) { + if (other == com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall.getDefaultInstance()) return this; if (other.hasName()) { mergeName(other.getName()); } @@ -5247,11 +5247,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -5262,9 +5262,9 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier name_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.Identifier name_ = com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.IdentifierOrBuilder> nameBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Identifier, com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.IdentifierOrBuilder> nameBuilder_; /** * required .Mysqlx.Expr.Identifier name = 1; */ @@ -5274,7 +5274,7 @@ public boolean hasName() { /** * required .Mysqlx.Expr.Identifier name = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier getName() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Identifier getName() { if (nameBuilder_ == null) { return name_; } else { @@ -5284,7 +5284,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier getName() { /** * required .Mysqlx.Expr.Identifier name = 1; */ - public Builder setName(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier value) { + public Builder setName(com.mysql.cj.x.protobuf.MysqlxExpr.Identifier value) { if (nameBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5301,7 +5301,7 @@ public Builder setName(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier value) * required .Mysqlx.Expr.Identifier name = 1; */ public Builder setName( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.Builder builderForValue) { if (nameBuilder_ == null) { name_ = builderForValue.build(); onChanged(); @@ -5314,12 +5314,12 @@ public Builder setName( /** * required .Mysqlx.Expr.Identifier name = 1; */ - public Builder mergeName(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier value) { + public Builder mergeName(com.mysql.cj.x.protobuf.MysqlxExpr.Identifier value) { if (nameBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - name_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.getDefaultInstance()) { + name_ != com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.getDefaultInstance()) { name_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.newBuilder(name_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.newBuilder(name_).mergeFrom(value).buildPartial(); } else { name_ = value; } @@ -5335,7 +5335,7 @@ public Builder mergeName(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier valu */ public Builder clearName() { if (nameBuilder_ == null) { - name_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.getDefaultInstance(); + name_ = com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.getDefaultInstance(); onChanged(); } else { nameBuilder_.clear(); @@ -5346,7 +5346,7 @@ public Builder clearName() { /** * required .Mysqlx.Expr.Identifier name = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.Builder getNameBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.Builder getNameBuilder() { bitField0_ |= 0x00000001; onChanged(); return getNameFieldBuilder().getBuilder(); @@ -5354,7 +5354,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.Builder getNameBuilder /** * required .Mysqlx.Expr.Identifier name = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.IdentifierOrBuilder getNameOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.IdentifierOrBuilder getNameOrBuilder() { if (nameBuilder_ != null) { return nameBuilder_.getMessageOrBuilder(); } else { @@ -5365,11 +5365,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.IdentifierOrBuilder getNameOrBuil * required .Mysqlx.Expr.Identifier name = 1; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.IdentifierOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Identifier, com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.IdentifierOrBuilder> getNameFieldBuilder() { if (nameBuilder_ == null) { nameBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.IdentifierOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Identifier, com.mysql.cj.x.protobuf.MysqlxExpr.Identifier.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.IdentifierOrBuilder>( getName(), getParentForChildren(), isClean()); @@ -5378,22 +5378,22 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.IdentifierOrBuilder getNameOrBuil return nameBuilder_; } - private java.util.List param_ = + private java.util.List param_ = java.util.Collections.emptyList(); private void ensureParamIsMutable() { if (!((bitField0_ & 0x00000002) == 0x00000002)) { - param_ = new java.util.ArrayList(param_); + param_ = new java.util.ArrayList(param_); bitField0_ |= 0x00000002; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> paramBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> paramBuilder_; /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public java.util.List getParamList() { + public java.util.List getParamList() { if (paramBuilder_ == null) { return java.util.Collections.unmodifiableList(param_); } else { @@ -5413,7 +5413,7 @@ public int getParamCount() { /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getParam(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getParam(int index) { if (paramBuilder_ == null) { return param_.get(index); } else { @@ -5424,7 +5424,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getParam(int index) { * repeated .Mysqlx.Expr.Expr param = 2; */ public Builder setParam( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (paramBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5441,7 +5441,7 @@ public Builder setParam( * repeated .Mysqlx.Expr.Expr param = 2; */ public Builder setParam( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (paramBuilder_ == null) { ensureParamIsMutable(); param_.set(index, builderForValue.build()); @@ -5454,7 +5454,7 @@ public Builder setParam( /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public Builder addParam(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder addParam(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (paramBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5471,7 +5471,7 @@ public Builder addParam(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { * repeated .Mysqlx.Expr.Expr param = 2; */ public Builder addParam( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (paramBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5488,7 +5488,7 @@ public Builder addParam( * repeated .Mysqlx.Expr.Expr param = 2; */ public Builder addParam( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (paramBuilder_ == null) { ensureParamIsMutable(); param_.add(builderForValue.build()); @@ -5502,7 +5502,7 @@ public Builder addParam( * repeated .Mysqlx.Expr.Expr param = 2; */ public Builder addParam( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (paramBuilder_ == null) { ensureParamIsMutable(); param_.add(index, builderForValue.build()); @@ -5516,7 +5516,7 @@ public Builder addParam( * repeated .Mysqlx.Expr.Expr param = 2; */ public Builder addAllParam( - java.lang.Iterable values) { + java.lang.Iterable values) { if (paramBuilder_ == null) { ensureParamIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -5556,14 +5556,14 @@ public Builder removeParam(int index) { /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getParamBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getParamBuilder( int index) { return getParamFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( int index) { if (paramBuilder_ == null) { return param_.get(index); } else { @@ -5573,7 +5573,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public java.util.List + public java.util.List getParamOrBuilderList() { if (paramBuilder_ != null) { return paramBuilder_.getMessageOrBuilderList(); @@ -5584,31 +5584,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder addParamBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder addParamBuilder() { return getParamFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder addParamBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder addParamBuilder( int index) { return getParamFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public java.util.List + public java.util.List getParamBuilderList() { return getParamFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getParamFieldBuilder() { if (paramBuilder_ == null) { paramBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( param_, ((bitField0_ & 0x00000002) == 0x00000002), getParentForChildren(), @@ -5650,12 +5650,12 @@ public interface OperatorOrBuilder extends /** * repeated .Mysqlx.Expr.Expr param = 2; */ - java.util.List + java.util.List getParamList(); /** * repeated .Mysqlx.Expr.Expr param = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getParam(int index); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getParam(int index); /** * repeated .Mysqlx.Expr.Expr param = 2; */ @@ -5663,12 +5663,12 @@ public interface OperatorOrBuilder extends /** * repeated .Mysqlx.Expr.Expr param = 2; */ - java.util.List + java.util.List getParamOrBuilderList(); /** * repeated .Mysqlx.Expr.Expr param = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( int index); } /** @@ -5813,10 +5813,10 @@ private Operator( } case 18: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - param_ = new java.util.ArrayList(); + param_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } - param_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry)); + param_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry)); break; } } @@ -5836,14 +5836,14 @@ private Operator( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Operator_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Operator_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Operator_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Operator_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.Operator.class, com.mysql.cj.x.protobuf.MysqlxExpr.Operator.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -5905,17 +5905,17 @@ public java.lang.String getName() { } public static final int PARAM_FIELD_NUMBER = 2; - private java.util.List param_; + private java.util.List param_; /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public java.util.List getParamList() { + public java.util.List getParamList() { return param_; } /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public java.util.List + public java.util.List getParamOrBuilderList() { return param_; } @@ -5928,13 +5928,13 @@ public int getParamCount() { /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getParam(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getParam(int index) { return param_.get(index); } /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( int index) { return param_.get(index); } @@ -6001,53 +6001,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Operator parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Operator parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Operator parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Operator parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Operator parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Operator parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Operator parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Operator parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Operator parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Operator parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -6056,7 +6056,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxExpr.Operator prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -6155,17 +6155,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Expr.Operator) - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.OperatorOrBuilder { + com.mysql.cj.x.protobuf.MysqlxExpr.OperatorOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Operator_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Operator_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Operator_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Operator_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.Operator.class, com.mysql.cj.x.protobuf.MysqlxExpr.Operator.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.newBuilder() @@ -6206,23 +6206,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Operator_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Operator_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxExpr.Operator getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxExpr.Operator.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator build() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxExpr.Operator build() { + com.mysql.cj.x.protobuf.MysqlxExpr.Operator result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator result = new com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator(this); + public com.mysql.cj.x.protobuf.MysqlxExpr.Operator buildPartial() { + com.mysql.cj.x.protobuf.MysqlxExpr.Operator result = new com.mysql.cj.x.protobuf.MysqlxExpr.Operator(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -6244,16 +6244,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxExpr.Operator) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxExpr.Operator)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxExpr.Operator other) { + if (other == com.mysql.cj.x.protobuf.MysqlxExpr.Operator.getDefaultInstance()) return this; if (other.hasName()) { bitField0_ |= 0x00000001; name_ = other.name_; @@ -6307,11 +6307,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Operator parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxExpr.Operator) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -6398,22 +6398,22 @@ public Builder setNameBytes( return this; } - private java.util.List param_ = + private java.util.List param_ = java.util.Collections.emptyList(); private void ensureParamIsMutable() { if (!((bitField0_ & 0x00000002) == 0x00000002)) { - param_ = new java.util.ArrayList(param_); + param_ = new java.util.ArrayList(param_); bitField0_ |= 0x00000002; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> paramBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> paramBuilder_; /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public java.util.List getParamList() { + public java.util.List getParamList() { if (paramBuilder_ == null) { return java.util.Collections.unmodifiableList(param_); } else { @@ -6433,7 +6433,7 @@ public int getParamCount() { /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getParam(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getParam(int index) { if (paramBuilder_ == null) { return param_.get(index); } else { @@ -6444,7 +6444,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getParam(int index) { * repeated .Mysqlx.Expr.Expr param = 2; */ public Builder setParam( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (paramBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6461,7 +6461,7 @@ public Builder setParam( * repeated .Mysqlx.Expr.Expr param = 2; */ public Builder setParam( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (paramBuilder_ == null) { ensureParamIsMutable(); param_.set(index, builderForValue.build()); @@ -6474,7 +6474,7 @@ public Builder setParam( /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public Builder addParam(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder addParam(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (paramBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6491,7 +6491,7 @@ public Builder addParam(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { * repeated .Mysqlx.Expr.Expr param = 2; */ public Builder addParam( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (paramBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6508,7 +6508,7 @@ public Builder addParam( * repeated .Mysqlx.Expr.Expr param = 2; */ public Builder addParam( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (paramBuilder_ == null) { ensureParamIsMutable(); param_.add(builderForValue.build()); @@ -6522,7 +6522,7 @@ public Builder addParam( * repeated .Mysqlx.Expr.Expr param = 2; */ public Builder addParam( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (paramBuilder_ == null) { ensureParamIsMutable(); param_.add(index, builderForValue.build()); @@ -6536,7 +6536,7 @@ public Builder addParam( * repeated .Mysqlx.Expr.Expr param = 2; */ public Builder addAllParam( - java.lang.Iterable values) { + java.lang.Iterable values) { if (paramBuilder_ == null) { ensureParamIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -6576,14 +6576,14 @@ public Builder removeParam(int index) { /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getParamBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getParamBuilder( int index) { return getParamFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( int index) { if (paramBuilder_ == null) { return param_.get(index); } else { @@ -6593,7 +6593,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public java.util.List + public java.util.List getParamOrBuilderList() { if (paramBuilder_ != null) { return paramBuilder_.getMessageOrBuilderList(); @@ -6604,31 +6604,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getParamOrBuilder( /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder addParamBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder addParamBuilder() { return getParamFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder addParamBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder addParamBuilder( int index) { return getParamFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.Expr param = 2; */ - public java.util.List + public java.util.List getParamBuilderList() { return getParamFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getParamFieldBuilder() { if (paramBuilder_ == null) { paramBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( param_, ((bitField0_ & 0x00000002) == 0x00000002), getParentForChildren(), @@ -6656,12 +6656,12 @@ public interface ObjectOrBuilder extends /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - java.util.List + java.util.List getFldList(); /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField getFld(int index); + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField getFld(int index); /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ @@ -6669,12 +6669,12 @@ public interface ObjectOrBuilder extends /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - java.util.List + java.util.List getFldOrBuilderList(); /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder getFldOrBuilder( + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder getFldOrBuilder( int index); } /** @@ -6735,10 +6735,10 @@ private Object( } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - fld_ = new java.util.ArrayList(); + fld_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - fld_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.PARSER, extensionRegistry)); + fld_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.PARSER, extensionRegistry)); break; } } @@ -6758,14 +6758,14 @@ private Object( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.Object.class, com.mysql.cj.x.protobuf.MysqlxExpr.Object.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -6808,11 +6808,11 @@ public interface ObjectFieldOrBuilder extends /** * required .Mysqlx.Expr.Expr value = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getValue(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getValue(); /** * required .Mysqlx.Expr.Expr value = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder(); } /** * Protobuf type {@code Mysqlx.Expr.Object.ObjectField} @@ -6873,11 +6873,11 @@ private ObjectField( break; } case 18: { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = value_.toBuilder(); } - value_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); + value_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(value_); value_ = subBuilder.buildPartial(); @@ -6899,14 +6899,14 @@ private ObjectField( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_ObjectField_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_ObjectField_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_ObjectField_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_ObjectField_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.class, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -6968,7 +6968,7 @@ public java.lang.String getKey() { } public static final int VALUE_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value_; + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr value_; /** * required .Mysqlx.Expr.Expr value = 2; */ @@ -6978,19 +6978,19 @@ public boolean hasValue() { /** * required .Mysqlx.Expr.Expr value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getValue() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getValue() { return value_; } /** * required .Mysqlx.Expr.Expr value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder() { return value_; } private void initFields() { key_ = ""; - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -7052,53 +7052,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -7107,7 +7107,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField parseFr public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -7124,17 +7124,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Expr.Object.ObjectField) - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder { + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_ObjectField_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_ObjectField_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_ObjectField_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_ObjectField_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.class, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.newBuilder() @@ -7161,7 +7161,7 @@ public Builder clear() { key_ = ""; bitField0_ = (bitField0_ & ~0x00000001); if (valueBuilder_ == null) { - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); } else { valueBuilder_.clear(); } @@ -7175,23 +7175,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_ObjectField_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_ObjectField_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField build() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField build() { + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField result = new com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField(this); + public com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField buildPartial() { + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField result = new com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -7212,16 +7212,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField buildPartial() } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField other) { + if (other == com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.getDefaultInstance()) return this; if (other.hasKey()) { bitField0_ |= 0x00000001; key_ = other.key_; @@ -7254,11 +7254,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -7345,9 +7345,9 @@ public Builder setKeyBytes( return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxExpr.Expr value_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> valueBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> valueBuilder_; /** * required .Mysqlx.Expr.Expr value = 2; */ @@ -7357,7 +7357,7 @@ public boolean hasValue() { /** * required .Mysqlx.Expr.Expr value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getValue() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getValue() { if (valueBuilder_ == null) { return value_; } else { @@ -7367,7 +7367,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getValue() { /** * required .Mysqlx.Expr.Expr value = 2; */ - public Builder setValue(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder setValue(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (valueBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -7384,7 +7384,7 @@ public Builder setValue(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { * required .Mysqlx.Expr.Expr value = 2; */ public Builder setValue( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (valueBuilder_ == null) { value_ = builderForValue.build(); onChanged(); @@ -7397,12 +7397,12 @@ public Builder setValue( /** * required .Mysqlx.Expr.Expr value = 2; */ - public Builder mergeValue(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder mergeValue(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (valueBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - value_ != com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { + value_ != com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()) { value_ = - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.newBuilder(value_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.newBuilder(value_).mergeFrom(value).buildPartial(); } else { value_ = value; } @@ -7418,7 +7418,7 @@ public Builder mergeValue(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { */ public Builder clearValue() { if (valueBuilder_ == null) { - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance(); onChanged(); } else { valueBuilder_.clear(); @@ -7429,7 +7429,7 @@ public Builder clearValue() { /** * required .Mysqlx.Expr.Expr value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getValueBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getValueBuilder() { bitField0_ |= 0x00000002; onChanged(); return getValueFieldBuilder().getBuilder(); @@ -7437,7 +7437,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getValueBuilder() { /** * required .Mysqlx.Expr.Expr value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder() { if (valueBuilder_ != null) { return valueBuilder_.getMessageOrBuilder(); } else { @@ -7448,11 +7448,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder() * required .Mysqlx.Expr.Expr value = 2; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getValueFieldBuilder() { if (valueBuilder_ == null) { valueBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( getValue(), getParentForChildren(), isClean()); @@ -7473,17 +7473,17 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder() } public static final int FLD_FIELD_NUMBER = 1; - private java.util.List fld_; + private java.util.List fld_; /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public java.util.List getFldList() { + public java.util.List getFldList() { return fld_; } /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public java.util.List + public java.util.List getFldOrBuilderList() { return fld_; } @@ -7496,13 +7496,13 @@ public int getFldCount() { /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField getFld(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField getFld(int index) { return fld_.get(index); } /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder getFldOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder getFldOrBuilder( int index) { return fld_.get(index); } @@ -7557,53 +7557,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Object parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -7612,7 +7612,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxExpr.Object prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -7633,17 +7633,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Expr.Object) - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ObjectOrBuilder { + com.mysql.cj.x.protobuf.MysqlxExpr.ObjectOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.Object.class, com.mysql.cj.x.protobuf.MysqlxExpr.Object.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.newBuilder() @@ -7682,23 +7682,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Object_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxExpr.Object getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxExpr.Object.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object build() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxExpr.Object build() { + com.mysql.cj.x.protobuf.MysqlxExpr.Object result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object result = new com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object(this); + public com.mysql.cj.x.protobuf.MysqlxExpr.Object buildPartial() { + com.mysql.cj.x.protobuf.MysqlxExpr.Object result = new com.mysql.cj.x.protobuf.MysqlxExpr.Object(this); int from_bitField0_ = bitField0_; if (fldBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -7714,16 +7714,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxExpr.Object) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxExpr.Object)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxExpr.Object other) { + if (other == com.mysql.cj.x.protobuf.MysqlxExpr.Object.getDefaultInstance()) return this; if (fldBuilder_ == null) { if (!other.fld_.isEmpty()) { if (fld_.isEmpty()) { @@ -7768,11 +7768,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Object parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxExpr.Object) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -7783,22 +7783,22 @@ public Builder mergeFrom( } private int bitField0_; - private java.util.List fld_ = + private java.util.List fld_ = java.util.Collections.emptyList(); private void ensureFldIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - fld_ = new java.util.ArrayList(fld_); + fld_ = new java.util.ArrayList(fld_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder> fldBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder> fldBuilder_; /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public java.util.List getFldList() { + public java.util.List getFldList() { if (fldBuilder_ == null) { return java.util.Collections.unmodifiableList(fld_); } else { @@ -7818,7 +7818,7 @@ public int getFldCount() { /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField getFld(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField getFld(int index) { if (fldBuilder_ == null) { return fld_.get(index); } else { @@ -7829,7 +7829,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField getFld(int ind * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ public Builder setFld( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField value) { if (fldBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -7846,7 +7846,7 @@ public Builder setFld( * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ public Builder setFld( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.Builder builderForValue) { if (fldBuilder_ == null) { ensureFldIsMutable(); fld_.set(index, builderForValue.build()); @@ -7859,7 +7859,7 @@ public Builder setFld( /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public Builder addFld(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField value) { + public Builder addFld(com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField value) { if (fldBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -7876,7 +7876,7 @@ public Builder addFld(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ public Builder addFld( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField value) { if (fldBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -7893,7 +7893,7 @@ public Builder addFld( * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ public Builder addFld( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.Builder builderForValue) { if (fldBuilder_ == null) { ensureFldIsMutable(); fld_.add(builderForValue.build()); @@ -7907,7 +7907,7 @@ public Builder addFld( * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ public Builder addFld( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.Builder builderForValue) { if (fldBuilder_ == null) { ensureFldIsMutable(); fld_.add(index, builderForValue.build()); @@ -7921,7 +7921,7 @@ public Builder addFld( * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ public Builder addAllFld( - java.lang.Iterable values) { + java.lang.Iterable values) { if (fldBuilder_ == null) { ensureFldIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -7961,14 +7961,14 @@ public Builder removeFld(int index) { /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.Builder getFldBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.Builder getFldBuilder( int index) { return getFldFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder getFldOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder getFldOrBuilder( int index) { if (fldBuilder_ == null) { return fld_.get(index); } else { @@ -7978,7 +7978,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder getFl /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public java.util.List + public java.util.List getFldOrBuilderList() { if (fldBuilder_ != null) { return fldBuilder_.getMessageOrBuilderList(); @@ -7989,31 +7989,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder getFl /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.Builder addFldBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.Builder addFldBuilder() { return getFldFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.Builder addFldBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.Builder addFldBuilder( int index) { return getFldFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.Object.ObjectField fld = 1; */ - public java.util.List + public java.util.List getFldBuilderList() { return getFldFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder> getFldFieldBuilder() { if (fldBuilder_ == null) { fldBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectFieldOrBuilder>( fld_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -8041,12 +8041,12 @@ public interface ArrayOrBuilder extends /** * repeated .Mysqlx.Expr.Expr value = 1; */ - java.util.List + java.util.List getValueList(); /** * repeated .Mysqlx.Expr.Expr value = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getValue(int index); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr getValue(int index); /** * repeated .Mysqlx.Expr.Expr value = 1; */ @@ -8054,12 +8054,12 @@ public interface ArrayOrBuilder extends /** * repeated .Mysqlx.Expr.Expr value = 1; */ - java.util.List + java.util.List getValueOrBuilderList(); /** * repeated .Mysqlx.Expr.Expr value = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder( + com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder( int index); } /** @@ -8120,10 +8120,10 @@ private Array( } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - value_ = new java.util.ArrayList(); + value_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - value_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry)); + value_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxExpr.Expr.PARSER, extensionRegistry)); break; } } @@ -8143,14 +8143,14 @@ private Array( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Array_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Array_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Array_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Array_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.Array.class, com.mysql.cj.x.protobuf.MysqlxExpr.Array.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -8169,17 +8169,17 @@ public com.google.protobuf.Parser getParserForType() { } public static final int VALUE_FIELD_NUMBER = 1; - private java.util.List value_; + private java.util.List value_; /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public java.util.List getValueList() { + public java.util.List getValueList() { return value_; } /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public java.util.List + public java.util.List getValueOrBuilderList() { return value_; } @@ -8192,13 +8192,13 @@ public int getValueCount() { /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getValue(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getValue(int index) { return value_.get(index); } /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder( int index) { return value_.get(index); } @@ -8253,53 +8253,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Array parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Array parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Array parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Array parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Array parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Array parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxExpr.Array parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Array parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Array parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxExpr.Array parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -8308,7 +8308,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxExpr.Array prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -8329,17 +8329,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Expr.Array) - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ArrayOrBuilder { + com.mysql.cj.x.protobuf.MysqlxExpr.ArrayOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Array_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Array_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Array_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Array_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.class, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.Builder.class); + com.mysql.cj.x.protobuf.MysqlxExpr.Array.class, com.mysql.cj.x.protobuf.MysqlxExpr.Array.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.newBuilder() @@ -8378,23 +8378,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Array_descriptor; + return com.mysql.cj.x.protobuf.MysqlxExpr.internal_static_Mysqlx_Expr_Array_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxExpr.Array getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxExpr.Array.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array build() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxExpr.Array build() { + com.mysql.cj.x.protobuf.MysqlxExpr.Array result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array result = new com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array(this); + public com.mysql.cj.x.protobuf.MysqlxExpr.Array buildPartial() { + com.mysql.cj.x.protobuf.MysqlxExpr.Array result = new com.mysql.cj.x.protobuf.MysqlxExpr.Array(this); int from_bitField0_ = bitField0_; if (valueBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -8410,16 +8410,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxExpr.Array) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxExpr.Array)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxExpr.Array other) { + if (other == com.mysql.cj.x.protobuf.MysqlxExpr.Array.getDefaultInstance()) return this; if (valueBuilder_ == null) { if (!other.value_.isEmpty()) { if (value_.isEmpty()) { @@ -8464,11 +8464,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxExpr.Array parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Array) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxExpr.Array) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -8479,22 +8479,22 @@ public Builder mergeFrom( } private int bitField0_; - private java.util.List value_ = + private java.util.List value_ = java.util.Collections.emptyList(); private void ensureValueIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - value_ = new java.util.ArrayList(value_); + value_ = new java.util.ArrayList(value_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> valueBuilder_; + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> valueBuilder_; /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public java.util.List getValueList() { + public java.util.List getValueList() { if (valueBuilder_ == null) { return java.util.Collections.unmodifiableList(value_); } else { @@ -8514,7 +8514,7 @@ public int getValueCount() { /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getValue(int index) { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr getValue(int index) { if (valueBuilder_ == null) { return value_.get(index); } else { @@ -8525,7 +8525,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr getValue(int index) { * repeated .Mysqlx.Expr.Expr value = 1; */ public Builder setValue( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (valueBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -8542,7 +8542,7 @@ public Builder setValue( * repeated .Mysqlx.Expr.Expr value = 1; */ public Builder setValue( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (valueBuilder_ == null) { ensureValueIsMutable(); value_.set(index, builderForValue.build()); @@ -8555,7 +8555,7 @@ public Builder setValue( /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public Builder addValue(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + public Builder addValue(com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (valueBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -8572,7 +8572,7 @@ public Builder addValue(com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { * repeated .Mysqlx.Expr.Expr value = 1; */ public Builder addValue( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr value) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr value) { if (valueBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -8589,7 +8589,7 @@ public Builder addValue( * repeated .Mysqlx.Expr.Expr value = 1; */ public Builder addValue( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (valueBuilder_ == null) { ensureValueIsMutable(); value_.add(builderForValue.build()); @@ -8603,7 +8603,7 @@ public Builder addValue( * repeated .Mysqlx.Expr.Expr value = 1; */ public Builder addValue( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder builderForValue) { if (valueBuilder_ == null) { ensureValueIsMutable(); value_.add(index, builderForValue.build()); @@ -8617,7 +8617,7 @@ public Builder addValue( * repeated .Mysqlx.Expr.Expr value = 1; */ public Builder addAllValue( - java.lang.Iterable values) { + java.lang.Iterable values) { if (valueBuilder_ == null) { ensureValueIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -8657,14 +8657,14 @@ public Builder removeValue(int index) { /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder getValueBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder getValueBuilder( int index) { return getValueFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder( int index) { if (valueBuilder_ == null) { return value_.get(index); } else { @@ -8674,7 +8674,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder( /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public java.util.List + public java.util.List getValueOrBuilderList() { if (valueBuilder_ != null) { return valueBuilder_.getMessageOrBuilderList(); @@ -8685,31 +8685,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder getValueOrBuilder( /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder addValueBuilder() { + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder addValueBuilder() { return getValueFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder addValueBuilder( + public com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder addValueBuilder( int index) { return getValueFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.getDefaultInstance()); } /** * repeated .Mysqlx.Expr.Expr value = 1; */ - public java.util.List + public java.util.List getValueBuilderList() { return getValueFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder> + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder> getValueFieldBuilder() { if (valueBuilder_ == null) { valueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ExprOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxExpr.Expr, com.mysql.cj.x.protobuf.MysqlxExpr.Expr.Builder, com.mysql.cj.x.protobuf.MysqlxExpr.ExprOrBuilder>( value_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -8827,7 +8827,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxDatatypes.getDescriptor(), }, assigner); internal_static_Mysqlx_Expr_Expr_descriptor = getDescriptor().getMessageTypes().get(0); @@ -8883,7 +8883,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_Mysqlx_Expr_Array_descriptor, new java.lang.String[] { "Value", }); - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxNotice.java b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxNotice.java similarity index 81% rename from src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxNotice.java rename to src/generated/java/com/mysql/cj/x/protobuf/MysqlxNotice.java index 9eb3209da..96bcc66b7 100644 --- a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxNotice.java +++ b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxNotice.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.protobuf; +package com.mysql.cj.x.protobuf; // Generated by the protocol buffer compiler. DO NOT EDIT! // source: mysqlx_notice.proto @@ -51,7 +51,7 @@ public interface FrameOrBuilder extends /** * optional .Mysqlx.Notice.Frame.Scope scope = 2 [default = GLOBAL]; */ - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope getScope(); + com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Scope getScope(); /** * optional bytes payload = 3; @@ -135,7 +135,7 @@ private Frame( } case 16: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope value = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Scope value = com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Scope.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(2, rawValue); } else { @@ -163,14 +163,14 @@ private Frame( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Frame_descriptor; + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Frame_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Frame_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Frame_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.class, com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Builder.class); + com.mysql.cj.x.protobuf.MysqlxNotice.Frame.class, com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -245,7 +245,7 @@ public Scope findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxNotice.Frame.getDescriptor().getEnumTypes().get(0); } private static final Scope[] VALUES = values(); @@ -287,7 +287,7 @@ public int getType() { } public static final int SCOPE_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope scope_; + private com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Scope scope_; /** * optional .Mysqlx.Notice.Frame.Scope scope = 2 [default = GLOBAL]; */ @@ -297,7 +297,7 @@ public boolean hasScope() { /** * optional .Mysqlx.Notice.Frame.Scope scope = 2 [default = GLOBAL]; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope getScope() { + public com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Scope getScope() { return scope_; } @@ -318,7 +318,7 @@ public com.google.protobuf.ByteString getPayload() { private void initFields() { type_ = 0; - scope_ = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope.GLOBAL; + scope_ = com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Scope.GLOBAL; payload_ = com.google.protobuf.ByteString.EMPTY; } private byte memoizedIsInitialized = -1; @@ -380,53 +380,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Frame parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Frame parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxNotice.Frame parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Frame parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxNotice.Frame parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Frame parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxNotice.Frame parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Frame parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Frame parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Frame parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -435,7 +435,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxNotice.Frame prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -466,17 +466,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Notice.Frame) - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.FrameOrBuilder { + com.mysql.cj.x.protobuf.MysqlxNotice.FrameOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Frame_descriptor; + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Frame_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Frame_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Frame_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.class, com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Builder.class); + com.mysql.cj.x.protobuf.MysqlxNotice.Frame.class, com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.newBuilder() @@ -501,7 +501,7 @@ public Builder clear() { super.clear(); type_ = 0; bitField0_ = (bitField0_ & ~0x00000001); - scope_ = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope.GLOBAL; + scope_ = com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Scope.GLOBAL; bitField0_ = (bitField0_ & ~0x00000002); payload_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000004); @@ -514,23 +514,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Frame_descriptor; + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Frame_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxNotice.Frame getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxNotice.Frame.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame build() { - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxNotice.Frame build() { + com.mysql.cj.x.protobuf.MysqlxNotice.Frame result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame result = new com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame(this); + public com.mysql.cj.x.protobuf.MysqlxNotice.Frame buildPartial() { + com.mysql.cj.x.protobuf.MysqlxNotice.Frame result = new com.mysql.cj.x.protobuf.MysqlxNotice.Frame(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -551,16 +551,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxNotice.Frame) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxNotice.Frame)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxNotice.Frame other) { + if (other == com.mysql.cj.x.protobuf.MysqlxNotice.Frame.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -586,11 +586,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxNotice.Frame parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxNotice.Frame) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -633,7 +633,7 @@ public Builder clearType() { return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope scope_ = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope.GLOBAL; + private com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Scope scope_ = com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Scope.GLOBAL; /** * optional .Mysqlx.Notice.Frame.Scope scope = 2 [default = GLOBAL]; */ @@ -643,13 +643,13 @@ public boolean hasScope() { /** * optional .Mysqlx.Notice.Frame.Scope scope = 2 [default = GLOBAL]; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope getScope() { + public com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Scope getScope() { return scope_; } /** * optional .Mysqlx.Notice.Frame.Scope scope = 2 [default = GLOBAL]; */ - public Builder setScope(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope value) { + public Builder setScope(com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Scope value) { if (value == null) { throw new NullPointerException(); } @@ -663,7 +663,7 @@ public Builder setScope(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope va */ public Builder clearScope() { bitField0_ = (bitField0_ & ~0x00000002); - scope_ = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame.Scope.GLOBAL; + scope_ = com.mysql.cj.x.protobuf.MysqlxNotice.Frame.Scope.GLOBAL; onChanged(); return this; } @@ -725,7 +725,7 @@ public interface WarningOrBuilder extends /** * optional .Mysqlx.Notice.Warning.Level level = 1 [default = WARNING]; */ - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level getLevel(); + com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Level getLevel(); /** * required uint32 code = 2; @@ -826,7 +826,7 @@ private Warning( } case 8: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level value = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Level value = com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Level.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -860,14 +860,14 @@ private Warning( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Warning_descriptor; + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Warning_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Warning_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Warning_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.class, com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Builder.class); + com.mysql.cj.x.protobuf.MysqlxNotice.Warning.class, com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -951,7 +951,7 @@ public Level findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxNotice.Warning.getDescriptor().getEnumTypes().get(0); } private static final Level[] VALUES = values(); @@ -978,7 +978,7 @@ private Level(int index, int value) { private int bitField0_; public static final int LEVEL_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level level_; + private com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Level level_; /** * optional .Mysqlx.Notice.Warning.Level level = 1 [default = WARNING]; */ @@ -988,7 +988,7 @@ public boolean hasLevel() { /** * optional .Mysqlx.Notice.Warning.Level level = 1 [default = WARNING]; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level getLevel() { + public com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Level getLevel() { return level_; } @@ -1050,7 +1050,7 @@ public java.lang.String getMsg() { } private void initFields() { - level_ = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level.WARNING; + level_ = com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Level.WARNING; code_ = 0; msg_ = ""; } @@ -1117,53 +1117,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Warning parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Warning parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxNotice.Warning parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Warning parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxNotice.Warning parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Warning parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxNotice.Warning parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Warning parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Warning parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.Warning parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1172,7 +1172,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxNotice.Warning prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1211,17 +1211,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Notice.Warning) - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.WarningOrBuilder { + com.mysql.cj.x.protobuf.MysqlxNotice.WarningOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Warning_descriptor; + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Warning_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Warning_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Warning_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.class, com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Builder.class); + com.mysql.cj.x.protobuf.MysqlxNotice.Warning.class, com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.newBuilder() @@ -1244,7 +1244,7 @@ private static Builder create() { public Builder clear() { super.clear(); - level_ = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level.WARNING; + level_ = com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Level.WARNING; bitField0_ = (bitField0_ & ~0x00000001); code_ = 0; bitField0_ = (bitField0_ & ~0x00000002); @@ -1259,23 +1259,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Warning_descriptor; + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_Warning_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxNotice.Warning getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxNotice.Warning.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning build() { - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxNotice.Warning build() { + com.mysql.cj.x.protobuf.MysqlxNotice.Warning result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning result = new com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning(this); + public com.mysql.cj.x.protobuf.MysqlxNotice.Warning buildPartial() { + com.mysql.cj.x.protobuf.MysqlxNotice.Warning result = new com.mysql.cj.x.protobuf.MysqlxNotice.Warning(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1296,16 +1296,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxNotice.Warning) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxNotice.Warning)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxNotice.Warning other) { + if (other == com.mysql.cj.x.protobuf.MysqlxNotice.Warning.getDefaultInstance()) return this; if (other.hasLevel()) { setLevel(other.getLevel()); } @@ -1337,11 +1337,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxNotice.Warning parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxNotice.Warning) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1352,7 +1352,7 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level level_ = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level.WARNING; + private com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Level level_ = com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Level.WARNING; /** * optional .Mysqlx.Notice.Warning.Level level = 1 [default = WARNING]; */ @@ -1362,13 +1362,13 @@ public boolean hasLevel() { /** * optional .Mysqlx.Notice.Warning.Level level = 1 [default = WARNING]; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level getLevel() { + public com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Level getLevel() { return level_; } /** * optional .Mysqlx.Notice.Warning.Level level = 1 [default = WARNING]; */ - public Builder setLevel(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level value) { + public Builder setLevel(com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Level value) { if (value == null) { throw new NullPointerException(); } @@ -1382,7 +1382,7 @@ public Builder setLevel(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level */ public Builder clearLevel() { bitField0_ = (bitField0_ & ~0x00000001); - level_ = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning.Level.WARNING; + level_ = com.mysql.cj.x.protobuf.MysqlxNotice.Warning.Level.WARNING; onChanged(); return this; } @@ -1531,11 +1531,11 @@ public interface SessionVariableChangedOrBuilder extends /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getValue(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getValue(); /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBuilder(); } /** * Protobuf type {@code Mysqlx.Notice.SessionVariableChanged} @@ -1612,11 +1612,11 @@ private SessionVariableChanged( break; } case 18: { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = value_.toBuilder(); } - value_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry); + value_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(value_); value_ = subBuilder.buildPartial(); @@ -1638,14 +1638,14 @@ private SessionVariableChanged( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionVariableChanged_descriptor; + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionVariableChanged_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionVariableChanged_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionVariableChanged_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged.class, com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged.Builder.class); + com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged.class, com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1707,7 +1707,7 @@ public java.lang.String getParam() { } public static final int VALUE_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value_; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value_; /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ @@ -1717,19 +1717,19 @@ public boolean hasValue() { /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getValue() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getValue() { return value_; } /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBuilder() { return value_; } private void initFields() { param_ = ""; - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -1789,53 +1789,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1844,7 +1844,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged p public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1877,17 +1877,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Notice.SessionVariableChanged) - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChangedOrBuilder { + com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChangedOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionVariableChanged_descriptor; + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionVariableChanged_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionVariableChanged_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionVariableChanged_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged.class, com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged.Builder.class); + com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged.class, com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged.newBuilder() @@ -1914,7 +1914,7 @@ public Builder clear() { param_ = ""; bitField0_ = (bitField0_ & ~0x00000001); if (valueBuilder_ == null) { - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); } else { valueBuilder_.clear(); } @@ -1928,23 +1928,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionVariableChanged_descriptor; + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionVariableChanged_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged build() { - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged build() { + com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged result = new com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged(this); + public com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged buildPartial() { + com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged result = new com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1965,16 +1965,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged buildPar } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged other) { + if (other == com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged.getDefaultInstance()) return this; if (other.hasParam()) { bitField0_ |= 0x00000001; param_ = other.param_; @@ -2005,11 +2005,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2096,9 +2096,9 @@ public Builder setParamBytes( return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> valueBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> valueBuilder_; /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ @@ -2108,7 +2108,7 @@ public boolean hasValue() { /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getValue() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getValue() { if (valueBuilder_ == null) { return value_; } else { @@ -2118,7 +2118,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getValue() { /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public Builder setValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + public Builder setValue(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (valueBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2135,7 +2135,7 @@ public Builder setValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar valu * optional .Mysqlx.Datatypes.Scalar value = 2; */ public Builder setValue( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (valueBuilder_ == null) { value_ = builderForValue.build(); onChanged(); @@ -2148,12 +2148,12 @@ public Builder setValue( /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public Builder mergeValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + public Builder mergeValue(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (valueBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - value_ != com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()) { + value_ != com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()) { value_ = - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.newBuilder(value_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.newBuilder(value_).mergeFrom(value).buildPartial(); } else { value_ = value; } @@ -2169,7 +2169,7 @@ public Builder mergeValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar va */ public Builder clearValue() { if (valueBuilder_ == null) { - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); onChanged(); } else { valueBuilder_.clear(); @@ -2180,7 +2180,7 @@ public Builder clearValue() { /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder getValueBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder getValueBuilder() { bitField0_ |= 0x00000002; onChanged(); return getValueFieldBuilder().getBuilder(); @@ -2188,7 +2188,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder getValueBuild /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBuilder() { if (valueBuilder_ != null) { return valueBuilder_.getMessageOrBuilder(); } else { @@ -2199,11 +2199,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBu * optional .Mysqlx.Datatypes.Scalar value = 2; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> getValueFieldBuilder() { if (valueBuilder_ == null) { valueBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder>( getValue(), getParentForChildren(), isClean()); @@ -2234,7 +2234,7 @@ public interface SessionStateChangedOrBuilder extends /** * required .Mysqlx.Notice.SessionStateChanged.Parameter param = 1; */ - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Parameter getParam(); + com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Parameter getParam(); /** * optional .Mysqlx.Datatypes.Scalar value = 2; @@ -2243,11 +2243,11 @@ public interface SessionStateChangedOrBuilder extends /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getValue(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getValue(); /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBuilder(); } /** * Protobuf type {@code Mysqlx.Notice.SessionStateChanged} @@ -2315,7 +2315,7 @@ private SessionStateChanged( } case 8: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Parameter value = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Parameter.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Parameter value = com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Parameter.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -2325,11 +2325,11 @@ private SessionStateChanged( break; } case 18: { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder subBuilder = null; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = value_.toBuilder(); } - value_ = input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry); + value_ = input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(value_); value_ = subBuilder.buildPartial(); @@ -2351,14 +2351,14 @@ private SessionStateChanged( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionStateChanged_descriptor; + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionStateChanged_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionStateChanged_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionStateChanged_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.class, com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Builder.class); + com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.class, com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2513,7 +2513,7 @@ public Parameter findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.getDescriptor().getEnumTypes().get(0); } private static final Parameter[] VALUES = values(); @@ -2540,7 +2540,7 @@ private Parameter(int index, int value) { private int bitField0_; public static final int PARAM_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Parameter param_; + private com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Parameter param_; /** * required .Mysqlx.Notice.SessionStateChanged.Parameter param = 1; */ @@ -2550,12 +2550,12 @@ public boolean hasParam() { /** * required .Mysqlx.Notice.SessionStateChanged.Parameter param = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Parameter getParam() { + public com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Parameter getParam() { return param_; } public static final int VALUE_FIELD_NUMBER = 2; - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value_; + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value_; /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ @@ -2565,19 +2565,19 @@ public boolean hasValue() { /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getValue() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getValue() { return value_; } /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBuilder() { return value_; } private void initFields() { - param_ = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Parameter.CURRENT_SCHEMA; - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + param_ = com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Parameter.CURRENT_SCHEMA; + value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2637,53 +2637,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2692,7 +2692,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged pars public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2721,17 +2721,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Notice.SessionStateChanged) - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChangedOrBuilder { + com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChangedOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionStateChanged_descriptor; + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionStateChanged_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionStateChanged_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionStateChanged_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.class, com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Builder.class); + com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.class, com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.newBuilder() @@ -2755,10 +2755,10 @@ private static Builder create() { public Builder clear() { super.clear(); - param_ = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Parameter.CURRENT_SCHEMA; + param_ = com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Parameter.CURRENT_SCHEMA; bitField0_ = (bitField0_ & ~0x00000001); if (valueBuilder_ == null) { - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); } else { valueBuilder_.clear(); } @@ -2772,23 +2772,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionStateChanged_descriptor; + return com.mysql.cj.x.protobuf.MysqlxNotice.internal_static_Mysqlx_Notice_SessionStateChanged_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged build() { - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged build() { + com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged result = new com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged(this); + public com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged buildPartial() { + com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged result = new com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2809,16 +2809,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged buildPartia } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged other) { + if (other == com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.getDefaultInstance()) return this; if (other.hasParam()) { setParam(other.getParam()); } @@ -2847,11 +2847,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2862,7 +2862,7 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Parameter param_ = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Parameter.CURRENT_SCHEMA; + private com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Parameter param_ = com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Parameter.CURRENT_SCHEMA; /** * required .Mysqlx.Notice.SessionStateChanged.Parameter param = 1; */ @@ -2872,13 +2872,13 @@ public boolean hasParam() { /** * required .Mysqlx.Notice.SessionStateChanged.Parameter param = 1; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Parameter getParam() { + public com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Parameter getParam() { return param_; } /** * required .Mysqlx.Notice.SessionStateChanged.Parameter param = 1; */ - public Builder setParam(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Parameter value) { + public Builder setParam(com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Parameter value) { if (value == null) { throw new NullPointerException(); } @@ -2892,14 +2892,14 @@ public Builder setParam(com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateCh */ public Builder clearParam() { bitField0_ = (bitField0_ & ~0x00000001); - param_ = com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged.Parameter.CURRENT_SCHEMA; + param_ = com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged.Parameter.CURRENT_SCHEMA; onChanged(); return this; } - private com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + private com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> valueBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> valueBuilder_; /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ @@ -2909,7 +2909,7 @@ public boolean hasValue() { /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getValue() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar getValue() { if (valueBuilder_ == null) { return value_; } else { @@ -2919,7 +2919,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar getValue() { /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public Builder setValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + public Builder setValue(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (valueBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2936,7 +2936,7 @@ public Builder setValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar valu * optional .Mysqlx.Datatypes.Scalar value = 2; */ public Builder setValue( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder builderForValue) { if (valueBuilder_ == null) { value_ = builderForValue.build(); onChanged(); @@ -2949,12 +2949,12 @@ public Builder setValue( /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public Builder mergeValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar value) { + public Builder mergeValue(com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar value) { if (valueBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - value_ != com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()) { + value_ != com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance()) { value_ = - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.newBuilder(value_).mergeFrom(value).buildPartial(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.newBuilder(value_).mergeFrom(value).buildPartial(); } else { value_ = value; } @@ -2970,7 +2970,7 @@ public Builder mergeValue(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar va */ public Builder clearValue() { if (valueBuilder_ == null) { - value_ = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); + value_ = com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.getDefaultInstance(); onChanged(); } else { valueBuilder_.clear(); @@ -2981,7 +2981,7 @@ public Builder clearValue() { /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder getValueBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder getValueBuilder() { bitField0_ |= 0x00000002; onChanged(); return getValueFieldBuilder().getBuilder(); @@ -2989,7 +2989,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder getValueBuild /** * optional .Mysqlx.Datatypes.Scalar value = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBuilder() { if (valueBuilder_ != null) { return valueBuilder_.getMessageOrBuilder(); } else { @@ -3000,11 +3000,11 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder getValueOrBu * optional .Mysqlx.Datatypes.Scalar value = 2; */ private com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder> getValueFieldBuilder() { if (valueBuilder_ == null) { valueBuilder_ = new com.google.protobuf.SingleFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.ScalarOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar, com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.ScalarOrBuilder>( getValue(), getParentForChildren(), isClean()); @@ -3085,7 +3085,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxDatatypes.getDescriptor(), }, assigner); internal_static_Mysqlx_Notice_Frame_descriptor = getDescriptor().getMessageTypes().get(0); @@ -3111,7 +3111,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_Mysqlx_Notice_SessionStateChanged_descriptor, new java.lang.String[] { "Param", "Value", }); - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxResultset.java b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxResultset.java similarity index 86% rename from src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxResultset.java rename to src/generated/java/com/mysql/cj/x/protobuf/MysqlxResultset.java index 02daea379..3a87dc7d5 100644 --- a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxResultset.java +++ b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxResultset.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.protobuf; +package com.mysql.cj.x.protobuf; // Generated by the protocol buffer compiler. DO NOT EDIT! // source: mysqlx_resultset.proto @@ -104,14 +104,14 @@ private FetchDoneMoreOutParams( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreOutParams_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreOutParams_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreOutParams_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreOutParams_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams.class, com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams.Builder.class); + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams.class, com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -165,53 +165,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -220,7 +220,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParam public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -241,17 +241,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Resultset.FetchDoneMoreOutParams) - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParamsOrBuilder { + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParamsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreOutParams_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreOutParams_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreOutParams_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreOutParams_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams.class, com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams.Builder.class); + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams.class, com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams.newBuilder() @@ -283,38 +283,38 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreOutParams_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreOutParams_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams build() { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams build() { + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams result = new com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams(this); + public com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams buildPartial() { + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams result = new com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams other) { + if (other == com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -327,11 +327,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreOutParams) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreOutParams) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -425,14 +425,14 @@ private FetchDoneMoreResultsets( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreResultsets_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreResultsets_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreResultsets_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreResultsets_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets.class, com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets.Builder.class); + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets.class, com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -486,53 +486,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -541,7 +541,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultse public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -562,17 +562,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Resultset.FetchDoneMoreResultsets) - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsetsOrBuilder { + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsetsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreResultsets_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreResultsets_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreResultsets_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreResultsets_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets.class, com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets.Builder.class); + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets.class, com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets.newBuilder() @@ -604,38 +604,38 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreResultsets_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDoneMoreResultsets_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets build() { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets build() { + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets result = new com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets(this); + public com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets buildPartial() { + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets result = new com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets other) { + if (other == com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -648,11 +648,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -746,14 +746,14 @@ private FetchDone( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDone_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDone_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDone_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDone_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone.class, com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone.Builder.class); + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone.class, com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -807,53 +807,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -862,7 +862,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -883,17 +883,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Resultset.FetchDone) - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneOrBuilder { + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDone_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDone_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDone_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDone_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone.class, com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone.Builder.class); + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone.class, com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone.newBuilder() @@ -925,38 +925,38 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDone_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_FetchDone_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone build() { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone build() { + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone result = new com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone(this); + public com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone buildPartial() { + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone result = new com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone other) { + if (other == com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -969,11 +969,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1013,7 +1013,7 @@ public interface ColumnMetaDataOrBuilder extends * datatype of the field in a row * */ - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType getType(); + com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType getType(); /** * optional bytes name = 2; @@ -1407,7 +1407,7 @@ private ColumnMetaData( } case 8: { int rawValue = input.readEnum(); - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType value = com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType.valueOf(rawValue); + com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType value = com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -1485,14 +1485,14 @@ private ColumnMetaData( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_ColumnMetaData_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_ColumnMetaData_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_ColumnMetaData_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_ColumnMetaData_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.class, com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.Builder.class); + com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.class, com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1648,7 +1648,7 @@ public FieldType findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.getDescriptor().getEnumTypes().get(0); + return com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.getDescriptor().getEnumTypes().get(0); } private static final FieldType[] VALUES = values(); @@ -1675,7 +1675,7 @@ private FieldType(int index, int value) { private int bitField0_; public static final int TYPE_FIELD_NUMBER = 1; - private com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType type_; + private com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType type_; /** * required .Mysqlx.Resultset.ColumnMetaData.FieldType type = 1; * @@ -1693,7 +1693,7 @@ public boolean hasType() { * datatype of the field in a row * */ - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType getType() { + public com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType getType() { return type_; } @@ -1863,7 +1863,7 @@ public int getContentType() { } private void initFields() { - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType.SINT; + type_ = com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType.SINT; name_ = com.google.protobuf.ByteString.EMPTY; originalName_ = com.google.protobuf.ByteString.EMPTY; table_ = com.google.protobuf.ByteString.EMPTY; @@ -1998,53 +1998,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2053,7 +2053,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData parseF public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2309,17 +2309,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Resultset.ColumnMetaData) - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaDataOrBuilder { + com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaDataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_ColumnMetaData_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_ColumnMetaData_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_ColumnMetaData_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_ColumnMetaData_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.class, com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.Builder.class); + com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.class, com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.newBuilder() @@ -2342,7 +2342,7 @@ private static Builder create() { public Builder clear() { super.clear(); - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType.SINT; + type_ = com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType.SINT; bitField0_ = (bitField0_ & ~0x00000001); name_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000002); @@ -2375,23 +2375,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_ColumnMetaData_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_ColumnMetaData_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData build() { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData build() { + com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData result = new com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData(this); + public com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData buildPartial() { + com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData result = new com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2448,16 +2448,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData buildPartial( } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData other) { + if (other == com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -2510,11 +2510,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2525,7 +2525,7 @@ public Builder mergeFrom( } private int bitField0_; - private com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType type_ = com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType.SINT; + private com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType type_ = com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType.SINT; /** * required .Mysqlx.Resultset.ColumnMetaData.FieldType type = 1; * @@ -2543,7 +2543,7 @@ public boolean hasType() { * datatype of the field in a row * */ - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType getType() { + public com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType getType() { return type_; } /** @@ -2553,7 +2553,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType get * datatype of the field in a row * */ - public Builder setType(com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType value) { + public Builder setType(com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType value) { if (value == null) { throw new NullPointerException(); } @@ -2571,7 +2571,7 @@ public Builder setType(com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaDa */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType.SINT; + type_ = com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType.SINT; onChanged(); return this; } @@ -3059,14 +3059,14 @@ private Row( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_Row_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_Row_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_Row_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_Row_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row.class, com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row.Builder.class); + com.mysql.cj.x.protobuf.MysqlxResultset.Row.class, com.mysql.cj.x.protobuf.MysqlxResultset.Row.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3155,53 +3155,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.Row parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.Row parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxResultset.Row parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.Row parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxResultset.Row parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.Row parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxResultset.Row parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.Row parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.Row parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxResultset.Row parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3210,7 +3210,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxResultset.Row prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3235,17 +3235,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Resultset.Row) - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.RowOrBuilder { + com.mysql.cj.x.protobuf.MysqlxResultset.RowOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_Row_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_Row_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_Row_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_Row_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row.class, com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row.Builder.class); + com.mysql.cj.x.protobuf.MysqlxResultset.Row.class, com.mysql.cj.x.protobuf.MysqlxResultset.Row.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row.newBuilder() @@ -3279,23 +3279,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_Row_descriptor; + return com.mysql.cj.x.protobuf.MysqlxResultset.internal_static_Mysqlx_Resultset_Row_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxResultset.Row getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxResultset.Row.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row build() { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxResultset.Row build() { + com.mysql.cj.x.protobuf.MysqlxResultset.Row result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row result = new com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row(this); + public com.mysql.cj.x.protobuf.MysqlxResultset.Row buildPartial() { + com.mysql.cj.x.protobuf.MysqlxResultset.Row result = new com.mysql.cj.x.protobuf.MysqlxResultset.Row(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) == 0x00000001)) { field_ = java.util.Collections.unmodifiableList(field_); @@ -3307,16 +3307,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxResultset.Row) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxResultset.Row)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxResultset.Row other) { + if (other == com.mysql.cj.x.protobuf.MysqlxResultset.Row.getDefaultInstance()) return this; if (!other.field_.isEmpty()) { if (field_.isEmpty()) { field_ = other.field_; @@ -3339,11 +3339,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxResultset.Row parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxResultset.Row) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { diff --git a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxSession.java b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxSession.java similarity index 81% rename from src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxSession.java rename to src/generated/java/com/mysql/cj/x/protobuf/MysqlxSession.java index 7c1e4b783..999fd9132 100644 --- a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxSession.java +++ b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxSession.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.protobuf; +package com.mysql.cj.x.protobuf; // Generated by the protocol buffer compiler. DO NOT EDIT! // source: mysqlx_session.proto @@ -158,14 +158,14 @@ private AuthenticateStart( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateStart_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateStart_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateStart_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateStart_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart.class, com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart.class, com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -320,53 +320,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -375,7 +375,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart parse public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -401,17 +401,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Session.AuthenticateStart) - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStartOrBuilder { + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStartOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateStart_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateStart_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateStart_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateStart_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart.class, com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart.class, com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart.newBuilder() @@ -449,23 +449,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateStart_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateStart_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart build() { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart build() { + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart result = new com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart(this); + public com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart buildPartial() { + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart result = new com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -486,16 +486,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart buildPartial } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart other) { + if (other == com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart.getDefaultInstance()) return this; if (other.hasMechName()) { bitField0_ |= 0x00000001; mechName_ = other.mechName_; @@ -523,11 +523,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -786,14 +786,14 @@ private AuthenticateContinue( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateContinue_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateContinue_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateContinue_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateContinue_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue.class, com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue.class, com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -875,53 +875,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -930,7 +930,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue pa public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -954,17 +954,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Session.AuthenticateContinue) - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinueOrBuilder { + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinueOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateContinue_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateContinue_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateContinue_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateContinue_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue.class, com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue.class, com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue.newBuilder() @@ -998,23 +998,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateContinue_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateContinue_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue build() { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue build() { + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue result = new com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue(this); + public com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue buildPartial() { + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue result = new com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1027,16 +1027,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue buildPart } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue other) { + if (other == com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue.getDefaultInstance()) return this; if (other.hasAuthData()) { setAuthData(other.getAuthData()); } @@ -1056,11 +1056,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1206,14 +1206,14 @@ private AuthenticateOk( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateOk_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateOk_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateOk_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateOk_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk.class, com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk.class, com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1291,53 +1291,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1346,7 +1346,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk parseFro public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1368,17 +1368,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Session.AuthenticateOk) - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOkOrBuilder { + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOkOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateOk_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateOk_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateOk_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateOk_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk.class, com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk.class, com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk.newBuilder() @@ -1412,23 +1412,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateOk_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_AuthenticateOk_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk build() { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk build() { + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk result = new com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk(this); + public com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk buildPartial() { + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk result = new com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1441,16 +1441,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk buildPartial() } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk other) { + if (other == com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk.getDefaultInstance()) return this; if (other.hasAuthData()) { setAuthData(other.getAuthData()); } @@ -1466,11 +1466,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1601,14 +1601,14 @@ private Reset( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Reset_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Reset_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Reset_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Reset_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset.class, com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSession.Reset.class, com.mysql.cj.x.protobuf.MysqlxSession.Reset.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1662,53 +1662,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Reset parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Reset parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxSession.Reset parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Reset parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSession.Reset parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Reset parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSession.Reset parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Reset parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Reset parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Reset parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1717,7 +1717,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxSession.Reset prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1739,17 +1739,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Session.Reset) - com.mysql.cj.mysqlx.protobuf.MysqlxSession.ResetOrBuilder { + com.mysql.cj.x.protobuf.MysqlxSession.ResetOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Reset_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Reset_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Reset_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Reset_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset.class, com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSession.Reset.class, com.mysql.cj.x.protobuf.MysqlxSession.Reset.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset.newBuilder() @@ -1781,38 +1781,38 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Reset_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Reset_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxSession.Reset getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxSession.Reset.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset build() { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxSession.Reset build() { + com.mysql.cj.x.protobuf.MysqlxSession.Reset result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset result = new com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset(this); + public com.mysql.cj.x.protobuf.MysqlxSession.Reset buildPartial() { + com.mysql.cj.x.protobuf.MysqlxSession.Reset result = new com.mysql.cj.x.protobuf.MysqlxSession.Reset(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxSession.Reset) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxSession.Reset)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxSession.Reset other) { + if (other == com.mysql.cj.x.protobuf.MysqlxSession.Reset.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -1825,11 +1825,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxSession.Reset parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxSession.Reset) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1924,14 +1924,14 @@ private Close( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Close_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Close_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Close_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Close_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close.class, com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSession.Close.class, com.mysql.cj.x.protobuf.MysqlxSession.Close.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1985,53 +1985,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Close parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Close parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxSession.Close parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Close parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSession.Close parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Close parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSession.Close parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Close parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Close parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSession.Close parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2040,7 +2040,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxSession.Close prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2062,17 +2062,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Session.Close) - com.mysql.cj.mysqlx.protobuf.MysqlxSession.CloseOrBuilder { + com.mysql.cj.x.protobuf.MysqlxSession.CloseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Close_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Close_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Close_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Close_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close.class, com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSession.Close.class, com.mysql.cj.x.protobuf.MysqlxSession.Close.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close.newBuilder() @@ -2104,38 +2104,38 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Close_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSession.internal_static_Mysqlx_Session_Close_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxSession.Close getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxSession.Close.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close build() { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxSession.Close build() { + com.mysql.cj.x.protobuf.MysqlxSession.Close result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close result = new com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close(this); + public com.mysql.cj.x.protobuf.MysqlxSession.Close buildPartial() { + com.mysql.cj.x.protobuf.MysqlxSession.Close result = new com.mysql.cj.x.protobuf.MysqlxSession.Close(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxSession.Close) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxSession.Close)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxSession.Close other) { + if (other == com.mysql.cj.x.protobuf.MysqlxSession.Close.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -2148,11 +2148,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxSession.Close parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxSession.Close) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { diff --git a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxSql.java b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxSql.java similarity index 82% rename from src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxSql.java rename to src/generated/java/com/mysql/cj/x/protobuf/MysqlxSql.java index 400343f07..1dae3fb4d 100644 --- a/src/generated/java/com/mysql/cj/mysqlx/protobuf/MysqlxSql.java +++ b/src/generated/java/com/mysql/cj/x/protobuf/MysqlxSql.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.protobuf; +package com.mysql.cj.x.protobuf; // Generated by the protocol buffer compiler. DO NOT EDIT! // source: mysqlx_sql.proto @@ -61,12 +61,12 @@ public interface StmtExecuteOrBuilder extends /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - java.util.List + java.util.List getArgsList(); /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getArgs(int index); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getArgs(int index); /** * repeated .Mysqlx.Datatypes.Any args = 2; */ @@ -74,12 +74,12 @@ public interface StmtExecuteOrBuilder extends /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - java.util.List + java.util.List getArgsOrBuilderList(); /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getArgsOrBuilder( + com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getArgsOrBuilder( int index); /** @@ -167,10 +167,10 @@ private StmtExecute( } case 18: { if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - args_ = new java.util.ArrayList(); + args_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } - args_.add(input.readMessage(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.PARSER, extensionRegistry)); + args_.add(input.readMessage(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.PARSER, extensionRegistry)); break; } case 26: { @@ -201,14 +201,14 @@ private StmtExecute( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecute_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecute_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecute_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecute_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute.class, com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute.class, com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -285,17 +285,17 @@ public com.google.protobuf.ByteString getStmt() { } public static final int ARGS_FIELD_NUMBER = 2; - private java.util.List args_; + private java.util.List args_; /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { return args_; } /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { return args_; } @@ -308,13 +308,13 @@ public int getArgsCount() { /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getArgs(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getArgs(int index) { return args_.get(index); } /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getArgsOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getArgsOrBuilder( int index) { return args_.get(index); } @@ -412,53 +412,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -467,7 +467,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -501,17 +501,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Sql.StmtExecute) - com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOrBuilder { + com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecute_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecute_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecute_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecute_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute.class, com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute.class, com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute.newBuilder() @@ -556,23 +556,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecute_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecute_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute build() { - com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute build() { + com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute result = new com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute(this); + public com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute buildPartial() { + com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute result = new com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -602,16 +602,16 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute other) { + if (other == com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute.getDefaultInstance()) return this; if (other.hasNamespace()) { bitField0_ |= 0x00000001; namespace_ = other.namespace_; @@ -671,11 +671,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -797,22 +797,22 @@ public Builder clearStmt() { return this; } - private java.util.List args_ = + private java.util.List args_ = java.util.Collections.emptyList(); private void ensureArgsIsMutable() { if (!((bitField0_ & 0x00000004) == 0x00000004)) { - args_ = new java.util.ArrayList(args_); + args_ = new java.util.ArrayList(args_); bitField0_ |= 0x00000004; } } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder> argsBuilder_; + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder> argsBuilder_; /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { if (argsBuilder_ == null) { return java.util.Collections.unmodifiableList(args_); } else { @@ -832,7 +832,7 @@ public int getArgsCount() { /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getArgs(int index) { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any getArgs(int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -843,7 +843,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any getArgs(int index) { * repeated .Mysqlx.Datatypes.Any args = 2; */ public Builder setArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -860,7 +860,7 @@ public Builder setArgs( * repeated .Mysqlx.Datatypes.Any args = 2; */ public Builder setArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.set(index, builderForValue.build()); @@ -873,7 +873,7 @@ public Builder setArgs( /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public Builder addArgs(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) { + public Builder addArgs(com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -890,7 +890,7 @@ public Builder addArgs(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) { * repeated .Mysqlx.Datatypes.Any args = 2; */ public Builder addArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any value) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -907,7 +907,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Any args = 2; */ public Builder addArgs( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(builderForValue.build()); @@ -921,7 +921,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Any args = 2; */ public Builder addArgs( - int index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { + int index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(index, builderForValue.build()); @@ -935,7 +935,7 @@ public Builder addArgs( * repeated .Mysqlx.Datatypes.Any args = 2; */ public Builder addAllArgs( - java.lang.Iterable values) { + java.lang.Iterable values) { if (argsBuilder_ == null) { ensureArgsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -975,14 +975,14 @@ public Builder removeArgs(int index) { /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder getArgsBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder getArgsBuilder( int index) { return getArgsFieldBuilder().getBuilder(index); } /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getArgsOrBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getArgsOrBuilder( int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -992,7 +992,7 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getArgsOrBuilde /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { if (argsBuilder_ != null) { return argsBuilder_.getMessageOrBuilderList(); @@ -1003,31 +1003,31 @@ public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder getArgsOrBuilde /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder addArgsBuilder() { + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder addArgsBuilder() { return getArgsFieldBuilder().addBuilder( - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance()); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder addArgsBuilder( + public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder addArgsBuilder( int index) { return getArgsFieldBuilder().addBuilder( - index, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.getDefaultInstance()); + index, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.getDefaultInstance()); } /** * repeated .Mysqlx.Datatypes.Any args = 2; */ - public java.util.List + public java.util.List getArgsBuilderList() { return getArgsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder> + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder> getArgsFieldBuilder() { if (argsBuilder_ == null) { argsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.AnyOrBuilder>( + com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder>( args_, ((bitField0_ & 0x00000004) == 0x00000004), getParentForChildren(), @@ -1153,14 +1153,14 @@ private StmtExecuteOk( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecuteOk_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecuteOk_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecuteOk_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecuteOk_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk.class, com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk.class, com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1214,53 +1214,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk parseFrom(byte[] data) + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk parseFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk parseDelimitedFrom(java.io.InputStream input) + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk parseDelimitedFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk parseFrom( + public static com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1269,7 +1269,7 @@ public static com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk prototype) { + public static Builder newBuilder(com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1290,17 +1290,17 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:Mysqlx.Sql.StmtExecuteOk) - com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOkOrBuilder { + com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOkOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecuteOk_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecuteOk_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecuteOk_fieldAccessorTable + return com.mysql.cj.x.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecuteOk_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk.class, com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk.Builder.class); + com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk.class, com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk.Builder.class); } // Construct using com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk.newBuilder() @@ -1332,38 +1332,38 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecuteOk_descriptor; + return com.mysql.cj.x.protobuf.MysqlxSql.internal_static_Mysqlx_Sql_StmtExecuteOk_descriptor; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk getDefaultInstanceForType() { - return com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk.getDefaultInstance(); + public com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk getDefaultInstanceForType() { + return com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk.getDefaultInstance(); } - public com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk build() { - com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk result = buildPartial(); + public com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk build() { + com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk buildPartial() { - com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk result = new com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk(this); + public com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk buildPartial() { + com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk result = new com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk) { - return mergeFrom((com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk)other); + if (other instanceof com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk) { + return mergeFrom((com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk other) { - if (other == com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk.getDefaultInstance()) return this; + public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk other) { + if (other == com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -1376,11 +1376,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk parsedMessage = null; + com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk) e.getUnfinishedMessage(); + parsedMessage = (com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1438,7 +1438,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.getDescriptor(), + com.mysql.cj.x.protobuf.MysqlxDatatypes.getDescriptor(), }, assigner); internal_static_Mysqlx_Sql_StmtExecute_descriptor = getDescriptor().getMessageTypes().get(0); @@ -1452,7 +1452,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_Mysqlx_Sql_StmtExecuteOk_descriptor, new java.lang.String[] { }); - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.getDescriptor(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/java/com/mysql/cj/mysqlx/protobuf/package-info.java b/src/generated/java/com/mysql/cj/x/protobuf/package-info.java similarity index 97% rename from src/generated/java/com/mysql/cj/mysqlx/protobuf/package-info.java rename to src/generated/java/com/mysql/cj/x/protobuf/package-info.java index 69b3bd9ff..6eb54a3e4 100644 --- a/src/generated/java/com/mysql/cj/mysqlx/protobuf/package-info.java +++ b/src/generated/java/com/mysql/cj/x/protobuf/package-info.java @@ -30,5 +30,5 @@ * @since 6.0 */ -package com.mysql.cj.mysqlx.protobuf; +package com.mysql.cj.x.protobuf; diff --git a/src/main/doc/mysqlx-overview.html b/src/main/doc/mysqlx-overview.html index f190c144b..a37e5892a 100644 --- a/src/main/doc/mysqlx-overview.html +++ b/src/main/doc/mysqlx-overview.html @@ -5,10 +5,10 @@

MySQL Connector/J X DevAPI Reference

This documentation covers the public classes and interfaces of the Java implementation of the X DevAPI. To get started, check out some of the main classes:
    -
  • Sessions can be created with {@link com.mysql.cj.x.MysqlxSessionFactory}.
    • -
  • Session operations are available on an {@link com.mysql.cj.api.x.XSession}.
    • -
  • JSON document collections are represented by a {@link com.mysql.cj.api.x.Collection}.
    • -
  • Working with JSON documents is done with a {@link com.mysql.cj.api.x.json.DbDoc}.
    • +
  • Sessions can be created with {@link com.mysql.cj.xdevapi.XSessionFactory}.
    • +
  • Session operations are available on an {@link com.mysql.cj.api.xdevapi.XSession}.
    • +
  • JSON document collections are represented by a {@link com.mysql.cj.api.xdevapi.Collection}.
    • +
  • Working with JSON documents is done with a {@link com.mysql.cj.xdevapi.DbDoc}.
For an introduction to concepts, refer to the X DevAPI User Guide. diff --git a/src/main/java/com/mysql/cj/api/x/XSessionFactory.java b/src/main/java/com/mysql/cj/api/x/XSessionFactory.java deleted file mode 100644 index fdff06685..000000000 --- a/src/main/java/com/mysql/cj/api/x/XSessionFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. - - The MySQL Connector/J is licensed under the terms of the GPLv2 - , like most MySQL Connectors. - There are special exceptions to the terms and conditions of the GPLv2 as it is applied to - this software, see the FOSS License Exception - . - - This program is free software; you can redistribute it and/or modify it under the terms - of the GNU General Public License as published by the Free Software Foundation; version 2 - of the License. - - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with this - program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth - Floor, Boston, MA 02110-1301 USA - - */ - -package com.mysql.cj.api.x; - -import java.util.Properties; - -/** - * XSessionFactory is used for creation of sessions. - * - * 
- * XSessionFactory xFactory = new XSessionFactory();
- * 
- * {@link XSession} crudSession = xFactory.getSession("mysqlx://host[:port]/db?user=user1&password=pwd1");
- * 
- * {@link NodeSession} nodeSession = xFactory.getNodeSession("mysqlx://host[:port]/db?user=user1&password=pwd1");
- *
- * - */ -public interface XSessionFactory { - - /** - * Creates {@link XSession} by given URL. - * - * @param url - * @return {@link XSession} - */ - XSession getSession(String url); - - /** - * Creates {@link XSession} according to given properties. - * - * @param properties - * @return {@link XSession} - */ - XSession getSession(Properties properties); - - // The mysqlx.getNodeSession() function can take a URL that specifies the connection information for a specific node or it can take a configuration provided by an XSession. - NodeSession getNodeSession(String url); - - NodeSession getNodeSession(Properties properties); -} diff --git a/src/main/java/com/mysql/cj/api/x/core/ResultCtor.java b/src/main/java/com/mysql/cj/api/x/core/ResultCtor.java new file mode 100644 index 000000000..46825f3d2 --- /dev/null +++ b/src/main/java/com/mysql/cj/api/x/core/ResultCtor.java @@ -0,0 +1,42 @@ +/* + Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + + The MySQL Connector/J is licensed under the terms of the GPLv2 + , like most MySQL Connectors. + There are special exceptions to the terms and conditions of the GPLv2 as it is applied to + this software, see the FOSS License Exception + . + + This program is free software; you can redistribute it and/or modify it under the terms + of the GNU General Public License as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this + program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301 USA + + */ + +package com.mysql.cj.api.x.core; + +import java.util.ArrayList; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.function.Supplier; + +import com.mysql.cj.api.result.RowList; +import com.mysql.cj.core.result.Field; +import com.mysql.cj.x.core.StatementExecuteOk; + +/** + * A function to create a result set from the metadata, row list and ok packet (curried representation). + * + * @param the + * type of the result that this constructor will create + */ +public interface ResultCtor extends Function, BiFunction, T>> { +} diff --git a/src/main/java/com/mysql/cj/mysqlx/result/RowToElement.java b/src/main/java/com/mysql/cj/api/x/core/RowToElement.java similarity index 91% rename from src/main/java/com/mysql/cj/mysqlx/result/RowToElement.java rename to src/main/java/com/mysql/cj/api/x/core/RowToElement.java index 341da78ed..ec9620037 100644 --- a/src/main/java/com/mysql/cj/mysqlx/result/RowToElement.java +++ b/src/main/java/com/mysql/cj/api/x/core/RowToElement.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.result; +package com.mysql.cj.api.x.core; import java.util.function.Function; diff --git a/src/main/java/com/mysql/cj/api/x/Warning.java b/src/main/java/com/mysql/cj/api/x/core/Warning.java similarity index 88% rename from src/main/java/com/mysql/cj/api/x/Warning.java rename to src/main/java/com/mysql/cj/api/x/core/Warning.java index f21c9d6ee..d366e0263 100644 --- a/src/main/java/com/mysql/cj/api/x/Warning.java +++ b/src/main/java/com/mysql/cj/api/x/core/Warning.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,11 +21,8 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.x.core; -/** - * A warning generated during statement execution. - */ public interface Warning { /** * Warning level. diff --git a/src/main/java/com/mysql/cj/api/x/protocol/ColToFieldTransformer.java b/src/main/java/com/mysql/cj/api/x/protocol/ColToFieldTransformer.java new file mode 100644 index 000000000..b0b70291e --- /dev/null +++ b/src/main/java/com/mysql/cj/api/x/protocol/ColToFieldTransformer.java @@ -0,0 +1,35 @@ +/* + Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + + The MySQL Connector/J is licensed under the terms of the GPLv2 + , like most MySQL Connectors. + There are special exceptions to the terms and conditions of the GPLv2 as it is applied to + this software, see the FOSS License Exception + . + + This program is free software; you can redistribute it and/or modify it under the terms + of the GNU General Public License as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this + program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301 USA + + */ + +package com.mysql.cj.api.x.protocol; + +import java.util.function.Function; + +import com.mysql.cj.core.result.Field; +import com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData; + +/** + * The type for the function to transform the {@link ColumnMetaData} to a {@link Field}. + */ +public interface ColToFieldTransformer extends Function { +} diff --git a/src/main/java/com/mysql/cj/api/x/protocol/DecoderFunction.java b/src/main/java/com/mysql/cj/api/x/protocol/DecoderFunction.java new file mode 100644 index 000000000..18867e265 --- /dev/null +++ b/src/main/java/com/mysql/cj/api/x/protocol/DecoderFunction.java @@ -0,0 +1,45 @@ +/* + Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + + The MySQL Connector/J is licensed under the terms of the GPLv2 + , like most MySQL Connectors. + There are special exceptions to the terms and conditions of the GPLv2 as it is applied to + this software, see the FOSS License Exception + . + + This program is free software; you can redistribute it and/or modify it under the terms + of the GNU General Public License as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this + program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301 USA + + */ + +package com.mysql.cj.api.x.protocol; + +import java.io.IOException; + +import com.google.protobuf.CodedInputStream; +import com.mysql.cj.api.io.ValueFactory; + +@FunctionalInterface +public interface DecoderFunction { + /** + * @todo document + * + * @param inputStream + * the CodedInputStream over the bytes representing this value + * @param vf + * the sink for the decoded value + * @throws IOException + * propagated from {@link CodedInputStream} + * @return the value factory's output + */ + T apply(CodedInputStream inputStream, ValueFactory vf) throws IOException; +} diff --git a/src/main/java/com/mysql/cj/mysqlx/io/MessageConstants.java b/src/main/java/com/mysql/cj/api/x/protocol/MessageConstants.java similarity index 81% rename from src/main/java/com/mysql/cj/mysqlx/io/MessageConstants.java rename to src/main/java/com/mysql/cj/api/x/protocol/MessageConstants.java index ed7423fb0..b1acff24f 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/MessageConstants.java +++ b/src/main/java/com/mysql/cj/api/x/protocol/MessageConstants.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.api.x.protocol; import java.util.Collections; import java.util.HashMap; @@ -30,32 +30,32 @@ import com.google.protobuf.GeneratedMessage; import com.google.protobuf.MessageLite; import com.google.protobuf.Parser; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Error; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages; -import com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities; -import com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet; -import com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionVariableChanged; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset; -import com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute; -import com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk; +import com.mysql.cj.x.protobuf.Mysqlx.ClientMessages; +import com.mysql.cj.x.protobuf.Mysqlx.Error; +import com.mysql.cj.x.protobuf.Mysqlx.Ok; +import com.mysql.cj.x.protobuf.Mysqlx.ServerMessages; +import com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities; +import com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet; +import com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet; +import com.mysql.cj.x.protobuf.MysqlxCrud.Delete; +import com.mysql.cj.x.protobuf.MysqlxCrud.Find; +import com.mysql.cj.x.protobuf.MysqlxCrud.Insert; +import com.mysql.cj.x.protobuf.MysqlxCrud.Update; +import com.mysql.cj.x.protobuf.MysqlxNotice.Frame; +import com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged; +import com.mysql.cj.x.protobuf.MysqlxNotice.SessionVariableChanged; +import com.mysql.cj.x.protobuf.MysqlxNotice.Warning; +import com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData; +import com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone; +import com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets; +import com.mysql.cj.x.protobuf.MysqlxResultset.Row; +import com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue; +import com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk; +import com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart; +import com.mysql.cj.x.protobuf.MysqlxSession.Close; +import com.mysql.cj.x.protobuf.MysqlxSession.Reset; +import com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute; +import com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk; /** * Constants related to X Protocol messages. diff --git a/src/main/java/com/mysql/cj/api/x/protocol/MessageListener.java b/src/main/java/com/mysql/cj/api/x/protocol/MessageListener.java new file mode 100644 index 000000000..f695d1335 --- /dev/null +++ b/src/main/java/com/mysql/cj/api/x/protocol/MessageListener.java @@ -0,0 +1,43 @@ +/* + Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + + The MySQL Connector/J is licensed under the terms of the GPLv2 + , like most MySQL Connectors. + There are special exceptions to the terms and conditions of the GPLv2 as it is applied to + this software, see the FOSS License Exception + . + + This program is free software; you can redistribute it and/or modify it under the terms + of the GNU General Public License as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this + program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301 USA + + */ + +package com.mysql.cj.api.x.protocol; + +import java.util.function.BiFunction; + +import com.google.protobuf.GeneratedMessage; + +/** + * Sink for messages that are read asynchonously from the socket. + * + * @return whether the listener is done receiving messages. + */ +@FunctionalInterface +public interface MessageListener extends BiFunction, GeneratedMessage, Boolean> { + default void closed() { + } + + default void error(Throwable ex) { + ex.printStackTrace(); + } +} diff --git a/src/main/java/com/mysql/cj/mysqlx/io/MessageReader.java b/src/main/java/com/mysql/cj/api/x/protocol/MessageReader.java similarity index 95% rename from src/main/java/com/mysql/cj/mysqlx/io/MessageReader.java rename to src/main/java/com/mysql/cj/api/x/protocol/MessageReader.java index 5600f6dea..e33ce1c41 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/MessageReader.java +++ b/src/main/java/com/mysql/cj/api/x/protocol/MessageReader.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.api.x.protocol; import com.google.protobuf.ByteString; import com.google.protobuf.GeneratedMessage; @@ -56,7 +56,7 @@ * * *

- * If the MessageReader encounters an Error message, it will throw a {@link MysqlxError} exception to indicate that an error was returned from the + * If the MessageReader encounters an Error message, it will throw a {@link XDevAPIError} exception to indicate that an error was returned from the * server. *

* All external interaction should only know about message classes. Message type tags are an implementation detail hidden in the MessageReader. @@ -68,7 +68,7 @@ public interface MessageReader { * Get the class of the next message, possibly blocking indefinitely until the message is received. * * @return the class of the received message - * @throws MysqlxError + * @throws XDevAPIError * if an Error message is received from the server */ Class getNextMessageClass(); @@ -81,7 +81,7 @@ public interface MessageReader { * @return the next message of type T * @throws WrongArgumentException * if the expected message type is not the next message (exception will be thrown in *caller* context) - * @throws MysqlxError + * @throws XDevAPIError * if an Error message is received from the server * @throws CJCommunicationsException * wrapping an {@link IOException} during read or parse diff --git a/src/main/java/com/mysql/cj/mysqlx/io/MessageWriter.java b/src/main/java/com/mysql/cj/api/x/protocol/MessageWriter.java similarity index 98% rename from src/main/java/com/mysql/cj/mysqlx/io/MessageWriter.java rename to src/main/java/com/mysql/cj/api/x/protocol/MessageWriter.java index d77dd3529..bcc0435f4 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/MessageWriter.java +++ b/src/main/java/com/mysql/cj/api/x/protocol/MessageWriter.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.api.x.protocol; import com.google.protobuf.MessageLite; import com.mysql.cj.core.exceptions.WrongArgumentException; diff --git a/src/main/java/com/mysql/cj/x/json/package-info.java b/src/main/java/com/mysql/cj/api/x/protocol/MetadataToRowToElement.java similarity index 74% rename from src/main/java/com/mysql/cj/x/json/package-info.java rename to src/main/java/com/mysql/cj/api/x/protocol/MetadataToRowToElement.java index abcfdee0b..2a2373d8f 100644 --- a/src/main/java/com/mysql/cj/x/json/package-info.java +++ b/src/main/java/com/mysql/cj/api/x/protocol/MetadataToRowToElement.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,10 +21,13 @@ */ -/** - * JSON parser and representation. - * - * @since 6.0 - */ +package com.mysql.cj.api.x.protocol; + +import java.util.ArrayList; +import java.util.function.Function; + +import com.mysql.cj.api.x.core.RowToElement; +import com.mysql.cj.core.result.Field; -package com.mysql.cj.x.json; +public interface MetadataToRowToElement extends Function, RowToElement> { +} diff --git a/src/main/java/com/mysql/cj/mysqlx/io/ResultListener.java b/src/main/java/com/mysql/cj/api/x/protocol/ResultListener.java similarity index 88% rename from src/main/java/com/mysql/cj/mysqlx/io/ResultListener.java rename to src/main/java/com/mysql/cj/api/x/protocol/ResultListener.java index f61c2189a..4736e2f9f 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/ResultListener.java +++ b/src/main/java/com/mysql/cj/api/x/protocol/ResultListener.java @@ -21,14 +21,14 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.api.x.protocol; import java.util.ArrayList; -import com.mysql.cj.core.io.StatementExecuteOk; import com.mysql.cj.core.result.Field; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.result.MysqlxRow; +import com.mysql.cj.x.core.StatementExecuteOk; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.x.protocol.XProtocolRow; public interface ResultListener { /** @@ -39,7 +39,7 @@ public interface ResultListener { /** * Called when row is available. */ - void onRow(MysqlxRow r); + void onRow(XProtocolRow r); /** * Called when result processing is complete. No additional notifications will be delivered. @@ -49,7 +49,7 @@ public interface ResultListener { /** * Called when a server error is available. No additional notifications will be delivered. */ - void onError(MysqlxError error); + void onError(XDevAPIError error); /** * Called when an exception occurs. No additional notifications will be delivered. diff --git a/src/main/java/com/mysql/cj/mysqlx/io/ResultStreamer.java b/src/main/java/com/mysql/cj/api/x/protocol/ResultStreamer.java similarity index 92% rename from src/main/java/com/mysql/cj/mysqlx/io/ResultStreamer.java rename to src/main/java/com/mysql/cj/api/x/protocol/ResultStreamer.java index 1b5a470cc..edac3801a 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/ResultStreamer.java +++ b/src/main/java/com/mysql/cj/api/x/protocol/ResultStreamer.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.api.x.protocol; /** * A result streamer is a result object that is streaming results from the current connection. It allows to stream as long as nothing else needs to happen on diff --git a/src/main/java/com/mysql/cj/api/x/protocol/XpluginStatementCommand.java b/src/main/java/com/mysql/cj/api/x/protocol/XpluginStatementCommand.java new file mode 100644 index 000000000..c23004754 --- /dev/null +++ b/src/main/java/com/mysql/cj/api/x/protocol/XpluginStatementCommand.java @@ -0,0 +1,37 @@ +/* + Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + + The MySQL Connector/J is licensed under the terms of the GPLv2 + , like most MySQL Connectors. + There are special exceptions to the terms and conditions of the GPLv2 as it is applied to + this software, see the FOSS License Exception + . + + This program is free software; you can redistribute it and/or modify it under the terms + of the GNU General Public License as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this + program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301 USA + + */ + +package com.mysql.cj.api.x.protocol; + +public enum XpluginStatementCommand { + XPLUGIN_STMT_CREATE_COLLECTION("create_collection"), XPLUGIN_STMT_CREATE_COLLECTION_INDEX("create_collection_index"), + XPLUGIN_STMT_DROP_COLLECTION("drop_collection"), XPLUGIN_STMT_DROP_COLLECTION_INDEX("drop_collection_index"), XPLUGIN_STMT_PING("ping"), + XPLUGIN_STMT_LIST_OBJECTS("list_objects"), XPLUGIN_STMT_ENABLE_NOTICES("enable_notices"), XPLUGIN_STMT_DISABLE_NOTICES("disable_notices"), + XPLUGIN_STMT_LIST_NOTICES("list_notices"); // TODO add support for "ping", "list_clients", "kill_client" and "ensure_collection" commands + + public String commandName; + + private XpluginStatementCommand(String commandName) { + this.commandName = commandName; + } +} diff --git a/src/main/java/com/mysql/cj/api/x/AddStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/AddStatement.java similarity index 95% rename from src/main/java/com/mysql/cj/api/x/AddStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/AddStatement.java index 107115bb6..78ddde763 100644 --- a/src/main/java/com/mysql/cj/api/x/AddStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/AddStatement.java @@ -21,9 +21,9 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; -import com.mysql.cj.x.json.DbDoc; +import com.mysql.cj.xdevapi.DbDoc; /** * A statement adding documents to a collection. diff --git a/src/main/java/com/mysql/cj/api/x/BaseSession.java b/src/main/java/com/mysql/cj/api/xdevapi/BaseSession.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/BaseSession.java rename to src/main/java/com/mysql/cj/api/xdevapi/BaseSession.java index c13456be2..c530c3d58 100644 --- a/src/main/java/com/mysql/cj/api/x/BaseSession.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/BaseSession.java @@ -21,11 +21,11 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; import java.util.List; -import com.mysql.cj.mysqlx.MysqlxSession; +import com.mysql.cj.x.core.MysqlxSession; /** * A client interface to the session on the X Plugin server. diff --git a/src/main/java/com/mysql/cj/api/x/Collection.java b/src/main/java/com/mysql/cj/api/xdevapi/Collection.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/Collection.java rename to src/main/java/com/mysql/cj/api/xdevapi/Collection.java index ea7c53751..cedb59967 100644 --- a/src/main/java/com/mysql/cj/api/x/Collection.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/Collection.java @@ -21,11 +21,11 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; import java.util.Map; -import com.mysql.cj.x.json.DbDoc; +import com.mysql.cj.xdevapi.DbDoc; /** * A client-side representation of a collection of documents. This interface allows access/manipulation to the collection through add/find/modify/remove diff --git a/src/main/java/com/mysql/cj/api/x/Column.java b/src/main/java/com/mysql/cj/api/xdevapi/Column.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/Column.java rename to src/main/java/com/mysql/cj/api/xdevapi/Column.java index cd5d6a333..bef5b5272 100644 --- a/src/main/java/com/mysql/cj/api/x/Column.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/Column.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; public interface Column { String getSchemaName(); diff --git a/src/main/java/com/mysql/cj/api/x/ColumnDefinition.java b/src/main/java/com/mysql/cj/api/xdevapi/ColumnDefinition.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/ColumnDefinition.java rename to src/main/java/com/mysql/cj/api/xdevapi/ColumnDefinition.java index e49f3bf42..12fd38a40 100644 --- a/src/main/java/com/mysql/cj/api/x/ColumnDefinition.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/ColumnDefinition.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; public interface ColumnDefinition> { diff --git a/src/main/java/com/mysql/cj/api/x/CreateCollectionIndexStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/CreateCollectionIndexStatement.java similarity index 92% rename from src/main/java/com/mysql/cj/api/x/CreateCollectionIndexStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/CreateCollectionIndexStatement.java index 024a7a560..982a8fab7 100644 --- a/src/main/java/com/mysql/cj/api/x/CreateCollectionIndexStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/CreateCollectionIndexStatement.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * A statement that creates an index on a collection. diff --git a/src/main/java/com/mysql/cj/api/x/CreateTableStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/CreateTableStatement.java similarity index 99% rename from src/main/java/com/mysql/cj/api/x/CreateTableStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/CreateTableStatement.java index a731879c3..4925a33b9 100644 --- a/src/main/java/com/mysql/cj/api/x/CreateTableStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/CreateTableStatement.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * CreateTableFunction diff --git a/src/main/java/com/mysql/cj/api/x/DataStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/DataStatement.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/DataStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/DataStatement.java index d0d3bb118..02b0a4feb 100644 --- a/src/main/java/com/mysql/cj/api/x/DataStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/DataStatement.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; import java.util.concurrent.CompletableFuture; import java.util.function.BiFunction; diff --git a/src/main/java/com/mysql/cj/api/x/DatabaseObject.java b/src/main/java/com/mysql/cj/api/xdevapi/DatabaseObject.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/DatabaseObject.java rename to src/main/java/com/mysql/cj/api/xdevapi/DatabaseObject.java index 40fd09ab0..9b8315be6 100644 --- a/src/main/java/com/mysql/cj/api/x/DatabaseObject.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/DatabaseObject.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * A client-side representation of X Plugin server object, e.g. table, collection, etc. diff --git a/src/main/java/com/mysql/cj/api/x/DeleteStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/DeleteStatement.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/DeleteStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/DeleteStatement.java index 8890dd4e0..d0b6107de 100644 --- a/src/main/java/com/mysql/cj/api/x/DeleteStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/DeleteStatement.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * A statement to delete rows from a table. diff --git a/src/main/java/com/mysql/cj/api/x/DocResult.java b/src/main/java/com/mysql/cj/api/xdevapi/DocResult.java similarity index 88% rename from src/main/java/com/mysql/cj/api/x/DocResult.java rename to src/main/java/com/mysql/cj/api/xdevapi/DocResult.java index ad7498ca2..20c6fd74b 100644 --- a/src/main/java/com/mysql/cj/api/x/DocResult.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/DocResult.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,9 +21,9 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; -import com.mysql.cj.x.json.DbDoc; +import com.mysql.cj.xdevapi.DbDoc; /** * A sequence of documents retrieved from a find query. diff --git a/src/main/java/com/mysql/cj/api/x/DropCollectionIndexStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/DropCollectionIndexStatement.java similarity index 91% rename from src/main/java/com/mysql/cj/api/x/DropCollectionIndexStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/DropCollectionIndexStatement.java index a7f82b671..7693a2d0e 100644 --- a/src/main/java/com/mysql/cj/api/x/DropCollectionIndexStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/DropCollectionIndexStatement.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * A statement that drops an index on a collection. diff --git a/src/main/java/com/mysql/cj/api/x/Expression.java b/src/main/java/com/mysql/cj/api/xdevapi/Expression.java similarity index 93% rename from src/main/java/com/mysql/cj/api/x/Expression.java rename to src/main/java/com/mysql/cj/api/xdevapi/Expression.java index 8b6732dca..f1e7ce886 100644 --- a/src/main/java/com/mysql/cj/api/x/Expression.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/Expression.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * A wrapper for expression strings. Used as parameters values e.g.: set("b", Expression.expr("a + 1")). diff --git a/src/main/java/com/mysql/cj/api/x/FetchResult.java b/src/main/java/com/mysql/cj/api/xdevapi/FetchResult.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/FetchResult.java rename to src/main/java/com/mysql/cj/api/xdevapi/FetchResult.java index d39d2cfe3..41d108ee2 100644 --- a/src/main/java/com/mysql/cj/api/x/FetchResult.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/FetchResult.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/com/mysql/cj/api/x/FindStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/FindStatement.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/FindStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/FindStatement.java index 6487dbb2d..a5e5e3bec 100644 --- a/src/main/java/com/mysql/cj/api/x/FindStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/FindStatement.java @@ -21,9 +21,9 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; -import com.mysql.cj.x.json.DbDoc; +import com.mysql.cj.xdevapi.DbDoc; /** * A statement to find the set of documents according to the given specification. diff --git a/src/main/java/com/mysql/cj/api/x/ForeignKeyDefinition.java b/src/main/java/com/mysql/cj/api/xdevapi/ForeignKeyDefinition.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/ForeignKeyDefinition.java rename to src/main/java/com/mysql/cj/api/xdevapi/ForeignKeyDefinition.java index 677ee47eb..cf0a9704c 100644 --- a/src/main/java/com/mysql/cj/api/x/ForeignKeyDefinition.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/ForeignKeyDefinition.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * FkSpec diff --git a/src/main/java/com/mysql/cj/api/x/InsertStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/InsertStatement.java similarity index 93% rename from src/main/java/com/mysql/cj/api/x/InsertStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/InsertStatement.java index 296135c02..73a4cb104 100644 --- a/src/main/java/com/mysql/cj/api/x/InsertStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/InsertStatement.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/mysql/cj/api/x/JsonValue.java b/src/main/java/com/mysql/cj/api/xdevapi/JsonValue.java similarity index 91% rename from src/main/java/com/mysql/cj/api/x/JsonValue.java rename to src/main/java/com/mysql/cj/api/xdevapi/JsonValue.java index 6e9b25956..ee6a85865 100644 --- a/src/main/java/com/mysql/cj/api/x/JsonValue.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/JsonValue.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * Common interface for classes representing JSON object, array, number, string and 'true', 'false' and 'null' literals. diff --git a/src/main/java/com/mysql/cj/api/x/ModifyStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/ModifyStatement.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/ModifyStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/ModifyStatement.java index 5f354427a..68f8aad75 100644 --- a/src/main/java/com/mysql/cj/api/x/ModifyStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/ModifyStatement.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * A statement representing a set of document modifications. diff --git a/src/main/java/com/mysql/cj/api/x/NodeSession.java b/src/main/java/com/mysql/cj/api/xdevapi/NodeSession.java similarity index 79% rename from src/main/java/com/mysql/cj/api/x/NodeSession.java rename to src/main/java/com/mysql/cj/api/xdevapi/NodeSession.java index a6ccc470a..7ca4b24a8 100644 --- a/src/main/java/com/mysql/cj/api/x/NodeSession.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/NodeSession.java @@ -21,31 +21,34 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; + +import com.mysql.cj.xdevapi.XSessionFactory; /** * In some cases access to the full SQL language is needed, e.g. to directly connect to a specific X Plugin node in a sharded environment and do operations - * specifically on this node. In those cases a direct, low-level connections needs to be opened. This is performed by using the mysqlx.getNodeSession() function - * which will return a NodeSession object. + * specifically on this node. In those cases a direct, low-level connections needs to be opened. This is performed by using the + * {@link XSessionFactory#getNodeSession(String)} function which will return a {@link NodeSession} object. *

* When using literal/verbatim SQL the common API patterns are mostly the same compared to using DML and CRUD operations on Tables and Collections. Two * differences exist: setting the current schema and escaping names. *

- * You cannot call mysqlx.getSchema() or mysqlx.getDefaultSchema() to obtain a Schema object against which you can issue verbatin SQL statements. The Schema - * object does not feature a executeSql() function. + * You cannot call {@link NodeSession#getSchema(String)} or {@link NodeSession#getDefaultSchema()} to obtain a {@link Schema} object against which you can + * issue verbatin SQL statements. The Schema object does not feature a sql() function. *

- * The executeSql() function is a method of the NodeSession class. Use NodeSession.executeSql() and the SQL command USE to change the current schema + * The sql() function is a method of the {@link NodeSession} class. Use {@link NodeSession#sql(String)} and the SQL command USE to change the current + * schema *

* NodeSession session = XSessionFactory.getNodeSession("root:s3kr3t@localhost");
- * session.executeSql("USE test"); + * session.sql("USE test"); *

* If a NodeSession has been established using a data source file the name of the default schema can be obtained to change the current database. *

* Properties p = new Properties();
* p.setProperty("dataSourceFile", "/home/app_instance50/mysqlxconfig.json");
- * NodeSession session = MysqlxSessionFactory.getSession(p);
+ * NodeSession session = XSessionFactory.getSession(p);
* String defaultSchema = session.getDefaultSchema().getName();
- * session.executeSql("USE ?", defaultSchema);
+ * session.sql("USE ?", defaultSchema);
*

* A quoting function exists to escape SQL names/identifiers. NodeSession.quoteName() will escape the identifier given in accordance to the settings of the * current connection. The escape function must not be used to escape values. Use the value bind syntax of NodeSession.executeSql() instead. diff --git a/src/main/java/com/mysql/cj/api/x/RemoveStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/RemoveStatement.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/RemoveStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/RemoveStatement.java index c1ab92916..cdb698c84 100644 --- a/src/main/java/com/mysql/cj/api/x/RemoveStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/RemoveStatement.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * A statement requesting to remove a set of documents. diff --git a/src/main/java/com/mysql/cj/api/x/Result.java b/src/main/java/com/mysql/cj/api/xdevapi/Result.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/Result.java rename to src/main/java/com/mysql/cj/api/xdevapi/Result.java index 3b83816fa..ac8442340 100644 --- a/src/main/java/com/mysql/cj/api/x/Result.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/Result.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/com/mysql/cj/api/x/Row.java b/src/main/java/com/mysql/cj/api/xdevapi/Row.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/Row.java rename to src/main/java/com/mysql/cj/api/xdevapi/Row.java index 2f0bab388..b366b99c7 100644 --- a/src/main/java/com/mysql/cj/api/x/Row.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/Row.java @@ -21,14 +21,14 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; import java.math.BigDecimal; import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; -import com.mysql.cj.x.json.DbDoc; +import com.mysql.cj.xdevapi.DbDoc; /** * A row element returned from a SELECT query. diff --git a/src/main/java/com/mysql/cj/api/x/RowResult.java b/src/main/java/com/mysql/cj/api/xdevapi/RowResult.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/RowResult.java rename to src/main/java/com/mysql/cj/api/xdevapi/RowResult.java index 2ea4901af..7d03b0633 100644 --- a/src/main/java/com/mysql/cj/api/x/RowResult.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/RowResult.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; import java.util.List; diff --git a/src/main/java/com/mysql/cj/api/x/Schema.java b/src/main/java/com/mysql/cj/api/xdevapi/Schema.java similarity index 96% rename from src/main/java/com/mysql/cj/api/x/Schema.java rename to src/main/java/com/mysql/cj/api/xdevapi/Schema.java index 67efbdbe4..55532d2ac 100644 --- a/src/main/java/com/mysql/cj/api/x/Schema.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/Schema.java @@ -21,11 +21,11 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; import java.util.List; -import com.mysql.cj.api.x.CreateTableStatement.CreateTableSplitStatement; +import com.mysql.cj.api.xdevapi.CreateTableStatement.CreateTableSplitStatement; /** * A client-side representation of a database schema. Provides access to the schema contents. diff --git a/src/main/java/com/mysql/cj/api/x/SelectStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/SelectStatement.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/SelectStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/SelectStatement.java index ab952dc07..91c5c4831 100644 --- a/src/main/java/com/mysql/cj/api/x/SelectStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/SelectStatement.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * A statement representing a SELECT query. diff --git a/src/main/java/com/mysql/cj/api/x/SqlResult.java b/src/main/java/com/mysql/cj/api/xdevapi/SqlResult.java similarity index 92% rename from src/main/java/com/mysql/cj/api/x/SqlResult.java rename to src/main/java/com/mysql/cj/api/xdevapi/SqlResult.java index 6a7012e52..f7838d282 100644 --- a/src/main/java/com/mysql/cj/api/x/SqlResult.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/SqlResult.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * A result from a SQL statement which may have several sets of data following by a DML result. diff --git a/src/main/java/com/mysql/cj/api/x/SqlStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/SqlStatement.java similarity index 91% rename from src/main/java/com/mysql/cj/api/x/SqlStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/SqlStatement.java index 33af1e134..cc53a6aa1 100644 --- a/src/main/java/com/mysql/cj/api/x/SqlStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/SqlStatement.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * A statement representing a raw SQL command. diff --git a/src/main/java/com/mysql/cj/api/x/Statement.java b/src/main/java/com/mysql/cj/api/xdevapi/Statement.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/Statement.java rename to src/main/java/com/mysql/cj/api/xdevapi/Statement.java index affa267d1..d05c399d8 100644 --- a/src/main/java/com/mysql/cj/api/x/Statement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/Statement.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/mysql/cj/api/x/Table.java b/src/main/java/com/mysql/cj/api/xdevapi/Table.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/Table.java rename to src/main/java/com/mysql/cj/api/xdevapi/Table.java index 336482c6c..ca723b2d1 100644 --- a/src/main/java/com/mysql/cj/api/x/Table.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/Table.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; import java.util.Map; diff --git a/src/main/java/com/mysql/cj/api/x/Type.java b/src/main/java/com/mysql/cj/api/xdevapi/Type.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/Type.java rename to src/main/java/com/mysql/cj/api/xdevapi/Type.java index 8830f6340..78df10f36 100644 --- a/src/main/java/com/mysql/cj/api/x/Type.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/Type.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; public enum Type { BIT, diff --git a/src/main/java/com/mysql/cj/api/x/UpdateStatement.java b/src/main/java/com/mysql/cj/api/xdevapi/UpdateStatement.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/UpdateStatement.java rename to src/main/java/com/mysql/cj/api/xdevapi/UpdateStatement.java index f248fb849..dd6b41c25 100644 --- a/src/main/java/com/mysql/cj/api/x/UpdateStatement.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/UpdateStatement.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; import java.util.Map; diff --git a/src/test/java/testsuite/mysqlx/devapi/package-info.java b/src/main/java/com/mysql/cj/api/xdevapi/UpdateType.java similarity index 77% rename from src/test/java/testsuite/mysqlx/devapi/package-info.java rename to src/main/java/com/mysql/cj/api/xdevapi/UpdateType.java index 54fae493f..60277353e 100644 --- a/src/test/java/testsuite/mysqlx/devapi/package-info.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/UpdateType.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,8 +21,9 @@ */ -/** - * Dev API test suite. - */ +package com.mysql.cj.api.xdevapi; -package testsuite.mysqlx.devapi; +public enum UpdateType { + // these must mirror exactly the names of UpdateOperation.UpdateType in mysqlx_crud.proto + ITEM_REMOVE, ITEM_SET, ITEM_REPLACE, ITEM_MERGE, ARRAY_INSERT, ARRAY_APPEND +} diff --git a/src/main/java/com/mysql/cj/api/xdevapi/Warning.java b/src/main/java/com/mysql/cj/api/xdevapi/Warning.java new file mode 100644 index 000000000..ab32ee323 --- /dev/null +++ b/src/main/java/com/mysql/cj/api/xdevapi/Warning.java @@ -0,0 +1,30 @@ +/* + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + + The MySQL Connector/J is licensed under the terms of the GPLv2 + , like most MySQL Connectors. + There are special exceptions to the terms and conditions of the GPLv2 as it is applied to + this software, see the FOSS License Exception + . + + This program is free software; you can redistribute it and/or modify it under the terms + of the GNU General Public License as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this + program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301 USA + + */ + +package com.mysql.cj.api.xdevapi; + +/** + * A warning generated during statement execution. + */ +public interface Warning extends com.mysql.cj.api.x.core.Warning { +} diff --git a/src/main/java/com/mysql/cj/api/x/XSession.java b/src/main/java/com/mysql/cj/api/xdevapi/XSession.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/XSession.java rename to src/main/java/com/mysql/cj/api/xdevapi/XSession.java index 9cb117573..7d5754f52 100644 --- a/src/main/java/com/mysql/cj/api/x/XSession.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/XSession.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; /** * X DevAPI introduces a new, high-level database session concept that is called XSession. When working with X DevAPI it is important to understand this new diff --git a/src/main/java/com/mysql/cj/api/x/package-info.java b/src/main/java/com/mysql/cj/api/xdevapi/package-info.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/package-info.java rename to src/main/java/com/mysql/cj/api/xdevapi/package-info.java index fd1f0d432..1234abfc9 100644 --- a/src/main/java/com/mysql/cj/api/x/package-info.java +++ b/src/main/java/com/mysql/cj/api/xdevapi/package-info.java @@ -27,4 +27,4 @@ * @since 6.0 */ -package com.mysql.cj.api.x; +package com.mysql.cj.api.xdevapi; diff --git a/src/main/java/com/mysql/cj/core/conf/PropertyDefinitions.java b/src/main/java/com/mysql/cj/core/conf/PropertyDefinitions.java index 1476cd631..16373b155 100644 --- a/src/main/java/com/mysql/cj/core/conf/PropertyDefinitions.java +++ b/src/main/java/com/mysql/cj/core/conf/PropertyDefinitions.java @@ -134,11 +134,11 @@ public class PropertyDefinitions { public static final String CATEGORY_EXCEPTIONS = Messages.getString("ConnectionProperties.categoryExceptions"); public static final String CATEGORY_INTEGRATION = Messages.getString("ConnectionProperties.categoryIntegration"); public static final String CATEGORY_JDBC = Messages.getString("ConnectionProperties.categoryJDBC"); - public static final String CATEGORY_MYSQLX = Messages.getString("ConnectionProperties.categoryMysqlx"); + public static final String CATEGORY_XDEVAPI = Messages.getString("ConnectionProperties.categoryXDevAPI"); public static final String[] PROPERTY_CATEGORIES = new String[] { CATEGORY_AUTH, CATEGORY_CONNECTION, CATEGORY_SESSION, CATEGORY_NETWORK, CATEGORY_SECURITY, CATEGORY_STATEMENTS, CATEGORY_PREPARED_STATEMENTS, CATEGORY_RESULT_SETS, CATEGORY_METADATA, CATEGORY_BLOBS, CATEGORY_DATETIMES, CATEGORY_HA, - CATEGORY_PERFORMANCE, CATEGORY_DEBUGING_PROFILING, CATEGORY_EXCEPTIONS, CATEGORY_INTEGRATION, CATEGORY_JDBC, CATEGORY_MYSQLX }; + CATEGORY_PERFORMANCE, CATEGORY_DEBUGING_PROFILING, CATEGORY_EXCEPTIONS, CATEGORY_INTEGRATION, CATEGORY_JDBC, CATEGORY_XDEVAPI }; /* * Property modifiers @@ -340,7 +340,7 @@ public class PropertyDefinitions { public static final String PNAME_dontCheckOnDuplicateKeyUpdateInSQL = "dontCheckOnDuplicateKeyUpdateInSQL"; public static final String PNAME_readOnlyPropagatesToServer = "readOnlyPropagatesToServer"; - public static final String PNAME_useAsyncProtocol = "mysqlx.useAsyncProtocol"; + public static final String PNAME_useAsyncProtocol = "xdevapi.useAsyncProtocol"; public static final String PNAME_enableEscapeProcessing = "enableEscapeProcessing"; @@ -905,10 +905,10 @@ public class PropertyDefinitions { new BooleanPropertyDefinition(PNAME_readOnlyPropagatesToServer, DEFAULT_VALUE_TRUE, RUNTIME_MODIFIABLE, Messages.getString("ConnectionProperties.readOnlyPropagatesToServer"), "5.1.35", CATEGORY_PERFORMANCE, Integer.MIN_VALUE), - // TODO improve MySQLx properties descriptions + // TODO improve X DevAPI properties descriptions new BooleanPropertyDefinition(PNAME_useAsyncProtocol, DEFAULT_VALUE_TRUE, RUNTIME_NOT_MODIFIABLE, - Messages.getString("ConnectionProperties.useAsyncProtocol"), "6.0.0", CATEGORY_MYSQLX, Integer.MIN_VALUE), + Messages.getString("ConnectionProperties.useAsyncProtocol"), "6.0.0", CATEGORY_XDEVAPI, Integer.MIN_VALUE), new BooleanPropertyDefinition(PNAME_enableEscapeProcessing, DEFAULT_VALUE_TRUE, RUNTIME_MODIFIABLE, Messages.getString("ConnectionProperties.enableEscapeProcessing"), "6.0.1", CATEGORY_PERFORMANCE, Integer.MIN_VALUE) }; diff --git a/src/main/java/com/mysql/cj/core/conf/url/ConnectionUrl.java b/src/main/java/com/mysql/cj/core/conf/url/ConnectionUrl.java index a5eebfbc4..a0ee4ef9e 100644 --- a/src/main/java/com/mysql/cj/core/conf/url/ConnectionUrl.java +++ b/src/main/java/com/mysql/cj/core/conf/url/ConnectionUrl.java @@ -111,7 +111,7 @@ public enum Type { FAILOVER_CONNECTION("jdbc:mysql:", HostsCardinality.MULTIPLE), // LOADBALANCE_CONNECTION("jdbc:mysql:loadbalance:", HostsCardinality.ONE_OR_MORE), // REPLICATION_CONNECTION("jdbc:mysql:replication:", HostsCardinality.ONE_OR_MORE), // - MYSQLX_SESSION("mysqlx:", HostsCardinality.ONE_OR_MORE); + XDEVAPI_SESSION("mysqlx:", HostsCardinality.ONE_OR_MORE); private String protocol; private HostsCardinality cardinality; @@ -210,8 +210,8 @@ public static ConnectionUrl getConnectionUrlInstance(String connString, Properti case REPLICATION_CONNECTION: connectionString = new ReplicationConnectionUrl(connStrParser, info); break; - case MYSQLX_SESSION: - connectionString = new MysqlxConnectionUrl(connStrParser, info); + case XDEVAPI_SESSION: + connectionString = new XDevAPIConnectionUrl(connStrParser, info); break; default: return new ConnectionUrl(connString) { diff --git a/src/main/java/com/mysql/cj/core/conf/url/MysqlxConnectionUrl.java b/src/main/java/com/mysql/cj/core/conf/url/XDevAPIConnectionUrl.java similarity index 91% rename from src/main/java/com/mysql/cj/core/conf/url/MysqlxConnectionUrl.java rename to src/main/java/com/mysql/cj/core/conf/url/XDevAPIConnectionUrl.java index dcdfdf52a..ca45b99a1 100644 --- a/src/main/java/com/mysql/cj/core/conf/url/MysqlxConnectionUrl.java +++ b/src/main/java/com/mysql/cj/core/conf/url/XDevAPIConnectionUrl.java @@ -39,20 +39,20 @@ import com.mysql.cj.core.exceptions.ExceptionFactory; import com.mysql.cj.core.exceptions.WrongArgumentException; -public class MysqlxConnectionUrl extends ConnectionUrl { +public class XDevAPIConnectionUrl extends ConnectionUrl { private static final int DEFAULT_PORT = 33060; /** - * Constructs an instance of {@link MysqlxConnectionUrl}, performing all the required initializations. + * Constructs an instance of {@link XDevAPIConnectionUrl}, performing all the required initializations. * * @param connStrParser * a {@link ConnectionUrlParser} instance containing the parsed version of the original connection string * @param info * the connection arguments map */ - protected MysqlxConnectionUrl(ConnectionUrlParser connStrParser, Properties info) { + protected XDevAPIConnectionUrl(ConnectionUrlParser connStrParser, Properties info) { super(connStrParser, info); - this.type = Type.MYSQLX_SESSION; + this.type = Type.XDEVAPI_SESSION; /* * Validate the hosts list: @@ -73,11 +73,11 @@ protected MysqlxConnectionUrl(ConnectionUrlParser connStrParser, Properties info } else { if (!user.equals(hi.getUser()) || !password.equals(hi.getPassword())) { throw ExceptionFactory.createException(WrongArgumentException.class, - Messages.getString("ConnectionString.14", new Object[] { Type.MYSQLX_SESSION.getProtocol() })); + Messages.getString("ConnectionString.14", new Object[] { Type.XDEVAPI_SESSION.getProtocol() })); } if (hasPriority ^ hi.getHostProperties().containsKey(PRIORITY_PROPERTY_KEY)) { throw ExceptionFactory.createException(WrongArgumentException.class, - Messages.getString("ConnectionString.15", new Object[] { Type.MYSQLX_SESSION.getProtocol() })); + Messages.getString("ConnectionString.15", new Object[] { Type.XDEVAPI_SESSION.getProtocol() })); } } if (hasPriority) { @@ -85,11 +85,11 @@ protected MysqlxConnectionUrl(ConnectionUrlParser connStrParser, Properties info int priority = Integer.parseInt(hi.getProperty(PRIORITY_PROPERTY_KEY)); if (priority < 0 || priority > 100) { throw ExceptionFactory.createException(WrongArgumentException.class, - Messages.getString("ConnectionString.16", new Object[] { Type.MYSQLX_SESSION.getProtocol() })); + Messages.getString("ConnectionString.16", new Object[] { Type.XDEVAPI_SESSION.getProtocol() })); } } catch (NumberFormatException e) { throw ExceptionFactory.createException(WrongArgumentException.class, - Messages.getString("ConnectionString.16", new Object[] { Type.MYSQLX_SESSION.getProtocol() })); + Messages.getString("ConnectionString.16", new Object[] { Type.XDEVAPI_SESSION.getProtocol() })); } } } diff --git a/src/main/java/com/mysql/cj/jdbc/NonRegisteringDriver.java b/src/main/java/com/mysql/cj/jdbc/NonRegisteringDriver.java index c7cb63f25..f36840cae 100644 --- a/src/main/java/com/mysql/cj/jdbc/NonRegisteringDriver.java +++ b/src/main/java/com/mysql/cj/jdbc/NonRegisteringDriver.java @@ -211,9 +211,9 @@ public java.sql.Connection connect(String url, Properties info) throws SQLExcept case REPLICATION_CONNECTION: return ReplicationConnectionProxy.createProxyInstance((ReplicationConnectionUrl) conStr); - case MYSQLX_SESSION: + case XDEVAPI_SESSION: // TODO test it - //return new MysqlxJdbcConnection(conStr.getProperties()); + //return new XJdbcConnection(conStr.getProperties()); default: return com.mysql.cj.jdbc.ConnectionImpl.getInstance(conStr.getMainHost()); diff --git a/src/main/java/com/mysql/cj/x/core/CoreWarning.java b/src/main/java/com/mysql/cj/x/core/CoreWarning.java new file mode 100644 index 000000000..6a63d5960 --- /dev/null +++ b/src/main/java/com/mysql/cj/x/core/CoreWarning.java @@ -0,0 +1,46 @@ +/* + Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + + The MySQL Connector/J is licensed under the terms of the GPLv2 + , like most MySQL Connectors. + There are special exceptions to the terms and conditions of the GPLv2 as it is applied to + this software, see the FOSS License Exception + . + + This program is free software; you can redistribute it and/or modify it under the terms + of the GNU General Public License as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this + program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301 USA + + */ + +package com.mysql.cj.x.core; + +import com.mysql.cj.x.protobuf.MysqlxNotice.Warning; + +public class CoreWarning implements com.mysql.cj.api.x.core.Warning { + private Warning message; + + public CoreWarning(Warning message) { + this.message = message; + } + + public int getLevel() { + return this.message.getLevel().getNumber(); + } + + public long getCode() { + return Integer.toUnsignedLong(this.message.getCode()); + } + + public String getMessage() { + return this.message.getMsg(); + } +} diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/DatabaseObjectDescription.java b/src/main/java/com/mysql/cj/x/core/DatabaseObjectDescription.java similarity index 95% rename from src/main/java/com/mysql/cj/mysqlx/devapi/DatabaseObjectDescription.java rename to src/main/java/com/mysql/cj/x/core/DatabaseObjectDescription.java index b59330513..c9a16e638 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/DatabaseObjectDescription.java +++ b/src/main/java/com/mysql/cj/x/core/DatabaseObjectDescription.java @@ -21,9 +21,9 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.x.core; -import com.mysql.cj.api.x.DatabaseObject; +import com.mysql.cj.api.xdevapi.DatabaseObject; public class DatabaseObjectDescription { private String objectName; diff --git a/src/main/java/com/mysql/cj/mysqlx/MysqlxSession.java b/src/main/java/com/mysql/cj/x/core/MysqlxSession.java similarity index 92% rename from src/main/java/com/mysql/cj/mysqlx/MysqlxSession.java rename to src/main/java/com/mysql/cj/x/core/MysqlxSession.java index cde6d314f..f6388473e 100644 --- a/src/main/java/com/mysql/cj/mysqlx/MysqlxSession.java +++ b/src/main/java/com/mysql/cj/x/core/MysqlxSession.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.x.core; import java.io.IOException; import java.net.SocketAddress; @@ -33,7 +33,6 @@ import java.util.Spliterators; import java.util.TimeZone; import java.util.concurrent.CompletableFuture; -import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collector; @@ -48,51 +47,50 @@ import com.mysql.cj.api.io.ServerSession; import com.mysql.cj.api.log.Log; import com.mysql.cj.api.result.Row; -import com.mysql.cj.api.result.RowList; -import com.mysql.cj.api.x.DataStatement.Reducer; -import com.mysql.cj.api.x.DatabaseObject; -import com.mysql.cj.api.x.DocResult; -import com.mysql.cj.api.x.RowResult; -import com.mysql.cj.api.x.SqlResult; +import com.mysql.cj.api.x.core.ResultCtor; +import com.mysql.cj.api.x.protocol.MetadataToRowToElement; +import com.mysql.cj.api.x.protocol.ResultListener; +import com.mysql.cj.api.x.protocol.ResultStreamer; +import com.mysql.cj.api.xdevapi.DatabaseObject; +import com.mysql.cj.api.xdevapi.DocResult; +import com.mysql.cj.api.xdevapi.RowResult; +import com.mysql.cj.api.xdevapi.SqlResult; +import com.mysql.cj.api.xdevapi.DataStatement.Reducer; import com.mysql.cj.core.ServerVersion; import com.mysql.cj.core.conf.DefaultPropertySet; import com.mysql.cj.core.conf.PropertyDefinitions; import com.mysql.cj.core.exceptions.CJCommunicationsException; -import com.mysql.cj.core.io.DbDocValueFactory; import com.mysql.cj.core.io.LongValueFactory; -import com.mysql.cj.core.io.StatementExecuteOk; import com.mysql.cj.core.io.StringValueFactory; import com.mysql.cj.core.result.Field; import com.mysql.cj.core.util.StringUtils; -import com.mysql.cj.mysqlx.devapi.DatabaseObjectDescription; -import com.mysql.cj.mysqlx.devapi.DevapiRowFactory; -import com.mysql.cj.mysqlx.devapi.DocResultImpl; -import com.mysql.cj.mysqlx.devapi.RowResultImpl; -import com.mysql.cj.mysqlx.devapi.SqlDataResult; -import com.mysql.cj.mysqlx.devapi.SqlResultImpl; -import com.mysql.cj.mysqlx.devapi.SqlUpdateResult; -import com.mysql.cj.mysqlx.io.MysqlxProtocol; -import com.mysql.cj.mysqlx.io.MysqlxProtocolFactory; -import com.mysql.cj.mysqlx.io.ResultListener; -import com.mysql.cj.mysqlx.io.ResultStreamer; -import com.mysql.cj.mysqlx.io.StatementExecuteOkBuilder; -import com.mysql.cj.x.json.DbDoc; +import com.mysql.cj.x.protocol.XProtocol; +import com.mysql.cj.x.protocol.XProtocolFactory; +import com.mysql.cj.x.protocol.DevapiRowFactory; +import com.mysql.cj.x.protocol.ResultCreatingResultListener; +import com.mysql.cj.x.protocol.RowWiseReducingResultListener; +import com.mysql.cj.x.protocol.StatementExecuteOkBuilder; +import com.mysql.cj.xdevapi.CreateIndexParams; +import com.mysql.cj.xdevapi.DbDoc; +import com.mysql.cj.xdevapi.DbDocValueFactory; +import com.mysql.cj.xdevapi.DocResultImpl; +import com.mysql.cj.xdevapi.ExprUnparser; +import com.mysql.cj.xdevapi.FilterParams; +import com.mysql.cj.xdevapi.FindParams; +import com.mysql.cj.xdevapi.InsertParams; +import com.mysql.cj.xdevapi.RowResultImpl; +import com.mysql.cj.xdevapi.SqlDataResult; +import com.mysql.cj.xdevapi.SqlResultImpl; +import com.mysql.cj.xdevapi.SqlUpdateResult; +import com.mysql.cj.xdevapi.UpdateParams; +import com.mysql.cj.xdevapi.UpdateSpec; /** * @todo */ public class MysqlxSession implements Session { - /** - * A function to create a result set from the metadata, row list and ok packet (curried representation). - * - * @param the - * type of the result that this constructor will create - */ - public static interface ResultCtor extends Function, BiFunction, T>> { - } - - private MysqlxProtocol protocol; + private XProtocol protocol; private ResultStreamer currentResult; private String host; private int port; @@ -111,7 +109,7 @@ public MysqlxSession(Properties properties) { } this.port = Integer.parseInt(properties.getProperty(PropertyDefinitions.PORT_PROPERTY_KEY, "33060")); - this.protocol = MysqlxProtocolFactory.getInstance(this.host, this.port, pset); + this.protocol = XProtocolFactory.getInstance(this.host, this.port, pset); } public String getHost() { @@ -502,11 +500,10 @@ public CompletableFuture asyncFindDocsReduce(FindParams findParams, R id, return f; } - public CompletableFuture asyncSelectRowsReduce(FindParams findParams, R id, Reducer reducer) { + public CompletableFuture asyncSelectRowsReduce(FindParams findParams, R id, Reducer reducer) { CompletableFuture f = new CompletableFuture(); - RowWiseReducingResultListener.MetadataToRowToElement rowFactory = metadata -> new DevapiRowFactory(metadata, - this.defaultTimeZone); - ResultListener l = new RowWiseReducingResultListener(id, reducer, f, rowFactory); + MetadataToRowToElement rowFactory = metadata -> new DevapiRowFactory(metadata, this.defaultTimeZone); + ResultListener l = new RowWiseReducingResultListener(id, reducer, f, rowFactory); newCommand(); // TODO: put characterSetMetadata somewhere useful this.protocol.asyncFind(findParams, "latin1", l, f); diff --git a/src/main/java/com/mysql/cj/core/io/StatementExecuteOk.java b/src/main/java/com/mysql/cj/x/core/StatementExecuteOk.java similarity index 92% rename from src/main/java/com/mysql/cj/core/io/StatementExecuteOk.java rename to src/main/java/com/mysql/cj/x/core/StatementExecuteOk.java index 28aa3edb1..6d0d7378e 100644 --- a/src/main/java/com/mysql/cj/core/io/StatementExecuteOk.java +++ b/src/main/java/com/mysql/cj/x/core/StatementExecuteOk.java @@ -21,11 +21,11 @@ */ -package com.mysql.cj.core.io; +package com.mysql.cj.x.core; import java.util.List; -import com.mysql.cj.api.x.Warning; +import com.mysql.cj.api.x.core.Warning; /** * The returned information from a successfully executed statement. All fields are optional and may be null. @@ -37,7 +37,6 @@ public class StatementExecuteOk { private Long lastInsertId; private List warnings; - // TODO; use of Warning here is not cross-protocol, need an abstract version public StatementExecuteOk(long rowsAffected, Long lastInsertId, List warnings) { this.rowsAffected = rowsAffected; this.lastInsertId = lastInsertId; diff --git a/src/main/java/com/mysql/cj/mysqlx/MysqlxError.java b/src/main/java/com/mysql/cj/x/core/XDevAPIError.java similarity index 91% rename from src/main/java/com/mysql/cj/mysqlx/MysqlxError.java rename to src/main/java/com/mysql/cj/x/core/XDevAPIError.java index d6ee5f009..17ac8f9d5 100644 --- a/src/main/java/com/mysql/cj/mysqlx/MysqlxError.java +++ b/src/main/java/com/mysql/cj/x/core/XDevAPIError.java @@ -21,15 +21,15 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.x.core; import com.mysql.cj.core.exceptions.CJException; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Error; +import com.mysql.cj.x.protobuf.Mysqlx.Error; /** * An Error returned from X Plugin. */ -public class MysqlxError extends CJException { +public class XDevAPIError extends CJException { private static final long serialVersionUID = 6991120628391138584L; /** @@ -37,12 +37,12 @@ public class MysqlxError extends CJException { */ private Error msg; - public MysqlxError(Error msg) { + public XDevAPIError(Error msg) { super(getFullErrorDescription(msg)); this.msg = msg; } - public MysqlxError(MysqlxError fromOtherThread) { + public XDevAPIError(XDevAPIError fromOtherThread) { super(getFullErrorDescription(fromOtherThread.msg), fromOtherThread); this.msg = fromOtherThread.msg; } diff --git a/src/main/java/com/mysql/cj/mysqlx/io/AsyncMessageReader.java b/src/main/java/com/mysql/cj/x/protocol/AsyncMessageReader.java similarity index 94% rename from src/main/java/com/mysql/cj/mysqlx/io/AsyncMessageReader.java rename to src/main/java/com/mysql/cj/x/protocol/AsyncMessageReader.java index 1cdacf313..af1b4c189 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/AsyncMessageReader.java +++ b/src/main/java/com/mysql/cj/x/protocol/AsyncMessageReader.java @@ -21,13 +21,13 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import java.nio.channels.AsynchronousCloseException; import java.nio.channels.AsynchronousByteChannel; +import java.nio.channels.AsynchronousCloseException; import java.nio.channels.CompletionHandler; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CompletableFuture; @@ -40,33 +40,21 @@ import com.google.protobuf.GeneratedMessage; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.Parser; +import com.mysql.cj.api.x.protocol.MessageConstants; +import com.mysql.cj.api.x.protocol.MessageListener; +import com.mysql.cj.api.x.protocol.MessageReader; import com.mysql.cj.core.exceptions.AssertionFailedException; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Error; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.x.protobuf.Mysqlx.Error; +import com.mysql.cj.x.protobuf.Mysqlx.ServerMessages; +import com.mysql.cj.x.protobuf.MysqlxNotice.Frame; /** * Asynchronous message reader for the X Protocol protobuf-encoded messages. */ public class AsyncMessageReader implements CompletionHandler, MessageReader { - /** - * Sink for messages that are read asynchonously from the socket. - * - * @return whether the listener is done receiving messages. - */ - @FunctionalInterface - public static interface MessageListener extends BiFunction, GeneratedMessage, Boolean> { - default void closed() { - } - - default void error(Throwable ex) { - ex.printStackTrace(); - } - } - /** Size of the message that will be read. */ private int messageSize; /** Type tag of the message to read (indicates parser to use). */ @@ -412,10 +400,13 @@ public Class getNextMessageClass() { /** * Synchronously read a message of the given type. * - * @param expectedClass The expected class of the message to read. - * @param T the expected class of the message to read. + * @param expectedClass + * The expected class of the message to read. + * @param T + * the expected class of the message to read. * @return The message of type T - * @throws WrongArgumentException if the message is of a different type + * @throws WrongArgumentException + * if the message is of a different type */ public T read(final Class expectedClass) { SyncReader r = new SyncReader<>(this, expectedClass); @@ -448,13 +439,13 @@ public void closed() { } /** - * Read the message and transform any error to a MysqlxError and throw it as an exception. + * Read the message and transform any error to a {@link XDevAPIError} and throw it as an exception. */ public T read() { try { return this.future.thenApply(f -> f.apply((msgClass, msg) -> { if (Error.class.equals(msgClass)) { - throw new MysqlxError(Error.class.cast(msg)); + throw new XDevAPIError(Error.class.cast(msg)); } // ensure that parsed message class matches incoming tag if (!msgClass.equals(this.expectedClass)) { @@ -464,9 +455,9 @@ public T read() { return this.expectedClass.cast(msg); })).get(); } catch (ExecutionException ex) { - if (MysqlxError.class.equals(ex.getCause().getClass())) { + if (XDevAPIError.class.equals(ex.getCause().getClass())) { // wrap the other thread's exception and include this thread's context - throw new MysqlxError((MysqlxError) ex.getCause()); + throw new XDevAPIError((XDevAPIError) ex.getCause()); } throw new CJCommunicationsException(ex.getCause().getMessage(), ex.getCause()); } catch (InterruptedException ex) { diff --git a/src/main/java/com/mysql/cj/mysqlx/io/AsyncMessageWriter.java b/src/main/java/com/mysql/cj/x/protocol/AsyncMessageWriter.java similarity index 98% rename from src/main/java/com/mysql/cj/mysqlx/io/AsyncMessageWriter.java rename to src/main/java/com/mysql/cj/x/protocol/AsyncMessageWriter.java index 98ec05578..1f05dcfea 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/AsyncMessageWriter.java +++ b/src/main/java/com/mysql/cj/x/protocol/AsyncMessageWriter.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.io.IOException; import java.nio.ByteBuffer; @@ -33,6 +33,7 @@ import com.google.protobuf.CodedOutputStream; import com.google.protobuf.MessageLite; +import com.mysql.cj.api.x.protocol.MessageWriter; import com.mysql.cj.core.Messages; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.exceptions.CJPacketTooBigException; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/DevapiRowFactory.java b/src/main/java/com/mysql/cj/x/protocol/DevapiRowFactory.java similarity index 86% rename from src/main/java/com/mysql/cj/mysqlx/devapi/DevapiRowFactory.java rename to src/main/java/com/mysql/cj/x/protocol/DevapiRowFactory.java index 5f19630b5..e07a459c9 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/DevapiRowFactory.java +++ b/src/main/java/com/mysql/cj/x/protocol/DevapiRowFactory.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.x.protocol; import java.util.ArrayList; import java.util.HashMap; @@ -29,13 +29,14 @@ import java.util.TimeZone; import java.util.stream.IntStream; +import com.mysql.cj.api.x.core.RowToElement; import com.mysql.cj.core.result.Field; -import com.mysql.cj.mysqlx.result.RowToElement; +import com.mysql.cj.xdevapi.RowImpl; /** - * Create {@link com.mysql.cj.api.x.Row} objects from internal row representation. + * Create {@link com.mysql.cj.api.xdevapi.Row} objects from internal row representation. */ -public class DevapiRowFactory implements RowToElement { +public class DevapiRowFactory implements RowToElement { private Map fieldNameToIndex; private ArrayList metadata; private TimeZone defaultTimeZone; @@ -53,7 +54,7 @@ private Map getFieldNameToIndexMap() { return this.fieldNameToIndex; } - public com.mysql.cj.api.x.Row apply(com.mysql.cj.api.result.Row internalRow) { + public com.mysql.cj.api.xdevapi.Row apply(com.mysql.cj.api.result.Row internalRow) { return new RowImpl(internalRow, this::getFieldNameToIndexMap, defaultTimeZone); } } diff --git a/src/main/java/com/mysql/cj/mysqlx/io/ErrorToFutureCompletionHandler.java b/src/main/java/com/mysql/cj/x/protocol/ErrorToFutureCompletionHandler.java similarity index 98% rename from src/main/java/com/mysql/cj/mysqlx/io/ErrorToFutureCompletionHandler.java rename to src/main/java/com/mysql/cj/x/protocol/ErrorToFutureCompletionHandler.java index 11ee8bc32..2b555846e 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/ErrorToFutureCompletionHandler.java +++ b/src/main/java/com/mysql/cj/x/protocol/ErrorToFutureCompletionHandler.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.util.concurrent.CompletableFuture; import java.nio.channels.CompletionHandler; diff --git a/src/main/java/com/mysql/cj/mysqlx/io/MessageBuilder.java b/src/main/java/com/mysql/cj/x/protocol/MessageBuilder.java similarity index 83% rename from src/main/java/com/mysql/cj/mysqlx/io/MessageBuilder.java rename to src/main/java/com/mysql/cj/x/protocol/MessageBuilder.java index 04565dc21..ae12972ff 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/MessageBuilder.java +++ b/src/main/java/com/mysql/cj/x/protocol/MessageBuilder.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.util.Arrays; import java.util.List; @@ -38,58 +38,46 @@ import javax.security.sasl.SaslException; import com.google.protobuf.ByteString; +import com.mysql.cj.api.x.protocol.XpluginStatementCommand; import com.mysql.cj.core.authentication.Security; import com.mysql.cj.core.util.StringUtils; -import com.mysql.cj.mysqlx.CreateIndexParams; -import com.mysql.cj.mysqlx.ExprUtil; -import com.mysql.cj.mysqlx.FilterParams; -import com.mysql.cj.mysqlx.FindParams; -import com.mysql.cj.mysqlx.InsertParams; -import com.mysql.cj.mysqlx.UpdateParams; -import com.mysql.cj.mysqlx.UpdateSpec; -import com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities; -import com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesSet; -import com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.DataModel; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Delete; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Find; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Limit; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Update; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation.UpdateType; -import com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any; -import com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField; -import com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart; -import com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecute; +import com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities; +import com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesSet; +import com.mysql.cj.x.protobuf.MysqlxConnection.Capability; +import com.mysql.cj.x.protobuf.MysqlxCrud.Collection; +import com.mysql.cj.x.protobuf.MysqlxCrud.Column; +import com.mysql.cj.x.protobuf.MysqlxCrud.DataModel; +import com.mysql.cj.x.protobuf.MysqlxCrud.Delete; +import com.mysql.cj.x.protobuf.MysqlxCrud.Find; +import com.mysql.cj.x.protobuf.MysqlxCrud.Insert; +import com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow; +import com.mysql.cj.x.protobuf.MysqlxCrud.Limit; +import com.mysql.cj.x.protobuf.MysqlxCrud.Order; +import com.mysql.cj.x.protobuf.MysqlxCrud.Projection; +import com.mysql.cj.x.protobuf.MysqlxCrud.Update; +import com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation; +import com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation.UpdateType; +import com.mysql.cj.x.protobuf.MysqlxDatatypes.Any; +import com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField; +import com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar; +import com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier; +import com.mysql.cj.x.protobuf.MysqlxExpr.Expr; +import com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue; +import com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart; +import com.mysql.cj.x.protobuf.MysqlxSql.StmtExecute; +import com.mysql.cj.xdevapi.CreateIndexParams; +import com.mysql.cj.xdevapi.ExprUtil; +import com.mysql.cj.xdevapi.FilterParams; +import com.mysql.cj.xdevapi.FindParams; +import com.mysql.cj.xdevapi.InsertParams; +import com.mysql.cj.xdevapi.UpdateParams; +import com.mysql.cj.xdevapi.UpdateSpec; public class MessageBuilder { // "mysqlx" namespace for StmtExecute messages is supported starting from MySQL 5.7.14 // the previous "xplugin" namespace isn't compatible with c/J 6.0.4+ private static final String XPLUGIN_NAMESPACE = "mysqlx"; - public static enum XpluginStatementCommand { - XPLUGIN_STMT_CREATE_COLLECTION("create_collection"), XPLUGIN_STMT_CREATE_COLLECTION_INDEX("create_collection_index"), - XPLUGIN_STMT_DROP_COLLECTION("drop_collection"), XPLUGIN_STMT_DROP_COLLECTION_INDEX("drop_collection_index"), XPLUGIN_STMT_PING("ping"), - XPLUGIN_STMT_LIST_OBJECTS("list_objects"), XPLUGIN_STMT_ENABLE_NOTICES("enable_notices"), XPLUGIN_STMT_DISABLE_NOTICES("disable_notices"), - XPLUGIN_STMT_LIST_NOTICES("list_notices"); // TODO add support for "ping", "list_clients", "kill_client" and "ensure_collection" commands - - public String commandName; - - private XpluginStatementCommand(String commandName) { - this.commandName = commandName; - } - } - public MessageBuilder() { } @@ -101,16 +89,16 @@ public CapabilitiesSet buildCapabilitiesSet(String name, Object value) { } public StmtExecute buildCreateCollectionIndex(String schemaName, String collectionName, CreateIndexParams params) { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.Builder builder = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.newBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.Builder builder = com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.newBuilder(); builder.addFld(ObjectField.newBuilder().setKey("name").setValue(ExprUtil.buildAny(params.getIndexName()))) .addFld(ObjectField.newBuilder().setKey("collection").setValue(ExprUtil.buildAny(collectionName))) .addFld(ObjectField.newBuilder().setKey("schema").setValue(ExprUtil.buildAny(schemaName))) .addFld(ObjectField.newBuilder().setKey("unique").setValue(ExprUtil.buildAny(params.isUnique()))); - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.Builder abuilder = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.newBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.Builder abuilder = com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.newBuilder(); for (int i = 0; i < params.getDocPaths().size(); ++i) { abuilder.addValue(Any.newBuilder().setType(Any.Type.OBJECT) - .setObj(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.newBuilder() + .setObj(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.newBuilder() .addFld(ObjectField.newBuilder().setKey("member").setValue(ExprUtil.buildAny("$" + params.getDocPaths().get(i)))) .addFld(ObjectField.newBuilder().setKey("required").setValue(ExprUtil.buildAny(params.getNotNulls().get(i)))) .addFld(ObjectField.newBuilder().setKey("type").setValue(ExprUtil.buildAny(params.getTypes().get(i)))))); @@ -124,7 +112,7 @@ public StmtExecute buildCreateCollectionIndex(String schemaName, String collecti public StmtExecute buildDropCollectionIndex(String schemaName, String collectionName, String indexName) { return buildXpluginCommand(XpluginStatementCommand.XPLUGIN_STMT_DROP_COLLECTION_INDEX, Any.newBuilder().setType(Any.Type.OBJECT) - .setObj(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.newBuilder() + .setObj(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.newBuilder() .addFld(ObjectField.newBuilder().setKey("name").setValue(ExprUtil.buildAny(indexName))) .addFld(ObjectField.newBuilder().setKey("collection").setValue(ExprUtil.buildAny(collectionName))) .addFld(ObjectField.newBuilder().setKey("schema").setValue(ExprUtil.buildAny(schemaName))) diff --git a/src/main/java/com/mysql/cj/mysqlx/ResultCreatingResultListener.java b/src/main/java/com/mysql/cj/x/protocol/ResultCreatingResultListener.java similarity index 89% rename from src/main/java/com/mysql/cj/mysqlx/ResultCreatingResultListener.java rename to src/main/java/com/mysql/cj/x/protocol/ResultCreatingResultListener.java index 47521242f..e40970b97 100644 --- a/src/main/java/com/mysql/cj/mysqlx/ResultCreatingResultListener.java +++ b/src/main/java/com/mysql/cj/x/protocol/ResultCreatingResultListener.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.x.protocol; import java.util.ArrayList; import java.util.List; @@ -29,12 +29,12 @@ import com.mysql.cj.api.result.Row; import com.mysql.cj.api.result.RowList; -import com.mysql.cj.core.io.StatementExecuteOk; +import com.mysql.cj.api.x.core.ResultCtor; +import com.mysql.cj.api.x.protocol.ResultListener; import com.mysql.cj.core.result.BufferedRowList; import com.mysql.cj.core.result.Field; -import com.mysql.cj.mysqlx.MysqlxSession.ResultCtor; -import com.mysql.cj.mysqlx.io.ResultListener; -import com.mysql.cj.mysqlx.result.MysqlxRow; +import com.mysql.cj.x.core.StatementExecuteOk; +import com.mysql.cj.x.core.XDevAPIError; /** * Create an entire (buffered) result from the data fed to this result listener. @@ -57,7 +57,7 @@ public void onMetadata(ArrayList metadataFields) { this.metadata = metadataFields; } - public void onRow(MysqlxRow r) { + public void onRow(XProtocolRow r) { this.rows.add(r); } @@ -67,7 +67,7 @@ public void onComplete(StatementExecuteOk ok) { this.future.complete(result); } - public void onError(MysqlxError error) { + public void onError(XDevAPIError error) { this.future.completeExceptionally(error); } diff --git a/src/main/java/com/mysql/cj/mysqlx/io/ResultMessageListener.java b/src/main/java/com/mysql/cj/x/protocol/ResultMessageListener.java similarity index 82% rename from src/main/java/com/mysql/cj/mysqlx/io/ResultMessageListener.java rename to src/main/java/com/mysql/cj/x/protocol/ResultMessageListener.java index 35bba2b62..731fe9a02 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/ResultMessageListener.java +++ b/src/main/java/com/mysql/cj/x/protocol/ResultMessageListener.java @@ -21,23 +21,23 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.util.ArrayList; -import java.util.function.Function; import com.google.protobuf.GeneratedMessage; +import com.mysql.cj.api.x.protocol.ColToFieldTransformer; +import com.mysql.cj.api.x.protocol.MessageListener; +import com.mysql.cj.api.x.protocol.ResultListener; import com.mysql.cj.core.exceptions.WrongArgumentException; import com.mysql.cj.core.result.Field; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.io.AsyncMessageReader.MessageListener; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Error; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row; -import com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk; -import com.mysql.cj.mysqlx.result.MysqlxRow; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.x.protobuf.Mysqlx.Error; +import com.mysql.cj.x.protobuf.MysqlxNotice.Frame; +import com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData; +import com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone; +import com.mysql.cj.x.protobuf.MysqlxResultset.Row; +import com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk; /** * A {@link MessageListener} to handle result data and propagate it to a {@link ResultListener}. @@ -58,12 +58,6 @@ public class ResultMessageListener implements MessageListener { private StatementExecuteOkBuilder okBuilder = new StatementExecuteOkBuilder(); - /** - * The type for the function to transform the {@link ColumnMetaData} to a {@link Field}. - */ - public static interface ColToFieldTransformer extends Function { - } - public ResultMessageListener(ColToFieldTransformer colToField, ResultListener callbacks) { this.callbacks = callbacks; this.colToField = colToField; @@ -76,7 +70,7 @@ private boolean handleColumn(ColumnMetaData col) { } private boolean handleRow(Row r) { - MysqlxRow row = new MysqlxRow(this.metadata, r); + XProtocolRow row = new XProtocolRow(this.metadata, r); this.callbacks.onRow(row); return false; /* done reading? */ } @@ -87,7 +81,7 @@ private boolean handleStmtExecuteOk() { } private boolean handleError(Error error) { - MysqlxError e = new MysqlxError(error); + XDevAPIError e = new XDevAPIError(error); this.callbacks.onError(e); return true; /* done reading? */ } diff --git a/src/main/java/com/mysql/cj/mysqlx/RowWiseReducingResultListener.java b/src/main/java/com/mysql/cj/x/protocol/RowWiseReducingResultListener.java similarity index 83% rename from src/main/java/com/mysql/cj/mysqlx/RowWiseReducingResultListener.java rename to src/main/java/com/mysql/cj/x/protocol/RowWiseReducingResultListener.java index a9b3739d8..f2dc734f5 100644 --- a/src/main/java/com/mysql/cj/mysqlx/RowWiseReducingResultListener.java +++ b/src/main/java/com/mysql/cj/x/protocol/RowWiseReducingResultListener.java @@ -21,18 +21,18 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.x.protocol; import java.util.ArrayList; import java.util.concurrent.CompletableFuture; -import java.util.function.Function; -import com.mysql.cj.api.x.DataStatement.Reducer; -import com.mysql.cj.core.io.StatementExecuteOk; +import com.mysql.cj.api.x.core.RowToElement; +import com.mysql.cj.api.x.protocol.MetadataToRowToElement; +import com.mysql.cj.api.x.protocol.ResultListener; +import com.mysql.cj.api.xdevapi.DataStatement.Reducer; import com.mysql.cj.core.result.Field; -import com.mysql.cj.mysqlx.io.ResultListener; -import com.mysql.cj.mysqlx.result.MysqlxRow; -import com.mysql.cj.mysqlx.result.RowToElement; +import com.mysql.cj.x.core.StatementExecuteOk; +import com.mysql.cj.x.core.XDevAPIError; /** * Reduce over the rows. @@ -44,9 +44,6 @@ public class RowWiseReducingResultListener implements ResultLi private MetadataToRowToElement metadataToRowToElement; private RowToElement rowToElement; - public static interface MetadataToRowToElement extends Function, RowToElement> { - } - public RowWiseReducingResultListener(R accumulator, Reducer reducer, CompletableFuture future, MetadataToRowToElement metadataToRowToElement) { this.accumulator = accumulator; @@ -59,7 +56,7 @@ public void onMetadata(ArrayList metadata) { this.rowToElement = this.metadataToRowToElement.apply(metadata); } - public void onRow(MysqlxRow r) { + public void onRow(XProtocolRow r) { this.accumulator = this.reducer.apply(this.accumulator, this.rowToElement.apply(r)); } @@ -67,7 +64,7 @@ public void onComplete(StatementExecuteOk ok) { this.future.complete(this.accumulator); } - public void onError(MysqlxError error) { + public void onError(XDevAPIError error) { this.future.completeExceptionally(error); } diff --git a/src/main/java/com/mysql/cj/mysqlx/io/SerializingBufferWriter.java b/src/main/java/com/mysql/cj/x/protocol/SerializingBufferWriter.java similarity index 99% rename from src/main/java/com/mysql/cj/mysqlx/io/SerializingBufferWriter.java rename to src/main/java/com/mysql/cj/x/protocol/SerializingBufferWriter.java index 0f0d43e99..2cbef5005 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/SerializingBufferWriter.java +++ b/src/main/java/com/mysql/cj/x/protocol/SerializingBufferWriter.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousSocketChannel; diff --git a/src/main/java/com/mysql/cj/mysqlx/io/SqlResultMessageListener.java b/src/main/java/com/mysql/cj/x/protocol/SqlResultMessageListener.java similarity index 86% rename from src/main/java/com/mysql/cj/mysqlx/io/SqlResultMessageListener.java rename to src/main/java/com/mysql/cj/x/protocol/SqlResultMessageListener.java index afe8da004..793bffeb8 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/SqlResultMessageListener.java +++ b/src/main/java/com/mysql/cj/x/protocol/SqlResultMessageListener.java @@ -21,23 +21,22 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.util.TimeZone; import java.util.concurrent.CompletableFuture; import com.google.protobuf.GeneratedMessage; -import com.mysql.cj.api.x.SqlResult; +import com.mysql.cj.api.x.core.ResultCtor; +import com.mysql.cj.api.x.protocol.ColToFieldTransformer; +import com.mysql.cj.api.x.protocol.MessageListener; +import com.mysql.cj.api.xdevapi.SqlResult; import com.mysql.cj.core.exceptions.CJCommunicationsException; -import com.mysql.cj.core.io.StatementExecuteOk; -import com.mysql.cj.mysqlx.MysqlxSession.ResultCtor; -import com.mysql.cj.mysqlx.ResultCreatingResultListener; -import com.mysql.cj.mysqlx.devapi.SqlDataResult; -import com.mysql.cj.mysqlx.devapi.SqlUpdateResult; -import com.mysql.cj.mysqlx.io.AsyncMessageReader.MessageListener; -import com.mysql.cj.mysqlx.io.ResultMessageListener.ColToFieldTransformer; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Error; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData; +import com.mysql.cj.x.core.StatementExecuteOk; +import com.mysql.cj.x.protobuf.Mysqlx.Error; +import com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData; +import com.mysql.cj.xdevapi.SqlDataResult; +import com.mysql.cj.xdevapi.SqlUpdateResult; public class SqlResultMessageListener implements MessageListener { private static enum ResultType { diff --git a/src/main/java/com/mysql/cj/mysqlx/io/StatementExecuteOkBuilder.java b/src/main/java/com/mysql/cj/x/protocol/StatementExecuteOkBuilder.java similarity index 76% rename from src/main/java/com/mysql/cj/mysqlx/io/StatementExecuteOkBuilder.java rename to src/main/java/com/mysql/cj/x/protocol/StatementExecuteOkBuilder.java index 5b530fddc..03a6b277e 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/StatementExecuteOkBuilder.java +++ b/src/main/java/com/mysql/cj/x/protocol/StatementExecuteOkBuilder.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,17 +21,18 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.util.ArrayList; import java.util.List; +import com.mysql.cj.api.x.protocol.MessageReader; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.core.io.StatementExecuteOk; -import com.mysql.cj.mysqlx.devapi.WarningImpl; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning; +import com.mysql.cj.x.core.CoreWarning; +import com.mysql.cj.x.core.StatementExecuteOk; +import com.mysql.cj.x.protobuf.MysqlxNotice.Frame; +import com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged; +import com.mysql.cj.x.protobuf.MysqlxNotice.Warning; /** * Handle state necessary to accumulate noticed and build a {@link StatementExecuteOk} response. @@ -39,26 +40,25 @@ public class StatementExecuteOkBuilder { private long rowsAffected = 0; private Long lastInsertId = null; - // TODO: don't use DevApi interfaces here! - private List warnings = new ArrayList<>(); + private List warnings = new ArrayList<>(); public void addNotice(Frame notice) { - if (notice.getType() == MysqlxProtocol.MysqlxNoticeFrameType_WARNING) { + if (notice.getType() == XProtocol.XProtocolNoticeFrameType_WARNING) { // TODO: shouldn't use DevApi WarningImpl class here - warnings.add(new WarningImpl(MessageReader.parseNotice(notice.getPayload(), Warning.class))); + this.warnings.add(new CoreWarning(MessageReader.parseNotice(notice.getPayload(), Warning.class))); // } else if (notice.getType() == MysqlxNoticeFrameType_SESS_VAR_CHANGED) { // // TODO: ignored for now // throw new RuntimeException("Got a session variable changed: " + notice); - } else if (notice.getType() == MysqlxProtocol.MysqlxNoticeFrameType_SESS_STATE_CHANGED) { + } else if (notice.getType() == XProtocol.XProtocolNoticeFrameType_SESS_STATE_CHANGED) { SessionStateChanged changeMsg = MessageReader.parseNotice(notice.getPayload(), SessionStateChanged.class); switch (changeMsg.getParam()) { case GENERATED_INSERT_ID: // TODO: handle > 2^63-1? - lastInsertId = changeMsg.getValue().getVUnsignedInt(); + this.lastInsertId = changeMsg.getValue().getVUnsignedInt(); break; case ROWS_AFFECTED: // TODO: handle > 2^63-1? - rowsAffected = changeMsg.getValue().getVUnsignedInt(); + this.rowsAffected = changeMsg.getValue().getVUnsignedInt(); break; case PRODUCED_MESSAGE: // TODO do something with notices. expose them to client diff --git a/src/main/java/com/mysql/cj/mysqlx/io/StatementExecuteOkMessageListener.java b/src/main/java/com/mysql/cj/x/protocol/StatementExecuteOkMessageListener.java similarity index 84% rename from src/main/java/com/mysql/cj/mysqlx/io/StatementExecuteOkMessageListener.java rename to src/main/java/com/mysql/cj/x/protocol/StatementExecuteOkMessageListener.java index fba880751..73a105444 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/StatementExecuteOkMessageListener.java +++ b/src/main/java/com/mysql/cj/x/protocol/StatementExecuteOkMessageListener.java @@ -21,20 +21,20 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.util.concurrent.CompletableFuture; import com.google.protobuf.GeneratedMessage; +import com.mysql.cj.api.x.protocol.MessageListener; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.core.io.StatementExecuteOk; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.io.AsyncMessageReader.MessageListener; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Error; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone; -import com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk; +import com.mysql.cj.x.core.StatementExecuteOk; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.x.protobuf.Mysqlx.Error; +import com.mysql.cj.x.protobuf.MysqlxNotice.Frame; +import com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone; +import com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk; /** * Async message reader accumulating the status necessary to produce a {@link StatementExecuteOk} result. @@ -55,7 +55,7 @@ public Boolean apply(Class msgClass, GeneratedMessag this.future.complete(this.builder.build()); return true; /* done reading? */ } else if (Error.class.equals(msgClass)) { - this.future.completeExceptionally(new MysqlxError(Error.class.cast(msg))); + this.future.completeExceptionally(new XDevAPIError(Error.class.cast(msg))); return true; /* done reading? */ } else if (FetchDone.class.equals(msgClass)) { return false; /* done reading? */ diff --git a/src/main/java/com/mysql/cj/mysqlx/io/SyncMessageReader.java b/src/main/java/com/mysql/cj/x/protocol/SyncMessageReader.java similarity index 93% rename from src/main/java/com/mysql/cj/mysqlx/io/SyncMessageReader.java rename to src/main/java/com/mysql/cj/x/protocol/SyncMessageReader.java index dd6751a6d..275d186b3 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/SyncMessageReader.java +++ b/src/main/java/com/mysql/cj/x/protocol/SyncMessageReader.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.io.IOException; import java.nio.ByteBuffer; @@ -30,13 +30,15 @@ import com.google.protobuf.GeneratedMessage; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.Parser; +import com.mysql.cj.api.x.protocol.MessageConstants; +import com.mysql.cj.api.x.protocol.MessageReader; import com.mysql.cj.core.exceptions.AssertionFailedException; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.exceptions.WrongArgumentException; import com.mysql.cj.core.io.FullReadInputStream; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Error; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.x.protobuf.Mysqlx.Error; +import com.mysql.cj.x.protobuf.Mysqlx.ServerMessages; /** * Synchronous-only implementation of {@link MessageReader}. This implementation wraps an {@link java.io.InputStream}. @@ -104,7 +106,7 @@ public Class getNextMessageClass() { throw AssertionFailedException.shouldNotHappen("Unknown message type: " + type + " (server messages mapping: " + serverMessageMapping + ")"); } else if (messageClass == Error.class) { // throw an error/exception if receive an Error message - throw new MysqlxError(readAndParse((Parser) MessageConstants.MESSAGE_CLASS_TO_PARSER.get(Error.class))); + throw new XDevAPIError(readAndParse((Parser) MessageConstants.MESSAGE_CLASS_TO_PARSER.get(Error.class))); } return messageClass; diff --git a/src/main/java/com/mysql/cj/mysqlx/io/SyncMessageWriter.java b/src/main/java/com/mysql/cj/x/protocol/SyncMessageWriter.java similarity index 97% rename from src/main/java/com/mysql/cj/mysqlx/io/SyncMessageWriter.java rename to src/main/java/com/mysql/cj/x/protocol/SyncMessageWriter.java index 770300001..2b3929029 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/SyncMessageWriter.java +++ b/src/main/java/com/mysql/cj/x/protocol/SyncMessageWriter.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.io.BufferedOutputStream; import java.io.IOException; @@ -30,6 +30,7 @@ import com.google.protobuf.MessageLite; import com.mysql.cj.api.io.PacketSentTimeHolder; +import com.mysql.cj.api.x.protocol.MessageWriter; import com.mysql.cj.core.Messages; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.exceptions.CJPacketTooBigException; diff --git a/src/main/java/com/mysql/cj/mysqlx/io/TlsDecryptingByteChannel.java b/src/main/java/com/mysql/cj/x/protocol/TlsDecryptingByteChannel.java similarity index 99% rename from src/main/java/com/mysql/cj/mysqlx/io/TlsDecryptingByteChannel.java rename to src/main/java/com/mysql/cj/x/protocol/TlsDecryptingByteChannel.java index 7801235e7..359d3b84d 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/TlsDecryptingByteChannel.java +++ b/src/main/java/com/mysql/cj/x/protocol/TlsDecryptingByteChannel.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.io.IOException; import java.nio.BufferOverflowException; diff --git a/src/main/java/com/mysql/cj/mysqlx/io/TlsEncryptingByteChannel.java b/src/main/java/com/mysql/cj/x/protocol/TlsEncryptingByteChannel.java similarity index 99% rename from src/main/java/com/mysql/cj/mysqlx/io/TlsEncryptingByteChannel.java rename to src/main/java/com/mysql/cj/x/protocol/TlsEncryptingByteChannel.java index b7b4fe0de..90fce0674 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/TlsEncryptingByteChannel.java +++ b/src/main/java/com/mysql/cj/x/protocol/TlsEncryptingByteChannel.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.io.IOException; import java.net.SocketAddress; diff --git a/src/main/java/com/mysql/cj/mysqlx/io/MysqlxProtocol.java b/src/main/java/com/mysql/cj/x/protocol/XProtocol.java similarity index 82% rename from src/main/java/com/mysql/cj/mysqlx/io/MysqlxProtocol.java rename to src/main/java/com/mysql/cj/x/protocol/XProtocol.java index 9946f924c..3b6f30201 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/MysqlxProtocol.java +++ b/src/main/java/com/mysql/cj/x/protocol/XProtocol.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import static java.util.stream.Collectors.toMap; @@ -47,73 +47,74 @@ import com.mysql.cj.api.io.ServerCapabilities; import com.mysql.cj.api.io.ServerSession; import com.mysql.cj.api.io.SocketConnection; -import com.mysql.cj.api.x.SqlResult; +import com.mysql.cj.api.x.protocol.MessageListener; +import com.mysql.cj.api.x.protocol.MessageReader; +import com.mysql.cj.api.x.protocol.MessageWriter; +import com.mysql.cj.api.x.protocol.ResultListener; +import com.mysql.cj.api.x.protocol.XpluginStatementCommand; +import com.mysql.cj.api.xdevapi.SqlResult; import com.mysql.cj.core.CharsetMapping; import com.mysql.cj.core.MysqlType; import com.mysql.cj.core.exceptions.AssertionFailedException; import com.mysql.cj.core.exceptions.ConnectionIsClosedException; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.core.io.StatementExecuteOk; import com.mysql.cj.core.result.Field; import com.mysql.cj.core.util.LazyString; import com.mysql.cj.mysqla.MysqlaConstants; -import com.mysql.cj.mysqlx.CreateIndexParams; -import com.mysql.cj.mysqlx.ExprUtil; -import com.mysql.cj.mysqlx.FilterParams; -import com.mysql.cj.mysqlx.FindParams; -import com.mysql.cj.mysqlx.InsertParams; -import com.mysql.cj.mysqlx.UpdateParams; -import com.mysql.cj.mysqlx.UpdateSpec; -import com.mysql.cj.mysqlx.io.AsyncMessageReader.MessageListener; -import com.mysql.cj.mysqlx.io.MessageBuilder.XpluginStatementCommand; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok; -import com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capabilities; -import com.mysql.cj.mysqlx.protobuf.MysqlxConnection.CapabilitiesGet; -import com.mysql.cj.mysqlx.protobuf.MysqlxConnection.Capability; -import com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any; -import com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.ObjectField; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Frame; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.SessionStateChanged; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.ColumnMetaData.FieldType; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDone; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.FetchDoneMoreResultsets; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateContinue; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateOk; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.Close; -import com.mysql.cj.mysqlx.protobuf.MysqlxSql.StmtExecuteOk; -import com.mysql.cj.mysqlx.result.MysqlxRow; -import com.mysql.cj.mysqlx.result.MysqlxRowInputStream; +import com.mysql.cj.x.core.StatementExecuteOk; +import com.mysql.cj.x.protobuf.Mysqlx.Ok; +import com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities; +import com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesGet; +import com.mysql.cj.x.protobuf.MysqlxConnection.Capability; +import com.mysql.cj.x.protobuf.MysqlxDatatypes.Any; +import com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.ObjectField; +import com.mysql.cj.x.protobuf.MysqlxNotice.Frame; +import com.mysql.cj.x.protobuf.MysqlxNotice.SessionStateChanged; +import com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData; +import com.mysql.cj.x.protobuf.MysqlxResultset.ColumnMetaData.FieldType; +import com.mysql.cj.x.protobuf.MysqlxResultset.FetchDone; +import com.mysql.cj.x.protobuf.MysqlxResultset.FetchDoneMoreResultsets; +import com.mysql.cj.x.protobuf.MysqlxResultset.Row; +import com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateContinue; +import com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateOk; +import com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart; +import com.mysql.cj.x.protobuf.MysqlxSession.Close; +import com.mysql.cj.x.protobuf.MysqlxSql.StmtExecuteOk; +import com.mysql.cj.xdevapi.CreateIndexParams; +import com.mysql.cj.xdevapi.ExprUtil; +import com.mysql.cj.xdevapi.FilterParams; +import com.mysql.cj.xdevapi.FindParams; +import com.mysql.cj.xdevapi.InsertParams; +import com.mysql.cj.xdevapi.UpdateParams; +import com.mysql.cj.xdevapi.UpdateSpec; /** * Low-level interface to communications with X Plugin. */ -public class MysqlxProtocol implements Protocol { +public class XProtocol implements Protocol { /** * Content-type used in type mapping. * c.f. mysqlx_resultset.proto */ - private static final int MYSQLX_COLUMN_BYTES_CONTENT_TYPE_GEOMETRY = 0x0001; - public static final int MYSQLX_COLUMN_BYTES_CONTENT_TYPE_JSON = 0x0002; - - private static final int MYSQLX_COLUMN_FLAGS_UINT_ZEROFILL = 0x0001; - private static final int MYSQLX_COLUMN_FLAGS_DOUBLE_UNSIGNED = 0x0001; - private static final int MYSQLX_COLUMN_FLAGS_FLOAT_UNSIGNED = 0x0001; - private static final int MYSQLX_COLUMN_FLAGS_DECIMAL_UNSIGNED = 0x0001; - private static final int MYSQLX_COLUMN_FLAGS_BYTES_RIGHTPAD = 0x0001; - private static final int MYSQLX_COLUMN_FLAGS_DATETIME_TIMESTAMP = 0x0001; - private static final int MYSQLX_COLUMN_FLAGS_NOT_NULL = 0x0010; - private static final int MYSQLX_COLUMN_FLAGS_PRIMARY_KEY = 0x0020; - private static final int MYSQLX_COLUMN_FLAGS_UNIQUE_KEY = 0x0040; - private static final int MYSQLX_COLUMN_FLAGS_MULTIPLE_KEY = 0x0080; - private static final int MYSQLX_COLUMN_FLAGS_AUTO_INCREMENT = 0x0100; + private static final int XPROTOCOL_COLUMN_BYTES_CONTENT_TYPE_GEOMETRY = 0x0001; + public static final int XPROTOCOL_COLUMN_BYTES_CONTENT_TYPE_JSON = 0x0002; + + private static final int XPROTOCOL_COLUMN_FLAGS_UINT_ZEROFILL = 0x0001; + private static final int XPROTOCOL_COLUMN_FLAGS_DOUBLE_UNSIGNED = 0x0001; + private static final int XPROTOCOL_COLUMN_FLAGS_FLOAT_UNSIGNED = 0x0001; + private static final int XPROTOCOL_COLUMN_FLAGS_DECIMAL_UNSIGNED = 0x0001; + private static final int XPROTOCOL_COLUMN_FLAGS_BYTES_RIGHTPAD = 0x0001; + private static final int XPROTOCOL_COLUMN_FLAGS_DATETIME_TIMESTAMP = 0x0001; + private static final int XPROTOCOL_COLUMN_FLAGS_NOT_NULL = 0x0010; + private static final int XPROTOCOL_COLUMN_FLAGS_PRIMARY_KEY = 0x0020; + private static final int XPROTOCOL_COLUMN_FLAGS_UNIQUE_KEY = 0x0040; + private static final int XPROTOCOL_COLUMN_FLAGS_MULTIPLE_KEY = 0x0080; + private static final int XPROTOCOL_COLUMN_FLAGS_AUTO_INCREMENT = 0x0100; // TODO: need protocol type constants here (these values copied from comments in mysqlx_notice.proto) - public static final int MysqlxNoticeFrameType_WARNING = 1; - public static final int MysqlxNoticeFrameType_SESS_VAR_CHANGED = 2; - public static final int MysqlxNoticeFrameType_SESS_STATE_CHANGED = 3; + public static final int XProtocolNoticeFrameType_WARNING = 1; + public static final int XProtocolNoticeFrameType_SESS_VAR_CHANGED = 2; + public static final int XProtocolNoticeFrameType_SESS_STATE_CHANGED = 3; private MessageReader reader; private MessageWriter writer; @@ -126,7 +127,7 @@ public class MysqlxProtocol implements Protocol { private long clientId = -1; private MessageBuilder msgBuilder = new MessageBuilder(); - public MysqlxProtocol(MessageReader reader, MessageWriter writer, Closeable network, PropertySet propSet) { + public XProtocol(MessageReader reader, MessageWriter writer, Closeable network, PropertySet propSet) { this.reader = reader; this.writer = writer; this.managedResource = network; @@ -265,7 +266,7 @@ public void readOk() { public void readAuthenticateOk() { while (this.reader.getNextMessageClass() == Frame.class) { Frame notice = this.reader.read(Frame.class); - if (notice.getType() == MysqlxNoticeFrameType_SESS_STATE_CHANGED) { + if (notice.getType() == XProtocolNoticeFrameType_SESS_STATE_CHANGED) { SessionStateChanged msg = MessageReader.parseNotice(notice.getPayload(), SessionStateChanged.class); switch (msg.getParam()) { case CLIENT_ID_ASSIGNED: @@ -295,7 +296,7 @@ public byte[] readAuthenticateContinue() { public void sendCreateCollection(String schemaName, String collectionName) { this.writer.write(this.msgBuilder.buildXpluginCommand(XpluginStatementCommand.XPLUGIN_STMT_CREATE_COLLECTION, Any.newBuilder().setType(Any.Type.OBJECT) - .setObj(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.newBuilder() + .setObj(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.newBuilder() .addFld(ObjectField.newBuilder().setKey("name").setValue(ExprUtil.buildAny(collectionName))) .addFld(ObjectField.newBuilder().setKey("schema").setValue(ExprUtil.buildAny(schemaName)))) .build())); @@ -307,7 +308,7 @@ public void sendCreateCollection(String schemaName, String collectionName) { public void sendDropCollection(String schemaName, String collectionName) { this.writer.write(this.msgBuilder.buildXpluginCommand(XpluginStatementCommand.XPLUGIN_STMT_DROP_COLLECTION, Any.newBuilder().setType(Any.Type.OBJECT) - .setObj(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.newBuilder() + .setObj(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.newBuilder() .addFld(ObjectField.newBuilder().setKey("name").setValue(ExprUtil.buildAny(collectionName))) .addFld(ObjectField.newBuilder().setKey("schema").setValue(ExprUtil.buildAny(schemaName)))) .build())); @@ -327,7 +328,7 @@ public void sendDropCollection(String schemaName, String collectionName) { public void sendListObjects(String schemaName, String pattern) { this.writer.write(this.msgBuilder.buildXpluginCommand(XpluginStatementCommand.XPLUGIN_STMT_LIST_OBJECTS, Any.newBuilder().setType(Any.Type.OBJECT) - .setObj(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.newBuilder() + .setObj(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.newBuilder() .addFld(ObjectField.newBuilder().setKey("schema").setValue(ExprUtil.buildAny(schemaName))) .addFld(ObjectField.newBuilder().setKey("pattern").setValue(ExprUtil.buildAny(pattern)))) .build())); @@ -335,7 +336,7 @@ public void sendListObjects(String schemaName, String pattern) { public void sendListObjects(String schemaName) { this.writer.write(this.msgBuilder.buildXpluginCommand(XpluginStatementCommand.XPLUGIN_STMT_LIST_OBJECTS, - Any.newBuilder().setType(Any.Type.OBJECT).setObj(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.newBuilder() + Any.newBuilder().setType(Any.Type.OBJECT).setObj(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.newBuilder() .addFld(ObjectField.newBuilder().setKey("schema").setValue(ExprUtil.buildAny(schemaName)))).build())); } @@ -353,7 +354,7 @@ public void sendListNotices() { } public void sendEnableNotices(String... notices) { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.Builder abuilder = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.newBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.Builder abuilder = com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.newBuilder(); for (String notice : notices) { abuilder.addValue(ExprUtil.buildAny(notice)); } @@ -361,13 +362,13 @@ public void sendEnableNotices(String... notices) { .write(this.msgBuilder .buildXpluginCommand(XpluginStatementCommand.XPLUGIN_STMT_ENABLE_NOTICES, Any.newBuilder() - .setType(Any.Type.OBJECT).setObj(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.newBuilder().addFld(ObjectField + .setType(Any.Type.OBJECT).setObj(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.newBuilder().addFld(ObjectField .newBuilder().setKey("notice").setValue(Any.newBuilder().setType(Any.Type.ARRAY).setArray(abuilder)))) .build())); } public void sendDisableNotices(String... notices) { - com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.Builder abuilder = com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Array.newBuilder(); + com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.Builder abuilder = com.mysql.cj.x.protobuf.MysqlxDatatypes.Array.newBuilder(); for (String notice : notices) { abuilder.addValue(ExprUtil.buildAny(notice)); } @@ -375,7 +376,7 @@ public void sendDisableNotices(String... notices) { .write(this.msgBuilder .buildXpluginCommand(XpluginStatementCommand.XPLUGIN_STMT_DISABLE_NOTICES, Any.newBuilder() - .setType(Any.Type.OBJECT).setObj(com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Object.newBuilder().addFld(ObjectField + .setType(Any.Type.OBJECT).setObj(com.mysql.cj.x.protobuf.MysqlxDatatypes.Object.newBuilder().addFld(ObjectField .newBuilder().setKey("notice").setValue(Any.newBuilder().setType(Any.Type.ARRAY).setArray(abuilder)))) .build())); } @@ -427,7 +428,8 @@ public void drainRows() { } /** - * Map a X Protocol type code from `ColumnMetaData.FieldType' to a MySQL type constant. These are the only types that will be present in {@link MysqlxRow} + * Map a X Protocol type code from `ColumnMetaData.FieldType' to a MySQL type constant. These are the only types that will be present in + * {@link XProtocolRow} * results. * * @param type @@ -436,7 +438,7 @@ public void drainRows() { * the inner type * @return A FIELD_TYPE constant from {@link MysqlaConstants} corresponding to the combination of input parameters. */ - private static int mysqlxTypeToMysqlType(FieldType type, int contentType) { + private static int xProtocolTypeToMysqlType(FieldType type, int contentType) { switch (type) { case SINT: // TODO: figure out ranges in detail and test them @@ -451,9 +453,9 @@ private static int mysqlxTypeToMysqlType(FieldType type, int contentType) { return MysqlaConstants.FIELD_TYPE_NEWDECIMAL; case BYTES: switch (contentType) { - case MYSQLX_COLUMN_BYTES_CONTENT_TYPE_GEOMETRY: + case XPROTOCOL_COLUMN_BYTES_CONTENT_TYPE_GEOMETRY: return MysqlaConstants.FIELD_TYPE_GEOMETRY; - case MYSQLX_COLUMN_BYTES_CONTENT_TYPE_JSON: + case XPROTOCOL_COLUMN_BYTES_CONTENT_TYPE_JSON: return MysqlaConstants.FIELD_TYPE_JSON; default: return MysqlaConstants.FIELD_TYPE_VARCHAR; @@ -481,16 +483,16 @@ public static MysqlType findMysqlType(FieldType type, int contentType, int flags case UINT: return MysqlType.BIGINT_UNSIGNED; case FLOAT: - return 0 < (flags & MYSQLX_COLUMN_FLAGS_FLOAT_UNSIGNED) ? MysqlType.FLOAT_UNSIGNED : MysqlType.FLOAT; + return 0 < (flags & XPROTOCOL_COLUMN_FLAGS_FLOAT_UNSIGNED) ? MysqlType.FLOAT_UNSIGNED : MysqlType.FLOAT; case DOUBLE: - return 0 < (flags & MYSQLX_COLUMN_FLAGS_DOUBLE_UNSIGNED) ? MysqlType.DOUBLE_UNSIGNED : MysqlType.DOUBLE; + return 0 < (flags & XPROTOCOL_COLUMN_FLAGS_DOUBLE_UNSIGNED) ? MysqlType.DOUBLE_UNSIGNED : MysqlType.DOUBLE; case DECIMAL: - return 0 < (flags & MYSQLX_COLUMN_FLAGS_DECIMAL_UNSIGNED) ? MysqlType.DECIMAL_UNSIGNED : MysqlType.DECIMAL; + return 0 < (flags & XPROTOCOL_COLUMN_FLAGS_DECIMAL_UNSIGNED) ? MysqlType.DECIMAL_UNSIGNED : MysqlType.DECIMAL; case BYTES: switch (contentType) { - case MYSQLX_COLUMN_BYTES_CONTENT_TYPE_GEOMETRY: + case XPROTOCOL_COLUMN_BYTES_CONTENT_TYPE_GEOMETRY: return MysqlType.GEOMETRY; - case MYSQLX_COLUMN_BYTES_CONTENT_TYPE_JSON: + case XPROTOCOL_COLUMN_BYTES_CONTENT_TYPE_JSON: return MysqlType.JSON; default: if (collationIndex == 33) { @@ -551,30 +553,30 @@ private static Field columnMetaDataToField(PropertySet propertySet, ColumnMetaDa String encoding = CharsetMapping.COLLATION_INDEX_TO_COLLATION_NAME[collationIndex]; MysqlType mysqlType = findMysqlType(col.getType(), col.getContentType(), col.getFlags(), collationIndex); - int mysqlTypeId = mysqlxTypeToMysqlType(col.getType(), col.getContentType()); + int mysqlTypeId = xProtocolTypeToMysqlType(col.getType(), col.getContentType()); // flags translation; unsigned is handled in Field by checking the MysqlType, so here we check others short flags = (short) 0; - if (col.getType().equals(FieldType.UINT) && 0 < (col.getFlags() & MYSQLX_COLUMN_FLAGS_UINT_ZEROFILL)) { + if (col.getType().equals(FieldType.UINT) && 0 < (col.getFlags() & XPROTOCOL_COLUMN_FLAGS_UINT_ZEROFILL)) { flags |= MysqlType.FIELD_FLAG_ZEROFILL; - } else if (col.getType().equals(FieldType.BYTES) && 0 < (col.getFlags() & MYSQLX_COLUMN_FLAGS_BYTES_RIGHTPAD)) { + } else if (col.getType().equals(FieldType.BYTES) && 0 < (col.getFlags() & XPROTOCOL_COLUMN_FLAGS_BYTES_RIGHTPAD)) { mysqlType = MysqlType.CHAR; - } else if (col.getType().equals(FieldType.DATETIME) && 0 < (col.getFlags() & MYSQLX_COLUMN_FLAGS_DATETIME_TIMESTAMP)) { + } else if (col.getType().equals(FieldType.DATETIME) && 0 < (col.getFlags() & XPROTOCOL_COLUMN_FLAGS_DATETIME_TIMESTAMP)) { mysqlType = MysqlType.TIMESTAMP; } - if ((col.getFlags() & MYSQLX_COLUMN_FLAGS_NOT_NULL) > 0) { + if ((col.getFlags() & XPROTOCOL_COLUMN_FLAGS_NOT_NULL) > 0) { flags |= MysqlType.FIELD_FLAG_NOT_NULL; } - if ((col.getFlags() & MYSQLX_COLUMN_FLAGS_PRIMARY_KEY) > 0) { + if ((col.getFlags() & XPROTOCOL_COLUMN_FLAGS_PRIMARY_KEY) > 0) { flags |= MysqlType.FIELD_FLAG_PRIMARY_KEY; } - if ((col.getFlags() & MYSQLX_COLUMN_FLAGS_UNIQUE_KEY) > 0) { + if ((col.getFlags() & XPROTOCOL_COLUMN_FLAGS_UNIQUE_KEY) > 0) { flags |= MysqlType.FIELD_FLAG_UNIQUE_KEY; } - if ((col.getFlags() & MYSQLX_COLUMN_FLAGS_MULTIPLE_KEY) > 0) { + if ((col.getFlags() & XPROTOCOL_COLUMN_FLAGS_MULTIPLE_KEY) > 0) { flags |= MysqlType.FIELD_FLAG_MULTIPLE_KEY; } - if ((col.getFlags() & MYSQLX_COLUMN_FLAGS_AUTO_INCREMENT) > 0) { + if ((col.getFlags() & XPROTOCOL_COLUMN_FLAGS_AUTO_INCREMENT) > 0) { flags |= MysqlType.FIELD_FLAG_AUTO_INCREMENT; } @@ -601,22 +603,23 @@ public ArrayList readMetadata(String characterSet) { return metadata; } - public MysqlxRow readRowOrNull(ArrayList metadata) { + public XProtocolRow readRowOrNull(ArrayList metadata) { if (this.reader.getNextMessageClass() == Row.class) { Row r = this.reader.read(Row.class); - return new MysqlxRow(metadata, r); + return new XProtocolRow(metadata, r); } return null; } - public MysqlxRowInputStream getRowInputStream(ArrayList metadata) { - return new MysqlxRowInputStream(metadata, this); + public XProtocolRowInputStream getRowInputStream(ArrayList metadata) { + return new XProtocolRowInputStream(metadata, this); } @SuppressWarnings("unchecked") public CompletableFuture asyncExecuteSql(String sql, Object args, String metadataCharacterSet, TimeZone defaultTimeZone) { CompletableFuture f = new CompletableFuture<>(); - MessageListener l = new SqlResultMessageListener(f, (col) -> columnMetaDataToField(this.propertySet, col, metadataCharacterSet), defaultTimeZone); + com.mysql.cj.api.x.protocol.MessageListener l = new SqlResultMessageListener(f, + (col) -> columnMetaDataToField(this.propertySet, col, metadataCharacterSet), defaultTimeZone); CompletionHandler resultHandler = new ErrorToFutureCompletionHandler(f, () -> ((AsyncMessageReader) this.reader).pushMessageListener(l)); ((AsyncMessageWriter) this.writer).writeAsync(this.msgBuilder.buildSqlStatement(sql, (List) args), resultHandler); diff --git a/src/main/java/com/mysql/cj/mysqlx/io/MysqlxDecoder.java b/src/main/java/com/mysql/cj/x/protocol/XProtocolDecoder.java similarity index 93% rename from src/main/java/com/mysql/cj/mysqlx/io/MysqlxDecoder.java rename to src/main/java/com/mysql/cj/x/protocol/XProtocolDecoder.java index 037b98aff..9fb319afa 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/MysqlxDecoder.java +++ b/src/main/java/com/mysql/cj/x/protocol/XProtocolDecoder.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.io.IOException; import java.math.BigDecimal; @@ -34,29 +34,14 @@ import com.google.protobuf.CodedInputStream; import com.mysql.cj.api.io.ValueFactory; +import com.mysql.cj.api.x.protocol.DecoderFunction; import com.mysql.cj.core.exceptions.AssertionFailedException; import com.mysql.cj.mysqla.MysqlaConstants; // TODO: ValueDecoder style, no protobuf messages anymore -public class MysqlxDecoder { - - @FunctionalInterface - public static interface DecoderFunction { - /** - * @todo document - * - * @param inputStream - * the CodedInputStream over the bytes representing this value - * @param vf - * the sink for the decoded value - * @throws IOException - * propagated from {@link CodedInputStream} - * @return the value factory's output - */ - T apply(CodedInputStream inputStream, ValueFactory vf) throws IOException; - } +public class XProtocolDecoder { - public static MysqlxDecoder instance = new MysqlxDecoder(); + public static XProtocolDecoder instance = new XProtocolDecoder(); public static final Map MYSQL_TYPE_TO_DECODER_FUNCTION; diff --git a/src/main/java/com/mysql/cj/mysqlx/io/MysqlxEncoder.java b/src/main/java/com/mysql/cj/x/protocol/XProtocolEncoder.java similarity index 87% rename from src/main/java/com/mysql/cj/mysqlx/io/MysqlxEncoder.java rename to src/main/java/com/mysql/cj/x/protocol/XProtocolEncoder.java index ee4e0ef73..3f039a005 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/MysqlxEncoder.java +++ b/src/main/java/com/mysql/cj/x/protocol/XProtocolEncoder.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; -public class MysqlxEncoder { +public class XProtocolEncoder { } diff --git a/src/main/java/com/mysql/cj/mysqlx/io/MysqlxProtocolFactory.java b/src/main/java/com/mysql/cj/x/protocol/XProtocolFactory.java similarity index 93% rename from src/main/java/com/mysql/cj/mysqlx/io/MysqlxProtocolFactory.java rename to src/main/java/com/mysql/cj/x/protocol/XProtocolFactory.java index d88a33f7b..67e93a33b 100644 --- a/src/main/java/com/mysql/cj/mysqlx/io/MysqlxProtocolFactory.java +++ b/src/main/java/com/mysql/cj/x/protocol/XProtocolFactory.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import java.io.IOException; import java.net.InetSocketAddress; @@ -41,6 +41,8 @@ import javax.net.ssl.SSLException; import com.mysql.cj.api.conf.PropertySet; +import com.mysql.cj.api.x.protocol.MessageReader; +import com.mysql.cj.api.x.protocol.MessageWriter; import com.mysql.cj.core.conf.PropertyDefinitions; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.io.ExportControlled; @@ -49,8 +51,8 @@ /** * Create a connection to X Plugin. */ -public class MysqlxProtocolFactory { - public static MysqlxProtocol getInstance(String host, int port, PropertySet propertySet) { +public class XProtocolFactory { + public static XProtocol getInstance(String host, int port, PropertySet propertySet) { if (propertySet.getBooleanReadableProperty(PropertyDefinitions.PNAME_useAsyncProtocol).getValue()) { return getAsyncInstance(host, port, propertySet); } @@ -66,13 +68,13 @@ public static MysqlxProtocol getInstance(String host, int port, PropertySet prop MessageReader messageReader = new SyncMessageReader(socketConnection.getMysqlInput()); MessageWriter messageWriter = new SyncMessageWriter(socketConnection.getMysqlOutput()); - return new MysqlxProtocol(messageReader, messageWriter, socketConnection.getMysqlSocket(), propertySet); + return new XProtocol(messageReader, messageWriter, socketConnection.getMysqlSocket(), propertySet); } /** - * Create an async I/O connection. This enables use of async methods on {@link MysqlxProtocol}. + * Create an async I/O connection. This enables use of async methods on {@link XProtocol}. */ - public static MysqlxProtocol getAsyncInstance(String host, int port, PropertySet propertySet) { + public static XProtocol getAsyncInstance(String host, int port, PropertySet propertySet) { try { AsynchronousSocketChannel channel = AsynchronousSocketChannel.open(); //channel.setOption(java.net.StandardSocketOptions.TCP_NODELAY, true); @@ -86,7 +88,7 @@ public static MysqlxProtocol getAsyncInstance(String host, int port, PropertySet messageReader.start(); AsyncMessageWriter messageWriter = new AsyncMessageWriter(channel); - MysqlxProtocol protocol = new MysqlxProtocol(messageReader, messageWriter, channel, propertySet); + XProtocol protocol = new XProtocol(messageReader, messageWriter, channel, propertySet); // switch to encrypted channel if requested if (propertySet.getBooleanReadableProperty(PropertyDefinitions.PNAME_useSSL).getValue()) { diff --git a/src/main/java/com/mysql/cj/mysqlx/result/MysqlxRow.java b/src/main/java/com/mysql/cj/x/protocol/XProtocolRow.java similarity index 86% rename from src/main/java/com/mysql/cj/mysqlx/result/MysqlxRow.java rename to src/main/java/com/mysql/cj/x/protocol/XProtocolRow.java index 2fafe93e4..f30272fa9 100644 --- a/src/main/java/com/mysql/cj/mysqlx/result/MysqlxRow.java +++ b/src/main/java/com/mysql/cj/x/protocol/XProtocolRow.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.result; +package com.mysql.cj.x.protocol; import java.io.IOException; import java.util.ArrayList; @@ -29,23 +29,23 @@ import com.google.protobuf.ByteString; import com.google.protobuf.CodedInputStream; import com.mysql.cj.api.io.ValueFactory; +import com.mysql.cj.api.x.protocol.DecoderFunction; import com.mysql.cj.core.exceptions.DataReadException; import com.mysql.cj.core.result.Field; import com.mysql.cj.mysqla.MysqlaConstants; -import com.mysql.cj.mysqlx.io.MysqlxDecoder; -import com.mysql.cj.mysqlx.protobuf.MysqlxResultset.Row; +import com.mysql.cj.x.protobuf.MysqlxResultset.Row; /** * TODO: write unit tests once server interface stabilizes * * @todo */ -public class MysqlxRow implements com.mysql.cj.api.result.Row { +public class XProtocolRow implements com.mysql.cj.api.result.Row { private ArrayList metadata; private Row rowMessage; private boolean wasNull = false; - public MysqlxRow(ArrayList metadata, Row rowMessage) { + public XProtocolRow(ArrayList metadata, Row rowMessage) { this.metadata = metadata; this.rowMessage = rowMessage; } @@ -68,11 +68,11 @@ public T getValue(int columnIndex, ValueFactory vf) { // X Protocol uses 64-bit ints for everything if (f.getMysqlTypeId() == MysqlaConstants.FIELD_TYPE_LONGLONG) { if (f.isUnsigned()) { - return MysqlxDecoder.instance.decodeUnsignedLong(CodedInputStream.newInstance(byteString.toByteArray()), vf); + return XProtocolDecoder.instance.decodeUnsignedLong(CodedInputStream.newInstance(byteString.toByteArray()), vf); } } - MysqlxDecoder.DecoderFunction decoderFunction = MysqlxDecoder.MYSQL_TYPE_TO_DECODER_FUNCTION.get(f.getMysqlTypeId()); + DecoderFunction decoderFunction = XProtocolDecoder.MYSQL_TYPE_TO_DECODER_FUNCTION.get(f.getMysqlTypeId()); if (decoderFunction != null) { this.wasNull = false; return decoderFunction.apply(CodedInputStream.newInstance(byteString.toByteArray()), vf); diff --git a/src/main/java/com/mysql/cj/mysqlx/result/MysqlxRowInputStream.java b/src/main/java/com/mysql/cj/x/protocol/XProtocolRowInputStream.java similarity index 79% rename from src/main/java/com/mysql/cj/mysqlx/result/MysqlxRowInputStream.java rename to src/main/java/com/mysql/cj/x/protocol/XProtocolRowInputStream.java index 2a370ff23..046180a61 100644 --- a/src/main/java/com/mysql/cj/mysqlx/result/MysqlxRowInputStream.java +++ b/src/main/java/com/mysql/cj/x/protocol/XProtocolRowInputStream.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,43 +21,42 @@ */ -package com.mysql.cj.mysqlx.result; +package com.mysql.cj.x.protocol; import java.util.ArrayList; import java.util.NoSuchElementException; import com.mysql.cj.api.result.RowList; import com.mysql.cj.core.result.Field; -import com.mysql.cj.mysqlx.io.MysqlxProtocol; /** * @todo doc */ -public class MysqlxRowInputStream implements RowList { +public class XProtocolRowInputStream implements RowList { private ArrayList metadata; - private MysqlxProtocol protocol; + private XProtocol protocol; private boolean isDone = false; private int position = -1; /** @todo doc */ - private MysqlxRow next; + private XProtocolRow next; - public MysqlxRowInputStream(ArrayList metadata, MysqlxProtocol protocol) { + public XProtocolRowInputStream(ArrayList metadata, XProtocol protocol) { this.metadata = metadata; this.protocol = protocol; } - public MysqlxRow readRow() { + public XProtocolRow readRow() { if (!hasNext()) { - isDone = true; + this.isDone = true; return null; } this.position++; - MysqlxRow r = this.next; + XProtocolRow r = this.next; this.next = null; return r; } - public MysqlxRow next() { + public XProtocolRow next() { if (!hasNext()) { throw new NoSuchElementException(); } @@ -65,7 +64,7 @@ public MysqlxRow next() { } public boolean hasNext() { - if (isDone) { + if (this.isDone) { return false; } else if (this.next == null) { this.next = this.protocol.readRowOrNull(this.metadata); diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/AbstractColumnDef.java b/src/main/java/com/mysql/cj/xdevapi/AbstractColumnDef.java similarity index 98% rename from src/main/java/com/mysql/cj/mysqlx/devapi/AbstractColumnDef.java rename to src/main/java/com/mysql/cj/xdevapi/AbstractColumnDef.java index 766430052..599b1696b 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/AbstractColumnDef.java +++ b/src/main/java/com/mysql/cj/xdevapi/AbstractColumnDef.java @@ -21,13 +21,13 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.Arrays; import java.util.stream.Collectors; -import com.mysql.cj.api.x.ColumnDefinition; -import com.mysql.cj.api.x.Type; +import com.mysql.cj.api.xdevapi.ColumnDefinition; +import com.mysql.cj.api.xdevapi.Type; import com.mysql.cj.core.Messages; import com.mysql.cj.core.exceptions.ExceptionFactory; import com.mysql.cj.core.exceptions.WrongArgumentException; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/AbstractDataResult.java b/src/main/java/com/mysql/cj/xdevapi/AbstractDataResult.java similarity index 89% rename from src/main/java/com/mysql/cj/mysqlx/devapi/AbstractDataResult.java rename to src/main/java/com/mysql/cj/xdevapi/AbstractDataResult.java index afe2854f6..01678f2ea 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/AbstractDataResult.java +++ b/src/main/java/com/mysql/cj/xdevapi/AbstractDataResult.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.ArrayList; import java.util.Collections; @@ -29,15 +29,16 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.function.Supplier; +import java.util.stream.Collectors; import com.mysql.cj.api.result.Row; import com.mysql.cj.api.result.RowList; -import com.mysql.cj.api.x.Warning; +import com.mysql.cj.api.x.core.RowToElement; +import com.mysql.cj.api.x.protocol.ResultStreamer; +import com.mysql.cj.api.xdevapi.Warning; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.core.io.StatementExecuteOk; import com.mysql.cj.core.result.BufferedRowList; -import com.mysql.cj.mysqlx.io.ResultStreamer; -import com.mysql.cj.mysqlx.result.RowToElement; +import com.mysql.cj.x.core.StatementExecuteOk; /** * Base class for data set results. @@ -119,6 +120,6 @@ public int getWarningsCount() { } public Iterator getWarnings() { - return getStatementExecuteOk().getWarnings().iterator(); + return getStatementExecuteOk().getWarnings().stream().map(w -> (Warning) new WarningImpl(w)).collect(Collectors.toList()).iterator(); } } diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/AbstractSession.java b/src/main/java/com/mysql/cj/xdevapi/AbstractSession.java similarity index 95% rename from src/main/java/com/mysql/cj/mysqlx/devapi/AbstractSession.java rename to src/main/java/com/mysql/cj/xdevapi/AbstractSession.java index 9d9c2beb3..de10a6e0e 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/AbstractSession.java +++ b/src/main/java/com/mysql/cj/xdevapi/AbstractSession.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.List; import java.util.Properties; @@ -31,16 +31,16 @@ import com.mysql.cj.api.conf.PropertySet; import com.mysql.cj.api.conf.ReadableProperty; import com.mysql.cj.api.result.Row; -import com.mysql.cj.api.x.BaseSession; -import com.mysql.cj.api.x.Schema; +import com.mysql.cj.api.xdevapi.BaseSession; +import com.mysql.cj.api.xdevapi.Schema; import com.mysql.cj.core.conf.PropertyDefinitions; import com.mysql.cj.core.conf.url.ConnectionUrl; import com.mysql.cj.core.exceptions.MysqlErrorNumbers; import com.mysql.cj.core.exceptions.WrongArgumentException; import com.mysql.cj.core.io.StringValueFactory; import com.mysql.cj.core.util.StringUtils; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.MysqlxSession; +import com.mysql.cj.x.core.MysqlxSession; +import com.mysql.cj.x.core.XDevAPIError; /** * @todo @@ -91,7 +91,7 @@ public Schema createSchema(String schemaName) { public Schema createSchema(String schemaName, boolean reuseExistingObject) { try { return createSchema(schemaName); - } catch (MysqlxError ex) { + } catch (XDevAPIError ex) { if (ex.getErrorCode() == MysqlErrorNumbers.ER_DB_CREATE_EXISTS) { return getSchema(schemaName); } @@ -128,7 +128,7 @@ public void rollback() { public String getUri() { PropertySet pset = this.session.getPropertySet(); - StringBuilder sb = new StringBuilder(ConnectionUrl.Type.MYSQLX_SESSION.getProtocol()); + StringBuilder sb = new StringBuilder(ConnectionUrl.Type.XDEVAPI_SESSION.getProtocol()); sb.append("//").append(this.session.getHost()).append(":").append(this.session.getPort()).append("/").append(this.defaultSchemaName).append("?"); for (String propName : PropertyDefinitions.PROPERTY_NAME_TO_PROPERTY_DEFINITION.keySet()) { diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/AddStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/AddStatementImpl.java similarity index 92% rename from src/main/java/com/mysql/cj/mysqlx/devapi/AddStatementImpl.java rename to src/main/java/com/mysql/cj/xdevapi/AddStatementImpl.java index 85daf8ea5..53efc72b5 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/AddStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/AddStatementImpl.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.io.IOException; import java.io.StringReader; @@ -31,14 +31,10 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import com.mysql.cj.api.x.AddStatement; -import com.mysql.cj.api.x.Result; +import com.mysql.cj.api.xdevapi.AddStatement; +import com.mysql.cj.api.xdevapi.Result; import com.mysql.cj.core.exceptions.AssertionFailedException; -import com.mysql.cj.core.io.StatementExecuteOk; -import com.mysql.cj.mysqlx.DocumentID; -import com.mysql.cj.x.json.DbDoc; -import com.mysql.cj.x.json.JsonParser; -import com.mysql.cj.x.json.JsonString; +import com.mysql.cj.x.core.StatementExecuteOk; /** * @todo diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/CollectionImpl.java b/src/main/java/com/mysql/cj/xdevapi/CollectionImpl.java similarity index 89% rename from src/main/java/com/mysql/cj/mysqlx/devapi/CollectionImpl.java rename to src/main/java/com/mysql/cj/xdevapi/CollectionImpl.java index b3ea7681e..8a98895c6 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/CollectionImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/CollectionImpl.java @@ -21,26 +21,23 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.io.IOException; import java.io.StringReader; import java.util.Map; -import com.mysql.cj.api.x.AddStatement; -import com.mysql.cj.api.x.BaseSession; -import com.mysql.cj.api.x.Collection; -import com.mysql.cj.api.x.CreateCollectionIndexStatement; -import com.mysql.cj.api.x.DropCollectionIndexStatement; -import com.mysql.cj.api.x.FindStatement; -import com.mysql.cj.api.x.ModifyStatement; -import com.mysql.cj.api.x.RemoveStatement; -import com.mysql.cj.api.x.Schema; +import com.mysql.cj.api.xdevapi.AddStatement; +import com.mysql.cj.api.xdevapi.BaseSession; +import com.mysql.cj.api.xdevapi.Collection; +import com.mysql.cj.api.xdevapi.CreateCollectionIndexStatement; +import com.mysql.cj.api.xdevapi.DropCollectionIndexStatement; +import com.mysql.cj.api.xdevapi.FindStatement; +import com.mysql.cj.api.xdevapi.ModifyStatement; +import com.mysql.cj.api.xdevapi.RemoveStatement; +import com.mysql.cj.api.xdevapi.Schema; import com.mysql.cj.core.exceptions.AssertionFailedException; import com.mysql.cj.core.exceptions.FeatureNotAvailableException; -import com.mysql.cj.mysqlx.ExprUnparser; -import com.mysql.cj.x.json.DbDoc; -import com.mysql.cj.x.json.JsonParser; public class CollectionImpl implements Collection { private SchemaImpl schema; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/ColumnDef.java b/src/main/java/com/mysql/cj/xdevapi/ColumnDef.java similarity index 96% rename from src/main/java/com/mysql/cj/mysqlx/devapi/ColumnDef.java rename to src/main/java/com/mysql/cj/xdevapi/ColumnDef.java index 4f09fbb9d..3b0250f50 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/ColumnDef.java +++ b/src/main/java/com/mysql/cj/xdevapi/ColumnDef.java @@ -21,13 +21,13 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.HashMap; import java.util.Map; -import com.mysql.cj.api.x.ColumnDefinition.StaticColumnDefinition; -import com.mysql.cj.api.x.Type; +import com.mysql.cj.api.xdevapi.Type; +import com.mysql.cj.api.xdevapi.ColumnDefinition.StaticColumnDefinition; import com.mysql.cj.core.util.StringUtils; public final class ColumnDef extends AbstractColumnDef implements StaticColumnDefinition { diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/ColumnImpl.java b/src/main/java/com/mysql/cj/xdevapi/ColumnImpl.java similarity index 98% rename from src/main/java/com/mysql/cj/mysqlx/devapi/ColumnImpl.java rename to src/main/java/com/mysql/cj/xdevapi/ColumnImpl.java index 68902e6fc..4e737d4c1 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/ColumnImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/ColumnImpl.java @@ -21,10 +21,10 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; -import com.mysql.cj.api.x.Column; -import com.mysql.cj.api.x.Type; +import com.mysql.cj.api.xdevapi.Column; +import com.mysql.cj.api.xdevapi.Type; import com.mysql.cj.core.CharsetMapping; import com.mysql.cj.core.MysqlType; import com.mysql.cj.core.result.Field; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/CreateCollectionIndexStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/CreateCollectionIndexStatementImpl.java similarity index 91% rename from src/main/java/com/mysql/cj/mysqlx/devapi/CreateCollectionIndexStatementImpl.java rename to src/main/java/com/mysql/cj/xdevapi/CreateCollectionIndexStatementImpl.java index b22eadc28..0235024f0 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/CreateCollectionIndexStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/CreateCollectionIndexStatementImpl.java @@ -21,14 +21,13 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.concurrent.CompletableFuture; -import com.mysql.cj.api.x.CreateCollectionIndexStatement; -import com.mysql.cj.api.x.Result; -import com.mysql.cj.core.io.StatementExecuteOk; -import com.mysql.cj.mysqlx.CreateIndexParams; +import com.mysql.cj.api.xdevapi.CreateCollectionIndexStatement; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.x.core.StatementExecuteOk; public class CreateCollectionIndexStatementImpl implements CreateCollectionIndexStatement { private CollectionImpl collection; diff --git a/src/main/java/com/mysql/cj/mysqlx/CreateIndexParams.java b/src/main/java/com/mysql/cj/xdevapi/CreateIndexParams.java similarity index 90% rename from src/main/java/com/mysql/cj/mysqlx/CreateIndexParams.java rename to src/main/java/com/mysql/cj/xdevapi/CreateIndexParams.java index cfb60dbd3..2d123f410 100644 --- a/src/main/java/com/mysql/cj/mysqlx/CreateIndexParams.java +++ b/src/main/java/com/mysql/cj/xdevapi/CreateIndexParams.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; import java.util.ArrayList; import java.util.List; @@ -39,9 +39,9 @@ public CreateIndexParams(String indexName, boolean unique) { } public void addField(String docPath, String type, boolean notNull) { - docPaths.add(docPath); - types.add(type); - notNulls.add(notNull); + this.docPaths.add(docPath); + this.types.add(type); + this.notNulls.add(notNull); } public String getIndexName() { diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/CreateTableStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/CreateTableStatementImpl.java similarity index 93% rename from src/main/java/com/mysql/cj/mysqlx/devapi/CreateTableStatementImpl.java rename to src/main/java/com/mysql/cj/xdevapi/CreateTableStatementImpl.java index 54c26eaee..856cf35a7 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/CreateTableStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/CreateTableStatementImpl.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.ArrayList; import java.util.Arrays; @@ -30,17 +30,17 @@ import java.util.Map; import java.util.stream.Collectors; -import com.mysql.cj.api.x.ColumnDefinition; -import com.mysql.cj.api.x.CreateTableStatement.CreateTableFullStatement; -import com.mysql.cj.api.x.CreateTableStatement.CreateTableLikeStatement; -import com.mysql.cj.api.x.CreateTableStatement.CreateTableSplitStatement; -import com.mysql.cj.api.x.ForeignKeyDefinition; -import com.mysql.cj.api.x.Schema; -import com.mysql.cj.api.x.SelectStatement; -import com.mysql.cj.api.x.Table; +import com.mysql.cj.api.xdevapi.ColumnDefinition; +import com.mysql.cj.api.xdevapi.ForeignKeyDefinition; +import com.mysql.cj.api.xdevapi.Schema; +import com.mysql.cj.api.xdevapi.SelectStatement; +import com.mysql.cj.api.xdevapi.Table; +import com.mysql.cj.api.xdevapi.CreateTableStatement.CreateTableFullStatement; +import com.mysql.cj.api.xdevapi.CreateTableStatement.CreateTableLikeStatement; +import com.mysql.cj.api.xdevapi.CreateTableStatement.CreateTableSplitStatement; import com.mysql.cj.core.exceptions.FeatureNotAvailableException; import com.mysql.cj.core.exceptions.MysqlErrorNumbers; -import com.mysql.cj.mysqlx.MysqlxError; +import com.mysql.cj.x.core.XDevAPIError; public class CreateTableStatementImpl implements CreateTableSplitStatement, CreateTableFullStatement, CreateTableLikeStatement { @@ -155,7 +155,7 @@ public Table execute() { try { // TODO implement using specific X Protocol message when available this.schema.getSession().getMysqlxSession().executeSql(toString(), null); - } catch (MysqlxError ex) { + } catch (XDevAPIError ex) { if (ex.getErrorCode() != MysqlErrorNumbers.ER_TABLE_EXISTS_ERROR || !this.reuseExistingObject) { throw ex; } diff --git a/src/main/java/com/mysql/cj/x/json/DbDoc.java b/src/main/java/com/mysql/cj/xdevapi/DbDoc.java similarity index 98% rename from src/main/java/com/mysql/cj/x/json/DbDoc.java rename to src/main/java/com/mysql/cj/xdevapi/DbDoc.java index 1ae94a0ba..6aab1bb47 100644 --- a/src/main/java/com/mysql/cj/x/json/DbDoc.java +++ b/src/main/java/com/mysql/cj/xdevapi/DbDoc.java @@ -21,11 +21,11 @@ */ -package com.mysql.cj.x.json; +package com.mysql.cj.xdevapi; import java.util.TreeMap; -import com.mysql.cj.api.x.JsonValue; +import com.mysql.cj.api.xdevapi.JsonValue; /** * Represents a JSON object: diff --git a/src/main/java/com/mysql/cj/core/io/DbDocValueFactory.java b/src/main/java/com/mysql/cj/xdevapi/DbDocValueFactory.java similarity index 95% rename from src/main/java/com/mysql/cj/core/io/DbDocValueFactory.java rename to src/main/java/com/mysql/cj/xdevapi/DbDocValueFactory.java index 3103a3e8d..fb092564c 100644 --- a/src/main/java/com/mysql/cj/core/io/DbDocValueFactory.java +++ b/src/main/java/com/mysql/cj/xdevapi/DbDocValueFactory.java @@ -21,16 +21,15 @@ */ -package com.mysql.cj.core.io; +package com.mysql.cj.xdevapi; import java.io.IOException; import java.io.StringReader; import com.mysql.cj.api.io.ValueFactory; import com.mysql.cj.core.exceptions.AssertionFailedException; +import com.mysql.cj.core.io.DefaultValueFactory; import com.mysql.cj.core.util.StringUtils; -import com.mysql.cj.x.json.DbDoc; -import com.mysql.cj.x.json.JsonParser; /** * A {@link ValueFactory} implementation to create {@link DbDoc}s. diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/DeleteStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/DeleteStatementImpl.java similarity index 91% rename from src/main/java/com/mysql/cj/mysqlx/devapi/DeleteStatementImpl.java rename to src/main/java/com/mysql/cj/xdevapi/DeleteStatementImpl.java index 92f2e0e99..6201853bc 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/DeleteStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/DeleteStatementImpl.java @@ -21,13 +21,13 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.concurrent.CompletableFuture; -import com.mysql.cj.api.x.DeleteStatement; -import com.mysql.cj.api.x.Result; -import com.mysql.cj.core.io.StatementExecuteOk; +import com.mysql.cj.api.xdevapi.DeleteStatement; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.x.core.StatementExecuteOk; public class DeleteStatementImpl extends FilterableStatement implements DeleteStatement { private TableImpl table; diff --git a/src/main/java/com/mysql/cj/mysqlx/DocFindParams.java b/src/main/java/com/mysql/cj/xdevapi/DocFindParams.java similarity index 93% rename from src/main/java/com/mysql/cj/mysqlx/DocFindParams.java rename to src/main/java/com/mysql/cj/xdevapi/DocFindParams.java index 3b2e35e3a..fc8847d2e 100644 --- a/src/main/java/com/mysql/cj/mysqlx/DocFindParams.java +++ b/src/main/java/com/mysql/cj/xdevapi/DocFindParams.java @@ -21,14 +21,14 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; import java.util.Arrays; import java.util.Collections; import java.util.stream.Collectors; -import com.mysql.cj.api.x.Expression; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection; +import com.mysql.cj.api.xdevapi.Expression; +import com.mysql.cj.x.protobuf.MysqlxCrud.Projection; public class DocFindParams extends FindParams { public DocFindParams(String schemaName, String collectionName) { diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/DocResultImpl.java b/src/main/java/com/mysql/cj/xdevapi/DocResultImpl.java similarity index 83% rename from src/main/java/com/mysql/cj/mysqlx/devapi/DocResultImpl.java rename to src/main/java/com/mysql/cj/xdevapi/DocResultImpl.java index 3697fe704..79fc9c656 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/DocResultImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/DocResultImpl.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,15 +21,13 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.function.Supplier; import com.mysql.cj.api.result.RowList; -import com.mysql.cj.api.x.DocResult; -import com.mysql.cj.core.io.DbDocValueFactory; -import com.mysql.cj.core.io.StatementExecuteOk; -import com.mysql.cj.x.json.DbDoc; +import com.mysql.cj.api.xdevapi.DocResult; +import com.mysql.cj.x.core.StatementExecuteOk; public class DocResultImpl extends AbstractDataResult implements DocResult { public DocResultImpl(RowList rows, Supplier completer) { diff --git a/src/main/java/com/mysql/cj/mysqlx/DocumentID.java b/src/main/java/com/mysql/cj/xdevapi/DocumentID.java similarity index 98% rename from src/main/java/com/mysql/cj/mysqlx/DocumentID.java rename to src/main/java/com/mysql/cj/xdevapi/DocumentID.java index 3c83ee812..b7129f6e5 100644 --- a/src/main/java/com/mysql/cj/mysqlx/DocumentID.java +++ b/src/main/java/com/mysql/cj/xdevapi/DocumentID.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; import java.util.UUID; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/DropCollectionIndexStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/DropCollectionIndexStatementImpl.java similarity index 92% rename from src/main/java/com/mysql/cj/mysqlx/devapi/DropCollectionIndexStatementImpl.java rename to src/main/java/com/mysql/cj/xdevapi/DropCollectionIndexStatementImpl.java index 1870362f5..598c2c74e 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/DropCollectionIndexStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/DropCollectionIndexStatementImpl.java @@ -21,13 +21,13 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.concurrent.CompletableFuture; -import com.mysql.cj.api.x.DropCollectionIndexStatement; -import com.mysql.cj.api.x.Result; -import com.mysql.cj.core.io.StatementExecuteOk; +import com.mysql.cj.api.xdevapi.DropCollectionIndexStatement; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.x.core.StatementExecuteOk; public class DropCollectionIndexStatementImpl implements DropCollectionIndexStatement { private CollectionImpl collection; diff --git a/src/main/java/com/mysql/cj/mysqlx/ExprParser.java b/src/main/java/com/mysql/cj/xdevapi/ExprParser.java similarity index 98% rename from src/main/java/com/mysql/cj/mysqlx/ExprParser.java rename to src/main/java/com/mysql/cj/xdevapi/ExprParser.java index b6e188bd7..eec7a4434 100644 --- a/src/main/java/com/mysql/cj/mysqlx/ExprParser.java +++ b/src/main/java/com/mysql/cj/xdevapi/ExprParser.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; import java.util.ArrayList; import java.util.Arrays; @@ -33,17 +33,17 @@ import java.util.function.Supplier; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator; +import com.mysql.cj.x.protobuf.MysqlxCrud.Column; +import com.mysql.cj.x.protobuf.MysqlxCrud.Order; +import com.mysql.cj.x.protobuf.MysqlxCrud.Projection; +import com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier; +import com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem; +import com.mysql.cj.x.protobuf.MysqlxExpr.Expr; +import com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall; +import com.mysql.cj.x.protobuf.MysqlxExpr.Identifier; +import com.mysql.cj.x.protobuf.MysqlxExpr.Object; +import com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField; +import com.mysql.cj.x.protobuf.MysqlxExpr.Operator; // Grammar includes precedence & associativity of binary operators: // (^ refers to the preceding production) @@ -103,7 +103,7 @@ public ExprParser(String s, boolean allowRelationalColumns) { /** * Token types used by the lexer. */ - public static enum TokenType { + private static enum TokenType { NOT, AND, ANDAND, OR, OROR, XOR, IS, LPAREN, RPAREN, LSQBRACKET, RSQBRACKET, BETWEEN, TRUE, NULL, FALSE, IN, LIKE, INTERVAL, REGEXP, ESCAPE, IDENT, LSTRING, LNUM_INT, LNUM_DOUBLE, DOT, DOLLAR, COMMA, EQ, NE, GT, GE, LT, LE, BITAND, BITOR, BITXOR, LSHIFT, RSHIFT, PLUS, MINUS, STAR, SLASH, HEX, BIN, NEG, BANG, EROTEME, MICROSECOND, SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, QUARTER, YEAR, SECOND_MICROSECOND, MINUTE_MICROSECOND, MINUTE_SECOND, diff --git a/src/main/java/com/mysql/cj/mysqlx/ExprUnparser.java b/src/main/java/com/mysql/cj/xdevapi/ExprUnparser.java similarity index 94% rename from src/main/java/com/mysql/cj/mysqlx/ExprUnparser.java rename to src/main/java/com/mysql/cj/xdevapi/ExprUnparser.java index ca0e168dc..035d70d75 100644 --- a/src/main/java/com/mysql/cj/mysqlx/ExprUnparser.java +++ b/src/main/java/com/mysql/cj/xdevapi/ExprUnparser.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; import java.util.ArrayList; import java.util.HashSet; @@ -29,14 +29,14 @@ import java.util.Set; import java.util.stream.Collectors; -import com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.FunctionCall; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Identifier; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Operator; +import com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar; +import com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier; +import com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem; +import com.mysql.cj.x.protobuf.MysqlxExpr.Expr; +import com.mysql.cj.x.protobuf.MysqlxExpr.FunctionCall; +import com.mysql.cj.x.protobuf.MysqlxExpr.Identifier; +import com.mysql.cj.x.protobuf.MysqlxExpr.Object; +import com.mysql.cj.x.protobuf.MysqlxExpr.Operator; /** * Serializer utility for dealing with X Protocol expression trees. diff --git a/src/main/java/com/mysql/cj/mysqlx/ExprUtil.java b/src/main/java/com/mysql/cj/xdevapi/ExprUtil.java similarity index 94% rename from src/main/java/com/mysql/cj/mysqlx/ExprUtil.java rename to src/main/java/com/mysql/cj/xdevapi/ExprUtil.java index 73e6e03eb..3da8e4a4b 100644 --- a/src/main/java/com/mysql/cj/mysqlx/ExprUtil.java +++ b/src/main/java/com/mysql/cj/xdevapi/ExprUtil.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; import java.sql.Date; import java.sql.Time; @@ -30,18 +30,14 @@ import java.util.stream.Collectors; import com.google.protobuf.ByteString; -import com.mysql.cj.api.x.Expression; +import com.mysql.cj.api.xdevapi.Expression; import com.mysql.cj.core.exceptions.FeatureNotAvailableException; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection; -import com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any; -import com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar; -import com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar.Octets; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr; -import com.mysql.cj.x.json.DbDoc; -import com.mysql.cj.x.json.JsonArray; -import com.mysql.cj.x.json.JsonNumber; -import com.mysql.cj.x.json.JsonString; +import com.mysql.cj.x.protobuf.MysqlxCrud.Collection; +import com.mysql.cj.x.protobuf.MysqlxDatatypes.Any; +import com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar; +import com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar.Octets; +import com.mysql.cj.x.protobuf.MysqlxExpr.Expr; /** * Utilities to deal with Expr (and related) structures. diff --git a/src/main/java/com/mysql/cj/mysqlx/FilterParams.java b/src/main/java/com/mysql/cj/xdevapi/FilterParams.java similarity index 95% rename from src/main/java/com/mysql/cj/mysqlx/FilterParams.java rename to src/main/java/com/mysql/cj/xdevapi/FilterParams.java index 404040476..a7e446ba5 100644 --- a/src/main/java/com/mysql/cj/mysqlx/FilterParams.java +++ b/src/main/java/com/mysql/cj/xdevapi/FilterParams.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; import java.util.Arrays; import java.util.List; @@ -30,10 +30,10 @@ import java.util.stream.IntStream; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Collection; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order; -import com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr; +import com.mysql.cj.x.protobuf.MysqlxCrud.Collection; +import com.mysql.cj.x.protobuf.MysqlxCrud.Order; +import com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar; +import com.mysql.cj.x.protobuf.MysqlxExpr.Expr; /** * Filter parameters. diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/FilterableStatement.java b/src/main/java/com/mysql/cj/xdevapi/FilterableStatement.java similarity index 96% rename from src/main/java/com/mysql/cj/mysqlx/devapi/FilterableStatement.java rename to src/main/java/com/mysql/cj/xdevapi/FilterableStatement.java index 7cf511b2f..04b196fcd 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/FilterableStatement.java +++ b/src/main/java/com/mysql/cj/xdevapi/FilterableStatement.java @@ -21,10 +21,9 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; -import com.mysql.cj.api.x.Statement; -import com.mysql.cj.mysqlx.FilterParams; +import com.mysql.cj.api.xdevapi.Statement; /** * @todo diff --git a/src/main/java/com/mysql/cj/mysqlx/FindParams.java b/src/main/java/com/mysql/cj/xdevapi/FindParams.java similarity index 94% rename from src/main/java/com/mysql/cj/mysqlx/FindParams.java rename to src/main/java/com/mysql/cj/xdevapi/FindParams.java index 22f74f677..9cf1cf2ac 100644 --- a/src/main/java/com/mysql/cj/mysqlx/FindParams.java +++ b/src/main/java/com/mysql/cj/xdevapi/FindParams.java @@ -21,14 +21,14 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr; +import com.mysql.cj.x.protobuf.MysqlxCrud.Projection; +import com.mysql.cj.x.protobuf.MysqlxExpr.Expr; public abstract class FindParams extends FilterParams { private List grouping; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/FindStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/FindStatementImpl.java similarity index 92% rename from src/main/java/com/mysql/cj/mysqlx/devapi/FindStatementImpl.java rename to src/main/java/com/mysql/cj/xdevapi/FindStatementImpl.java index 1d57b0dd2..2c0f953d4 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/FindStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/FindStatementImpl.java @@ -21,15 +21,13 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.concurrent.CompletableFuture; -import com.mysql.cj.api.x.DocResult; -import com.mysql.cj.api.x.Expression; -import com.mysql.cj.api.x.FindStatement; -import com.mysql.cj.mysqlx.DocFindParams; -import com.mysql.cj.x.json.DbDoc; +import com.mysql.cj.api.xdevapi.DocResult; +import com.mysql.cj.api.xdevapi.Expression; +import com.mysql.cj.api.xdevapi.FindStatement; public class FindStatementImpl extends FilterableStatement implements FindStatement { private CollectionImpl collection; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/ForeignKeyDef.java b/src/main/java/com/mysql/cj/xdevapi/ForeignKeyDef.java similarity index 97% rename from src/main/java/com/mysql/cj/mysqlx/devapi/ForeignKeyDef.java rename to src/main/java/com/mysql/cj/xdevapi/ForeignKeyDef.java index 94b59e1ce..c30eef4a1 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/ForeignKeyDef.java +++ b/src/main/java/com/mysql/cj/xdevapi/ForeignKeyDef.java @@ -21,12 +21,12 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.Arrays; import java.util.stream.Collectors; -import com.mysql.cj.api.x.ForeignKeyDefinition; +import com.mysql.cj.api.xdevapi.ForeignKeyDefinition; public class ForeignKeyDef implements ForeignKeyDefinition { diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/GeneratedColumnDef.java b/src/main/java/com/mysql/cj/xdevapi/GeneratedColumnDef.java similarity index 95% rename from src/main/java/com/mysql/cj/mysqlx/devapi/GeneratedColumnDef.java rename to src/main/java/com/mysql/cj/xdevapi/GeneratedColumnDef.java index bb59e70de..10ba69e6d 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/GeneratedColumnDef.java +++ b/src/main/java/com/mysql/cj/xdevapi/GeneratedColumnDef.java @@ -21,10 +21,10 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; -import com.mysql.cj.api.x.ColumnDefinition.GeneratedColumnDefinition; -import com.mysql.cj.api.x.Type; +import com.mysql.cj.api.xdevapi.Type; +import com.mysql.cj.api.xdevapi.ColumnDefinition.GeneratedColumnDefinition; import com.mysql.cj.core.util.StringUtils; public final class GeneratedColumnDef extends AbstractColumnDef implements GeneratedColumnDefinition { diff --git a/src/main/java/com/mysql/cj/mysqlx/InsertParams.java b/src/main/java/com/mysql/cj/xdevapi/InsertParams.java similarity index 94% rename from src/main/java/com/mysql/cj/mysqlx/InsertParams.java rename to src/main/java/com/mysql/cj/xdevapi/InsertParams.java index 0f8d046b1..b9532e943 100644 --- a/src/main/java/com/mysql/cj/mysqlx/InsertParams.java +++ b/src/main/java/com/mysql/cj/xdevapi/InsertParams.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; import java.util.ArrayList; import java.util.Arrays; @@ -30,8 +30,8 @@ import java.util.Map; import java.util.stream.Collectors; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Insert.TypedRow; +import com.mysql.cj.x.protobuf.MysqlxCrud.Column; +import com.mysql.cj.x.protobuf.MysqlxCrud.Insert.TypedRow; /** * Parameters for relational insert command. diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/InsertStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/InsertStatementImpl.java similarity index 92% rename from src/main/java/com/mysql/cj/mysqlx/devapi/InsertStatementImpl.java rename to src/main/java/com/mysql/cj/xdevapi/InsertStatementImpl.java index 7e8de370c..6a183564a 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/InsertStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/InsertStatementImpl.java @@ -21,16 +21,15 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; -import com.mysql.cj.api.x.InsertStatement; -import com.mysql.cj.api.x.Result; -import com.mysql.cj.core.io.StatementExecuteOk; -import com.mysql.cj.mysqlx.InsertParams; +import com.mysql.cj.api.xdevapi.InsertStatement; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.x.core.StatementExecuteOk; public class InsertStatementImpl implements InsertStatement { private TableImpl table; diff --git a/src/main/java/com/mysql/cj/x/json/JsonArray.java b/src/main/java/com/mysql/cj/xdevapi/JsonArray.java similarity index 93% rename from src/main/java/com/mysql/cj/x/json/JsonArray.java rename to src/main/java/com/mysql/cj/xdevapi/JsonArray.java index c5837264a..9161199a8 100644 --- a/src/main/java/com/mysql/cj/x/json/JsonArray.java +++ b/src/main/java/com/mysql/cj/xdevapi/JsonArray.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,11 +21,11 @@ */ -package com.mysql.cj.x.json; +package com.mysql.cj.xdevapi; import java.util.ArrayList; -import com.mysql.cj.api.x.JsonValue; +import com.mysql.cj.api.xdevapi.JsonValue; /** * Represents a JSON array. diff --git a/src/main/java/com/mysql/cj/x/json/JsonLiteral.java b/src/main/java/com/mysql/cj/xdevapi/JsonLiteral.java similarity index 90% rename from src/main/java/com/mysql/cj/x/json/JsonLiteral.java rename to src/main/java/com/mysql/cj/xdevapi/JsonLiteral.java index 1a8f5dcea..222baaa63 100644 --- a/src/main/java/com/mysql/cj/x/json/JsonLiteral.java +++ b/src/main/java/com/mysql/cj/xdevapi/JsonLiteral.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,9 +21,9 @@ */ -package com.mysql.cj.x.json; +package com.mysql.cj.xdevapi; -import com.mysql.cj.api.x.JsonValue; +import com.mysql.cj.api.xdevapi.JsonValue; /** * Represents JSON true, false and null literals. diff --git a/src/main/java/com/mysql/cj/x/json/JsonNumber.java b/src/main/java/com/mysql/cj/xdevapi/JsonNumber.java similarity index 91% rename from src/main/java/com/mysql/cj/x/json/JsonNumber.java rename to src/main/java/com/mysql/cj/xdevapi/JsonNumber.java index 38f5eadb4..87004869c 100644 --- a/src/main/java/com/mysql/cj/x/json/JsonNumber.java +++ b/src/main/java/com/mysql/cj/xdevapi/JsonNumber.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,11 +21,11 @@ */ -package com.mysql.cj.x.json; +package com.mysql.cj.xdevapi; import java.math.BigDecimal; -import com.mysql.cj.api.x.JsonValue; +import com.mysql.cj.api.xdevapi.JsonValue; /** * Represents a JSON number. diff --git a/src/main/java/com/mysql/cj/x/json/JsonParser.java b/src/main/java/com/mysql/cj/xdevapi/JsonParser.java similarity index 99% rename from src/main/java/com/mysql/cj/x/json/JsonParser.java rename to src/main/java/com/mysql/cj/xdevapi/JsonParser.java index 23d9c0b70..f7b69a24a 100644 --- a/src/main/java/com/mysql/cj/x/json/JsonParser.java +++ b/src/main/java/com/mysql/cj/xdevapi/JsonParser.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.json; +package com.mysql.cj.xdevapi; import java.io.IOException; import java.io.StringReader; @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.Set; -import com.mysql.cj.api.x.JsonValue; +import com.mysql.cj.api.xdevapi.JsonValue; import com.mysql.cj.core.Messages; import com.mysql.cj.core.exceptions.ExceptionFactory; import com.mysql.cj.core.exceptions.WrongArgumentException; diff --git a/src/main/java/com/mysql/cj/x/json/JsonString.java b/src/main/java/com/mysql/cj/xdevapi/JsonString.java similarity index 91% rename from src/main/java/com/mysql/cj/x/json/JsonString.java rename to src/main/java/com/mysql/cj/xdevapi/JsonString.java index bb310a640..7a09ab91d 100644 --- a/src/main/java/com/mysql/cj/x/json/JsonString.java +++ b/src/main/java/com/mysql/cj/xdevapi/JsonString.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,12 +21,12 @@ */ -package com.mysql.cj.x.json; +package com.mysql.cj.xdevapi; import java.util.HashMap; -import com.mysql.cj.api.x.JsonValue; -import com.mysql.cj.x.json.JsonParser.EscapeChar; +import com.mysql.cj.api.xdevapi.JsonValue; +import com.mysql.cj.xdevapi.JsonParser.EscapeChar; /** * Represents a JSON string. diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/ModifyStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/ModifyStatementImpl.java similarity index 93% rename from src/main/java/com/mysql/cj/mysqlx/devapi/ModifyStatementImpl.java rename to src/main/java/com/mysql/cj/xdevapi/ModifyStatementImpl.java index 0ada4fcf1..ba8e68b0e 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/ModifyStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/ModifyStatementImpl.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.ArrayList; import java.util.Arrays; @@ -29,12 +29,11 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import com.mysql.cj.api.x.ModifyStatement; -import com.mysql.cj.api.x.Result; +import com.mysql.cj.api.xdevapi.ModifyStatement; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.api.xdevapi.UpdateType; import com.mysql.cj.core.exceptions.FeatureNotAvailableException; -import com.mysql.cj.core.io.StatementExecuteOk; -import com.mysql.cj.mysqlx.UpdateSpec; -import com.mysql.cj.mysqlx.UpdateSpec.UpdateType; +import com.mysql.cj.x.core.StatementExecuteOk; public class ModifyStatementImpl extends FilterableStatement implements ModifyStatement { private CollectionImpl collection; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/NodeSessionImpl.java b/src/main/java/com/mysql/cj/xdevapi/NodeSessionImpl.java similarity index 95% rename from src/main/java/com/mysql/cj/mysqlx/devapi/NodeSessionImpl.java rename to src/main/java/com/mysql/cj/xdevapi/NodeSessionImpl.java index 19449634e..bd6fc1a99 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/NodeSessionImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/NodeSessionImpl.java @@ -21,11 +21,11 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.Properties; -import com.mysql.cj.api.x.NodeSession; +import com.mysql.cj.api.xdevapi.NodeSession; public class NodeSessionImpl extends AbstractSession implements NodeSession { diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/RemoveStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/RemoveStatementImpl.java similarity index 89% rename from src/main/java/com/mysql/cj/mysqlx/devapi/RemoveStatementImpl.java rename to src/main/java/com/mysql/cj/xdevapi/RemoveStatementImpl.java index 0516c3cb1..88aec15bb 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/RemoveStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/RemoveStatementImpl.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,13 +21,13 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.concurrent.CompletableFuture; -import com.mysql.cj.api.x.RemoveStatement; -import com.mysql.cj.api.x.Result; -import com.mysql.cj.core.io.StatementExecuteOk; +import com.mysql.cj.api.xdevapi.RemoveStatement; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.x.core.StatementExecuteOk; public class RemoveStatementImpl extends FilterableStatement implements RemoveStatement { private CollectionImpl collection; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/RowImpl.java b/src/main/java/com/mysql/cj/xdevapi/RowImpl.java similarity index 95% rename from src/main/java/com/mysql/cj/mysqlx/devapi/RowImpl.java rename to src/main/java/com/mysql/cj/xdevapi/RowImpl.java index dc0b55931..9fea22b64 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/RowImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/RowImpl.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.math.BigDecimal; import java.sql.Date; @@ -36,7 +36,6 @@ import com.mysql.cj.core.io.BigDecimalValueFactory; import com.mysql.cj.core.io.BooleanValueFactory; import com.mysql.cj.core.io.ByteValueFactory; -import com.mysql.cj.core.io.DbDocValueFactory; import com.mysql.cj.core.io.DoubleValueFactory; import com.mysql.cj.core.io.IntegerValueFactory; import com.mysql.cj.core.io.LongValueFactory; @@ -44,9 +43,10 @@ import com.mysql.cj.jdbc.io.JdbcDateValueFactory; import com.mysql.cj.jdbc.io.JdbcTimeValueFactory; import com.mysql.cj.jdbc.io.JdbcTimestampValueFactory; -import com.mysql.cj.x.json.DbDoc; -public class RowImpl implements com.mysql.cj.api.x.Row { +// TODO rid off JdbcDateValueFactory, JdbcTimeValueFactory, JdbcTimestampValueFactory + +public class RowImpl implements com.mysql.cj.api.xdevapi.Row { private Row row; private Supplier> lazyFieldNameToIndex; /** @@ -103,7 +103,7 @@ public Date getDate(String fieldName) { } public Date getDate(int pos) { - return this.row.getValue(pos, new JdbcDateValueFactory(defaultTimeZone)); + return this.row.getValue(pos, new JdbcDateValueFactory(this.defaultTimeZone)); } public DbDoc getDbDoc(String fieldName) { diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/RowResultImpl.java b/src/main/java/com/mysql/cj/xdevapi/RowResultImpl.java similarity index 89% rename from src/main/java/com/mysql/cj/mysqlx/devapi/RowResultImpl.java rename to src/main/java/com/mysql/cj/xdevapi/RowResultImpl.java index 859f7eea4..d185dc198 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/RowResultImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/RowResultImpl.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.ArrayList; import java.util.List; @@ -30,11 +30,12 @@ import java.util.stream.Collectors; import com.mysql.cj.api.result.RowList; -import com.mysql.cj.api.x.Column; -import com.mysql.cj.api.x.Row; -import com.mysql.cj.api.x.RowResult; -import com.mysql.cj.core.io.StatementExecuteOk; +import com.mysql.cj.api.xdevapi.Column; +import com.mysql.cj.api.xdevapi.Row; +import com.mysql.cj.api.xdevapi.RowResult; import com.mysql.cj.core.result.Field; +import com.mysql.cj.x.core.StatementExecuteOk; +import com.mysql.cj.x.protocol.DevapiRowFactory; public class RowResultImpl extends AbstractDataResult implements RowResult { private ArrayList metadata; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/SchemaImpl.java b/src/main/java/com/mysql/cj/xdevapi/SchemaImpl.java similarity index 93% rename from src/main/java/com/mysql/cj/mysqlx/devapi/SchemaImpl.java rename to src/main/java/com/mysql/cj/xdevapi/SchemaImpl.java index e151f557c..bf1b5d673 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/SchemaImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/SchemaImpl.java @@ -21,20 +21,20 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.List; import java.util.stream.Collectors; -import com.mysql.cj.api.x.BaseSession; -import com.mysql.cj.api.x.Collection; -import com.mysql.cj.api.x.CreateTableStatement.CreateTableSplitStatement; -import com.mysql.cj.api.x.Schema; -import com.mysql.cj.api.x.Table; +import com.mysql.cj.api.xdevapi.BaseSession; +import com.mysql.cj.api.xdevapi.Collection; +import com.mysql.cj.api.xdevapi.Schema; +import com.mysql.cj.api.xdevapi.Table; +import com.mysql.cj.api.xdevapi.CreateTableStatement.CreateTableSplitStatement; import com.mysql.cj.core.exceptions.MysqlErrorNumbers; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.mysqlx.ExprUnparser; -import com.mysql.cj.mysqlx.MysqlxError; +import com.mysql.cj.x.core.DatabaseObjectDescription; +import com.mysql.cj.x.core.XDevAPIError; public class SchemaImpl implements Schema { private BaseSession session; @@ -126,7 +126,7 @@ public Collection createCollection(String collectionName) { public Collection createCollection(String collectionName, boolean reuseExistingObject) { try { return createCollection(collectionName); - } catch (MysqlxError ex) { + } catch (XDevAPIError ex) { if (ex.getErrorCode() == MysqlErrorNumbers.ER_TABLE_EXISTS_ERROR) { return getCollection(collectionName); } diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/SelectStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/SelectStatementImpl.java similarity index 92% rename from src/main/java/com/mysql/cj/mysqlx/devapi/SelectStatementImpl.java rename to src/main/java/com/mysql/cj/xdevapi/SelectStatementImpl.java index 8f053f25c..b71662ede 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/SelectStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/SelectStatementImpl.java @@ -21,15 +21,13 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.concurrent.CompletableFuture; -import com.mysql.cj.api.x.Row; -import com.mysql.cj.api.x.RowResult; -import com.mysql.cj.api.x.SelectStatement; -import com.mysql.cj.mysqlx.FindParams; -import com.mysql.cj.mysqlx.TableFindParams; +import com.mysql.cj.api.xdevapi.Row; +import com.mysql.cj.api.xdevapi.RowResult; +import com.mysql.cj.api.xdevapi.SelectStatement; public class SelectStatementImpl extends FilterableStatement implements SelectStatement { private TableImpl table; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/SqlDataResult.java b/src/main/java/com/mysql/cj/xdevapi/SqlDataResult.java similarity index 94% rename from src/main/java/com/mysql/cj/mysqlx/devapi/SqlDataResult.java rename to src/main/java/com/mysql/cj/xdevapi/SqlDataResult.java index 56c75f47a..43fdeca18 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/SqlDataResult.java +++ b/src/main/java/com/mysql/cj/xdevapi/SqlDataResult.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.ArrayList; import java.util.List; @@ -29,10 +29,10 @@ import java.util.function.Supplier; import com.mysql.cj.api.result.RowList; -import com.mysql.cj.api.x.SqlResult; +import com.mysql.cj.api.xdevapi.SqlResult; import com.mysql.cj.core.exceptions.FeatureNotAvailableException; -import com.mysql.cj.core.io.StatementExecuteOk; import com.mysql.cj.core.result.Field; +import com.mysql.cj.x.core.StatementExecuteOk; /** * SQL result with data. Implemented as a thin layer over {@link RowResultImpl}. diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/SqlResultImpl.java b/src/main/java/com/mysql/cj/xdevapi/SqlResultImpl.java similarity index 93% rename from src/main/java/com/mysql/cj/mysqlx/devapi/SqlResultImpl.java rename to src/main/java/com/mysql/cj/xdevapi/SqlResultImpl.java index 2f7c6b508..6bdf940b1 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/SqlResultImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/SqlResultImpl.java @@ -21,18 +21,18 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.Iterator; import java.util.List; import java.util.function.Supplier; -import com.mysql.cj.api.x.Column; -import com.mysql.cj.api.x.Row; -import com.mysql.cj.api.x.SqlResult; -import com.mysql.cj.api.x.Warning; +import com.mysql.cj.api.x.protocol.ResultStreamer; +import com.mysql.cj.api.xdevapi.Column; +import com.mysql.cj.api.xdevapi.Row; +import com.mysql.cj.api.xdevapi.SqlResult; +import com.mysql.cj.api.xdevapi.Warning; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.mysqlx.io.ResultStreamer; /** * SQL result. diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/SqlStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/SqlStatementImpl.java similarity index 92% rename from src/main/java/com/mysql/cj/mysqlx/devapi/SqlStatementImpl.java rename to src/main/java/com/mysql/cj/xdevapi/SqlStatementImpl.java index 600470506..38ef263c0 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/SqlStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/SqlStatementImpl.java @@ -21,18 +21,17 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; -import com.mysql.cj.api.x.SqlResult; -import com.mysql.cj.api.x.SqlStatement; +import com.mysql.cj.api.xdevapi.SqlResult; +import com.mysql.cj.api.xdevapi.SqlStatement; import com.mysql.cj.core.exceptions.FeatureNotAvailableException; -import com.mysql.cj.mysqlx.ExprUtil; -import com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Any; +import com.mysql.cj.x.protobuf.MysqlxDatatypes.Any; public class SqlStatementImpl implements SqlStatement { private NodeSessionImpl session; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/SqlUpdateResult.java b/src/main/java/com/mysql/cj/xdevapi/SqlUpdateResult.java similarity index 92% rename from src/main/java/com/mysql/cj/mysqlx/devapi/SqlUpdateResult.java rename to src/main/java/com/mysql/cj/xdevapi/SqlUpdateResult.java index ab750675b..f5ead8277 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/SqlUpdateResult.java +++ b/src/main/java/com/mysql/cj/xdevapi/SqlUpdateResult.java @@ -21,15 +21,15 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.List; -import com.mysql.cj.api.x.Column; -import com.mysql.cj.api.x.Row; -import com.mysql.cj.api.x.SqlResult; +import com.mysql.cj.api.xdevapi.Column; +import com.mysql.cj.api.xdevapi.Row; +import com.mysql.cj.api.xdevapi.SqlResult; import com.mysql.cj.core.exceptions.FeatureNotAvailableException; -import com.mysql.cj.core.io.StatementExecuteOk; +import com.mysql.cj.x.core.StatementExecuteOk; /** * SQL result for DML statements. diff --git a/src/main/java/com/mysql/cj/mysqlx/TableFindParams.java b/src/main/java/com/mysql/cj/xdevapi/TableFindParams.java similarity index 98% rename from src/main/java/com/mysql/cj/mysqlx/TableFindParams.java rename to src/main/java/com/mysql/cj/xdevapi/TableFindParams.java index 8ab7513a7..ae7e0dd6a 100644 --- a/src/main/java/com/mysql/cj/mysqlx/TableFindParams.java +++ b/src/main/java/com/mysql/cj/xdevapi/TableFindParams.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/TableImpl.java b/src/main/java/com/mysql/cj/xdevapi/TableImpl.java similarity index 91% rename from src/main/java/com/mysql/cj/mysqlx/devapi/TableImpl.java rename to src/main/java/com/mysql/cj/xdevapi/TableImpl.java index 25cc6e5e8..de5be4bc1 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/TableImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/TableImpl.java @@ -21,19 +21,19 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.List; import java.util.Map; -import com.mysql.cj.api.x.BaseSession; -import com.mysql.cj.api.x.DeleteStatement; -import com.mysql.cj.api.x.InsertStatement; -import com.mysql.cj.api.x.Schema; -import com.mysql.cj.api.x.SelectStatement; -import com.mysql.cj.api.x.Table; -import com.mysql.cj.api.x.UpdateStatement; -import com.mysql.cj.mysqlx.ExprUnparser; +import com.mysql.cj.api.xdevapi.BaseSession; +import com.mysql.cj.api.xdevapi.DeleteStatement; +import com.mysql.cj.api.xdevapi.InsertStatement; +import com.mysql.cj.api.xdevapi.Schema; +import com.mysql.cj.api.xdevapi.SelectStatement; +import com.mysql.cj.api.xdevapi.Table; +import com.mysql.cj.api.xdevapi.UpdateStatement; +import com.mysql.cj.x.core.DatabaseObjectDescription; public class TableImpl implements Table { diff --git a/src/main/java/com/mysql/cj/mysqlx/UpdateParams.java b/src/main/java/com/mysql/cj/xdevapi/UpdateParams.java similarity index 88% rename from src/main/java/com/mysql/cj/mysqlx/UpdateParams.java rename to src/main/java/com/mysql/cj/xdevapi/UpdateParams.java index d6caa89b4..824e5da15 100644 --- a/src/main/java/com/mysql/cj/mysqlx/UpdateParams.java +++ b/src/main/java/com/mysql/cj/xdevapi/UpdateParams.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,13 +21,13 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; import java.util.HashMap; import java.util.Map; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr; +import com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier; +import com.mysql.cj.x.protobuf.MysqlxExpr.Expr; /** * Update parameters for a relational update command. diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/UpdateResult.java b/src/main/java/com/mysql/cj/xdevapi/UpdateResult.java similarity index 86% rename from src/main/java/com/mysql/cj/mysqlx/devapi/UpdateResult.java rename to src/main/java/com/mysql/cj/xdevapi/UpdateResult.java index 227b3aae1..050d14f89 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/UpdateResult.java +++ b/src/main/java/com/mysql/cj/xdevapi/UpdateResult.java @@ -21,14 +21,15 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.Iterator; import java.util.List; +import java.util.stream.Collectors; -import com.mysql.cj.api.x.Result; -import com.mysql.cj.api.x.Warning; -import com.mysql.cj.core.io.StatementExecuteOk; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.api.xdevapi.Warning; +import com.mysql.cj.x.core.StatementExecuteOk; /** * A result from a statement that doesn't return a set of rows. @@ -67,6 +68,6 @@ public int getWarningsCount() { } public Iterator getWarnings() { - return this.ok.getWarnings().iterator(); + return this.ok.getWarnings().stream().map(w -> (Warning) new WarningImpl(w)).collect(Collectors.toList()).iterator(); } } diff --git a/src/main/java/com/mysql/cj/mysqlx/UpdateSpec.java b/src/main/java/com/mysql/cj/xdevapi/UpdateSpec.java similarity index 82% rename from src/main/java/com/mysql/cj/mysqlx/UpdateSpec.java rename to src/main/java/com/mysql/cj/xdevapi/UpdateSpec.java index c3b942e24..ade8f8cbf 100644 --- a/src/main/java/com/mysql/cj/mysqlx/UpdateSpec.java +++ b/src/main/java/com/mysql/cj/xdevapi/UpdateSpec.java @@ -21,17 +21,14 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.UpdateOperation; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr; +import com.mysql.cj.api.xdevapi.UpdateType; +import com.mysql.cj.x.protobuf.MysqlxCrud.UpdateOperation; +import com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier; +import com.mysql.cj.x.protobuf.MysqlxExpr.Expr; public class UpdateSpec { - public static enum UpdateType { - // these must mirror exactly the names of UpdateOperation.UpdateType in mysqlx_crud.proto - ITEM_REMOVE, ITEM_SET, ITEM_REPLACE, ITEM_MERGE, ARRAY_INSERT, ARRAY_APPEND - } private UpdateOperation.UpdateType updateType; private ColumnIdentifier source; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/UpdateStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/UpdateStatementImpl.java similarity index 91% rename from src/main/java/com/mysql/cj/mysqlx/devapi/UpdateStatementImpl.java rename to src/main/java/com/mysql/cj/xdevapi/UpdateStatementImpl.java index 2c84c3032..4206a84b3 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/UpdateStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/UpdateStatementImpl.java @@ -21,15 +21,14 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.Map; import java.util.concurrent.CompletableFuture; -import com.mysql.cj.api.x.Result; -import com.mysql.cj.api.x.UpdateStatement; -import com.mysql.cj.core.io.StatementExecuteOk; -import com.mysql.cj.mysqlx.UpdateParams; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.api.xdevapi.UpdateStatement; +import com.mysql.cj.x.core.StatementExecuteOk; public class UpdateStatementImpl extends FilterableStatement implements UpdateStatement { private TableImpl table; diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/VirtualNodeSession.java b/src/main/java/com/mysql/cj/xdevapi/VirtualNodeSession.java similarity index 95% rename from src/main/java/com/mysql/cj/mysqlx/devapi/VirtualNodeSession.java rename to src/main/java/com/mysql/cj/xdevapi/VirtualNodeSession.java index c1708c739..ade0dba40 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/VirtualNodeSession.java +++ b/src/main/java/com/mysql/cj/xdevapi/VirtualNodeSession.java @@ -21,9 +21,9 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; -import com.mysql.cj.api.x.XSession; +import com.mysql.cj.api.xdevapi.XSession; public class VirtualNodeSession extends NodeSessionImpl { diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/WarningImpl.java b/src/main/java/com/mysql/cj/xdevapi/WarningImpl.java similarity index 80% rename from src/main/java/com/mysql/cj/mysqlx/devapi/WarningImpl.java rename to src/main/java/com/mysql/cj/xdevapi/WarningImpl.java index 4158f3abd..dc6cc8963 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/WarningImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/WarningImpl.java @@ -21,11 +21,11 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; -import com.mysql.cj.mysqlx.protobuf.MysqlxNotice.Warning; +import com.mysql.cj.api.x.core.Warning; -public class WarningImpl implements com.mysql.cj.api.x.Warning { +public class WarningImpl implements com.mysql.cj.api.xdevapi.Warning { private Warning message; public WarningImpl(Warning message) { @@ -33,14 +33,14 @@ public WarningImpl(Warning message) { } public int getLevel() { - return this.message.getLevel().getNumber(); + return this.message.getLevel(); } public long getCode() { - return Integer.toUnsignedLong(this.message.getCode()); + return this.message.getCode(); } public String getMessage() { - return this.message.getMsg(); + return this.message.getMessage(); } } diff --git a/src/main/java/com/mysql/cj/x/MysqlxSessionFactory.java b/src/main/java/com/mysql/cj/xdevapi/XSessionFactory.java similarity index 68% rename from src/main/java/com/mysql/cj/x/MysqlxSessionFactory.java rename to src/main/java/com/mysql/cj/xdevapi/XSessionFactory.java index 43c7e9b9f..999c90313 100644 --- a/src/main/java/com/mysql/cj/x/MysqlxSessionFactory.java +++ b/src/main/java/com/mysql/cj/xdevapi/XSessionFactory.java @@ -21,41 +21,52 @@ */ -package com.mysql.cj.x; +package com.mysql.cj.xdevapi; import java.util.Properties; -import com.mysql.cj.api.x.NodeSession; -import com.mysql.cj.api.x.XSession; -import com.mysql.cj.api.x.XSessionFactory; +import com.mysql.cj.api.xdevapi.NodeSession; +import com.mysql.cj.api.xdevapi.XSession; import com.mysql.cj.core.conf.url.ConnectionUrl; import com.mysql.cj.core.conf.url.HostInfo; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.exceptions.ExceptionFactory; import com.mysql.cj.core.exceptions.InvalidConnectionAttributeException; -import com.mysql.cj.mysqlx.devapi.NodeSessionImpl; -import com.mysql.cj.mysqlx.devapi.SessionImpl; /** - * Entry point for creating sessions to the X Plugin server. + * XSessionFactory is used for creation of sessions. + * + * 

+ * XSessionFactory xFactory = new XSessionFactory();
+ * 
+ * {@link XSession} crudSession = xFactory.getSession("mysqlx://host[:port]/db?user=user1&password=pwd1");
+ * 
+ * {@link NodeSession} nodeSession = xFactory.getNodeSession("mysqlx://host[:port]/db?user=user1&password=pwd1");
+ *
+ * */ -public class MysqlxSessionFactory implements XSessionFactory { +public class XSessionFactory { private ConnectionUrl parseUrl(String url) { ConnectionUrl connUrl = ConnectionUrl.getConnectionUrlInstance(url, null); - if (connUrl.getType() != ConnectionUrl.Type.MYSQLX_SESSION) { + if (connUrl.getType() != ConnectionUrl.Type.XDEVAPI_SESSION) { throw ExceptionFactory.createException(InvalidConnectionAttributeException.class, "Initialization via URL failed for \"" + url + "\""); } return connUrl; } - @Override + /** + * Creates {@link XSession} by given URL. + * + * @param url + * @return {@link XSession} + */ public XSession getSession(String url) { CJCommunicationsException latestException = null; ConnectionUrl connUrl = parseUrl(url); for (HostInfo hi : connUrl.getHostsList()) { try { - return new SessionImpl(hi.exposeAsProperties()); + return new XSessionImpl(hi.exposeAsProperties()); } catch (CJCommunicationsException e) { latestException = e; } @@ -66,12 +77,22 @@ public XSession getSession(String url) { return null; } - @Override + /** + * Creates {@link XSession} according to given properties. + * + * @param properties + * @return {@link XSession} + */ public XSession getSession(Properties properties) { - return new SessionImpl(properties); + return new XSessionImpl(properties); } - @Override + /** + * Creates {@link NodeSession} by given URL. + * + * @param url + * @return {@link NodeSession} + */ public NodeSession getNodeSession(String url) { ConnectionUrl connUrl = parseUrl(url); if (connUrl.getHostsList().size() > 1) { @@ -80,7 +101,12 @@ public NodeSession getNodeSession(String url) { return new NodeSessionImpl(connUrl.getMainHost().exposeAsProperties()); } - @Override + /** + * Creates {@link NodeSession} according to given properties. + * + * @param properties + * @return {@link NodeSession} + */ public NodeSession getNodeSession(Properties properties) { return new NodeSessionImpl(properties); } diff --git a/src/main/java/com/mysql/cj/mysqlx/devapi/SessionImpl.java b/src/main/java/com/mysql/cj/xdevapi/XSessionImpl.java similarity index 87% rename from src/main/java/com/mysql/cj/mysqlx/devapi/SessionImpl.java rename to src/main/java/com/mysql/cj/xdevapi/XSessionImpl.java index 7ff23305c..bb529f913 100644 --- a/src/main/java/com/mysql/cj/mysqlx/devapi/SessionImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/XSessionImpl.java @@ -21,17 +21,17 @@ */ -package com.mysql.cj.mysqlx.devapi; +package com.mysql.cj.xdevapi; import java.util.Properties; -import com.mysql.cj.api.x.NodeSession; -import com.mysql.cj.api.x.XSession; +import com.mysql.cj.api.xdevapi.NodeSession; +import com.mysql.cj.api.xdevapi.XSession; import com.mysql.cj.core.exceptions.ConnectionIsClosedException; -public class SessionImpl extends AbstractSession implements XSession { +public class XSessionImpl extends AbstractSession implements XSession { - public SessionImpl(Properties properties) { + public XSessionImpl(Properties properties) { super(properties); } diff --git a/src/main/java/com/mysql/cj/x/package-info.java b/src/main/java/com/mysql/cj/xdevapi/package-info.java similarity index 97% rename from src/main/java/com/mysql/cj/x/package-info.java rename to src/main/java/com/mysql/cj/xdevapi/package-info.java index 9e511347d..34eb9b957 100644 --- a/src/main/java/com/mysql/cj/x/package-info.java +++ b/src/main/java/com/mysql/cj/xdevapi/package-info.java @@ -27,4 +27,4 @@ * @since 6.0 */ -package com.mysql.cj.x; +package com.mysql.cj.xdevapi; diff --git a/src/main/resources/com/mysql/cj/core/LocalizedErrorMessages.properties b/src/main/resources/com/mysql/cj/core/LocalizedErrorMessages.properties index 1517573b9..80334e629 100644 --- a/src/main/resources/com/mysql/cj/core/LocalizedErrorMessages.properties +++ b/src/main/resources/com/mysql/cj/core/LocalizedErrorMessages.properties @@ -702,7 +702,7 @@ ConnectionProperties.categoryDebuggingProfiling=Debugging/Profiling ConnectionProperties.categoryExceptions=Exceptions/Warnings ConnectionProperties.categoryIntegration=Tunes for integration with other products ConnectionProperties.categoryJDBC=JDBC compliance -ConnectionProperties.categoryMysqlx=X Protocol and X DevAPI +ConnectionProperties.categoryXDevAPI=X Protocol and X DevAPI # # ConnectionProperty Descriptions diff --git a/src/test/java/com/mysql/cj/core/ConnectionUrlTest.java b/src/test/java/com/mysql/cj/core/ConnectionUrlTest.java index 0dcbb81b9..b246bcd8e 100644 --- a/src/test/java/com/mysql/cj/core/ConnectionUrlTest.java +++ b/src/test/java/com/mysql/cj/core/ConnectionUrlTest.java @@ -419,7 +419,7 @@ public void testTypeEnumCorrectValues() { assertEquals(ConnectionUrl.Type.LOADBALANCE_CONNECTION, ConnectionUrl.Type.fromValue("jdbc:mysql:loadbalance:", 2)); assertEquals(ConnectionUrl.Type.REPLICATION_CONNECTION, ConnectionUrl.Type.fromValue("jdbc:mysql:replication:", 1)); assertEquals(ConnectionUrl.Type.REPLICATION_CONNECTION, ConnectionUrl.Type.fromValue("jdbc:mysql:replication:", 2)); - assertEquals(ConnectionUrl.Type.MYSQLX_SESSION, ConnectionUrl.Type.fromValue("mysqlx:", 1)); + assertEquals(ConnectionUrl.Type.XDEVAPI_SESSION, ConnectionUrl.Type.fromValue("mysqlx:", 1)); } /** @@ -561,7 +561,7 @@ public void testConnectionUrl() { ConnectionUrl.getConnectionUrlInstance(cs, props); } catch (WrongArgumentException e) { // X plugin connections ("mysqlx:") don't allow different credentials in different hosts and the generator doesn't account for that. - assertEquals(cs, ConnectionUrl.Type.MYSQLX_SESSION.getProtocol(), csg.getProtocol()); + assertEquals(cs, ConnectionUrl.Type.XDEVAPI_SESSION.getProtocol(), csg.getProtocol()); boolean first = true; boolean ok = false; String lastUi = ""; @@ -1010,7 +1010,7 @@ public void testMysqlxConnectionUrl() { fail(cs + ": expected to throw a " + WrongArgumentException.class.getName()); } catch (Exception e) { assertTrue(cs + ": expected to throw a " + WrongArgumentException.class.getName(), WrongArgumentException.class.isAssignableFrom(e.getClass())); - assertEquals(cs, Messages.getString("ConnectionString.14", new Object[] { ConnectionUrl.Type.MYSQLX_SESSION.getProtocol() }), e.getMessage()); + assertEquals(cs, Messages.getString("ConnectionString.14", new Object[] { ConnectionUrl.Type.XDEVAPI_SESSION.getProtocol() }), e.getMessage()); } } @@ -1029,7 +1029,7 @@ public void testMysqlxConnectionUrl() { fail(cs + ": expected to throw a " + WrongArgumentException.class.getName()); } catch (Exception e) { assertTrue(cs + ": expected to throw a " + WrongArgumentException.class.getName(), WrongArgumentException.class.isAssignableFrom(e.getClass())); - assertEquals(cs, Messages.getString("ConnectionString.15", new Object[] { ConnectionUrl.Type.MYSQLX_SESSION.getProtocol() }), e.getMessage()); + assertEquals(cs, Messages.getString("ConnectionString.15", new Object[] { ConnectionUrl.Type.XDEVAPI_SESSION.getProtocol() }), e.getMessage()); } } @@ -1044,7 +1044,7 @@ public void testMysqlxConnectionUrl() { fail(cs + ": expected to throw a " + WrongArgumentException.class.getName()); } catch (Exception e) { assertTrue(cs + ": expected to throw a " + WrongArgumentException.class.getName(), WrongArgumentException.class.isAssignableFrom(e.getClass())); - assertEquals(cs, Messages.getString("ConnectionString.16", new Object[] { ConnectionUrl.Type.MYSQLX_SESSION.getProtocol() }), e.getMessage()); + assertEquals(cs, Messages.getString("ConnectionString.16", new Object[] { ConnectionUrl.Type.XDEVAPI_SESSION.getProtocol() }), e.getMessage()); } } diff --git a/src/test/java/com/mysql/cj/mysqlx/io/AsyncMessageReaderTest.java b/src/test/java/com/mysql/cj/x/protocol/AsyncMessageReaderTest.java similarity index 78% rename from src/test/java/com/mysql/cj/mysqlx/io/AsyncMessageReaderTest.java rename to src/test/java/com/mysql/cj/x/protocol/AsyncMessageReaderTest.java index e0e45a60e..735bc3eb5 100644 --- a/src/test/java/com/mysql/cj/mysqlx/io/AsyncMessageReaderTest.java +++ b/src/test/java/com/mysql/cj/x/protocol/AsyncMessageReaderTest.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import static org.junit.Assert.assertEquals; @@ -30,11 +30,13 @@ import java.nio.channels.CompletionHandler; import java.util.concurrent.Future; -import com.google.protobuf.GeneratedMessage; import org.junit.Test; +import com.google.protobuf.GeneratedMessage; +import com.mysql.cj.api.x.protocol.MessageListener; import com.mysql.cj.core.exceptions.CJCommunicationsException; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok; +import com.mysql.cj.x.protobuf.Mysqlx.Ok; +import com.mysql.cj.x.protocol.AsyncMessageReader; /** * Tests for {@link AsyncMessageReader}. @@ -66,18 +68,18 @@ public Future write(ByteBuffer src) { throw new UnsupportedOperationException(); } - public void read(ByteBuffer dst, A attachment, CompletionHandler handler) { + public void read(ByteBuffer dst, A attachment, CompletionHandler handler) { this.readHandler = handler; this.readBuf = dst; } - public void write(ByteBuffer src, A attachment, CompletionHandler handler) { + public void write(ByteBuffer src, A attachment, CompletionHandler handler) { this.writeHandler = handler; } public void completeRead(int bytes, byte[] data) { if (data != null) { - readBuf.put(data); + this.readBuf.put(data); } this.readHandler.completed(bytes, null); } @@ -101,25 +103,25 @@ public void testBug22972057() { // close the socket after the read is pending new Thread(() -> { - try { - Thread.sleep(100); - } catch (InterruptedException ex) { - ex.printStackTrace(); - } - // this is what we get from the socket when it's closed/RST - channel.completeRead(-1, null); + try { + Thread.sleep(100); + } catch (InterruptedException ex) { + ex.printStackTrace(); + } + // this is what we get from the socket when it's closed/RST + channel.completeRead(-1, null); }).start(); // interrupt this test thread if it does happen to hang Thread testThread = Thread.currentThread(); Thread interruptThread = new Thread(() -> { - try { - Thread.sleep(1000); - } catch (InterruptedException ex) { - return; - } - testThread.interrupt(); - }); + try { + Thread.sleep(1000); + } catch (InterruptedException ex) { + return; + } + testThread.interrupt(); + }); interruptThread.start(); try { @@ -146,25 +148,25 @@ public void testBug22972057_getNextMessageClass() { // close the socket after the read is pending new Thread(() -> { - try { - Thread.sleep(100); - } catch (InterruptedException ex) { - ex.printStackTrace(); - } - // this is what we get from the socket when it's closed/RST - channel.completeRead(-1, null); + try { + Thread.sleep(100); + } catch (InterruptedException ex) { + ex.printStackTrace(); + } + // this is what we get from the socket when it's closed/RST + channel.completeRead(-1, null); }).start(); // interrupt this test thread if it does happen to hang Thread testThread = Thread.currentThread(); Thread interruptThread = new Thread(() -> { - try { - Thread.sleep(1000); - } catch (InterruptedException ex) { - return; - } - testThread.interrupt(); - }); + try { + Thread.sleep(1000); + } catch (InterruptedException ex) { + return; + } + testThread.interrupt(); + }); interruptThread.start(); try { @@ -203,11 +205,11 @@ public void errorAfterClosed() { } try { - reader.pushMessageListener(new AsyncMessageReader.MessageListener() { - public Boolean apply(Class msgClass, GeneratedMessage msg) { - return true; - } - }); + reader.pushMessageListener(new MessageListener() { + public Boolean apply(Class msgClass, GeneratedMessage msg) { + return true; + } + }); } catch (CJCommunicationsException ex) { // expected } diff --git a/src/test/java/com/mysql/cj/mysqlx/io/SyncMessageReaderTest.java b/src/test/java/com/mysql/cj/x/protocol/SyncMessageReaderTest.java similarity index 93% rename from src/test/java/com/mysql/cj/mysqlx/io/SyncMessageReaderTest.java rename to src/test/java/com/mysql/cj/x/protocol/SyncMessageReaderTest.java index 3ea7894f6..9d2c4f418 100644 --- a/src/test/java/com/mysql/cj/mysqlx/io/SyncMessageReaderTest.java +++ b/src/test/java/com/mysql/cj/x/protocol/SyncMessageReaderTest.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -41,12 +41,14 @@ import com.google.protobuf.GeneratedMessage; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.Parser; +import com.mysql.cj.api.x.protocol.MessageConstants; import com.mysql.cj.core.exceptions.WrongArgumentException; import com.mysql.cj.core.io.FullReadInputStream; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Error; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.ServerMessages; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.x.protobuf.Mysqlx.Error; +import com.mysql.cj.x.protobuf.Mysqlx.Ok; +import com.mysql.cj.x.protobuf.Mysqlx.ServerMessages; +import com.mysql.cj.x.protocol.SyncMessageReader; /** * Tests for {@link SyncMessageReader}. @@ -105,7 +107,7 @@ public void testUnexpectedError() { // attempt to read an Ok packet this.reader.read(Ok.class); fail("Should not be able to read the OK packet"); - } catch (MysqlxError ex) { + } catch (XDevAPIError ex) { // check that the exception contains the error info from the server assertEquals("ERROR 5432 (12S34) oops", ex.getMessage()); assertEquals("12S34", ex.getSQLState()); @@ -135,7 +137,7 @@ public void testSeveralMessages() throws IOException { for (int i = 0; i < 3; ++i) { try { this.reader.read(Ok.class); - } catch (MysqlxError err) { + } catch (XDevAPIError err) { assertEquals(5432, err.getErrorCode()); } } @@ -143,13 +145,13 @@ public void testSeveralMessages() throws IOException { this.reader.read(Ok.class); try { this.reader.read(Error.class); - } catch (MysqlxError err) { + } catch (XDevAPIError err) { // expected } this.reader.read(Ok.class); try { this.reader.read(Error.class); - } catch (MysqlxError err) { + } catch (XDevAPIError err) { // expected } } diff --git a/src/test/java/com/mysql/cj/mysqlx/io/SyncMessageWriterTest.java b/src/test/java/com/mysql/cj/x/protocol/SyncMessageWriterTest.java similarity index 92% rename from src/test/java/com/mysql/cj/mysqlx/io/SyncMessageWriterTest.java rename to src/test/java/com/mysql/cj/x/protocol/SyncMessageWriterTest.java index 2254c5ca5..8b45f45a3 100644 --- a/src/test/java/com/mysql/cj/mysqlx/io/SyncMessageWriterTest.java +++ b/src/test/java/com/mysql/cj/x/protocol/SyncMessageWriterTest.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx.io; +package com.mysql.cj.x.protocol; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -36,10 +36,11 @@ import com.google.protobuf.ByteString; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.ClientMessages; -import com.mysql.cj.mysqlx.protobuf.Mysqlx.Ok; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.AuthenticateStart; -import com.mysql.cj.mysqlx.protobuf.MysqlxSession.Reset; +import com.mysql.cj.x.protobuf.Mysqlx.ClientMessages; +import com.mysql.cj.x.protobuf.Mysqlx.Ok; +import com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart; +import com.mysql.cj.x.protobuf.MysqlxSession.Reset; +import com.mysql.cj.x.protocol.SyncMessageWriter; public class SyncMessageWriterTest { private ByteArrayOutputStream outputStream; diff --git a/src/test/java/com/mysql/cj/mysqlx/ExprParserTest.java b/src/test/java/com/mysql/cj/xdevapi/ExprParserTest.java similarity index 97% rename from src/test/java/com/mysql/cj/mysqlx/ExprParserTest.java rename to src/test/java/com/mysql/cj/xdevapi/ExprParserTest.java index 3bb802fc9..5a35f27c7 100644 --- a/src/test/java/com/mysql/cj/mysqlx/ExprParserTest.java +++ b/src/test/java/com/mysql/cj/xdevapi/ExprParserTest.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.mysqlx; +package com.mysql.cj.xdevapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -35,15 +35,17 @@ import org.junit.Test; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Column; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Order; -import com.mysql.cj.mysqlx.protobuf.MysqlxCrud.Projection; -import com.mysql.cj.mysqlx.protobuf.MysqlxDatatypes.Scalar; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.ColumnIdentifier; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.DocumentPathItem; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Expr; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object; -import com.mysql.cj.mysqlx.protobuf.MysqlxExpr.Object.ObjectField; +import com.mysql.cj.x.protobuf.MysqlxCrud.Column; +import com.mysql.cj.x.protobuf.MysqlxCrud.Order; +import com.mysql.cj.x.protobuf.MysqlxCrud.Projection; +import com.mysql.cj.x.protobuf.MysqlxDatatypes.Scalar; +import com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier; +import com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem; +import com.mysql.cj.x.protobuf.MysqlxExpr.Expr; +import com.mysql.cj.x.protobuf.MysqlxExpr.Object; +import com.mysql.cj.x.protobuf.MysqlxExpr.Object.ObjectField; +import com.mysql.cj.xdevapi.ExprParser; +import com.mysql.cj.xdevapi.ExprUnparser; /** * Expression parser tests. diff --git a/src/test/java/com/mysql/cj/x/json/JsonDocTest.java b/src/test/java/com/mysql/cj/xdevapi/JsonDocTest.java similarity index 99% rename from src/test/java/com/mysql/cj/x/json/JsonDocTest.java rename to src/test/java/com/mysql/cj/xdevapi/JsonDocTest.java index 485998fa9..f8f6a75fd 100644 --- a/src/test/java/com/mysql/cj/x/json/JsonDocTest.java +++ b/src/test/java/com/mysql/cj/xdevapi/JsonDocTest.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.json; +package com.mysql.cj.xdevapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -33,6 +33,12 @@ import org.junit.Test; import com.mysql.cj.core.exceptions.WrongArgumentException; +import com.mysql.cj.xdevapi.DbDoc; +import com.mysql.cj.xdevapi.JsonArray; +import com.mysql.cj.xdevapi.JsonLiteral; +import com.mysql.cj.xdevapi.JsonNumber; +import com.mysql.cj.xdevapi.JsonParser; +import com.mysql.cj.xdevapi.JsonString; /** * DbDoc tests. diff --git a/src/test/java/testsuite/mysqlx/AsyncTests.java b/src/test/java/testsuite/x/AsyncTests.java similarity index 91% rename from src/test/java/testsuite/mysqlx/AsyncTests.java rename to src/test/java/testsuite/x/AsyncTests.java index 2183625bb..f551b61ce 100644 --- a/src/test/java/testsuite/mysqlx/AsyncTests.java +++ b/src/test/java/testsuite/x/AsyncTests.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. The MySQL Connector/J is licensed under the terms of the GPLv2 , like most MySQL Connectors. @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx; +package testsuite.x; /** * Marker for async tests. diff --git a/src/test/java/testsuite/x/BaseMysqlxTestCase.java b/src/test/java/testsuite/x/BaseXDevAPITestCase.java similarity index 82% rename from src/test/java/testsuite/x/BaseMysqlxTestCase.java rename to src/test/java/testsuite/x/BaseXDevAPITestCase.java index 973810811..e0ef24426 100644 --- a/src/test/java/testsuite/x/BaseMysqlxTestCase.java +++ b/src/test/java/testsuite/x/BaseXDevAPITestCase.java @@ -25,18 +25,17 @@ import java.util.Properties; -import com.mysql.cj.api.x.NodeSession; -import com.mysql.cj.api.x.XSession; -import com.mysql.cj.api.x.XSessionFactory; +import com.mysql.cj.api.xdevapi.NodeSession; +import com.mysql.cj.api.xdevapi.XSession; import com.mysql.cj.core.conf.PropertyDefinitions; -import com.mysql.cj.x.MysqlxSessionFactory; +import com.mysql.cj.xdevapi.XSessionFactory; -public abstract class BaseMysqlxTestCase { +public abstract class BaseXDevAPITestCase { protected String baseUrl = System.getProperty(PropertyDefinitions.SYSP_testsuite_url_mysqlx); - protected boolean isSetForMySQLxTests = this.baseUrl != null && this.baseUrl.length() > 0; - protected XSessionFactory f = new MysqlxSessionFactory(); + protected boolean isSetForXTests = this.baseUrl != null && this.baseUrl.length() > 0; + protected XSessionFactory f = new XSessionFactory(); - public BaseMysqlxTestCase() { + public BaseXDevAPITestCase() { super(); // TODO create instance of XSessionFactory } diff --git a/src/test/java/testsuite/x/TestMysqlxRequirements.java b/src/test/java/testsuite/x/TestXDevAPIRequirements.java similarity index 93% rename from src/test/java/testsuite/x/TestMysqlxRequirements.java rename to src/test/java/testsuite/x/TestXDevAPIRequirements.java index f02e923d3..d4115bf1e 100644 --- a/src/test/java/testsuite/x/TestMysqlxRequirements.java +++ b/src/test/java/testsuite/x/TestXDevAPIRequirements.java @@ -33,19 +33,19 @@ import org.junit.Ignore; import org.junit.Test; -import com.mysql.cj.api.x.Collection; -import com.mysql.cj.api.x.NodeSession; -import com.mysql.cj.api.x.Schema; -import com.mysql.cj.api.x.Table; -import com.mysql.cj.api.x.XSession; +import com.mysql.cj.api.xdevapi.Collection; +import com.mysql.cj.api.xdevapi.NodeSession; +import com.mysql.cj.api.xdevapi.Schema; +import com.mysql.cj.api.xdevapi.Table; +import com.mysql.cj.api.xdevapi.XSession; import com.mysql.cj.core.conf.PropertyDefinitions; import com.mysql.cj.core.conf.url.ConnectionUrl; -import com.mysql.cj.mysqlx.devapi.SessionImpl; +import com.mysql.cj.xdevapi.XSessionImpl; /** - * Tests for MySQLx DevAPI requirements. + * Tests for X DevAPI requirements. */ -public class TestMysqlxRequirements extends BaseMysqlxTestCase { +public class TestXDevAPIRequirements extends BaseXDevAPITestCase { /** * NodeSession [10] @@ -58,7 +58,7 @@ public class TestMysqlxRequirements extends BaseMysqlxTestCase { @Test @Ignore("needs implemented") public void testNodeSessionCreation() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } // TODO fill in the next pattern @@ -84,7 +84,7 @@ public void testNodeSessionCreation() { */ @Test public void testSessionCreation() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } XSession sess; @@ -119,7 +119,7 @@ public void testSessionCreation() throws Exception { @Test @Ignore("needs implemented") public void testNodeSessionMethods() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -152,13 +152,13 @@ public void testNodeSessionMethods() throws Exception { */ @Test public void testSessionMethods() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } XSession sess = getSession(this.baseUrl); assertNotNull(sess); - assertTrue(sess instanceof SessionImpl); + assertTrue(sess instanceof XSessionImpl); Schema sch = sess.getDefaultSchema(); sch.getName(); @@ -190,7 +190,7 @@ public void testSessionMethods() throws Exception { @Test @Ignore("needs implemented") public void testSchemaMethods() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -247,7 +247,7 @@ public void testSchemaMethods() throws Exception { @Test @Ignore("needs implemented") public void testCollectionMethods() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -316,7 +316,7 @@ public void testCollectionMethods() throws Exception { @Test @Ignore("needs implemented") public void testTableMethods() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -368,7 +368,7 @@ public void testTableMethods() throws Exception { @Test @Ignore("needs implemented") public void testViewMethods() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -412,7 +412,7 @@ public void testViewMethods() throws Exception { @Test @Ignore("needs implemented") public void testExecutionContext() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -428,7 +428,7 @@ public void testExecutionContext() throws Exception { @Test @Ignore("needs implemented") public void testResultMethods() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -446,7 +446,7 @@ public void testResultMethods() throws Exception { @Test @Ignore("needs implemented") public void testExecution() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } diff --git a/src/test/java/testsuite/mysqlx/devapi/AsyncQueryTest.java b/src/test/java/testsuite/x/devapi/AsyncQueryTest.java similarity index 89% rename from src/test/java/testsuite/mysqlx/devapi/AsyncQueryTest.java rename to src/test/java/testsuite/x/devapi/AsyncQueryTest.java index 7454f134a..74af809b6 100644 --- a/src/test/java/testsuite/mysqlx/devapi/AsyncQueryTest.java +++ b/src/test/java/testsuite/x/devapi/AsyncQueryTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -39,19 +39,19 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import com.mysql.cj.api.x.Collection; -import com.mysql.cj.api.x.DocResult; -import com.mysql.cj.api.x.Result; -import com.mysql.cj.api.x.Row; -import com.mysql.cj.api.x.SqlResult; -import com.mysql.cj.api.x.Table; +import com.mysql.cj.api.xdevapi.Collection; +import com.mysql.cj.api.xdevapi.DocResult; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.api.xdevapi.Row; +import com.mysql.cj.api.xdevapi.SqlResult; +import com.mysql.cj.api.xdevapi.Table; import com.mysql.cj.core.exceptions.MysqlErrorNumbers; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.x.json.DbDoc; -import com.mysql.cj.x.json.JsonNumber; -import com.mysql.cj.x.json.JsonString; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.xdevapi.DbDoc; +import com.mysql.cj.xdevapi.JsonNumber; +import com.mysql.cj.xdevapi.JsonString; -@Category(testsuite.mysqlx.AsyncTests.class) +@Category(testsuite.x.AsyncTests.class) public class AsyncQueryTest extends CollectionTest { @Before @Override @@ -67,7 +67,7 @@ public void teardownCollectionTest() { @Test public void basicAsyncQuery() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String json = "{'firstName':'Frank', 'middleName':'Lloyd', 'lastName':'Wright'}".replaceAll("'", "\""); @@ -83,7 +83,7 @@ public void basicAsyncQuery() throws Exception { @Test public void overlappedAsyncQueries() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } final int NUMBER_OF_QUERIES = 50; @@ -107,7 +107,7 @@ public void overlappedAsyncQueries() throws Exception { @Test public void basicRowWiseAsync() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists rowwise"); @@ -121,7 +121,7 @@ public void basicRowWiseAsync() throws Exception { @Test public void syntaxErrorRowWise() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } CompletableFuture res = this.collection.find("NON_EXISTING_FUNCTION()").executeAsync(1, (acc, doc) -> 1); @@ -130,14 +130,14 @@ public void syntaxErrorRowWise() throws Exception { fail("Should fail due to non existing function"); } catch (ExecutionException ex) { Throwable cause = ex.getCause(); - assertEquals(MysqlxError.class, cause.getClass()); - assertEquals(MysqlErrorNumbers.ER_SP_DOES_NOT_EXIST, ((MysqlxError) cause).getErrorCode()); + assertEquals(XDevAPIError.class, cause.getClass()); + assertEquals(MysqlErrorNumbers.ER_SP_DOES_NOT_EXIST, ((XDevAPIError) cause).getErrorCode()); } } @Test public void syntaxErrorEntireResult() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } CompletableFuture res = this.collection.find("NON_EXISTING_FUNCTION()").executeAsync(); @@ -146,14 +146,14 @@ public void syntaxErrorEntireResult() throws Exception { fail("Should fail due to non existing function"); } catch (ExecutionException ex) { Throwable cause = ex.getCause(); - assertEquals(MysqlxError.class, cause.getClass()); - assertEquals(MysqlErrorNumbers.ER_SP_DOES_NOT_EXIST, ((MysqlxError) cause).getErrorCode()); + assertEquals(XDevAPIError.class, cause.getClass()); + assertEquals(MysqlErrorNumbers.ER_SP_DOES_NOT_EXIST, ((XDevAPIError) cause).getErrorCode()); } } @Test public void insertDocs() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String json = "{'firstName':'Frank', 'middleName':'Lloyd', 'lastName':'Wright'}".replaceAll("'", "\""); @@ -170,7 +170,7 @@ public void insertDocs() throws Exception { @Test public void manyModifications() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } // we guarantee serial execution @@ -193,7 +193,7 @@ public void manyModifications() throws Exception { @Test public void sqlUpdate() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } CompletableFuture resF = this.session.sql("set @cjTestVar = 1").executeAsync(); @@ -208,7 +208,7 @@ public void sqlUpdate() throws Exception { @Test public void sqlQuery() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } CompletableFuture resF = this.session.sql("select 1,2,3 from dual").executeAsync(); @@ -227,7 +227,7 @@ public void sqlQuery() throws Exception { @Test public void sqlError() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } try { @@ -244,7 +244,7 @@ public void sqlError() throws Exception { */ @Test public void manyFutures() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } int MANY = 1000; @@ -271,7 +271,7 @@ public void manyFutures() throws Exception { docs = futures.get(i).get(); fail("Expected error"); } catch (ExecutionException ex) { - MysqlxError err = (MysqlxError) ex.getCause(); + XDevAPIError err = (XDevAPIError) ex.getCause(); assertEquals(MysqlErrorNumbers.ER_SP_DOES_NOT_EXIST, err.getErrorCode()); } } else { diff --git a/src/test/java/testsuite/mysqlx/devapi/BindTest.java b/src/test/java/testsuite/x/devapi/BindTest.java similarity index 94% rename from src/test/java/testsuite/mysqlx/devapi/BindTest.java rename to src/test/java/testsuite/x/devapi/BindTest.java index 12b658a6e..b525c05e1 100644 --- a/src/test/java/testsuite/mysqlx/devapi/BindTest.java +++ b/src/test/java/testsuite/x/devapi/BindTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -52,7 +52,7 @@ public void teardownCollectionTest() { @Test public void removeWithBind() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"x\":1}").execute(); @@ -69,7 +69,7 @@ public void removeWithBind() { @Test public void removeWithNamedBinds() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"x\":1}").execute(); @@ -88,7 +88,7 @@ public void removeWithNamedBinds() { @Test public void bug21798850() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } Map params = new HashMap<>(); @@ -101,7 +101,7 @@ public void bug21798850() { @Test public void properExceptionUnboundParams() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } try { @@ -114,7 +114,7 @@ public void properExceptionUnboundParams() { @Test public void bindArgsOrder() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{'x':1,'y':2}".replaceAll("'", "\"")).execute(); diff --git a/src/test/java/testsuite/mysqlx/devapi/CollectionAddTest.java b/src/test/java/testsuite/x/devapi/CollectionAddTest.java similarity index 92% rename from src/test/java/testsuite/mysqlx/devapi/CollectionAddTest.java rename to src/test/java/testsuite/x/devapi/CollectionAddTest.java index 107de2b1d..03e7076c4 100644 --- a/src/test/java/testsuite/mysqlx/devapi/CollectionAddTest.java +++ b/src/test/java/testsuite/x/devapi/CollectionAddTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -35,10 +35,10 @@ import org.junit.Ignore; import org.junit.Test; -import com.mysql.cj.api.x.DocResult; -import com.mysql.cj.api.x.Result; -import com.mysql.cj.x.json.DbDoc; -import com.mysql.cj.x.json.JsonString; +import com.mysql.cj.api.xdevapi.DocResult; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.xdevapi.DbDoc; +import com.mysql.cj.xdevapi.JsonString; public class CollectionAddTest extends CollectionTest { @Before @@ -55,7 +55,7 @@ public void teardownCollectionTest() { @Test public void testBasicAddString() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String json = "{'firstName':'Frank', 'middleName':'Lloyd', 'lastName':'Wright'}".replaceAll("'", "\""); @@ -70,7 +70,7 @@ public void testBasicAddString() { @Test public void testBasicAddStringArray() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"_id\": 1}", "{\"_id\": 2}").execute(); @@ -88,7 +88,7 @@ public void testBasicAddStringArray() { @Test public void testBasicAddDoc() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } DbDoc doc = new DbDoc().add("firstName", new JsonString().setValue("Georgia")); @@ -105,7 +105,7 @@ public void testBasicAddDoc() { @Test public void testBasicAddDocArray() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } Result res = this.collection.add(new DbDoc().add("f1", new JsonString().setValue("doc1")), new DbDoc().add("f1", new JsonString().setValue("doc2"))) @@ -125,7 +125,7 @@ public void testBasicAddDocArray() { @Test @Ignore("needs implemented") public void testBasicAddMap() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } Map doc = new HashMap<>(); @@ -143,7 +143,7 @@ public void testBasicAddMap() { @Test public void testAddWithAssignedId() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String json = "{'_id': 'Id#1', 'name': ''}".replaceAll("'", "\""); @@ -158,7 +158,7 @@ public void testAddWithAssignedId() { @Test public void testChainedAdd() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String json = "{'_id': 1}".replaceAll("'", "\""); @@ -171,7 +171,7 @@ public void testChainedAdd() { @Test public void testAddLargeDocument() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } int docSize = 255 * 1024; @@ -189,7 +189,7 @@ public void testAddLargeDocument() { @Test public void testAddNoDocs() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } Result res = this.collection.add(new DbDoc[] {}).execute(); diff --git a/src/test/java/testsuite/mysqlx/devapi/CollectionFindTest.java b/src/test/java/testsuite/x/devapi/CollectionFindTest.java similarity index 94% rename from src/test/java/testsuite/mysqlx/devapi/CollectionFindTest.java rename to src/test/java/testsuite/x/devapi/CollectionFindTest.java index 3dc525a0b..a8019f971 100644 --- a/src/test/java/testsuite/mysqlx/devapi/CollectionFindTest.java +++ b/src/test/java/testsuite/x/devapi/CollectionFindTest.java @@ -21,9 +21,9 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; -import static com.mysql.cj.api.x.Expression.expr; +import static com.mysql.cj.api.xdevapi.Expression.expr; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; @@ -34,14 +34,14 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.DocResult; -import com.mysql.cj.api.x.Row; -import com.mysql.cj.api.x.Table; +import com.mysql.cj.api.xdevapi.DocResult; +import com.mysql.cj.api.xdevapi.Row; +import com.mysql.cj.api.xdevapi.Table; import com.mysql.cj.core.exceptions.MysqlErrorNumbers; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.x.json.DbDoc; -import com.mysql.cj.x.json.JsonNumber; -import com.mysql.cj.x.json.JsonString; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.xdevapi.DbDoc; +import com.mysql.cj.xdevapi.JsonNumber; +import com.mysql.cj.xdevapi.JsonString; /** * @todo @@ -67,7 +67,7 @@ public void teardownCollectionTest() { @Test public void testProjection() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } // TODO: the "1" is coming back from the server as a string. checking with xplugin team if this is ok @@ -89,7 +89,7 @@ public void testProjection() { @Test public void testDocumentProjection() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } // use a document as a projection @@ -107,7 +107,7 @@ public void testDocumentProjection() { */ @Test public void outOfRange() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } try { @@ -115,7 +115,7 @@ public void outOfRange() { DocResult docs = this.collection.find().fields(expr("{'X':1-cast(pow(2,63) as signed)}")).execute(); docs.next(); // we are getting valid data from xplugin before the error, need this call to force the error fail("Statement should raise an error"); - } catch (MysqlxError err) { + } catch (XDevAPIError err) { assertEquals(MysqlErrorNumbers.ER_DATA_OUT_OF_RANGE, err.getErrorCode()); } } @@ -125,7 +125,7 @@ public void outOfRange() { */ @Test public void testIterable() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -144,7 +144,7 @@ public void testIterable() { @Test public void basicCollectionAsTable() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"xyz\":1}").execute(); @@ -156,7 +156,7 @@ public void basicCollectionAsTable() { @Test public void testLimitOffset() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{}").execute(); @@ -184,7 +184,7 @@ public void testLimitOffset() { @Test public void testNumericExpressions() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"x\":1, \"y\":2}").execute(); @@ -217,7 +217,7 @@ public void testNumericExpressions() { @Test public void testBitwiseExpressions() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"x1\":31, \"x2\":13, \"x3\":8, \"x4\":\"18446744073709551614\"}").execute(); @@ -241,7 +241,7 @@ public void testBitwiseExpressions() { @Test public void testIntervalExpressions() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"aDate\":\"2000-01-01\", \"aDatetime\":\"2000-01-01 12:00:01\"}").execute(); @@ -293,7 +293,7 @@ public void testIntervalExpressions() { @Test // these are important to test the "operator" (BETWEEN/REGEXP/etc) to function representation in the protocol public void testIlriExpressions() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"a\":\"some text with 5432\", \"b\":\"100\", \"c\":true}").execute(); @@ -321,7 +321,7 @@ public void testIlriExpressions() { @Test public void cast() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"x\":100}").execute(); @@ -332,7 +332,7 @@ public void cast() { @Test public void testOrderBy() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"_id\":1, \"x\":20, \"y\":22}").execute(); diff --git a/src/test/java/testsuite/mysqlx/devapi/CollectionModifyTest.java b/src/test/java/testsuite/x/devapi/CollectionModifyTest.java similarity index 93% rename from src/test/java/testsuite/mysqlx/devapi/CollectionModifyTest.java rename to src/test/java/testsuite/x/devapi/CollectionModifyTest.java index 2fa11188d..bbf18037d 100644 --- a/src/test/java/testsuite/mysqlx/devapi/CollectionModifyTest.java +++ b/src/test/java/testsuite/x/devapi/CollectionModifyTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -30,11 +30,11 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.DocResult; -import com.mysql.cj.x.json.DbDoc; -import com.mysql.cj.x.json.JsonArray; -import com.mysql.cj.x.json.JsonNumber; -import com.mysql.cj.x.json.JsonString; +import com.mysql.cj.api.xdevapi.DocResult; +import com.mysql.cj.xdevapi.DbDoc; +import com.mysql.cj.xdevapi.JsonArray; +import com.mysql.cj.xdevapi.JsonNumber; +import com.mysql.cj.xdevapi.JsonString; /** * @todo @@ -54,7 +54,7 @@ public void teardownCollectionTest() { @Test public void testSet() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{}").execute(); @@ -68,7 +68,7 @@ public void testSet() { @Test public void testUnset() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"x\":\"100\", \"y\":\"200\", \"z\":1}").execute(); @@ -87,7 +87,7 @@ public void testUnset() { @Test public void testReplace() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"x\":100}").execute(); @@ -100,7 +100,7 @@ public void testReplace() { @Test public void testArrayAppend() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"x\":[8,16,32]}").execute(); @@ -119,7 +119,7 @@ public void testArrayAppend() { @Test public void testArrayInsert() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{\"x\":[1,2]}").execute(); @@ -139,7 +139,7 @@ public void testArrayInsert() { @Test public void testJsonModify() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -182,7 +182,7 @@ public void testJsonModify() { @Test public void testArrayModify() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } diff --git a/src/test/java/testsuite/mysqlx/devapi/CollectionRemoveTest.java b/src/test/java/testsuite/x/devapi/CollectionRemoveTest.java similarity index 95% rename from src/test/java/testsuite/mysqlx/devapi/CollectionRemoveTest.java rename to src/test/java/testsuite/x/devapi/CollectionRemoveTest.java index c90e49598..b384eab9c 100644 --- a/src/test/java/testsuite/mysqlx/devapi/CollectionRemoveTest.java +++ b/src/test/java/testsuite/x/devapi/CollectionRemoveTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; @@ -47,7 +47,7 @@ public void teardownCollectionTest() { @Test public void deleteAll() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{}").execute(); @@ -61,7 +61,7 @@ public void deleteAll() { @Test public void deleteSome() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{}").execute(); diff --git a/src/test/java/testsuite/mysqlx/devapi/CollectionTest.java b/src/test/java/testsuite/x/devapi/CollectionTest.java similarity index 90% rename from src/test/java/testsuite/mysqlx/devapi/CollectionTest.java rename to src/test/java/testsuite/x/devapi/CollectionTest.java index 95a4a108b..53ce8cf21 100644 --- a/src/test/java/testsuite/mysqlx/devapi/CollectionTest.java +++ b/src/test/java/testsuite/x/devapi/CollectionTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; @@ -31,11 +31,11 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.Collection; -import com.mysql.cj.api.x.DatabaseObject.DbObjectStatus; +import com.mysql.cj.api.xdevapi.Collection; +import com.mysql.cj.api.xdevapi.DatabaseObject.DbObjectStatus; import com.mysql.cj.core.exceptions.MysqlErrorNumbers; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.mysqlx.MysqlxError; +import com.mysql.cj.x.core.XDevAPIError; public class CollectionTest extends DevApiBaseTestCase { /** Collection for testing. */ @@ -53,7 +53,7 @@ public void setupCollectionTest() { @After public void teardownCollectionTest() { - if (this.isSetForMySQLxTests && this.session.isOpen()) { + if (this.isSetForXTests && this.session.isOpen()) { try { dropCollection(this.collectionName); } catch (Exception ex) { @@ -66,7 +66,7 @@ public void teardownCollectionTest() { @Test public void testCount() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{'a':'a'}".replaceAll("'", "\"")).execute(); @@ -77,7 +77,7 @@ public void testCount() { @Test public void testExists() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = "testExists"; @@ -91,7 +91,7 @@ public void testExists() { @Test(expected = WrongArgumentException.class) public void getNonExistentCollectionWithRequireExistsShouldThrow() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { throw new WrongArgumentException("Throw WrongArgumentException as expected, but test was ignored because of missed configuration."); } String collName = "testRequireExists"; @@ -101,7 +101,7 @@ public void getNonExistentCollectionWithRequireExistsShouldThrow() { @Test public void getNonExistentCollectionWithoutRequireExistsShouldNotThrow() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = "testRequireExists"; @@ -111,7 +111,7 @@ public void getNonExistentCollectionWithoutRequireExistsShouldNotThrow() { @Test public void getExistentCollectionWithRequireExistsShouldNotThrow() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = "testRequireExists"; @@ -122,7 +122,7 @@ public void getExistentCollectionWithRequireExistsShouldNotThrow() { @Test public void createIndex() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.createIndex("x_idx", true).field(".x", "INT", true).execute(); @@ -131,7 +131,7 @@ public void createIndex() { try { // fail due to duplicate value for unique index on "x" this.collection.add("{'x':'1'}".replaceAll("'", "\"")).execute(); - } catch (MysqlxError err) { + } catch (XDevAPIError err) { assertEquals(MysqlErrorNumbers.ER_X_DOC_ID_DUPLICATE, err.getErrorCode()); } // drop the index and we can now insert what was a duplicate key entry diff --git a/src/test/java/testsuite/mysqlx/devapi/DevApiBaseTestCase.java b/src/test/java/testsuite/x/devapi/DevApiBaseTestCase.java similarity index 83% rename from src/test/java/testsuite/mysqlx/devapi/DevApiBaseTestCase.java rename to src/test/java/testsuite/x/devapi/DevApiBaseTestCase.java index ff39fcc62..e239af660 100644 --- a/src/test/java/testsuite/mysqlx/devapi/DevApiBaseTestCase.java +++ b/src/test/java/testsuite/x/devapi/DevApiBaseTestCase.java @@ -21,20 +21,20 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; -import com.mysql.cj.api.x.NodeSession; -import com.mysql.cj.api.x.Schema; +import com.mysql.cj.api.xdevapi.NodeSession; +import com.mysql.cj.api.xdevapi.Schema; import com.mysql.cj.core.exceptions.MysqlErrorNumbers; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.devapi.NodeSessionImpl; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.xdevapi.NodeSessionImpl; -import testsuite.mysqlx.internal.InternalMysqlxBaseTestCase; +import testsuite.x.internal.InternalXBaseTestCase; /** * Utilities for Dev API tests. */ -public class DevApiBaseTestCase extends InternalMysqlxBaseTestCase { +public class DevApiBaseTestCase extends InternalXBaseTestCase { /** * Session for use in tests. @@ -43,7 +43,7 @@ public class DevApiBaseTestCase extends InternalMysqlxBaseTestCase { Schema schema; public boolean setupTestSession() { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { this.session = new NodeSessionImpl(this.testProperties); this.schema = this.session.getDefaultSchema(); return true; @@ -68,10 +68,10 @@ protected void sqlUpdate(String sql) { } protected void dropCollection(String collectionName) { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { try { this.session.dropCollection(schema.getName(), collectionName); - } catch (MysqlxError ex) { + } catch (XDevAPIError ex) { if (ex.getErrorCode() != MysqlErrorNumbers.ER_BAD_TABLE_ERROR) { throw ex; } diff --git a/src/test/java/testsuite/mysqlx/devapi/MetadataTest.java b/src/test/java/testsuite/x/devapi/MetadataTest.java similarity index 98% rename from src/test/java/testsuite/mysqlx/devapi/MetadataTest.java rename to src/test/java/testsuite/x/devapi/MetadataTest.java index b58804f08..e158adadb 100644 --- a/src/test/java/testsuite/mysqlx/devapi/MetadataTest.java +++ b/src/test/java/testsuite/x/devapi/MetadataTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; @@ -31,10 +31,10 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.Column; -import com.mysql.cj.api.x.RowResult; -import com.mysql.cj.api.x.Table; -import com.mysql.cj.api.x.Type; +import com.mysql.cj.api.xdevapi.Column; +import com.mysql.cj.api.xdevapi.RowResult; +import com.mysql.cj.api.xdevapi.Table; +import com.mysql.cj.api.xdevapi.Type; /** * Tests for "Column" table metadata API. @@ -44,7 +44,7 @@ public class MetadataTest extends TableTest { @Override public void setupTableTest() { super.setupTableTest(); - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { sqlUpdate("drop table if exists example_metadata"); sqlUpdate("create table example_metadata (_id varchar(32), name varchar(20), birthday date, age int)"); } @@ -58,7 +58,7 @@ public void teardownTableTest() { @Test public void example_metadata() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } Table table = this.schema.getTable("example_metadata"); @@ -145,7 +145,7 @@ public void example_metadata() { @Test public void renameCol() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } Table table = this.schema.getTable("example_metadata"); @@ -175,7 +175,7 @@ public void renameCol() { @Test public void derivedCol() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } Table table = this.schema.getTable("example_metadata"); @@ -205,7 +205,7 @@ public void derivedCol() { @Test public void docAsTableIsJSON() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = "doc_as_table"; @@ -257,7 +257,7 @@ public void docAsTableIsJSON() { @Test public void exhaustTypes() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String tableName = "exhaust_types"; diff --git a/src/test/java/testsuite/mysqlx/devapi/NodeSessionTest.java b/src/test/java/testsuite/x/devapi/NodeSessionTest.java similarity index 92% rename from src/test/java/testsuite/mysqlx/devapi/NodeSessionTest.java rename to src/test/java/testsuite/x/devapi/NodeSessionTest.java index a73d19d2d..c97eb0f6e 100644 --- a/src/test/java/testsuite/mysqlx/devapi/NodeSessionTest.java +++ b/src/test/java/testsuite/x/devapi/NodeSessionTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,14 +33,14 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.NodeSession; -import com.mysql.cj.api.x.Row; -import com.mysql.cj.api.x.SqlResult; -import com.mysql.cj.api.x.SqlStatement; -import com.mysql.cj.api.x.XSession; +import com.mysql.cj.api.xdevapi.NodeSession; +import com.mysql.cj.api.xdevapi.Row; +import com.mysql.cj.api.xdevapi.SqlResult; +import com.mysql.cj.api.xdevapi.SqlStatement; +import com.mysql.cj.api.xdevapi.XSession; import com.mysql.cj.core.exceptions.ConnectionIsClosedException; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.x.MysqlxSessionFactory; +import com.mysql.cj.xdevapi.XSessionFactory; public class NodeSessionTest extends DevApiBaseTestCase { @Before @@ -55,7 +55,7 @@ public void teardownCollectionTest() { @Test public void basicSql() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } SqlStatement stmt = this.session.sql("select 1,2,3 from dual"); @@ -73,7 +73,7 @@ public void basicSql() { @Test public void sqlUpdate() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } SqlStatement stmt = this.session.sql("set @cjTestVar = 1"); @@ -87,7 +87,7 @@ public void sqlUpdate() { @Test public void sqlArguments() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } SqlStatement stmt = this.session.sql("select ? as a, 40 + ? as b, ? as c"); @@ -100,7 +100,7 @@ public void sqlArguments() { @Test public void basicMultipleResults() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop procedure if exists basicMultipleResults"); @@ -119,7 +119,7 @@ public void basicMultipleResults() { @Test public void smartBufferMultipleResults() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop procedure if exists basicMultipleResults"); @@ -134,7 +134,7 @@ public void smartBufferMultipleResults() { @Test public void virtualNodeSession() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -148,7 +148,7 @@ public void virtualNodeSession() { sqlUpdate("insert into virtualNodeSession2 values ('some long UUID', '2000-05-27', 14)"); // 1. Ensure both XSession and NodeSession share the same router connection - XSession xsess = new MysqlxSessionFactory().getSession(this.testProperties); + XSession xsess = new XSessionFactory().getSession(this.testProperties); NodeSession nsess = xsess.bindToDefaultShard(); assertEquals(xsess.getMysqlxSession(), nsess.getMysqlxSession()); // server channel is shared for both xsess and nsess diff --git a/src/test/java/testsuite/mysqlx/devapi/ResultTest.java b/src/test/java/testsuite/x/devapi/ResultTest.java similarity index 94% rename from src/test/java/testsuite/mysqlx/devapi/ResultTest.java rename to src/test/java/testsuite/x/devapi/ResultTest.java index c1163e6fc..98d1c4b2c 100644 --- a/src/test/java/testsuite/mysqlx/devapi/ResultTest.java +++ b/src/test/java/testsuite/x/devapi/ResultTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -38,10 +38,10 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.Row; -import com.mysql.cj.api.x.RowResult; -import com.mysql.cj.api.x.Table; -import com.mysql.cj.api.x.Warning; +import com.mysql.cj.api.xdevapi.Row; +import com.mysql.cj.api.xdevapi.RowResult; +import com.mysql.cj.api.xdevapi.Table; +import com.mysql.cj.api.xdevapi.Warning; import com.mysql.cj.core.exceptions.DataReadException; public class ResultTest extends DevApiBaseTestCase { @@ -57,7 +57,7 @@ public void teardownTableTest() { @Test public void testForceBuffering() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists testx"); @@ -87,7 +87,7 @@ public void testForceBuffering() { @Test public void testMars() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists testx"); @@ -105,7 +105,7 @@ public void testMars() { @Test public void exceptionForNonExistingColumns() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists testx"); @@ -130,7 +130,7 @@ public void exceptionForNonExistingColumns() { @Test public void testDateTimeTypes() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists testx"); diff --git a/src/test/java/testsuite/mysqlx/devapi/SchemaTest.java b/src/test/java/testsuite/x/devapi/SchemaTest.java similarity index 94% rename from src/test/java/testsuite/mysqlx/devapi/SchemaTest.java rename to src/test/java/testsuite/x/devapi/SchemaTest.java index fe4e4d429..134caa242 100644 --- a/src/test/java/testsuite/mysqlx/devapi/SchemaTest.java +++ b/src/test/java/testsuite/x/devapi/SchemaTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -36,23 +36,23 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.Collection; -import com.mysql.cj.api.x.CreateTableStatement; -import com.mysql.cj.api.x.DatabaseObject.DbObjectStatus; -import com.mysql.cj.api.x.ForeignKeyDefinition.ChangeMode; -import com.mysql.cj.api.x.Row; -import com.mysql.cj.api.x.RowResult; -import com.mysql.cj.api.x.Schema; -import com.mysql.cj.api.x.Table; -import com.mysql.cj.api.x.Type; -import com.mysql.cj.api.x.XSession; +import com.mysql.cj.api.xdevapi.Collection; +import com.mysql.cj.api.xdevapi.CreateTableStatement; +import com.mysql.cj.api.xdevapi.Row; +import com.mysql.cj.api.xdevapi.RowResult; +import com.mysql.cj.api.xdevapi.Schema; +import com.mysql.cj.api.xdevapi.Table; +import com.mysql.cj.api.xdevapi.Type; +import com.mysql.cj.api.xdevapi.XSession; +import com.mysql.cj.api.xdevapi.DatabaseObject.DbObjectStatus; +import com.mysql.cj.api.xdevapi.ForeignKeyDefinition.ChangeMode; import com.mysql.cj.core.exceptions.MysqlErrorNumbers; import com.mysql.cj.core.exceptions.WrongArgumentException; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.devapi.ColumnDef; -import com.mysql.cj.mysqlx.devapi.ForeignKeyDef; -import com.mysql.cj.mysqlx.devapi.GeneratedColumnDef; -import com.mysql.cj.mysqlx.devapi.SessionImpl; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.xdevapi.ColumnDef; +import com.mysql.cj.xdevapi.ForeignKeyDef; +import com.mysql.cj.xdevapi.GeneratedColumnDef; +import com.mysql.cj.xdevapi.XSessionImpl; public class SchemaTest extends DevApiBaseTestCase { @Before @@ -67,7 +67,7 @@ public void teardownCollectionTest() { @Test public void testEquals() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } Schema otherDefaultSchema = this.session.getDefaultSchema(); @@ -76,7 +76,7 @@ public void testEquals() { assertTrue(this.schema.equals(otherDefaultSchema)); assertFalse(this.schema.equals(this.session)); - XSession otherSession = new SessionImpl(this.testProperties); + XSession otherSession = new XSessionImpl(this.testProperties); Schema diffSessionSchema = otherSession.getDefaultSchema(); assertEquals(this.schema.getName(), diffSessionSchema.getName()); assertFalse(this.schema.equals(diffSessionSchema)); @@ -86,7 +86,7 @@ public void testEquals() { @Test public void testToString() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } // this will pass as long as the test database doesn't require identifier quoting @@ -97,7 +97,7 @@ public void testToString() { @Test public void testListCollections() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName1 = "test_list_collections1"; @@ -118,7 +118,7 @@ public void testListCollections() { @Test public void testExists() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } assertEquals(DbObjectStatus.EXISTS, this.schema.existsInDatabase()); @@ -128,7 +128,7 @@ public void testExists() { @Test public void testCreateCollection() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = "testCreateCollection"; @@ -137,7 +137,7 @@ public void testCreateCollection() { try { this.schema.createCollection(collName); fail("Exception should be thrown trying to create a collection that already exists"); - } catch (MysqlxError ex) { + } catch (XDevAPIError ex) { // expected assertEquals(MysqlErrorNumbers.ER_TABLE_EXISTS_ERROR, ex.getErrorCode()); } @@ -147,7 +147,7 @@ public void testCreateCollection() { @Test public void testListTables() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = "test_list_tables_collection"; @@ -186,7 +186,7 @@ public void testListTables() { @Test public void testCreateTable() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String tableName1 = "test_create_table1"; @@ -358,7 +358,7 @@ public Void call() throws Exception { try { this.schema.createTable(tableName2).addColumn(new ColumnDef("id", Type.TINYINT).unsigned().notNull().primaryKey()).execute(); fail("Exception should be thrown if trying to create a table that already exists"); - } catch (MysqlxError ex) { + } catch (XDevAPIError ex) { // expected assertEquals(MysqlErrorNumbers.ER_TABLE_EXISTS_ERROR, ex.getErrorCode()); } diff --git a/src/test/java/testsuite/mysqlx/devapi/SessionTest.java b/src/test/java/testsuite/x/devapi/SessionTest.java similarity index 90% rename from src/test/java/testsuite/mysqlx/devapi/SessionTest.java rename to src/test/java/testsuite/x/devapi/SessionTest.java index c8328ab9a..e681ac673 100644 --- a/src/test/java/testsuite/mysqlx/devapi/SessionTest.java +++ b/src/test/java/testsuite/x/devapi/SessionTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -37,11 +37,11 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.Schema; +import com.mysql.cj.api.xdevapi.Schema; import com.mysql.cj.core.exceptions.CJPacketTooBigException; import com.mysql.cj.core.exceptions.MysqlErrorNumbers; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.x.MysqlxSessionFactory; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.xdevapi.XSessionFactory; public class SessionTest extends DevApiBaseTestCase { @Before @@ -51,11 +51,11 @@ public void setupCollectionTest() { @After public void teardownCollectionTest() { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { this.createdTestSchemas.forEach(schemaName -> { try { this.session.dropSchema(schemaName); - } catch (MysqlxError x) { + } catch (XDevAPIError x) { // ignored } }); @@ -76,7 +76,7 @@ private String getRandomTestSchemaName() { @Test public void createDropSchema() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String testSchemaName = getRandomTestSchemaName(); @@ -88,7 +88,7 @@ public void createDropSchema() { @Test public void createAndReuseExistingSchema() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String testSchemaName = getRandomTestSchemaName(); @@ -100,7 +100,7 @@ public void createAndReuseExistingSchema() { @Test public void listSchemas() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } List schemas = this.session.getSchemas(); @@ -113,7 +113,7 @@ public void listSchemas() { @Test public void createExistingSchemaError() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String testSchemaName = getRandomTestSchemaName(); @@ -122,7 +122,7 @@ public void createExistingSchemaError() { try { this.session.createSchema(testSchemaName); fail("Attempt to create a schema with the name of an existing schema should fail"); - } catch (MysqlxError err) { + } catch (XDevAPIError err) { assertEquals(MysqlErrorNumbers.ER_DB_CREATE_EXISTS, err.getErrorCode()); } } @@ -132,7 +132,7 @@ public void createExistingSchemaError() { */ @Test public void errorOnPacketTooBig() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } try { @@ -157,7 +157,7 @@ public void errorOnPacketTooBig() { */ @Test public void testBug21690043() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -168,7 +168,7 @@ public void testBug21690043() { props.putAll(this.testProperties); props.setProperty("user", "bug21690043user1"); props.setProperty("password", ""); - new MysqlxSessionFactory().getSession(props); + new XSessionFactory().getSession(props); } catch (Throwable t) { throw t; } finally { diff --git a/src/test/java/testsuite/mysqlx/devapi/TableDeleteTest.java b/src/test/java/testsuite/x/devapi/TableDeleteTest.java similarity index 95% rename from src/test/java/testsuite/mysqlx/devapi/TableDeleteTest.java rename to src/test/java/testsuite/x/devapi/TableDeleteTest.java index ce64e42a3..b781939e0 100644 --- a/src/test/java/testsuite/mysqlx/devapi/TableDeleteTest.java +++ b/src/test/java/testsuite/x/devapi/TableDeleteTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; @@ -29,8 +29,8 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.Result; -import com.mysql.cj.api.x.Table; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.api.xdevapi.Table; /** * @todo @@ -50,7 +50,7 @@ public void teardownTableTest() { @Test public void testDelete() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } try { diff --git a/src/test/java/testsuite/mysqlx/devapi/TableInsertTest.java b/src/test/java/testsuite/x/devapi/TableInsertTest.java similarity index 94% rename from src/test/java/testsuite/mysqlx/devapi/TableInsertTest.java rename to src/test/java/testsuite/x/devapi/TableInsertTest.java index ef53a6811..2eda5a458 100644 --- a/src/test/java/testsuite/mysqlx/devapi/TableInsertTest.java +++ b/src/test/java/testsuite/x/devapi/TableInsertTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -35,13 +35,13 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.Result; -import com.mysql.cj.api.x.Row; -import com.mysql.cj.api.x.RowResult; -import com.mysql.cj.api.x.Table; -import com.mysql.cj.x.json.DbDoc; -import com.mysql.cj.x.json.JsonParser; -import com.mysql.cj.x.json.JsonString; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.api.xdevapi.Row; +import com.mysql.cj.api.xdevapi.RowResult; +import com.mysql.cj.api.xdevapi.Table; +import com.mysql.cj.xdevapi.DbDoc; +import com.mysql.cj.xdevapi.JsonParser; +import com.mysql.cj.xdevapi.JsonString; /** * @todo @@ -61,7 +61,7 @@ public void teardownTableTest() { @Test public void lastInsertId() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String tableName = "lastInsertId"; @@ -76,7 +76,7 @@ public void lastInsertId() { @Test public void basicInsert() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } try { @@ -147,7 +147,7 @@ public void basicInsert() { @Test public void jsonInsert() throws IOException { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } try { diff --git a/src/test/java/testsuite/mysqlx/devapi/TableSelectTest.java b/src/test/java/testsuite/x/devapi/TableSelectTest.java similarity index 96% rename from src/test/java/testsuite/mysqlx/devapi/TableSelectTest.java rename to src/test/java/testsuite/x/devapi/TableSelectTest.java index af298ffc6..b83651fb8 100644 --- a/src/test/java/testsuite/mysqlx/devapi/TableSelectTest.java +++ b/src/test/java/testsuite/x/devapi/TableSelectTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -37,11 +37,11 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.Column; -import com.mysql.cj.api.x.Row; -import com.mysql.cj.api.x.RowResult; -import com.mysql.cj.api.x.SelectStatement; -import com.mysql.cj.api.x.Table; +import com.mysql.cj.api.xdevapi.Column; +import com.mysql.cj.api.xdevapi.Row; +import com.mysql.cj.api.xdevapi.RowResult; +import com.mysql.cj.api.xdevapi.SelectStatement; +import com.mysql.cj.api.xdevapi.Table; import com.mysql.cj.core.exceptions.DataConversionException; /** @@ -62,7 +62,7 @@ public void teardownTableTest() { @Test public void basicQuery() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists basicQuery"); @@ -99,7 +99,7 @@ public void basicQuery() { @Test public void testComplexQuery() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists complexQuery"); @@ -147,7 +147,7 @@ public void testComplexQuery() { @Test public void allColumns() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists allColumns"); @@ -166,7 +166,7 @@ public void allColumns() { @Test public void countAllColumns() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists countAllColumns"); @@ -185,7 +185,7 @@ public void countAllColumns() { */ @Test public void testBug22931433() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists testBug22931433"); @@ -267,7 +267,7 @@ public Void call() throws Exception { } }); - assertThrows(DataConversionException.class, "Unsupported conversion from BIT to com.mysql.cj.x.json.DbDoc", new Callable() { + assertThrows(DataConversionException.class, "Unsupported conversion from BIT to com.mysql.cj.xdevapi.DbDoc", new Callable() { public Void call() throws Exception { row.getDbDoc("c1"); return null; @@ -345,7 +345,7 @@ public Void call() throws Exception { @Test public void basicViewQuery() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } try { @@ -389,7 +389,7 @@ public void basicViewQuery() { @Test public void testOrderBy() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists testOrderBy"); @@ -415,7 +415,7 @@ public void testOrderBy() { @Test public void testBug22988922() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists testBug22988922"); diff --git a/src/test/java/testsuite/mysqlx/devapi/TableTest.java b/src/test/java/testsuite/x/devapi/TableTest.java similarity index 95% rename from src/test/java/testsuite/mysqlx/devapi/TableTest.java rename to src/test/java/testsuite/x/devapi/TableTest.java index 5b6127f7a..a66f4bf24 100644 --- a/src/test/java/testsuite/mysqlx/devapi/TableTest.java +++ b/src/test/java/testsuite/x/devapi/TableTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -31,8 +31,8 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.DatabaseObject.DbObjectStatus; -import com.mysql.cj.api.x.Table; +import com.mysql.cj.api.xdevapi.Table; +import com.mysql.cj.api.xdevapi.DatabaseObject.DbObjectStatus; /** * @todo @@ -50,7 +50,7 @@ public void teardownTableTest() { @Test public void tableBasics() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } sqlUpdate("drop table if exists tableBasics"); @@ -67,7 +67,7 @@ public void tableBasics() { @Test public void viewBasics() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } diff --git a/src/test/java/testsuite/mysqlx/devapi/TableUpdateTest.java b/src/test/java/testsuite/x/devapi/TableUpdateTest.java similarity index 92% rename from src/test/java/testsuite/mysqlx/devapi/TableUpdateTest.java rename to src/test/java/testsuite/x/devapi/TableUpdateTest.java index e8d033f2d..8ded64e42 100644 --- a/src/test/java/testsuite/mysqlx/devapi/TableUpdateTest.java +++ b/src/test/java/testsuite/x/devapi/TableUpdateTest.java @@ -21,9 +21,9 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; -import static com.mysql.cj.api.x.Expression.expr; +import static com.mysql.cj.api.xdevapi.Expression.expr; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -31,10 +31,10 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.Result; -import com.mysql.cj.api.x.Row; -import com.mysql.cj.api.x.RowResult; -import com.mysql.cj.api.x.Table; +import com.mysql.cj.api.xdevapi.Result; +import com.mysql.cj.api.xdevapi.Row; +import com.mysql.cj.api.xdevapi.RowResult; +import com.mysql.cj.api.xdevapi.Table; /** * @todo @@ -54,7 +54,7 @@ public void teardownTableTest() { @Test public void testUpdates() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } try { diff --git a/src/test/java/testsuite/mysqlx/devapi/TransactionTest.java b/src/test/java/testsuite/x/devapi/TransactionTest.java similarity index 92% rename from src/test/java/testsuite/mysqlx/devapi/TransactionTest.java rename to src/test/java/testsuite/x/devapi/TransactionTest.java index 733c33ffb..98485b0c1 100644 --- a/src/test/java/testsuite/mysqlx/devapi/TransactionTest.java +++ b/src/test/java/testsuite/x/devapi/TransactionTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; @@ -29,7 +29,7 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.Collection; +import com.mysql.cj.api.xdevapi.Collection; public class TransactionTest extends DevApiBaseTestCase { protected Collection collection; @@ -44,7 +44,7 @@ public void setupCollectionTest() { @After public void teardownCollectionTest() { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { dropCollection("txTest"); destroyTestSession(); } @@ -52,7 +52,7 @@ public void teardownCollectionTest() { @Test public void basicRollback() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{}").add("{}").execute(); @@ -67,7 +67,7 @@ public void basicRollback() { @Test public void basicCommit() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.collection.add("{}").add("{}").execute(); diff --git a/src/test/java/testsuite/mysqlx/devapi/XSessionFailoverTest.java b/src/test/java/testsuite/x/devapi/XSessionFailoverTest.java similarity index 94% rename from src/test/java/testsuite/mysqlx/devapi/XSessionFailoverTest.java rename to src/test/java/testsuite/x/devapi/XSessionFailoverTest.java index ce4b9a1d2..7505d0a7d 100644 --- a/src/test/java/testsuite/mysqlx/devapi/XSessionFailoverTest.java +++ b/src/test/java/testsuite/x/devapi/XSessionFailoverTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.devapi; +package testsuite.x.devapi; import static org.junit.Assert.assertEquals; @@ -35,18 +35,18 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.NodeSession; -import com.mysql.cj.api.x.XSession; +import com.mysql.cj.api.xdevapi.NodeSession; +import com.mysql.cj.api.xdevapi.XSession; import com.mysql.cj.core.conf.url.ConnectionUrl; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.exceptions.InvalidConnectionAttributeException; -import testsuite.mysqlx.internal.InternalMysqlxBaseTestCase; +import testsuite.x.internal.InternalXBaseTestCase; /** * Tests for XSession client side failover features. */ -public class XSessionFailoverTest extends InternalMysqlxBaseTestCase { +public class XSessionFailoverTest extends InternalXBaseTestCase { private String testsHost = ""; /** @@ -57,7 +57,7 @@ public class XSessionFailoverTest extends InternalMysqlxBaseTestCase { * @return a single host or a multi-host connection string */ private String buildConnectionString(String... hosts) { - StringBuilder url = new StringBuilder(ConnectionUrl.Type.MYSQLX_SESSION.getProtocol()).append("//"); + StringBuilder url = new StringBuilder(ConnectionUrl.Type.XDEVAPI_SESSION.getProtocol()).append("//"); url.append(getTestUser()).append(":").append(getTestPassword()).append("@").append("["); String separator = ""; int priority = 100; @@ -71,7 +71,7 @@ private String buildConnectionString(String... hosts) { @Before public void setupFailoverTest() { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { StringBuilder sb = new StringBuilder(); sb.append(getTestHost()).append(":").append(getTestPort()); this.testsHost = sb.toString(); @@ -83,7 +83,7 @@ public void setupFailoverTest() { */ @Test public void testGetSessionForSingleHost() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -104,7 +104,7 @@ public void testGetSessionForSingleHost() throws Exception { */ @Test public void testGetSessionForMultipleHostsWithFailover() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } @@ -136,7 +136,7 @@ public void testGetSessionForMultipleHostsWithFailover() throws Exception { */ @Test public void testGetNodeSessionForMultipleHosts() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } diff --git a/src/test/java/testsuite/x/devapi/package-info.java b/src/test/java/testsuite/x/devapi/package-info.java new file mode 100644 index 000000000..62304aa10 --- /dev/null +++ b/src/test/java/testsuite/x/devapi/package-info.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + * + * The MySQL Connector/J is licensed under the terms of the GPLv2 + * , like most MySQL Connectors. + * There are special exceptions to the terms and conditions of the GPLv2 as it is applied to + * this software, see the FOSS License Exception + * . + * + * This program is free software; you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Foundation; version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + * Floor, Boston, MA 02110-1301 USA + * + */ + +/** + * Dev API test suite. + */ + +package testsuite.x.devapi; diff --git a/src/test/java/testsuite/mysqlx/internal/InternalMysqlxBaseTestCase.java b/src/test/java/testsuite/x/internal/InternalXBaseTestCase.java similarity index 81% rename from src/test/java/testsuite/mysqlx/internal/InternalMysqlxBaseTestCase.java rename to src/test/java/testsuite/x/internal/InternalXBaseTestCase.java index 839d2d96a..3ae1d3c13 100644 --- a/src/test/java/testsuite/mysqlx/internal/InternalMysqlxBaseTestCase.java +++ b/src/test/java/testsuite/x/internal/InternalXBaseTestCase.java @@ -21,27 +21,26 @@ */ -package testsuite.mysqlx.internal; +package testsuite.x.internal; import static org.junit.Assert.fail; import java.util.Properties; import java.util.concurrent.Callable; -import com.mysql.cj.api.x.XSessionFactory; import com.mysql.cj.core.conf.DefaultPropertySet; import com.mysql.cj.core.conf.PropertyDefinitions; import com.mysql.cj.core.conf.url.ConnectionUrl; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.MysqlxSession; -import com.mysql.cj.mysqlx.io.MysqlxProtocol; -import com.mysql.cj.mysqlx.io.MysqlxProtocolFactory; -import com.mysql.cj.x.MysqlxSessionFactory; +import com.mysql.cj.x.core.MysqlxSession; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.x.protocol.XProtocol; +import com.mysql.cj.x.protocol.XProtocolFactory; +import com.mysql.cj.xdevapi.XSessionFactory; /** * Base class for tests of X DevAPI and X Protocol client internal components. */ -public class InternalMysqlxBaseTestCase { +public class InternalXBaseTestCase { /** * The default character set used to interpret metadata. Use latin1 - MySQL's default. This value is provided by higher layers above the protocol so * we avoid issues by using only ASCII characters for metadata in these tests. @@ -49,13 +48,13 @@ public class InternalMysqlxBaseTestCase { protected static final String DEFAULT_METADATA_CHARSET = "latin1"; protected String baseUrl = System.getProperty(PropertyDefinitions.SYSP_testsuite_url_mysqlx); - protected boolean isSetForMySQLxTests = this.baseUrl != null && this.baseUrl.length() > 0; - protected XSessionFactory fact = new MysqlxSessionFactory(); + protected boolean isSetForXTests = this.baseUrl != null && this.baseUrl.length() > 0; + protected XSessionFactory fact = new XSessionFactory(); public Properties testProperties = new Properties(); - public InternalMysqlxBaseTestCase() { - if (this.isSetForMySQLxTests) { + public InternalXBaseTestCase() { + if (this.isSetForXTests) { ConnectionUrl conUrl = ConnectionUrl.getConnectionUrlInstance(this.baseUrl, null); if (conUrl.getType() == null) { throw new RuntimeException("Initialization via URL failed for \"" + this.baseUrl + "\""); @@ -85,19 +84,19 @@ public String getTestDatabase() { } /** - * Create a new {@link MysqlxProtocol} instance for testing. + * Create a new {@link XProtocol} instance for testing. */ - public MysqlxProtocol createTestProtocol() { + public XProtocol createTestProtocol() { // TODO pass prop. set - MysqlxProtocol protocol = MysqlxProtocolFactory.getInstance(getTestHost(), getTestPort(), new DefaultPropertySet()); + XProtocol protocol = XProtocolFactory.getInstance(getTestHost(), getTestPort(), new DefaultPropertySet()); return protocol; } /** - * Create a new {@link MysqlxProtocol} that is part of an authenticated session. + * Create a new {@link XProtocol} that is part of an authenticated session. */ - public MysqlxProtocol createAuthenticatedTestProtocol() { - MysqlxProtocol protocol = createTestProtocol(); + public XProtocol createAuthenticatedTestProtocol() { + XProtocol protocol = createTestProtocol(); protocol.sendSaslMysql41AuthStart(); byte[] salt = protocol.readAuthenticateContinue(); @@ -118,13 +117,13 @@ public MysqlxSession createTestSession() { * * @return the temporary collection name */ - public String createTempTestCollection(MysqlxProtocol protocol) { + public String createTempTestCollection(XProtocol protocol) { String collName = "protocol_test_collection"; try { protocol.sendDropCollection(getTestDatabase(), collName); protocol.readStatementExecuteOk(); - } catch (MysqlxError err) { + } catch (XDevAPIError err) { // ignore } protocol.sendCreateCollection(getTestDatabase(), collName); diff --git a/src/test/java/testsuite/mysqlx/internal/MysqlxSessionTest.java b/src/test/java/testsuite/x/internal/MysqlxSessionTest.java similarity index 91% rename from src/test/java/testsuite/mysqlx/internal/MysqlxSessionTest.java rename to src/test/java/testsuite/x/internal/MysqlxSessionTest.java index 66f7e7955..b2cda6b64 100644 --- a/src/test/java/testsuite/mysqlx/internal/MysqlxSessionTest.java +++ b/src/test/java/testsuite/x/internal/MysqlxSessionTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.internal; +package testsuite.x.internal; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -35,36 +35,36 @@ import org.junit.Before; import org.junit.Test; -import com.mysql.cj.api.x.DatabaseObject.DbObjectType; +import com.mysql.cj.api.xdevapi.DatabaseObject.DbObjectType; import com.mysql.cj.core.io.IntegerValueFactory; -import com.mysql.cj.mysqlx.DocFindParams; -import com.mysql.cj.mysqlx.FindParams; -import com.mysql.cj.mysqlx.MysqlxSession; -import com.mysql.cj.mysqlx.devapi.DocResultImpl; +import com.mysql.cj.x.core.MysqlxSession; +import com.mysql.cj.xdevapi.DocFindParams; +import com.mysql.cj.xdevapi.DocResultImpl; +import com.mysql.cj.xdevapi.FindParams; /** * Tests for (internal) session-level APIs against X Plugin via X Protocol. */ -public class MysqlxSessionTest extends InternalMysqlxBaseTestCase { +public class MysqlxSessionTest extends InternalXBaseTestCase { private MysqlxSession session; @Before public void setupTestSession() { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { this.session = createTestSession(); } } @After public void destroyTestSession() { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { this.session.close(); } } @Test public void testCreateDropCollection() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = "toBeCreatedAndDropped"; @@ -86,7 +86,7 @@ public void testCreateDropCollection() { @Test public void testGetObjects() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = "test_get_objects"; @@ -103,7 +103,7 @@ public void testGetObjects() { @Test public void testInterleavedResults() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = "testInterleavedResults"; @@ -148,7 +148,7 @@ public void testInterleavedResults() { @Test public void testGenericQuery() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } List ints = this.session.query("select 2 union select 1", r -> r.getValue(0, new IntegerValueFactory()), Collectors.toList()); diff --git a/src/test/java/testsuite/mysqlx/internal/MysqlxProtocolAsyncTest.java b/src/test/java/testsuite/x/internal/XProtocolAsyncTest.java similarity index 77% rename from src/test/java/testsuite/mysqlx/internal/MysqlxProtocolAsyncTest.java rename to src/test/java/testsuite/x/internal/XProtocolAsyncTest.java index 7a391dacc..5711adac5 100644 --- a/src/test/java/testsuite/mysqlx/internal/MysqlxProtocolAsyncTest.java +++ b/src/test/java/testsuite/x/internal/XProtocolAsyncTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.internal; +package testsuite.x.internal; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -39,31 +39,31 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import com.mysql.cj.core.io.StatementExecuteOk; +import com.mysql.cj.api.x.protocol.ResultListener; import com.mysql.cj.core.result.Field; -import com.mysql.cj.mysqlx.DocFindParams; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.io.MysqlxProtocol; -import com.mysql.cj.mysqlx.io.ResultListener; -import com.mysql.cj.mysqlx.result.MysqlxRow; +import com.mysql.cj.x.core.StatementExecuteOk; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.x.protocol.XProtocol; +import com.mysql.cj.x.protocol.XProtocolRow; +import com.mysql.cj.xdevapi.DocFindParams; /** * Tests for protocol-level async APIs against X Plugin via X Protocol. */ -@Category(testsuite.mysqlx.AsyncTests.class) -public class MysqlxProtocolAsyncTest extends InternalMysqlxBaseTestCase { - private MysqlxProtocol protocol; +@Category(testsuite.x.AsyncTests.class) +public class XProtocolAsyncTest extends InternalXBaseTestCase { + private XProtocol protocol; @Before public void setupTestProtocol() { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { this.protocol = createAuthenticatedTestProtocol(); } } @After public void destroyTestProtocol() throws IOException { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { this.protocol.sendSessionClose(); this.protocol.readOk(); this.protocol.close(); @@ -87,7 +87,7 @@ public T get() { @Test public void simpleSuccessfulQuery() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = createTempTestCollection(this.protocol); @@ -97,10 +97,10 @@ public void simpleSuccessfulQuery() throws Exception { this.protocol.readStatementExecuteOk(); final ValueHolder> metadataHolder = new ValueHolder<>(); - final ValueHolder> rowHolder = new ValueHolder<>(); + final ValueHolder> rowHolder = new ValueHolder<>(); rowHolder.accept(new ArrayList<>()); final ValueHolder okHolder = new ValueHolder<>(); - final ValueHolder errHolder = new ValueHolder<>(); + final ValueHolder errHolder = new ValueHolder<>(); final ValueHolder excHolder = new ValueHolder<>(); this.protocol.asyncFind(new DocFindParams(getTestDatabase(), collName), DEFAULT_METADATA_CHARSET, new ResultListener() { @@ -108,28 +108,28 @@ public void onMetadata(ArrayList metadata) { metadataHolder.accept(metadata); } - public void onRow(MysqlxRow r) { + public void onRow(XProtocolRow r) { rowHolder.get().add(r); } public void onComplete(StatementExecuteOk ok) { okHolder.accept(ok); - synchronized (MysqlxProtocolAsyncTest.this) { - MysqlxProtocolAsyncTest.this.notify(); + synchronized (XProtocolAsyncTest.this) { + XProtocolAsyncTest.this.notify(); } } - public void onError(MysqlxError err) { + public void onError(XDevAPIError err) { errHolder.accept(err); - synchronized (MysqlxProtocolAsyncTest.this) { - MysqlxProtocolAsyncTest.this.notify(); + synchronized (XProtocolAsyncTest.this) { + XProtocolAsyncTest.this.notify(); } } public void onException(Throwable t) { excHolder.accept(t); - synchronized (MysqlxProtocolAsyncTest.this) { - MysqlxProtocolAsyncTest.this.notify(); + synchronized (XProtocolAsyncTest.this) { + XProtocolAsyncTest.this.notify(); } } }, new CompletableFuture()); diff --git a/src/test/java/testsuite/mysqlx/internal/MysqlxProtocolAuthTest.java b/src/test/java/testsuite/x/internal/XProtocolAuthTest.java similarity index 87% rename from src/test/java/testsuite/mysqlx/internal/MysqlxProtocolAuthTest.java rename to src/test/java/testsuite/x/internal/XProtocolAuthTest.java index 0deb88410..a409e5117 100644 --- a/src/test/java/testsuite/mysqlx/internal/MysqlxProtocolAuthTest.java +++ b/src/test/java/testsuite/x/internal/XProtocolAuthTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.internal; +package testsuite.x.internal; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -32,25 +32,25 @@ import org.junit.Test; import com.mysql.cj.core.exceptions.MysqlErrorNumbers; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.io.MysqlxProtocol; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.x.protocol.XProtocol; /** * Tests for protocol-level auth APIs against X Plugin via X Protocol. */ -public class MysqlxProtocolAuthTest extends InternalMysqlxBaseTestCase { - private static MysqlxProtocol protocol; +public class XProtocolAuthTest extends InternalXBaseTestCase { + private static XProtocol protocol; @Before public void setupTestProtocol() throws Exception { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { protocol = createTestProtocol(); } } @After public void destroyTestProtocol() throws Exception { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { protocol.close(); } } @@ -61,14 +61,14 @@ public void destroyTestProtocol() throws Exception { */ @Test public void testBadAuthMessage() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } try { protocol.sendCreateCollection(getTestDatabase(), "wont_be_Created"); protocol.readStatementExecuteOk(); fail("Should fail after first message is sent"); - } catch (MysqlxError err) { + } catch (XDevAPIError err) { // expected //ex.printStackTrace(); } @@ -77,7 +77,7 @@ public void testBadAuthMessage() throws Exception { @Test @Ignore("PLAIN only supported over SSL") public void testBasicSaslPlainAuth() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } protocol.sendSaslAuthStart(getTestUser(), getTestPassword(), getTestDatabase()); @@ -86,7 +86,7 @@ public void testBasicSaslPlainAuth() throws Exception { @Test public void testBasicSaslMysql41Auth() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } protocol.sendSaslMysql41AuthStart(); @@ -98,14 +98,14 @@ public void testBasicSaslMysql41Auth() throws Exception { @Test @Ignore("PLAIN only supported over SSL") public void testBasicSaslPlainAuthFailure() throws Exception { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } try { protocol.sendSaslAuthStart(getTestUser(), "com.mysql.cj.theWrongPassword", getTestDatabase()); protocol.readAuthenticateOk(); fail("Auth using wrong password should fail"); - } catch (MysqlxError ex) { + } catch (XDevAPIError ex) { assertEquals(MysqlErrorNumbers.ER_ACCESS_DENIED_ERROR, ex.getErrorCode()); assertEquals("ERROR 1045 (HY000) Invalid user or password", ex.getMessage()); } @@ -116,7 +116,7 @@ public void testBasicSaslPlainAuthFailure() throws Exception { */ @Test public void testEmptyDatabaseMYSQL41() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } protocol.sendSaslMysql41AuthStart(); @@ -131,7 +131,7 @@ public void testEmptyDatabaseMYSQL41() { @Test @Ignore("PLAIN only supported over SSL") public void testEmptyDatabasePLAIN() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } protocol.sendSaslAuthStart(getTestUser(), getTestPassword(), null); diff --git a/src/test/java/testsuite/mysqlx/internal/MysqlxProtocolTest.java b/src/test/java/testsuite/x/internal/XProtocolTest.java similarity index 94% rename from src/test/java/testsuite/mysqlx/internal/MysqlxProtocolTest.java rename to src/test/java/testsuite/x/internal/XProtocolTest.java index 66640c2fb..687c85102 100644 --- a/src/test/java/testsuite/mysqlx/internal/MysqlxProtocolTest.java +++ b/src/test/java/testsuite/x/internal/XProtocolTest.java @@ -21,7 +21,7 @@ */ -package testsuite.mysqlx.internal; +package testsuite.x.internal; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -42,38 +42,39 @@ import org.junit.Test; import com.mysql.cj.api.result.Row; -import com.mysql.cj.api.x.Warning; +import com.mysql.cj.api.xdevapi.UpdateType; +import com.mysql.cj.api.xdevapi.Warning; import com.mysql.cj.core.exceptions.MysqlErrorNumbers; -import com.mysql.cj.core.io.StatementExecuteOk; import com.mysql.cj.core.io.StringValueFactory; import com.mysql.cj.core.result.Field; import com.mysql.cj.mysqla.MysqlaConstants; -import com.mysql.cj.mysqlx.DocFindParams; -import com.mysql.cj.mysqlx.FilterParams; -import com.mysql.cj.mysqlx.FindParams; -import com.mysql.cj.mysqlx.InsertParams; -import com.mysql.cj.mysqlx.MysqlxError; -import com.mysql.cj.mysqlx.TableFindParams; -import com.mysql.cj.mysqlx.UpdateSpec; -import com.mysql.cj.mysqlx.UpdateSpec.UpdateType; -import com.mysql.cj.mysqlx.io.MysqlxProtocol; +import com.mysql.cj.x.core.StatementExecuteOk; +import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.x.protocol.XProtocol; +import com.mysql.cj.xdevapi.DocFindParams; +import com.mysql.cj.xdevapi.FilterParams; +import com.mysql.cj.xdevapi.FindParams; +import com.mysql.cj.xdevapi.InsertParams; +import com.mysql.cj.xdevapi.TableFindParams; +import com.mysql.cj.xdevapi.UpdateSpec; +import com.mysql.cj.xdevapi.WarningImpl; /** * Tests for protocol-level APIs against X Plugin via X Protocol. */ -public class MysqlxProtocolTest extends InternalMysqlxBaseTestCase { - private MysqlxProtocol protocol; +public class XProtocolTest extends InternalXBaseTestCase { + private XProtocol protocol; @Before public void setupTestProtocol() { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { this.protocol = createAuthenticatedTestProtocol(); } } @After public void destroyTestProtocol() throws IOException { - if (this.isSetForMySQLxTests) { + if (this.isSetForXTests) { try { this.protocol.sendSessionClose(); this.protocol.readOk(); @@ -91,13 +92,13 @@ public void destroyTestProtocol() throws IOException { */ @Test public void testCreateAndDropCollection() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } try { this.protocol.sendCreateCollection(getTestDatabase(), "testCreateAndDropCollection"); this.protocol.readStatementExecuteOk(); - } catch (MysqlxError err) { + } catch (XDevAPIError err) { // leftovers, clean them up now if (err.getErrorCode() == MysqlErrorNumbers.ER_TABLE_EXISTS_ERROR) { this.protocol.sendDropCollection(getTestDatabase(), "testCreateAndDropCollection"); @@ -116,7 +117,7 @@ public void testCreateAndDropCollection() { @Test public void testTrivialSqlQuery() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.protocol.sendSqlStatement("select 'x' as y"); @@ -136,7 +137,7 @@ public void testTrivialSqlQuery() { @Test public void testAnotherBasicSqlQuery() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.protocol.sendSqlStatement("select 'x' as a_string, 42 as a_long, 7.6 as a_decimal union select 'y' as a_string, 11 as a_long, .1111 as a_decimal"); @@ -180,7 +181,7 @@ public void testAnotherBasicSqlQuery() { */ @Test public void testDecodingAllTypes() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } // some types depend on this table @@ -287,7 +288,7 @@ public void testDecodingAllTypes() { */ @Test public void testSqlDml() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.protocol.sendSqlStatement("drop table if exists mysqlx_sqlDmlTest"); @@ -313,7 +314,7 @@ public void testSqlDml() { @Test public void testBasicCrudInsertFind() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = createTempTestCollection(this.protocol); @@ -334,7 +335,7 @@ public void testBasicCrudInsertFind() { @Test public void testMultiInsert() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = createTempTestCollection(this.protocol); @@ -364,7 +365,7 @@ public void testMultiInsert() { @Test public void testDocUpdate() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } String collName = createTempTestCollection(this.protocol); @@ -390,7 +391,7 @@ public void testDocUpdate() { @Test public void tableInsert() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.protocol.sendSqlStatement("drop table if exists tableInsert"); @@ -428,14 +429,15 @@ public void tableInsert() { @Test public void testWarnings() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.protocol.sendSqlStatement("explain select 1"); this.protocol.readMetadata(DEFAULT_METADATA_CHARSET); this.protocol.drainRows(); StatementExecuteOk ok = this.protocol.readStatementExecuteOk(); - List warnings = ok.getWarnings(); + List warnings = ok.getWarnings().stream().map(w -> new WarningImpl(w)).collect(Collectors.toList()); + assertEquals(1, warnings.size()); Warning w = warnings.get(0); assertEquals(1, w.getLevel()); @@ -446,7 +448,7 @@ public void testWarnings() { @Test public void testEnableDisableNotices() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.protocol.sendDisableNotices("warnings"); // TODO currently only "warnings" are allowed to be disabled @@ -472,7 +474,7 @@ public void testEnableDisableNotices() { */ @Test public void testResultSet() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } // begin "send" stage, change this as necessary @@ -501,7 +503,7 @@ public void testResultSet() { @Test public void testCapabilities() { - if (!this.isSetForMySQLxTests) { + if (!this.isSetForXTests) { return; } this.protocol.getPluginVersion(); diff --git a/src/test/java/testsuite/mysqlx/internal/package-info.java b/src/test/java/testsuite/x/internal/package-info.java similarity index 97% rename from src/test/java/testsuite/mysqlx/internal/package-info.java rename to src/test/java/testsuite/x/internal/package-info.java index c0dbe94d0..36af13490 100644 --- a/src/test/java/testsuite/mysqlx/internal/package-info.java +++ b/src/test/java/testsuite/x/internal/package-info.java @@ -25,4 +25,4 @@ * Tests for internal components of the X Protocol and X DevAPI features. */ -package testsuite.mysqlx.internal; +package testsuite.x.internal; From 2ac9ee9ca2406bbaa141c1d9eb2623060e585779 Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Sat, 15 Oct 2016 00:42:13 +0100 Subject: [PATCH 004/625] Fix for SyntaxRegressionTest.testExplicitPartitions() failures with MySQL 5.7.16. --- .../regression/SyntaxRegressionTest.java | 41 ++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/src/testsuite/regression/SyntaxRegressionTest.java b/src/testsuite/regression/SyntaxRegressionTest.java index 0416afbc9..b4ef9ee9c 100644 --- a/src/testsuite/regression/SyntaxRegressionTest.java +++ b/src/testsuite/regression/SyntaxRegressionTest.java @@ -380,15 +380,36 @@ public void testExchangePartition() throws Exception { * @throws SQLException */ public void testExplicitPartitions() throws Exception { - if (versionMeetsMinimum(5, 6, 5)) { - Connection c = null; + String datadir = null; + this.rs = this.stmt.executeQuery("SHOW VARIABLES WHERE Variable_name='datadir'"); + this.rs.next(); + datadir = this.rs.getString(2); + if (datadir != null) { + datadir = new File(datadir).getCanonicalPath(); + } + + this.rs = this.stmt.executeQuery("SHOW VARIABLES WHERE Variable_name='secure_file_priv'"); + this.rs.next(); + String fileprivdir = this.rs.getString(2); + if ("NULL".equalsIgnoreCase(this.rs.getString(2))) { + fail("To run this test the server needs to be started with the option\"--secure-file-priv=\""); + } else if (fileprivdir.length() > 0) { + fileprivdir = new File(fileprivdir).getCanonicalPath(); + if (!datadir.equals(fileprivdir)) { + fail("To run this test the server option\"--secure-file-priv=\" needs to be empty or to match the server's data directory."); + } + } + + Connection c = null; Properties props = new NonRegisteringDriver().parseURL(dbUrl, null); String dbname = props.getProperty(NonRegisteringDriver.DBNAME_PROPERTY_KEY); props = new Properties(); props.setProperty("useServerPrepStmts", "true"); + + boolean exceptionCaugth = false; try { this.stmt.executeUpdate("SET @old_default_storage_engine = @@default_storage_engine"); @@ -453,14 +474,10 @@ public void testExplicitPartitions() throws Exception { this.stmt.executeUpdate("UNLOCK TABLES"); // Test LOAD - this.rs = this.stmt.executeQuery("SHOW VARIABLES WHERE Variable_name='datadir'"); - this.rs.next(); - datadir = this.rs.getString(2); - if (dbname == null) { fail("No database selected"); } else { - File f = new File(datadir + dbname + File.separator + "loadtestExplicitPartitions.txt"); + File f = new File(datadir + File.separator + dbname + File.separator + "loadtestExplicitPartitions.txt"); if (f.exists()) { f.delete(); } @@ -606,6 +623,10 @@ public void testExplicitPartitions() throws Exception { this.stmt.executeUpdate("SET @@default_storage_engine = @old_default_storage_engine"); + } catch (SQLException e) { + exceptionCaugth = true; + fail(e.getMessage()); + } finally { this.stmt.executeUpdate("DROP TABLE IF EXISTS testExplicitPartitions, testExplicitPartitions2, testExplicitPartitions3"); @@ -613,11 +634,11 @@ public void testExplicitPartitions() throws Exception { c.close(); } if (datadir != null) { - File f = new File(datadir + dbname + File.separator + "loadtestExplicitPartitions.txt"); + File f = new File(datadir + File.separator + dbname + File.separator + "loadtestExplicitPartitions.txt"); if (f.exists()) { f.deleteOnExit(); - } else { - fail("File " + datadir + dbname + File.separator + "loadtestExplicitPartitions.txt cannot be deleted." + } else if (!exceptionCaugth) { + fail("File " + datadir + File.separator + dbname + File.separator + "loadtestExplicitPartitions.txt cannot be deleted." + "You should run server and tests on the same filesystem."); } } From 6b46452817c4522e7ae8f105df8e3882d8c9e16e Mon Sep 17 00:00:00 2001 From: Alexander Soklakov Date: Wed, 19 Oct 2016 13:51:54 +0400 Subject: [PATCH 005/625] MYSQLCONNJ-840, Reorganize X DevAPI packages. Part 2. --- .../ColToFieldTransformer.java | 2 +- .../x/{protocol => io}/DecoderFunction.java | 2 +- .../x/{protocol => io}/MessageConstants.java | 2 +- .../x/{protocol => io}/MessageListener.java | 2 +- .../api/x/{protocol => io}/MessageReader.java | 2 +- .../api/x/{protocol => io}/MessageWriter.java | 2 +- .../MetadataToRowToElement.java | 2 +- .../api/x/{protocol => io}/ResultListener.java | 4 ++-- .../api/x/{protocol => io}/ResultStreamer.java | 2 +- .../XpluginStatementCommand.java | 2 +- .../com/mysql/cj/x/core/MysqlxSession.java | 18 +++++++++--------- .../x/{protocol => io}/AsyncMessageReader.java | 8 ++++---- .../x/{protocol => io}/AsyncMessageWriter.java | 4 ++-- .../x/{protocol => io}/DevapiRowFactory.java | 2 +- .../ErrorToFutureCompletionHandler.java | 2 +- .../cj/x/{protocol => io}/MessageBuilder.java | 4 ++-- .../ResultCreatingResultListener.java | 4 ++-- .../ResultMessageListener.java | 8 ++++---- .../RowWiseReducingResultListener.java | 6 +++--- .../SerializingBufferWriter.java | 2 +- .../SqlResultMessageListener.java | 6 +++--- .../StatementExecuteOkBuilder.java | 4 ++-- .../StatementExecuteOkMessageListener.java | 4 ++-- .../x/{protocol => io}/SyncMessageReader.java | 6 +++--- .../x/{protocol => io}/SyncMessageWriter.java | 4 ++-- .../TlsDecryptingByteChannel.java | 2 +- .../TlsEncryptingByteChannel.java | 2 +- .../mysql/cj/x/{protocol => io}/XProtocol.java | 14 +++++++------- .../x/{protocol => io}/XProtocolDecoder.java | 4 ++-- .../x/{protocol => io}/XProtocolEncoder.java | 2 +- .../x/{protocol => io}/XProtocolFactory.java | 6 +++--- .../cj/x/{protocol => io}/XProtocolRow.java | 4 ++-- .../XProtocolRowInputStream.java | 2 +- .../mysql/cj/xdevapi/AbstractDataResult.java | 2 +- .../com/mysql/cj/xdevapi/RowResultImpl.java | 2 +- .../com/mysql/cj/xdevapi/SqlResultImpl.java | 2 +- .../AsyncMessageReaderTest.java | 6 +++--- .../SyncMessageReaderTest.java | 6 +++--- .../SyncMessageWriterTest.java | 4 ++-- .../x/internal/InternalXBaseTestCase.java | 4 ++-- .../x/internal/XProtocolAsyncTest.java | 6 +++--- .../x/internal/XProtocolAuthTest.java | 2 +- .../testsuite/x/internal/XProtocolTest.java | 2 +- 43 files changed, 88 insertions(+), 88 deletions(-) rename src/main/java/com/mysql/cj/api/x/{protocol => io}/ColToFieldTransformer.java (97%) rename src/main/java/com/mysql/cj/api/x/{protocol => io}/DecoderFunction.java (97%) rename src/main/java/com/mysql/cj/api/x/{protocol => io}/MessageConstants.java (99%) rename src/main/java/com/mysql/cj/api/x/{protocol => io}/MessageListener.java (97%) rename src/main/java/com/mysql/cj/api/x/{protocol => io}/MessageReader.java (99%) rename src/main/java/com/mysql/cj/api/x/{protocol => io}/MessageWriter.java (98%) rename src/main/java/com/mysql/cj/api/x/{protocol => io}/MetadataToRowToElement.java (97%) rename src/main/java/com/mysql/cj/api/x/{protocol => io}/ResultListener.java (95%) rename src/main/java/com/mysql/cj/api/x/{protocol => io}/ResultStreamer.java (97%) rename src/main/java/com/mysql/cj/api/x/{protocol => io}/XpluginStatementCommand.java (98%) rename src/main/java/com/mysql/cj/x/{protocol => io}/AsyncMessageReader.java (99%) rename src/main/java/com/mysql/cj/x/{protocol => io}/AsyncMessageWriter.java (98%) rename src/main/java/com/mysql/cj/x/{protocol => io}/DevapiRowFactory.java (98%) rename src/main/java/com/mysql/cj/x/{protocol => io}/ErrorToFutureCompletionHandler.java (98%) rename src/main/java/com/mysql/cj/x/{protocol => io}/MessageBuilder.java (99%) rename src/main/java/com/mysql/cj/x/{protocol => io}/ResultCreatingResultListener.java (97%) rename src/main/java/com/mysql/cj/x/{protocol => io}/ResultMessageListener.java (95%) rename src/main/java/com/mysql/cj/x/{protocol => io}/RowWiseReducingResultListener.java (95%) rename src/main/java/com/mysql/cj/x/{protocol => io}/SerializingBufferWriter.java (99%) rename src/main/java/com/mysql/cj/x/{protocol => io}/SqlResultMessageListener.java (96%) rename src/main/java/com/mysql/cj/x/{protocol => io}/StatementExecuteOkBuilder.java (97%) rename src/main/java/com/mysql/cj/x/{protocol => io}/StatementExecuteOkMessageListener.java (97%) rename src/main/java/com/mysql/cj/x/{protocol => io}/SyncMessageReader.java (97%) rename src/main/java/com/mysql/cj/x/{protocol => io}/SyncMessageWriter.java (97%) rename src/main/java/com/mysql/cj/x/{protocol => io}/TlsDecryptingByteChannel.java (99%) rename src/main/java/com/mysql/cj/x/{protocol => io}/TlsEncryptingByteChannel.java (99%) rename src/main/java/com/mysql/cj/x/{protocol => io}/XProtocol.java (98%) rename src/main/java/com/mysql/cj/x/{protocol => io}/XProtocolDecoder.java (99%) rename src/main/java/com/mysql/cj/x/{protocol => io}/XProtocolEncoder.java (97%) rename src/main/java/com/mysql/cj/x/{protocol => io}/XProtocolFactory.java (98%) rename src/main/java/com/mysql/cj/x/{protocol => io}/XProtocolRow.java (97%) rename src/main/java/com/mysql/cj/x/{protocol => io}/XProtocolRowInputStream.java (98%) rename src/test/java/com/mysql/cj/x/{protocol => io}/AsyncMessageReaderTest.java (98%) rename src/test/java/com/mysql/cj/x/{protocol => io}/SyncMessageReaderTest.java (98%) rename src/test/java/com/mysql/cj/x/{protocol => io}/SyncMessageWriterTest.java (97%) diff --git a/src/main/java/com/mysql/cj/api/x/protocol/ColToFieldTransformer.java b/src/main/java/com/mysql/cj/api/x/io/ColToFieldTransformer.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/protocol/ColToFieldTransformer.java rename to src/main/java/com/mysql/cj/api/x/io/ColToFieldTransformer.java index b0b70291e..7cabdee10 100644 --- a/src/main/java/com/mysql/cj/api/x/protocol/ColToFieldTransformer.java +++ b/src/main/java/com/mysql/cj/api/x/io/ColToFieldTransformer.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x.protocol; +package com.mysql.cj.api.x.io; import java.util.function.Function; diff --git a/src/main/java/com/mysql/cj/api/x/protocol/DecoderFunction.java b/src/main/java/com/mysql/cj/api/x/io/DecoderFunction.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/protocol/DecoderFunction.java rename to src/main/java/com/mysql/cj/api/x/io/DecoderFunction.java index 18867e265..c877bc898 100644 --- a/src/main/java/com/mysql/cj/api/x/protocol/DecoderFunction.java +++ b/src/main/java/com/mysql/cj/api/x/io/DecoderFunction.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x.protocol; +package com.mysql.cj.api.x.io; import java.io.IOException; diff --git a/src/main/java/com/mysql/cj/api/x/protocol/MessageConstants.java b/src/main/java/com/mysql/cj/api/x/io/MessageConstants.java similarity index 99% rename from src/main/java/com/mysql/cj/api/x/protocol/MessageConstants.java rename to src/main/java/com/mysql/cj/api/x/io/MessageConstants.java index b1acff24f..6ccd012b2 100644 --- a/src/main/java/com/mysql/cj/api/x/protocol/MessageConstants.java +++ b/src/main/java/com/mysql/cj/api/x/io/MessageConstants.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x.protocol; +package com.mysql.cj.api.x.io; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/com/mysql/cj/api/x/protocol/MessageListener.java b/src/main/java/com/mysql/cj/api/x/io/MessageListener.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/protocol/MessageListener.java rename to src/main/java/com/mysql/cj/api/x/io/MessageListener.java index f695d1335..95bf37b27 100644 --- a/src/main/java/com/mysql/cj/api/x/protocol/MessageListener.java +++ b/src/main/java/com/mysql/cj/api/x/io/MessageListener.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x.protocol; +package com.mysql.cj.api.x.io; import java.util.function.BiFunction; diff --git a/src/main/java/com/mysql/cj/api/x/protocol/MessageReader.java b/src/main/java/com/mysql/cj/api/x/io/MessageReader.java similarity index 99% rename from src/main/java/com/mysql/cj/api/x/protocol/MessageReader.java rename to src/main/java/com/mysql/cj/api/x/io/MessageReader.java index e33ce1c41..6fc02beec 100644 --- a/src/main/java/com/mysql/cj/api/x/protocol/MessageReader.java +++ b/src/main/java/com/mysql/cj/api/x/io/MessageReader.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x.protocol; +package com.mysql.cj.api.x.io; import com.google.protobuf.ByteString; import com.google.protobuf.GeneratedMessage; diff --git a/src/main/java/com/mysql/cj/api/x/protocol/MessageWriter.java b/src/main/java/com/mysql/cj/api/x/io/MessageWriter.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/protocol/MessageWriter.java rename to src/main/java/com/mysql/cj/api/x/io/MessageWriter.java index bcc0435f4..8c2bc90f3 100644 --- a/src/main/java/com/mysql/cj/api/x/protocol/MessageWriter.java +++ b/src/main/java/com/mysql/cj/api/x/io/MessageWriter.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x.protocol; +package com.mysql.cj.api.x.io; import com.google.protobuf.MessageLite; import com.mysql.cj.core.exceptions.WrongArgumentException; diff --git a/src/main/java/com/mysql/cj/api/x/protocol/MetadataToRowToElement.java b/src/main/java/com/mysql/cj/api/x/io/MetadataToRowToElement.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/protocol/MetadataToRowToElement.java rename to src/main/java/com/mysql/cj/api/x/io/MetadataToRowToElement.java index 2a2373d8f..998278214 100644 --- a/src/main/java/com/mysql/cj/api/x/protocol/MetadataToRowToElement.java +++ b/src/main/java/com/mysql/cj/api/x/io/MetadataToRowToElement.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x.protocol; +package com.mysql.cj.api.x.io; import java.util.ArrayList; import java.util.function.Function; diff --git a/src/main/java/com/mysql/cj/api/x/protocol/ResultListener.java b/src/main/java/com/mysql/cj/api/x/io/ResultListener.java similarity index 95% rename from src/main/java/com/mysql/cj/api/x/protocol/ResultListener.java rename to src/main/java/com/mysql/cj/api/x/io/ResultListener.java index 4736e2f9f..4fb9f95e7 100644 --- a/src/main/java/com/mysql/cj/api/x/protocol/ResultListener.java +++ b/src/main/java/com/mysql/cj/api/x/io/ResultListener.java @@ -21,14 +21,14 @@ */ -package com.mysql.cj.api.x.protocol; +package com.mysql.cj.api.x.io; import java.util.ArrayList; import com.mysql.cj.core.result.Field; import com.mysql.cj.x.core.StatementExecuteOk; import com.mysql.cj.x.core.XDevAPIError; -import com.mysql.cj.x.protocol.XProtocolRow; +import com.mysql.cj.x.io.XProtocolRow; public interface ResultListener { /** diff --git a/src/main/java/com/mysql/cj/api/x/protocol/ResultStreamer.java b/src/main/java/com/mysql/cj/api/x/io/ResultStreamer.java similarity index 97% rename from src/main/java/com/mysql/cj/api/x/protocol/ResultStreamer.java rename to src/main/java/com/mysql/cj/api/x/io/ResultStreamer.java index edac3801a..7510e8404 100644 --- a/src/main/java/com/mysql/cj/api/x/protocol/ResultStreamer.java +++ b/src/main/java/com/mysql/cj/api/x/io/ResultStreamer.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x.protocol; +package com.mysql.cj.api.x.io; /** * A result streamer is a result object that is streaming results from the current connection. It allows to stream as long as nothing else needs to happen on diff --git a/src/main/java/com/mysql/cj/api/x/protocol/XpluginStatementCommand.java b/src/main/java/com/mysql/cj/api/x/io/XpluginStatementCommand.java similarity index 98% rename from src/main/java/com/mysql/cj/api/x/protocol/XpluginStatementCommand.java rename to src/main/java/com/mysql/cj/api/x/io/XpluginStatementCommand.java index c23004754..2c2ea7672 100644 --- a/src/main/java/com/mysql/cj/api/x/protocol/XpluginStatementCommand.java +++ b/src/main/java/com/mysql/cj/api/x/io/XpluginStatementCommand.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.api.x.protocol; +package com.mysql.cj.api.x.io; public enum XpluginStatementCommand { XPLUGIN_STMT_CREATE_COLLECTION("create_collection"), XPLUGIN_STMT_CREATE_COLLECTION_INDEX("create_collection_index"), diff --git a/src/main/java/com/mysql/cj/x/core/MysqlxSession.java b/src/main/java/com/mysql/cj/x/core/MysqlxSession.java index f6388473e..31aa7b73e 100644 --- a/src/main/java/com/mysql/cj/x/core/MysqlxSession.java +++ b/src/main/java/com/mysql/cj/x/core/MysqlxSession.java @@ -48,9 +48,9 @@ import com.mysql.cj.api.log.Log; import com.mysql.cj.api.result.Row; import com.mysql.cj.api.x.core.ResultCtor; -import com.mysql.cj.api.x.protocol.MetadataToRowToElement; -import com.mysql.cj.api.x.protocol.ResultListener; -import com.mysql.cj.api.x.protocol.ResultStreamer; +import com.mysql.cj.api.x.io.MetadataToRowToElement; +import com.mysql.cj.api.x.io.ResultListener; +import com.mysql.cj.api.x.io.ResultStreamer; import com.mysql.cj.api.xdevapi.DatabaseObject; import com.mysql.cj.api.xdevapi.DocResult; import com.mysql.cj.api.xdevapi.RowResult; @@ -64,12 +64,12 @@ import com.mysql.cj.core.io.StringValueFactory; import com.mysql.cj.core.result.Field; import com.mysql.cj.core.util.StringUtils; -import com.mysql.cj.x.protocol.XProtocol; -import com.mysql.cj.x.protocol.XProtocolFactory; -import com.mysql.cj.x.protocol.DevapiRowFactory; -import com.mysql.cj.x.protocol.ResultCreatingResultListener; -import com.mysql.cj.x.protocol.RowWiseReducingResultListener; -import com.mysql.cj.x.protocol.StatementExecuteOkBuilder; +import com.mysql.cj.x.io.DevapiRowFactory; +import com.mysql.cj.x.io.ResultCreatingResultListener; +import com.mysql.cj.x.io.RowWiseReducingResultListener; +import com.mysql.cj.x.io.StatementExecuteOkBuilder; +import com.mysql.cj.x.io.XProtocol; +import com.mysql.cj.x.io.XProtocolFactory; import com.mysql.cj.xdevapi.CreateIndexParams; import com.mysql.cj.xdevapi.DbDoc; import com.mysql.cj.xdevapi.DbDocValueFactory; diff --git a/src/main/java/com/mysql/cj/x/protocol/AsyncMessageReader.java b/src/main/java/com/mysql/cj/x/io/AsyncMessageReader.java similarity index 99% rename from src/main/java/com/mysql/cj/x/protocol/AsyncMessageReader.java rename to src/main/java/com/mysql/cj/x/io/AsyncMessageReader.java index af1b4c189..d9b56c8ce 100644 --- a/src/main/java/com/mysql/cj/x/protocol/AsyncMessageReader.java +++ b/src/main/java/com/mysql/cj/x/io/AsyncMessageReader.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.io.IOException; import java.nio.ByteBuffer; @@ -40,9 +40,9 @@ import com.google.protobuf.GeneratedMessage; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.Parser; -import com.mysql.cj.api.x.protocol.MessageConstants; -import com.mysql.cj.api.x.protocol.MessageListener; -import com.mysql.cj.api.x.protocol.MessageReader; +import com.mysql.cj.api.x.io.MessageConstants; +import com.mysql.cj.api.x.io.MessageListener; +import com.mysql.cj.api.x.io.MessageReader; import com.mysql.cj.core.exceptions.AssertionFailedException; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.exceptions.WrongArgumentException; diff --git a/src/main/java/com/mysql/cj/x/protocol/AsyncMessageWriter.java b/src/main/java/com/mysql/cj/x/io/AsyncMessageWriter.java similarity index 98% rename from src/main/java/com/mysql/cj/x/protocol/AsyncMessageWriter.java rename to src/main/java/com/mysql/cj/x/io/AsyncMessageWriter.java index 1f05dcfea..5ca5fcf9e 100644 --- a/src/main/java/com/mysql/cj/x/protocol/AsyncMessageWriter.java +++ b/src/main/java/com/mysql/cj/x/io/AsyncMessageWriter.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.io.IOException; import java.nio.ByteBuffer; @@ -33,7 +33,7 @@ import com.google.protobuf.CodedOutputStream; import com.google.protobuf.MessageLite; -import com.mysql.cj.api.x.protocol.MessageWriter; +import com.mysql.cj.api.x.io.MessageWriter; import com.mysql.cj.core.Messages; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.exceptions.CJPacketTooBigException; diff --git a/src/main/java/com/mysql/cj/x/protocol/DevapiRowFactory.java b/src/main/java/com/mysql/cj/x/io/DevapiRowFactory.java similarity index 98% rename from src/main/java/com/mysql/cj/x/protocol/DevapiRowFactory.java rename to src/main/java/com/mysql/cj/x/io/DevapiRowFactory.java index e07a459c9..886482d4d 100644 --- a/src/main/java/com/mysql/cj/x/protocol/DevapiRowFactory.java +++ b/src/main/java/com/mysql/cj/x/io/DevapiRowFactory.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/mysql/cj/x/protocol/ErrorToFutureCompletionHandler.java b/src/main/java/com/mysql/cj/x/io/ErrorToFutureCompletionHandler.java similarity index 98% rename from src/main/java/com/mysql/cj/x/protocol/ErrorToFutureCompletionHandler.java rename to src/main/java/com/mysql/cj/x/io/ErrorToFutureCompletionHandler.java index 2b555846e..75b8bb9bc 100644 --- a/src/main/java/com/mysql/cj/x/protocol/ErrorToFutureCompletionHandler.java +++ b/src/main/java/com/mysql/cj/x/io/ErrorToFutureCompletionHandler.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.util.concurrent.CompletableFuture; import java.nio.channels.CompletionHandler; diff --git a/src/main/java/com/mysql/cj/x/protocol/MessageBuilder.java b/src/main/java/com/mysql/cj/x/io/MessageBuilder.java similarity index 99% rename from src/main/java/com/mysql/cj/x/protocol/MessageBuilder.java rename to src/main/java/com/mysql/cj/x/io/MessageBuilder.java index ae12972ff..8fad8b828 100644 --- a/src/main/java/com/mysql/cj/x/protocol/MessageBuilder.java +++ b/src/main/java/com/mysql/cj/x/io/MessageBuilder.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.util.Arrays; import java.util.List; @@ -38,7 +38,7 @@ import javax.security.sasl.SaslException; import com.google.protobuf.ByteString; -import com.mysql.cj.api.x.protocol.XpluginStatementCommand; +import com.mysql.cj.api.x.io.XpluginStatementCommand; import com.mysql.cj.core.authentication.Security; import com.mysql.cj.core.util.StringUtils; import com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities; diff --git a/src/main/java/com/mysql/cj/x/protocol/ResultCreatingResultListener.java b/src/main/java/com/mysql/cj/x/io/ResultCreatingResultListener.java similarity index 97% rename from src/main/java/com/mysql/cj/x/protocol/ResultCreatingResultListener.java rename to src/main/java/com/mysql/cj/x/io/ResultCreatingResultListener.java index e40970b97..7b528c080 100644 --- a/src/main/java/com/mysql/cj/x/protocol/ResultCreatingResultListener.java +++ b/src/main/java/com/mysql/cj/x/io/ResultCreatingResultListener.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.util.ArrayList; import java.util.List; @@ -30,7 +30,7 @@ import com.mysql.cj.api.result.Row; import com.mysql.cj.api.result.RowList; import com.mysql.cj.api.x.core.ResultCtor; -import com.mysql.cj.api.x.protocol.ResultListener; +import com.mysql.cj.api.x.io.ResultListener; import com.mysql.cj.core.result.BufferedRowList; import com.mysql.cj.core.result.Field; import com.mysql.cj.x.core.StatementExecuteOk; diff --git a/src/main/java/com/mysql/cj/x/protocol/ResultMessageListener.java b/src/main/java/com/mysql/cj/x/io/ResultMessageListener.java similarity index 95% rename from src/main/java/com/mysql/cj/x/protocol/ResultMessageListener.java rename to src/main/java/com/mysql/cj/x/io/ResultMessageListener.java index 731fe9a02..f3045b37e 100644 --- a/src/main/java/com/mysql/cj/x/protocol/ResultMessageListener.java +++ b/src/main/java/com/mysql/cj/x/io/ResultMessageListener.java @@ -21,14 +21,14 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.util.ArrayList; import com.google.protobuf.GeneratedMessage; -import com.mysql.cj.api.x.protocol.ColToFieldTransformer; -import com.mysql.cj.api.x.protocol.MessageListener; -import com.mysql.cj.api.x.protocol.ResultListener; +import com.mysql.cj.api.x.io.ColToFieldTransformer; +import com.mysql.cj.api.x.io.MessageListener; +import com.mysql.cj.api.x.io.ResultListener; import com.mysql.cj.core.exceptions.WrongArgumentException; import com.mysql.cj.core.result.Field; import com.mysql.cj.x.core.XDevAPIError; diff --git a/src/main/java/com/mysql/cj/x/protocol/RowWiseReducingResultListener.java b/src/main/java/com/mysql/cj/x/io/RowWiseReducingResultListener.java similarity index 95% rename from src/main/java/com/mysql/cj/x/protocol/RowWiseReducingResultListener.java rename to src/main/java/com/mysql/cj/x/io/RowWiseReducingResultListener.java index f2dc734f5..14a12a269 100644 --- a/src/main/java/com/mysql/cj/x/protocol/RowWiseReducingResultListener.java +++ b/src/main/java/com/mysql/cj/x/io/RowWiseReducingResultListener.java @@ -21,14 +21,14 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.util.ArrayList; import java.util.concurrent.CompletableFuture; import com.mysql.cj.api.x.core.RowToElement; -import com.mysql.cj.api.x.protocol.MetadataToRowToElement; -import com.mysql.cj.api.x.protocol.ResultListener; +import com.mysql.cj.api.x.io.MetadataToRowToElement; +import com.mysql.cj.api.x.io.ResultListener; import com.mysql.cj.api.xdevapi.DataStatement.Reducer; import com.mysql.cj.core.result.Field; import com.mysql.cj.x.core.StatementExecuteOk; diff --git a/src/main/java/com/mysql/cj/x/protocol/SerializingBufferWriter.java b/src/main/java/com/mysql/cj/x/io/SerializingBufferWriter.java similarity index 99% rename from src/main/java/com/mysql/cj/x/protocol/SerializingBufferWriter.java rename to src/main/java/com/mysql/cj/x/io/SerializingBufferWriter.java index 2cbef5005..76ed8b8f5 100644 --- a/src/main/java/com/mysql/cj/x/protocol/SerializingBufferWriter.java +++ b/src/main/java/com/mysql/cj/x/io/SerializingBufferWriter.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousSocketChannel; diff --git a/src/main/java/com/mysql/cj/x/protocol/SqlResultMessageListener.java b/src/main/java/com/mysql/cj/x/io/SqlResultMessageListener.java similarity index 96% rename from src/main/java/com/mysql/cj/x/protocol/SqlResultMessageListener.java rename to src/main/java/com/mysql/cj/x/io/SqlResultMessageListener.java index 793bffeb8..fe2d1e412 100644 --- a/src/main/java/com/mysql/cj/x/protocol/SqlResultMessageListener.java +++ b/src/main/java/com/mysql/cj/x/io/SqlResultMessageListener.java @@ -21,15 +21,15 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.util.TimeZone; import java.util.concurrent.CompletableFuture; import com.google.protobuf.GeneratedMessage; import com.mysql.cj.api.x.core.ResultCtor; -import com.mysql.cj.api.x.protocol.ColToFieldTransformer; -import com.mysql.cj.api.x.protocol.MessageListener; +import com.mysql.cj.api.x.io.ColToFieldTransformer; +import com.mysql.cj.api.x.io.MessageListener; import com.mysql.cj.api.xdevapi.SqlResult; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.x.core.StatementExecuteOk; diff --git a/src/main/java/com/mysql/cj/x/protocol/StatementExecuteOkBuilder.java b/src/main/java/com/mysql/cj/x/io/StatementExecuteOkBuilder.java similarity index 97% rename from src/main/java/com/mysql/cj/x/protocol/StatementExecuteOkBuilder.java rename to src/main/java/com/mysql/cj/x/io/StatementExecuteOkBuilder.java index 03a6b277e..f9e22b791 100644 --- a/src/main/java/com/mysql/cj/x/protocol/StatementExecuteOkBuilder.java +++ b/src/main/java/com/mysql/cj/x/io/StatementExecuteOkBuilder.java @@ -21,12 +21,12 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.util.ArrayList; import java.util.List; -import com.mysql.cj.api.x.protocol.MessageReader; +import com.mysql.cj.api.x.io.MessageReader; import com.mysql.cj.core.exceptions.WrongArgumentException; import com.mysql.cj.x.core.CoreWarning; import com.mysql.cj.x.core.StatementExecuteOk; diff --git a/src/main/java/com/mysql/cj/x/protocol/StatementExecuteOkMessageListener.java b/src/main/java/com/mysql/cj/x/io/StatementExecuteOkMessageListener.java similarity index 97% rename from src/main/java/com/mysql/cj/x/protocol/StatementExecuteOkMessageListener.java rename to src/main/java/com/mysql/cj/x/io/StatementExecuteOkMessageListener.java index 73a105444..cf515b1a9 100644 --- a/src/main/java/com/mysql/cj/x/protocol/StatementExecuteOkMessageListener.java +++ b/src/main/java/com/mysql/cj/x/io/StatementExecuteOkMessageListener.java @@ -21,12 +21,12 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.util.concurrent.CompletableFuture; import com.google.protobuf.GeneratedMessage; -import com.mysql.cj.api.x.protocol.MessageListener; +import com.mysql.cj.api.x.io.MessageListener; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.exceptions.WrongArgumentException; import com.mysql.cj.x.core.StatementExecuteOk; diff --git a/src/main/java/com/mysql/cj/x/protocol/SyncMessageReader.java b/src/main/java/com/mysql/cj/x/io/SyncMessageReader.java similarity index 97% rename from src/main/java/com/mysql/cj/x/protocol/SyncMessageReader.java rename to src/main/java/com/mysql/cj/x/io/SyncMessageReader.java index 275d186b3..7300803bd 100644 --- a/src/main/java/com/mysql/cj/x/protocol/SyncMessageReader.java +++ b/src/main/java/com/mysql/cj/x/io/SyncMessageReader.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.io.IOException; import java.nio.ByteBuffer; @@ -30,8 +30,8 @@ import com.google.protobuf.GeneratedMessage; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.Parser; -import com.mysql.cj.api.x.protocol.MessageConstants; -import com.mysql.cj.api.x.protocol.MessageReader; +import com.mysql.cj.api.x.io.MessageConstants; +import com.mysql.cj.api.x.io.MessageReader; import com.mysql.cj.core.exceptions.AssertionFailedException; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.exceptions.WrongArgumentException; diff --git a/src/main/java/com/mysql/cj/x/protocol/SyncMessageWriter.java b/src/main/java/com/mysql/cj/x/io/SyncMessageWriter.java similarity index 97% rename from src/main/java/com/mysql/cj/x/protocol/SyncMessageWriter.java rename to src/main/java/com/mysql/cj/x/io/SyncMessageWriter.java index 2b3929029..905bba6df 100644 --- a/src/main/java/com/mysql/cj/x/protocol/SyncMessageWriter.java +++ b/src/main/java/com/mysql/cj/x/io/SyncMessageWriter.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.io.BufferedOutputStream; import java.io.IOException; @@ -30,7 +30,7 @@ import com.google.protobuf.MessageLite; import com.mysql.cj.api.io.PacketSentTimeHolder; -import com.mysql.cj.api.x.protocol.MessageWriter; +import com.mysql.cj.api.x.io.MessageWriter; import com.mysql.cj.core.Messages; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.exceptions.CJPacketTooBigException; diff --git a/src/main/java/com/mysql/cj/x/protocol/TlsDecryptingByteChannel.java b/src/main/java/com/mysql/cj/x/io/TlsDecryptingByteChannel.java similarity index 99% rename from src/main/java/com/mysql/cj/x/protocol/TlsDecryptingByteChannel.java rename to src/main/java/com/mysql/cj/x/io/TlsDecryptingByteChannel.java index 359d3b84d..fd06a1f51 100644 --- a/src/main/java/com/mysql/cj/x/protocol/TlsDecryptingByteChannel.java +++ b/src/main/java/com/mysql/cj/x/io/TlsDecryptingByteChannel.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.io.IOException; import java.nio.BufferOverflowException; diff --git a/src/main/java/com/mysql/cj/x/protocol/TlsEncryptingByteChannel.java b/src/main/java/com/mysql/cj/x/io/TlsEncryptingByteChannel.java similarity index 99% rename from src/main/java/com/mysql/cj/x/protocol/TlsEncryptingByteChannel.java rename to src/main/java/com/mysql/cj/x/io/TlsEncryptingByteChannel.java index 90fce0674..10dee3671 100644 --- a/src/main/java/com/mysql/cj/x/protocol/TlsEncryptingByteChannel.java +++ b/src/main/java/com/mysql/cj/x/io/TlsEncryptingByteChannel.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.io.IOException; import java.net.SocketAddress; diff --git a/src/main/java/com/mysql/cj/x/protocol/XProtocol.java b/src/main/java/com/mysql/cj/x/io/XProtocol.java similarity index 98% rename from src/main/java/com/mysql/cj/x/protocol/XProtocol.java rename to src/main/java/com/mysql/cj/x/io/XProtocol.java index 3b6f30201..04f9e867e 100644 --- a/src/main/java/com/mysql/cj/x/protocol/XProtocol.java +++ b/src/main/java/com/mysql/cj/x/io/XProtocol.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import static java.util.stream.Collectors.toMap; @@ -47,11 +47,11 @@ import com.mysql.cj.api.io.ServerCapabilities; import com.mysql.cj.api.io.ServerSession; import com.mysql.cj.api.io.SocketConnection; -import com.mysql.cj.api.x.protocol.MessageListener; -import com.mysql.cj.api.x.protocol.MessageReader; -import com.mysql.cj.api.x.protocol.MessageWriter; -import com.mysql.cj.api.x.protocol.ResultListener; -import com.mysql.cj.api.x.protocol.XpluginStatementCommand; +import com.mysql.cj.api.x.io.MessageListener; +import com.mysql.cj.api.x.io.MessageReader; +import com.mysql.cj.api.x.io.MessageWriter; +import com.mysql.cj.api.x.io.ResultListener; +import com.mysql.cj.api.x.io.XpluginStatementCommand; import com.mysql.cj.api.xdevapi.SqlResult; import com.mysql.cj.core.CharsetMapping; import com.mysql.cj.core.MysqlType; @@ -618,7 +618,7 @@ public XProtocolRowInputStream getRowInputStream(ArrayList metadata) { @SuppressWarnings("unchecked") public CompletableFuture asyncExecuteSql(String sql, Object args, String metadataCharacterSet, TimeZone defaultTimeZone) { CompletableFuture f = new CompletableFuture<>(); - com.mysql.cj.api.x.protocol.MessageListener l = new SqlResultMessageListener(f, + com.mysql.cj.api.x.io.MessageListener l = new SqlResultMessageListener(f, (col) -> columnMetaDataToField(this.propertySet, col, metadataCharacterSet), defaultTimeZone); CompletionHandler resultHandler = new ErrorToFutureCompletionHandler(f, () -> ((AsyncMessageReader) this.reader).pushMessageListener(l)); diff --git a/src/main/java/com/mysql/cj/x/protocol/XProtocolDecoder.java b/src/main/java/com/mysql/cj/x/io/XProtocolDecoder.java similarity index 99% rename from src/main/java/com/mysql/cj/x/protocol/XProtocolDecoder.java rename to src/main/java/com/mysql/cj/x/io/XProtocolDecoder.java index 9fb319afa..173a7f683 100644 --- a/src/main/java/com/mysql/cj/x/protocol/XProtocolDecoder.java +++ b/src/main/java/com/mysql/cj/x/io/XProtocolDecoder.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.io.IOException; import java.math.BigDecimal; @@ -34,7 +34,7 @@ import com.google.protobuf.CodedInputStream; import com.mysql.cj.api.io.ValueFactory; -import com.mysql.cj.api.x.protocol.DecoderFunction; +import com.mysql.cj.api.x.io.DecoderFunction; import com.mysql.cj.core.exceptions.AssertionFailedException; import com.mysql.cj.mysqla.MysqlaConstants; diff --git a/src/main/java/com/mysql/cj/x/protocol/XProtocolEncoder.java b/src/main/java/com/mysql/cj/x/io/XProtocolEncoder.java similarity index 97% rename from src/main/java/com/mysql/cj/x/protocol/XProtocolEncoder.java rename to src/main/java/com/mysql/cj/x/io/XProtocolEncoder.java index 3f039a005..2ad848065 100644 --- a/src/main/java/com/mysql/cj/x/protocol/XProtocolEncoder.java +++ b/src/main/java/com/mysql/cj/x/io/XProtocolEncoder.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; public class XProtocolEncoder { } diff --git a/src/main/java/com/mysql/cj/x/protocol/XProtocolFactory.java b/src/main/java/com/mysql/cj/x/io/XProtocolFactory.java similarity index 98% rename from src/main/java/com/mysql/cj/x/protocol/XProtocolFactory.java rename to src/main/java/com/mysql/cj/x/io/XProtocolFactory.java index 67e93a33b..8cb35356e 100644 --- a/src/main/java/com/mysql/cj/x/protocol/XProtocolFactory.java +++ b/src/main/java/com/mysql/cj/x/io/XProtocolFactory.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.io.IOException; import java.net.InetSocketAddress; @@ -41,8 +41,8 @@ import javax.net.ssl.SSLException; import com.mysql.cj.api.conf.PropertySet; -import com.mysql.cj.api.x.protocol.MessageReader; -import com.mysql.cj.api.x.protocol.MessageWriter; +import com.mysql.cj.api.x.io.MessageReader; +import com.mysql.cj.api.x.io.MessageWriter; import com.mysql.cj.core.conf.PropertyDefinitions; import com.mysql.cj.core.exceptions.CJCommunicationsException; import com.mysql.cj.core.io.ExportControlled; diff --git a/src/main/java/com/mysql/cj/x/protocol/XProtocolRow.java b/src/main/java/com/mysql/cj/x/io/XProtocolRow.java similarity index 97% rename from src/main/java/com/mysql/cj/x/protocol/XProtocolRow.java rename to src/main/java/com/mysql/cj/x/io/XProtocolRow.java index f30272fa9..b37f04603 100644 --- a/src/main/java/com/mysql/cj/x/protocol/XProtocolRow.java +++ b/src/main/java/com/mysql/cj/x/io/XProtocolRow.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.io.IOException; import java.util.ArrayList; @@ -29,7 +29,7 @@ import com.google.protobuf.ByteString; import com.google.protobuf.CodedInputStream; import com.mysql.cj.api.io.ValueFactory; -import com.mysql.cj.api.x.protocol.DecoderFunction; +import com.mysql.cj.api.x.io.DecoderFunction; import com.mysql.cj.core.exceptions.DataReadException; import com.mysql.cj.core.result.Field; import com.mysql.cj.mysqla.MysqlaConstants; diff --git a/src/main/java/com/mysql/cj/x/protocol/XProtocolRowInputStream.java b/src/main/java/com/mysql/cj/x/io/XProtocolRowInputStream.java similarity index 98% rename from src/main/java/com/mysql/cj/x/protocol/XProtocolRowInputStream.java rename to src/main/java/com/mysql/cj/x/io/XProtocolRowInputStream.java index 046180a61..012510277 100644 --- a/src/main/java/com/mysql/cj/x/protocol/XProtocolRowInputStream.java +++ b/src/main/java/com/mysql/cj/x/io/XProtocolRowInputStream.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import java.util.ArrayList; import java.util.NoSuchElementException; diff --git a/src/main/java/com/mysql/cj/xdevapi/AbstractDataResult.java b/src/main/java/com/mysql/cj/xdevapi/AbstractDataResult.java index 01678f2ea..ec5f0b301 100644 --- a/src/main/java/com/mysql/cj/xdevapi/AbstractDataResult.java +++ b/src/main/java/com/mysql/cj/xdevapi/AbstractDataResult.java @@ -34,7 +34,7 @@ import com.mysql.cj.api.result.Row; import com.mysql.cj.api.result.RowList; import com.mysql.cj.api.x.core.RowToElement; -import com.mysql.cj.api.x.protocol.ResultStreamer; +import com.mysql.cj.api.x.io.ResultStreamer; import com.mysql.cj.api.xdevapi.Warning; import com.mysql.cj.core.exceptions.WrongArgumentException; import com.mysql.cj.core.result.BufferedRowList; diff --git a/src/main/java/com/mysql/cj/xdevapi/RowResultImpl.java b/src/main/java/com/mysql/cj/xdevapi/RowResultImpl.java index d185dc198..5d6f51e8e 100644 --- a/src/main/java/com/mysql/cj/xdevapi/RowResultImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/RowResultImpl.java @@ -35,7 +35,7 @@ import com.mysql.cj.api.xdevapi.RowResult; import com.mysql.cj.core.result.Field; import com.mysql.cj.x.core.StatementExecuteOk; -import com.mysql.cj.x.protocol.DevapiRowFactory; +import com.mysql.cj.x.io.DevapiRowFactory; public class RowResultImpl extends AbstractDataResult implements RowResult { private ArrayList metadata; diff --git a/src/main/java/com/mysql/cj/xdevapi/SqlResultImpl.java b/src/main/java/com/mysql/cj/xdevapi/SqlResultImpl.java index 6bdf940b1..10e17cbaf 100644 --- a/src/main/java/com/mysql/cj/xdevapi/SqlResultImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/SqlResultImpl.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.function.Supplier; -import com.mysql.cj.api.x.protocol.ResultStreamer; +import com.mysql.cj.api.x.io.ResultStreamer; import com.mysql.cj.api.xdevapi.Column; import com.mysql.cj.api.xdevapi.Row; import com.mysql.cj.api.xdevapi.SqlResult; diff --git a/src/test/java/com/mysql/cj/x/protocol/AsyncMessageReaderTest.java b/src/test/java/com/mysql/cj/x/io/AsyncMessageReaderTest.java similarity index 98% rename from src/test/java/com/mysql/cj/x/protocol/AsyncMessageReaderTest.java rename to src/test/java/com/mysql/cj/x/io/AsyncMessageReaderTest.java index 735bc3eb5..3590cb26f 100644 --- a/src/test/java/com/mysql/cj/x/protocol/AsyncMessageReaderTest.java +++ b/src/test/java/com/mysql/cj/x/io/AsyncMessageReaderTest.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import static org.junit.Assert.assertEquals; @@ -33,10 +33,10 @@ import org.junit.Test; import com.google.protobuf.GeneratedMessage; -import com.mysql.cj.api.x.protocol.MessageListener; +import com.mysql.cj.api.x.io.MessageListener; import com.mysql.cj.core.exceptions.CJCommunicationsException; +import com.mysql.cj.x.io.AsyncMessageReader; import com.mysql.cj.x.protobuf.Mysqlx.Ok; -import com.mysql.cj.x.protocol.AsyncMessageReader; /** * Tests for {@link AsyncMessageReader}. diff --git a/src/test/java/com/mysql/cj/x/protocol/SyncMessageReaderTest.java b/src/test/java/com/mysql/cj/x/io/SyncMessageReaderTest.java similarity index 98% rename from src/test/java/com/mysql/cj/x/protocol/SyncMessageReaderTest.java rename to src/test/java/com/mysql/cj/x/io/SyncMessageReaderTest.java index 9d2c4f418..9766f4fbd 100644 --- a/src/test/java/com/mysql/cj/x/protocol/SyncMessageReaderTest.java +++ b/src/test/java/com/mysql/cj/x/io/SyncMessageReaderTest.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -41,14 +41,14 @@ import com.google.protobuf.GeneratedMessage; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.Parser; -import com.mysql.cj.api.x.protocol.MessageConstants; +import com.mysql.cj.api.x.io.MessageConstants; import com.mysql.cj.core.exceptions.WrongArgumentException; import com.mysql.cj.core.io.FullReadInputStream; import com.mysql.cj.x.core.XDevAPIError; +import com.mysql.cj.x.io.SyncMessageReader; import com.mysql.cj.x.protobuf.Mysqlx.Error; import com.mysql.cj.x.protobuf.Mysqlx.Ok; import com.mysql.cj.x.protobuf.Mysqlx.ServerMessages; -import com.mysql.cj.x.protocol.SyncMessageReader; /** * Tests for {@link SyncMessageReader}. diff --git a/src/test/java/com/mysql/cj/x/protocol/SyncMessageWriterTest.java b/src/test/java/com/mysql/cj/x/io/SyncMessageWriterTest.java similarity index 97% rename from src/test/java/com/mysql/cj/x/protocol/SyncMessageWriterTest.java rename to src/test/java/com/mysql/cj/x/io/SyncMessageWriterTest.java index 8b45f45a3..77599f3c9 100644 --- a/src/test/java/com/mysql/cj/x/protocol/SyncMessageWriterTest.java +++ b/src/test/java/com/mysql/cj/x/io/SyncMessageWriterTest.java @@ -21,7 +21,7 @@ */ -package com.mysql.cj.x.protocol; +package com.mysql.cj.x.io; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -36,11 +36,11 @@ import com.google.protobuf.ByteString; import com.mysql.cj.core.exceptions.WrongArgumentException; +import com.mysql.cj.x.io.SyncMessageWriter; import com.mysql.cj.x.protobuf.Mysqlx.ClientMessages; import com.mysql.cj.x.protobuf.Mysqlx.Ok; import com.mysql.cj.x.protobuf.MysqlxSession.AuthenticateStart; import com.mysql.cj.x.protobuf.MysqlxSession.Reset; -import com.mysql.cj.x.protocol.SyncMessageWriter; public class SyncMessageWriterTest { private ByteArrayOutputStream outputStream; diff --git a/src/test/java/testsuite/x/internal/InternalXBaseTestCase.java b/src/test/java/testsuite/x/internal/InternalXBaseTestCase.java index 3ae1d3c13..d03d7f3ed 100644 --- a/src/test/java/testsuite/x/internal/InternalXBaseTestCase.java +++ b/src/test/java/testsuite/x/internal/InternalXBaseTestCase.java @@ -33,8 +33,8 @@ import com.mysql.cj.core.conf.url.ConnectionUrl; import com.mysql.cj.x.core.MysqlxSession; import com.mysql.cj.x.core.XDevAPIError; -import com.mysql.cj.x.protocol.XProtocol; -import com.mysql.cj.x.protocol.XProtocolFactory; +import com.mysql.cj.x.io.XProtocol; +import com.mysql.cj.x.io.XProtocolFactory; import com.mysql.cj.xdevapi.XSessionFactory; /** diff --git a/src/test/java/testsuite/x/internal/XProtocolAsyncTest.java b/src/test/java/testsuite/x/internal/XProtocolAsyncTest.java index 5711adac5..545307b14 100644 --- a/src/test/java/testsuite/x/internal/XProtocolAsyncTest.java +++ b/src/test/java/testsuite/x/internal/XProtocolAsyncTest.java @@ -39,12 +39,12 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import com.mysql.cj.api.x.protocol.ResultListener; +import com.mysql.cj.api.x.io.ResultListener; import com.mysql.cj.core.result.Field; import com.mysql.cj.x.core.StatementExecuteOk; import com.mysql.cj.x.core.XDevAPIError; -import com.mysql.cj.x.protocol.XProtocol; -import com.mysql.cj.x.protocol.XProtocolRow; +import com.mysql.cj.x.io.XProtocol; +import com.mysql.cj.x.io.XProtocolRow; import com.mysql.cj.xdevapi.DocFindParams; /** diff --git a/src/test/java/testsuite/x/internal/XProtocolAuthTest.java b/src/test/java/testsuite/x/internal/XProtocolAuthTest.java index a409e5117..aa05669d8 100644 --- a/src/test/java/testsuite/x/internal/XProtocolAuthTest.java +++ b/src/test/java/testsuite/x/internal/XProtocolAuthTest.java @@ -33,7 +33,7 @@ import com.mysql.cj.core.exceptions.MysqlErrorNumbers; import com.mysql.cj.x.core.XDevAPIError; -import com.mysql.cj.x.protocol.XProtocol; +import com.mysql.cj.x.io.XProtocol; /** * Tests for protocol-level auth APIs against X Plugin via X Protocol. diff --git a/src/test/java/testsuite/x/internal/XProtocolTest.java b/src/test/java/testsuite/x/internal/XProtocolTest.java index 687c85102..0352b0439 100644 --- a/src/test/java/testsuite/x/internal/XProtocolTest.java +++ b/src/test/java/testsuite/x/internal/XProtocolTest.java @@ -50,7 +50,7 @@ import com.mysql.cj.mysqla.MysqlaConstants; import com.mysql.cj.x.core.StatementExecuteOk; import com.mysql.cj.x.core.XDevAPIError; -import com.mysql.cj.x.protocol.XProtocol; +import com.mysql.cj.x.io.XProtocol; import com.mysql.cj.xdevapi.DocFindParams; import com.mysql.cj.xdevapi.FilterParams; import com.mysql.cj.xdevapi.FindParams; From 5436c63b00609de985f96adfe84583f2855879cf Mon Sep 17 00:00:00 2001 From: Alexander Soklakov Date: Wed, 19 Oct 2016 14:18:03 +0400 Subject: [PATCH 006/625] Fix for package-info. --- .../java/testsuite/x/devapi/package-info.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/test/java/testsuite/x/devapi/package-info.java b/src/test/java/testsuite/x/devapi/package-info.java index 62304aa10..ece8ad9a3 100644 --- a/src/test/java/testsuite/x/devapi/package-info.java +++ b/src/test/java/testsuite/x/devapi/package-info.java @@ -1,24 +1,24 @@ /* - * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. - * - * The MySQL Connector/J is licensed under the terms of the GPLv2 - * , like most MySQL Connectors. - * There are special exceptions to the terms and conditions of the GPLv2 as it is applied to - * this software, see the FOSS License Exception - * . - * - * This program is free software; you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Foundation; version 2 - * of the License. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth - * Floor, Boston, MA 02110-1301 USA - * + Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + + The MySQL Connector/J is licensed under the terms of the GPLv2 + , like most MySQL Connectors. + There are special exceptions to the terms and conditions of the GPLv2 as it is applied to + this software, see the FOSS License Exception + . + + This program is free software; you can redistribute it and/or modify it under the terms + of the GNU General Public License as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this + program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301 USA + */ /** From 2418db638ecba601e337bb779d2e33920298625d Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Tue, 25 Oct 2016 10:28:02 +0100 Subject: [PATCH 007/625] Fix for Bug#82826 (24942672), Unneeded version requirement for javax.net.ssl Import-Package on OSGi MANIFEST.MF. --- CHANGES | 2 ++ build.xml | 72 ++++++++++++++++++++++++++++++------------------------- 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/CHANGES b/CHANGES index 7bd83b5a4..0bf44c851 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,8 @@ # $Id$ mm-dd-yy - Version 5.1.41 + - Fix for Bug#82826 (24942672), Unneeded version requirement for javax.net.ssl Import-Package on OSGi MANIFEST.MF. + 09-30-16 - Version 5.1.40 - Fix for Bug#24619829, NEW FAILURES IN C/JAVA UNITTESTS AGAINST MYSQL 8.0. diff --git a/build.xml b/build.xml index c0bf0a094..4edd5cabb 100644 --- a/build.xml +++ b/build.xml @@ -209,7 +209,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=yes - + @@ -629,32 +629,33 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this - - + + value="javax.xml.parsers;javax.xml.stream;javax.xml.transform;javax.xml.transform.dom;javax.xml.transform.sax;javax.xml.transform.stax;javax.xml.transform.stream;org.w3c.dom;org.xml.sax;org.xml.sax.helpers;resolution:=optional" /> + + + value="com.mchange.v2.c3p0;version="[0.9.1.2,1.0.0)";resolution:=optional,org.jboss.resource.adapter.jdbc;org.jboss.resource.adapter.jdbc.vendor;resolution:=optional" /> + + + value="com.mysql.jdbc;version="${osgid-version}";uses:="com.mysql.jdbc.log,javax.management,javax.naming,javax.net.ssl,javax.xml.parsers,javax.xml.stream,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,org.xml.sax"" /> + value="com.mysql.jdbc.jdbc2.optional;version="${osgid-version}";uses:="com.mysql.jdbc,com.mysql.jdbc.log,javax.sql,javax.naming,javax.naming.spi,javax.transaction.xa"" /> - - + + - - - - + + + value="com.mysql.jdbc.integration.c3p0;version="${osgid-version}";uses:="com.mchange.v2.c3p0",com.mysql.jdbc.integration.jboss;version="${osgid-version}";uses:="org.jboss.resource.adapter.jdbc,org.jboss.resource.adapter.jdbc.vendor"" /> - + + @@ -668,14 +669,15 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this - + - + - - + + @@ -1238,8 +1240,8 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this - - + + @@ -1283,8 +1285,8 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this - - + + @@ -1462,13 +1464,13 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this - + - - - + + + @@ -1492,7 +1494,7 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this - + @@ -1507,10 +1509,14 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this - + - + From 569f70169caad9f17423bd12a07dbebae6d0fd60 Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Thu, 27 Oct 2016 01:13:15 +0100 Subject: [PATCH 008/625] Fix for Bug#82826 (24942672), Unneeded version requirement for javax.net.ssl Import-Package on OSGi MANIFEST.MF. --- CHANGES | 2 ++ build.xml | 39 +++++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/CHANGES b/CHANGES index 13238e444..ec241f5cd 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,8 @@ # $Id$ mm-dd-yy - Version 6.0.6 + - Fix for Bug#82826 (24942672), Unneeded version requirement for javax.net.ssl Import-Package on OSGi MANIFEST.MF. + 10-21-16 - Version 6.0.5 - Added client-side failover during XSession initialization for multi-router configuration. diff --git a/build.xml b/build.xml index aef1abafb..0387ad8f6 100644 --- a/build.xml +++ b/build.xml @@ -587,22 +587,25 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - - - - - - - - - - + + + + + + + + + + + + - - - + + + - + + @@ -616,14 +619,14 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + - + - + value="${com.mysql.cj.build.meta-inf.driver-exports},${com.mysql.cj.build.meta-inf.logging-exports},${com.mysql.cj.build.meta-inf.profiling-exports},${com.mysql.cj.build.meta-inf.util-exports},${com.mysql.cj.build.meta-inf.exceptions-exports},${com.mysql.cj.build.meta-inf.interceptors-exports},${com.mysql.cj.build.meta-inf.integration-exports},${com.mysql.cj.build.meta-inf.configs-exports},${com.mysql.cj.build.meta-inf.legacy-exports},${com.mysql.cj.build.meta-inf.xdevapi-exports}" /> + Date: Thu, 27 Oct 2016 13:01:35 +0100 Subject: [PATCH 009/625] build.xml formatting. --- build.xml | 281 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 164 insertions(+), 117 deletions(-) diff --git a/build.xml b/build.xml index 0387ad8f6..e8da02147 100644 --- a/build.xml +++ b/build.xml @@ -178,15 +178,18 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + - + - + @@ -241,7 +244,7 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + @@ -370,11 +373,12 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - - - - + + + + @@ -446,7 +450,7 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + @@ -561,7 +565,9 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + @@ -582,30 +588,44 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -626,7 +646,8 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + - + @@ -747,7 +771,9 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + @@ -758,13 +784,21 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + - - + + @@ -780,7 +814,9 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + @@ -815,7 +851,11 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + - + @@ -972,7 +1014,9 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t description="Generates error mapping table doc for the MySQL Connector/J docs web site." depends="compile-driver"> - + @@ -1022,13 +1066,13 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t fork="on" forkmode="once" jvm="${com.mysql.cj.testsuite.jvm.java}" - errorProperty="com.mysql.cj.testsuite.junit.fail" - failureProperty="com.mysql.cj.testsuite.junit.fail"> + errorProperty="com.mysql.cj.testsuite.junit.fail" + failureProperty="com.mysql.cj.testsuite.junit.fail"> - + - + @@ -1041,13 +1085,19 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + - - - - - + + + + + @@ -1080,11 +1130,13 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + - + @@ -1098,10 +1150,12 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + - + @@ -1119,7 +1173,7 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + @@ -1127,16 +1181,20 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - + - + - + @@ -1147,63 +1205,57 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - + - + - + - + - - + + @@ -1241,23 +1290,21 @@ See also com.mysql.cj.core.conf.PropertyDefinitions.SYSP_* variables for other t - - - - - - - + + + + + + + - - - - + + + + From 1340ddd54092b9ae10c8cca4e0f0d2c60069cbd4 Mon Sep 17 00:00:00 2001 From: Alexander Soklakov Date: Wed, 2 Nov 2016 16:07:48 +0400 Subject: [PATCH 010/625] Fix for Bug#81691 (23519211), GETLASTDOCUMENTIDS() DOESN'T REPORT IDS PROVIDED BY USER. --- CHANGES | 2 ++ .../mysql/cj/xdevapi/AddStatementImpl.java | 7 +++++- .../testsuite/x/devapi/CollectionAddTest.java | 25 +++++++++++++------ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index ec241f5cd..a61f71517 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,8 @@ # $Id$ mm-dd-yy - Version 6.0.6 + - Fix for Bug#81691 (23519211), GETLASTDOCUMENTIDS() DOESN'T REPORT IDS PROVIDED BY USER. + - Fix for Bug#82826 (24942672), Unneeded version requirement for javax.net.ssl Import-Package on OSGi MANIFEST.MF. 10-21-16 - Version 6.0.5 diff --git a/src/main/java/com/mysql/cj/xdevapi/AddStatementImpl.java b/src/main/java/com/mysql/cj/xdevapi/AddStatementImpl.java index 53efc72b5..049adf15e 100644 --- a/src/main/java/com/mysql/cj/xdevapi/AddStatementImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/AddStatementImpl.java @@ -32,6 +32,7 @@ import java.util.stream.Collectors; import com.mysql.cj.api.xdevapi.AddStatement; +import com.mysql.cj.api.xdevapi.JsonValue; import com.mysql.cj.api.xdevapi.Result; import com.mysql.cj.core.exceptions.AssertionFailedException; import com.mysql.cj.x.core.StatementExecuteOk; @@ -70,7 +71,11 @@ public AddStatement add(DbDoc... docs) { } private List assignIds() { - return this.newDocs.stream().filter(d -> d.get("_id") == null).map(d -> { + return this.newDocs.stream().map(d -> { + JsonValue id = d.get("_id"); + if (id != null) { + return id instanceof JsonString ? ((JsonString) id).getString() : id.toString(); + } String newId = DocumentID.generate(); d.put("_id", new JsonString().setValue(newId)); return newId; diff --git a/src/test/java/testsuite/x/devapi/CollectionAddTest.java b/src/test/java/testsuite/x/devapi/CollectionAddTest.java index 03e7076c4..9db125d0c 100644 --- a/src/test/java/testsuite/x/devapi/CollectionAddTest.java +++ b/src/test/java/testsuite/x/devapi/CollectionAddTest.java @@ -28,6 +28,7 @@ import java.math.BigDecimal; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.junit.After; @@ -146,14 +147,24 @@ public void testAddWithAssignedId() { if (!this.isSetForXTests) { return; } - String json = "{'_id': 'Id#1', 'name': ''}".replaceAll("'", "\""); - Result res = this.collection.add(json).execute(); - assertEquals(0, res.getLastDocumentIds().size()); + String json1 = "{'_id': 'Id#1', 'name': 'assignedId'}".replaceAll("'", "\""); + String json2 = "{'name': 'autoId'}".replaceAll("'", "\""); + Result res = this.collection.add(json1).add(json2).execute(); + + List ids = res.getLastDocumentIds(); + assertEquals(2, ids.size()); + + for (String strId : ids) { + DocResult docs = this.collection.find("_id == '" + strId + "'").execute(); + DbDoc d = docs.next(); + JsonString val = (JsonString) d.get("name"); + if (strId.equals("Id#1")) { + assertEquals("assignedId", val.getString()); + } else { + assertEquals("autoId", val.getString()); + } + } - DocResult docs = this.collection.find("_id == 'Id#1'").execute(); - DbDoc d = docs.next(); - JsonString val = (JsonString) d.get("name"); - assertEquals("", val.getString()); } @Test From ccf0b8b7533d6dd5535a67868d486276c02a1e1a Mon Sep 17 00:00:00 2001 From: Alexander Soklakov Date: Wed, 2 Nov 2016 16:27:25 +0400 Subject: [PATCH 011/625] Fix for BUG#24471057, UPDATE FAILS WHEN THE NEW VALUE IS OF TYPE DBDOC WHICH HAS ARRAY IN IT. --- CHANGES | 2 + .../java/com/mysql/cj/xdevapi/ExprParser.java | 10 +++++ .../x/devapi/CollectionModifyTest.java | 42 +++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/CHANGES b/CHANGES index ec241f5cd..b435af231 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,8 @@ # $Id$ mm-dd-yy - Version 6.0.6 + - Fix for BUG#24471057, UPDATE FAILS WHEN THE NEW VALUE IS OF TYPE DBDOC WHICH HAS ARRAY IN IT. + - Fix for Bug#82826 (24942672), Unneeded version requirement for javax.net.ssl Import-Package on OSGi MANIFEST.MF. 10-21-16 - Version 6.0.5 diff --git a/src/main/java/com/mysql/cj/xdevapi/ExprParser.java b/src/main/java/com/mysql/cj/xdevapi/ExprParser.java index eec7a4434..248ac8b3d 100644 --- a/src/main/java/com/mysql/cj/xdevapi/ExprParser.java +++ b/src/main/java/com/mysql/cj/xdevapi/ExprParser.java @@ -36,6 +36,7 @@ import com.mysql.cj.x.protobuf.MysqlxCrud.Column; import com.mysql.cj.x.protobuf.MysqlxCrud.Order; import com.mysql.cj.x.protobuf.MysqlxCrud.Projection; +import com.mysql.cj.x.protobuf.MysqlxExpr.Array; import com.mysql.cj.x.protobuf.MysqlxExpr.ColumnIdentifier; import com.mysql.cj.x.protobuf.MysqlxExpr.DocumentPathItem; import com.mysql.cj.x.protobuf.MysqlxExpr.Expr; @@ -715,6 +716,15 @@ Expr atomicExpr() { // constant, identifier, variable, function call, etc consumeToken(TokenType.RCURLY); return Expr.newBuilder().setType(Expr.Type.OBJECT).setObject(builder.build()).build(); } + case LSQBRACKET: { // Array + Array.Builder builder = Expr.newBuilder().setType(Expr.Type.ARRAY).getArrayBuilder(); + parseCommaSeparatedList(() -> { + return expr(); + }).stream().forEach(builder::addValue); + + consumeToken(TokenType.RSQBRACKET); + return Expr.newBuilder().setType(Expr.Type.ARRAY).setArray(builder).build(); + } case CAST: { consumeToken(TokenType.LPAREN); Operator.Builder builder = Operator.newBuilder().setName(TokenType.CAST.toString().toLowerCase()); diff --git a/src/test/java/testsuite/x/devapi/CollectionModifyTest.java b/src/test/java/testsuite/x/devapi/CollectionModifyTest.java index bbf18037d..5b8b042c5 100644 --- a/src/test/java/testsuite/x/devapi/CollectionModifyTest.java +++ b/src/test/java/testsuite/x/devapi/CollectionModifyTest.java @@ -26,6 +26,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import java.io.StringReader; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -34,6 +36,7 @@ import com.mysql.cj.xdevapi.DbDoc; import com.mysql.cj.xdevapi.JsonArray; import com.mysql.cj.xdevapi.JsonNumber; +import com.mysql.cj.xdevapi.JsonParser; import com.mysql.cj.xdevapi.JsonString; /** @@ -210,4 +213,43 @@ public void testArrayModify() { } + /** + * Tests fix for BUG#24471057, UPDATE FAILS WHEN THE NEW VALUE IS OF TYPE DBDOC WHICH HAS ARRAY IN IT. + * + * @throws Exception + * if the test fails. + */ + @Test + public void testBug24471057() throws Exception { + if (!this.isSetForXTests) { + return; + } + + String docStr = "{\"B\" : 2, \"ID\" : 1, \"KEY\" : [1]}"; + DbDoc doc1 = JsonParser.parseDoc(new StringReader(docStr)); + + this.collection.add(doc1).execute(); + this.collection.modify("ID=1").set("$.B", doc1).execute(); + + // expected doc + DbDoc doc2 = JsonParser.parseDoc(new StringReader(docStr)); + doc2.put("B", doc1); + doc2.put("_id", doc1.get("_id")); + DocResult docs = this.collection.find().execute(); + DbDoc doc = docs.next(); + assertEquals(doc2.toString(), doc.toString()); + + // DbDoc as an array member + DbDoc doc3 = JsonParser.parseDoc(new StringReader(docStr)); + ((JsonArray) doc1.get("KEY")).add(doc3); + this.collection.modify("ID=1").set("$.B", doc1).execute(); + + // expected doc + doc2.put("B", doc1); + docs = this.collection.find().execute(); + doc = docs.next(); + assertEquals(doc2.toString(), doc.toString()); + + } + } From 86b8191f6ac712695587f2d0b9330c47585940a9 Mon Sep 17 00:00:00 2001 From: Alexander Soklakov Date: Thu, 3 Nov 2016 11:21:52 +0400 Subject: [PATCH 012/625] Fix for Bug#22931277, COLUMN.GETTYPE() RETURNS ERROR FOR VALID DATATYPES. --- CHANGES | 2 + .../java/com/mysql/cj/xdevapi/ColumnImpl.java | 63 +++++++++---------- .../testsuite/x/devapi/TableSelectTest.java | 29 +++++++++ 3 files changed, 61 insertions(+), 33 deletions(-) diff --git a/CHANGES b/CHANGES index ec241f5cd..616d29529 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,8 @@ # $Id$ mm-dd-yy - Version 6.0.6 + - Fix for Bug#22931277, COLUMN.GETTYPE() RETURNS ERROR FOR VALID DATATYPES. + - Fix for Bug#82826 (24942672), Unneeded version requirement for javax.net.ssl Import-Package on OSGi MANIFEST.MF. 10-21-16 - Version 6.0.5 diff --git a/src/main/java/com/mysql/cj/xdevapi/ColumnImpl.java b/src/main/java/com/mysql/cj/xdevapi/ColumnImpl.java index 4e737d4c1..2148a9d91 100644 --- a/src/main/java/com/mysql/cj/xdevapi/ColumnImpl.java +++ b/src/main/java/com/mysql/cj/xdevapi/ColumnImpl.java @@ -61,35 +61,33 @@ public Type getType() { case BIT: return Type.BIT; case BIGINT: - switch ((int) this.field.getLength()) { - case 4: - return Type.TINYINT; - case 6: - return Type.SMALLINT; - case 9: - return Type.MEDIUMINT; - case 11: - return Type.INT; - case 20: - return Type.BIGINT; - default: - throw new IllegalArgumentException("Unknown field length `" + this.field.getLength() + "` for signed int"); + int len = (int) this.field.getLength(); + if (len < 5) { + return Type.TINYINT; + } else if (len < 7) { + return Type.SMALLINT; + } else if (len < 10) { + return Type.MEDIUMINT; + } else if (len < 12) { + return Type.INT; + } else if (len < 21) { + return Type.BIGINT; } + throw new IllegalArgumentException("Unknown field length `" + this.field.getLength() + "` for signed int"); case BIGINT_UNSIGNED: - switch ((int) this.field.getLength()) { - case 3: - return Type.TINYINT; - case 5: - return Type.SMALLINT; - case 8: - return Type.MEDIUMINT; - case 10: - return Type.INT; - case 20: - return Type.BIGINT; - default: - throw new IllegalArgumentException("Unknown field length `" + this.field.getLength() + "` for unsigned int"); + len = (int) this.field.getLength(); + if (len < 4) { + return Type.TINYINT; + } else if (len < 6) { + return Type.SMALLINT; + } else if (len < 9) { + return Type.MEDIUMINT; + } else if (len < 11) { + return Type.INT; + } else if (len < 21) { + return Type.BIGINT; } + throw new IllegalArgumentException("Unknown field length `" + this.field.getLength() + "` for unsigned int"); case FLOAT: case FLOAT_UNSIGNED: return Type.FLOAT; @@ -109,14 +107,13 @@ public Type getType() { case TIME: return Type.TIME; case DATETIME: - switch ((int) this.field.getLength()) { - case 10: - return Type.DATE; - case 19: - return Type.DATETIME; - default: - throw new IllegalArgumentException("Unknown field length `" + this.field.getLength() + "` for datetime"); + len = (int) this.field.getLength(); + if (len == 10) { + return Type.DATE; + } else if (len > 18 && len < 27) { + return Type.DATETIME; } + throw new IllegalArgumentException("Unknown field length `" + this.field.getLength() + "` for datetime"); case TIMESTAMP: return Type.TIMESTAMP; case SET: diff --git a/src/test/java/testsuite/x/devapi/TableSelectTest.java b/src/test/java/testsuite/x/devapi/TableSelectTest.java index b83651fb8..97030f4ce 100644 --- a/src/test/java/testsuite/x/devapi/TableSelectTest.java +++ b/src/test/java/testsuite/x/devapi/TableSelectTest.java @@ -42,6 +42,7 @@ import com.mysql.cj.api.xdevapi.RowResult; import com.mysql.cj.api.xdevapi.SelectStatement; import com.mysql.cj.api.xdevapi.Table; +import com.mysql.cj.api.xdevapi.Type; import com.mysql.cj.core.exceptions.DataConversionException; /** @@ -431,4 +432,32 @@ public void testBug22988922() { sqlUpdate("drop table if exists testBug22988922"); } + + /** + * Tests fix for BUG#22931277, COLUMN.GETTYPE() RETURNS ERROR FOR VALID DATATYPES. + */ + @Test + public void testBug22931277() { + if (!this.isSetForXTests) { + return; + } + sqlUpdate("drop table if exists testBug22931277"); + sqlUpdate("create table testBug22931277 (j year,k datetime(3))"); + Table table = this.schema.getTable("testBug22931277"); + + table = this.schema.getTable("testBug22931277"); + table.insert("j", "k").values(2000, "2016-03-15 12:13:14").execute(); + + RowResult rows = table.select("1,j,k").execute(); + List metadata = rows.getColumns(); + + Column myCol = metadata.get(0); + assertEquals(Type.TINYINT, myCol.getType()); + + myCol = metadata.get(1); + assertEquals(Type.SMALLINT, myCol.getType()); + + myCol = metadata.get(2); + assertEquals(Type.DATETIME, myCol.getType()); + } } From 0f3aaf3c9501d657cd5fcdb50d3740c6096f98b2 Mon Sep 17 00:00:00 2001 From: Alexander Soklakov Date: Thu, 3 Nov 2016 11:45:27 +0400 Subject: [PATCH 013/625] Fix for Bug#82964 (24658016), JSR-310 DATA TYPES CREATED THROUGH JAVA.SQL TYPES. Fix for Bug#81202 (23188159), RESULTSETIMPL.GETOBJECT THROWS NULLPOINTEREXCEPTION WHEN FIELD IS NULL. --- CHANGES | 4 + .../io/JdbcLocalDateTimeValueFactory.java | 75 +++++++++++ .../cj/jdbc/io/JdbcLocalDateValueFactory.java | 67 ++++++++++ .../cj/jdbc/io/JdbcLocalTimeValueFactory.java | 67 ++++++++++ .../mysql/cj/jdbc/result/ResultSetImpl.java | 41 +++++- .../regression/ResultSetRegressionTest.java | 124 ++++++++++++++++++ 6 files changed, 373 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/mysql/cj/jdbc/io/JdbcLocalDateTimeValueFactory.java create mode 100644 src/main/java/com/mysql/cj/jdbc/io/JdbcLocalDateValueFactory.java create mode 100644 src/main/java/com/mysql/cj/jdbc/io/JdbcLocalTimeValueFactory.java diff --git a/CHANGES b/CHANGES index ec241f5cd..8292b3968 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ # $Id$ mm-dd-yy - Version 6.0.6 + - Fix for Bug#82964 (24658016), JSR-310 DATA TYPES CREATED THROUGH JAVA.SQL TYPES. + + - Fix for Bug#81202 (23188159), RESULTSETIMPL.GETOBJECT THROWS NULLPOINTEREXCEPTION WHEN FIELD IS NULL. + - Fix for Bug#82826 (24942672), Unneeded version requirement for javax.net.ssl Import-Package on OSGi MANIFEST.MF. 10-21-16 - Version 6.0.5 diff --git a/src/main/java/com/mysql/cj/jdbc/io/JdbcLocalDateTimeValueFactory.java b/src/main/java/com/mysql/cj/jdbc/io/JdbcLocalDateTimeValueFactory.java new file mode 100644 index 000000000..9c306a829 --- /dev/null +++ b/src/main/java/com/mysql/cj/jdbc/io/JdbcLocalDateTimeValueFactory.java @@ -0,0 +1,75 @@ +/* + Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + + The MySQL Connector/J is licensed under the terms of the GPLv2 + , like most MySQL Connectors. + There are special exceptions to the terms and conditions of the GPLv2 as it is applied to + this software, see the FOSS License Exception + . + + This program is free software; you can redistribute it and/or modify it under the terms + of the GNU General Public License as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this + program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301 USA + + */ + +package com.mysql.cj.jdbc.io; + +import java.sql.Timestamp; +import java.time.LocalDateTime; + +import com.mysql.cj.core.Messages; +import com.mysql.cj.core.exceptions.DataReadException; +import com.mysql.cj.core.io.DefaultValueFactory; + +/** + * Value factory to create {@link LocalDateTime} instances. + */ +public class JdbcLocalDateTimeValueFactory extends DefaultValueFactory { + + public JdbcLocalDateTimeValueFactory() { + } + + /** + * Create a LocalDateTime from a DATE value. + * + * @return a LocalDateTime at midnight on the day given by the DATE value + */ + @Override + public LocalDateTime createFromDate(int year, int month, int day) { + return createFromTimestamp(year, month, day, 0, 0, 0, 0); + } + + /** + * Create a LocalDateTime from a TIME value. + * + * @return a LocalDateTime at the given time on 1970 Jan 1. + */ + @Override + public LocalDateTime createFromTime(int hours, int minutes, int seconds, int nanos) { + if (hours < 0 || hours >= 24) { + throw new DataReadException(Messages.getString("ResultSet.InvalidTimeValue", new Object[] { "" + hours + ":" + minutes + ":" + seconds })); + } + return createFromTimestamp(1970, 1, 1, hours, minutes, seconds, nanos); + } + + @Override + public LocalDateTime createFromTimestamp(int year, int month, int day, int hours, int minutes, int seconds, int nanos) { + if (year == 0 && month == 0 && day == 0) { + throw new DataReadException(Messages.getString("ResultSet.InvalidZeroDate")); + } + return LocalDateTime.of(year, month, day, hours, minutes, seconds, nanos); + } + + public String getTargetTypeName() { + return Timestamp.class.getName(); + } +} diff --git a/src/main/java/com/mysql/cj/jdbc/io/JdbcLocalDateValueFactory.java b/src/main/java/com/mysql/cj/jdbc/io/JdbcLocalDateValueFactory.java new file mode 100644 index 000000000..45cef70dc --- /dev/null +++ b/src/main/java/com/mysql/cj/jdbc/io/JdbcLocalDateValueFactory.java @@ -0,0 +1,67 @@ +/* + Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + + The MySQL Connector/J is licensed under the terms of the GPLv2 + , like most MySQL Connectors. + There are special exceptions to the terms and conditions of the GPLv2 as it is applied to + this software, see the FOSS License Exception + . + + This program is free software; you can redistribute it and/or modify it under the terms + of the GNU General Public License as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this + program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301 USA + + */ + +package com.mysql.cj.jdbc.io; + +import java.time.LocalDate; + +import com.mysql.cj.api.WarningListener; +import com.mysql.cj.core.Messages; +import com.mysql.cj.core.exceptions.DataReadException; +import com.mysql.cj.core.io.DefaultValueFactory; + +/** + * A value factory for creating {@link LocalDate} values. + */ +public class JdbcLocalDateValueFactory extends DefaultValueFactory { + private WarningListener warningListener; + + public JdbcLocalDateValueFactory() { + } + + public JdbcLocalDateValueFactory(WarningListener warningListener) { + this(); + this.warningListener = warningListener; + } + + @Override + public LocalDate createFromDate(int year, int month, int day) { + if (year == 0 && month == 0 && day == 0) { + throw new DataReadException(Messages.getString("ResultSet.InvalidZeroDate")); + } + return LocalDate.of(year, month, day); + } + + @Override + public LocalDate createFromTimestamp(int year, int month, int day, int hours, int minutes, int seconds, int nanos) { + if (this.warningListener != null) { + this.warningListener.warningEncountered(Messages.getString("ResultSet.PrecisionLostWarning", new Object[] { getTargetTypeName() })); + } + // truncate any time information + return createFromDate(year, month, day); + } + + public String getTargetTypeName() { + return LocalDate.class.getName(); + } +} diff --git a/src/main/java/com/mysql/cj/jdbc/io/JdbcLocalTimeValueFactory.java b/src/main/java/com/mysql/cj/jdbc/io/JdbcLocalTimeValueFactory.java new file mode 100644 index 000000000..1a76ea991 --- /dev/null +++ b/src/main/java/com/mysql/cj/jdbc/io/JdbcLocalTimeValueFactory.java @@ -0,0 +1,67 @@ +/* + Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + + The MySQL Connector/J is licensed under the terms of the GPLv2 + , like most MySQL Connectors. + There are special exceptions to the terms and conditions of the GPLv2 as it is applied to + this software, see the FOSS License Exception + . + + This program is free software; you can redistribute it and/or modify it under the terms + of the GNU General Public License as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this + program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301 USA + + */ + +package com.mysql.cj.jdbc.io; + +import java.time.LocalTime; + +import com.mysql.cj.api.WarningListener; +import com.mysql.cj.core.Messages; +import com.mysql.cj.core.exceptions.DataReadException; +import com.mysql.cj.core.io.DefaultValueFactory; + +/** + * JdbcTimeValueFactory is a value factory to create {@link LocalTime} instances. + */ +public class JdbcLocalTimeValueFactory extends DefaultValueFactory { + private WarningListener warningListener; + + public JdbcLocalTimeValueFactory() { + } + + public JdbcLocalTimeValueFactory(WarningListener warningListener) { + this(); + this.warningListener = warningListener; + } + + @Override + public LocalTime createFromTime(int hours, int minutes, int seconds, int nanos) { + if (hours < 0 || hours >= 24) { + throw new DataReadException(Messages.getString("ResultSet.InvalidTimeValue", new Object[] { "" + hours + ":" + minutes + ":" + seconds })); + } + return LocalTime.of(hours, minutes, seconds, nanos); + } + + @Override + public LocalTime createFromTimestamp(int year, int month, int day, int hours, int minutes, int seconds, int nanos) { + if (this.warningListener != null) { + this.warningListener.warningEncountered(Messages.getString("ResultSet.PrecisionLostWarning", new Object[] { getTargetTypeName() })); + } + // truncate date information + return createFromTime(hours, minutes, seconds, nanos); + } + + public String getTargetTypeName() { + return LocalTime.class.getName(); + } +} diff --git a/src/main/java/com/mysql/cj/jdbc/result/ResultSetImpl.java b/src/main/java/com/mysql/cj/jdbc/result/ResultSetImpl.java index c5633949c..93ab3b61f 100644 --- a/src/main/java/com/mysql/cj/jdbc/result/ResultSetImpl.java +++ b/src/main/java/com/mysql/cj/jdbc/result/ResultSetImpl.java @@ -104,6 +104,9 @@ import com.mysql.cj.jdbc.exceptions.SQLError; import com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping; import com.mysql.cj.jdbc.io.JdbcDateValueFactory; +import com.mysql.cj.jdbc.io.JdbcLocalDateTimeValueFactory; +import com.mysql.cj.jdbc.io.JdbcLocalDateValueFactory; +import com.mysql.cj.jdbc.io.JdbcLocalTimeValueFactory; import com.mysql.cj.jdbc.io.JdbcTimeValueFactory; import com.mysql.cj.jdbc.io.JdbcTimestampValueFactory; import com.mysql.cj.jdbc.io.ResultSetFactory; @@ -206,6 +209,10 @@ public class ResultSetImpl extends MysqlaResultset implements ResultSetInternalM private ValueFactory