From b7b3e65c1bda48a2c8ad92d14749732a035cefa9 Mon Sep 17 00:00:00 2001 From: Roman Gushel Date: Mon, 14 May 2018 14:54:25 +0300 Subject: [PATCH] - Changed license from GNU GPL to MIT - Updated dependencies - Added author --- LICENSE | 21 + README.md | 3 +- build.gradle | 21 +- example/build.gradle | 10 +- example/libs/protobuf-converter.jar | Bin 36460 -> 40634 bytes .../net/badata/protobuf/example/Main.java | 3 +- .../example/client/ClientException.java | 3 +- .../example/client/ProtobufClient.java | 3 +- .../example/client/domain/BookMapper.java | 3 +- .../client/domain/BooleanEnumConverter.java | 3 +- .../example/client/domain/Reader.java | 3 +- .../example/client/domain/ReadingBook.java | 3 +- .../example/client/view/AddBookView.java | 3 +- .../example/client/view/ClientWindow.java | 3 +- .../example/client/view/LibraryView.java | 3 +- .../example/client/view/LoginView.java | 3 +- .../example/server/LibraryService.java | 5 +- .../example/server/MemoryDatabase.java | 3 +- .../example/server/ProtobufServer.java | 5 +- .../example/server/domain/LibraryBook.java | 3 +- .../example/server/domain/Reader.java | 3 +- gradle/wrapper/gradle-wrapper.properties | 4 +- .../protobuf/converter/Configuration.java | 18 +- .../badata/protobuf/converter/Converter.java | 20 +- .../protobuf/converter/FieldsIgnore.java | 20 +- .../converter/annotation/ProtoClass.java | 17 +- .../converter/annotation/ProtoClasses.java | 18 +- .../converter/annotation/ProtoField.java | 18 +- .../exception/ConverterException.java | 18 +- .../converter/exception/MappingException.java | 18 +- .../exception/TypeRelationException.java | 18 +- .../converter/exception/WriteException.java | 18 +- .../DefaultNullValueInspectorImpl.java | 18 +- .../converter/inspection/DefaultValue.java | 18 +- .../inspection/NullValueInspector.java | 18 +- .../inspection/SimpleDefaultValueImpl.java | 18 +- .../converter/mapping/DefaultMapperImpl.java | 18 +- .../protobuf/converter/mapping/Mapper.java | 18 +- .../converter/mapping/MappingResult.java | 18 +- .../AnnotatedFieldResolverFactoryImpl.java | 18 +- .../resolver/DefaultFieldResolverImpl.java | 18 +- .../converter/resolver/FieldResolver.java | 18 +- .../resolver/FieldResolverFactory.java | 18 +- .../converter/type/DateLongConverterImpl.java | 18 +- .../converter/type/DefaultConverterImpl.java | 18 +- .../converter/type/EnumStringConverter.java | 23 +- .../converter/type/SetListConverterImpl.java | 18 +- .../converter/type/TypeConverter.java | 18 +- .../converter/utils/AnnotationUtils.java | 18 +- .../protobuf/converter/utils/FieldUtils.java | 20 +- .../converter/utils/MessageUtils.java | 18 +- .../protobuf/converter/utils/StringUtils.java | 20 +- .../converter/writer/AbstractWriter.java | 18 +- .../converter/writer/DomainWriter.java | 18 +- .../converter/writer/ProtobufWriter.java | 18 +- .../protobuf/converter/ConverterTest.java | 3 +- .../protobuf/converter/DefaultMapperTest.java | 3 +- .../converter/DomainInheritanceTest.java | 6 +- .../protobuf/converter/FieldsIgnoreTest.java | 3 +- .../protobuf/converter/MultiMappingTest.java | 20 +- .../protobuf/converter/ResolverTest.java | 20 +- .../converter/domain/ConverterDomain.java | 3 +- .../domain/DomainInheritanceDomain.java | 20 +- .../converter/domain/IgnoreDomain.java | 3 +- .../converter/domain/MappingDomain.java | 3 +- .../converter/domain/MultiMappingDomain.java | 20 +- .../converter/domain/ResolverDomain.java | 20 +- .../converter/proto/ConverterProto.java | 1211 +++++++++++------ .../proto/DomainInheritanceProto.java | 221 ++- .../converter/proto/MappingProto.java | 518 ++++--- .../converter/proto/MultiMappingProto.java | 608 ++++++--- .../converter/proto/ResolverProto.java | 198 ++- 72 files changed, 2044 insertions(+), 1553 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c7334bd --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2014-2018 BAData LLC, https://badata.net + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index 143f261..6872a71 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ [![Build Status](https://api.travis-ci.org/BAData/protobuf-converter.svg)](https://travis-ci.org/BAData/protobuf-converter) [![GitHub release](https://img.shields.io/github/release/BAData/protobuf-converter.svg)](https://github.com/BAData/protobuf-converter/releases) -[![Slack Status](http://badata-support.herokuapp.com/badge.svg)](https://badata-support.herokuapp.com) [![JitPack repository](https://jitpack.io/v/BAData/protobuf-converter.svg)](https://jitpack.io/#BAData/protobuf-converter) # Protobuf converter **protobuf-converter** is library for transforming your Domain Model Objects into Google Protobuf Messages and vice versa. @@ -137,4 +136,4 @@ java -jar example.jar # License -GNU General Public License v3.0 +MIT License diff --git a/build.gradle b/build.gradle index 3577b06..90e6ade 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } } dependencies { - classpath "gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.7.6" + classpath "gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.5" } } @@ -27,13 +27,13 @@ targetCompatibility='1.7' protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.0.0-beta-1' + artifact = 'com.google.protobuf:protoc:3.5.1' } generatedFilesBaseDir = "$projectDir/src" } dependencies { - compile 'com.google.protobuf:protobuf-java:3.0.0-beta-1' + compile 'com.google.protobuf:protobuf-java:3.5.1' testCompile 'junit:junit:4.12' } @@ -50,19 +50,4 @@ task javadocJar(type: Jar, dependsOn: javadoc) { artifacts { archives sourcesJar archives javadocJar -} - -// To specify a license in the pom: -install { - repositories.mavenInstaller { - pom.project { - licenses { - license { - name 'GNU General Public License v3.0' - url 'http://www.gnu.org/licenses/gpl-3.0.txt' - distribution 'repo' - } - } - } - } } \ No newline at end of file diff --git a/example/build.gradle b/example/build.gradle index c6e5220..402587f 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -5,7 +5,7 @@ buildscript { } } dependencies { - classpath "gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.7.6" + classpath "gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.5" } } @@ -40,11 +40,11 @@ jar { protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.0.0-beta-1' + artifact = 'com.google.protobuf:protoc:3.5.1' } plugins { grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:0.9.0' + artifact = 'io.grpc:protoc-gen-grpc-java:1.12.0' } } generateProtoTasks { @@ -58,6 +58,6 @@ protobuf { dependencies { compile files("libs/protobuf-converter.jar") - compile 'com.google.protobuf:protobuf-java:3.0.0-beta-1' - compile 'io.grpc:grpc-all:0.9.0' + compile 'com.google.protobuf:protobuf-java:3.5.1' + compile 'io.grpc:grpc-all:1.12.0' } diff --git a/example/libs/protobuf-converter.jar b/example/libs/protobuf-converter.jar index 73aa2cead6a09aaf33ee174679ae9540e4ea0631..e7d3b1a501e169daa38640a43678c6da366d4527 100644 GIT binary patch delta 30865 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
IDeV>jhPQjLbm@T>=da#guCKQu46&QqU22= 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

leVD-Z%MTqd*{zhuydj#y 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 diff --git a/example/src/main/java/net/badata/protobuf/example/Main.java b/example/src/main/java/net/badata/protobuf/example/Main.java index 686e820..37252ed 100644 --- a/example/src/main/java/net/badata/protobuf/example/Main.java +++ b/example/src/main/java/net/badata/protobuf/example/Main.java @@ -4,9 +4,8 @@ import net.badata.protobuf.example.server.ProtobufServer; /** - * Created by jsjem on 04.05.2016. - * * @author jsjem + * @author Roman Gushel */ public class Main { diff --git a/example/src/main/java/net/badata/protobuf/example/client/ClientException.java b/example/src/main/java/net/badata/protobuf/example/client/ClientException.java index 8cbae49..3c42977 100644 --- a/example/src/main/java/net/badata/protobuf/example/client/ClientException.java +++ b/example/src/main/java/net/badata/protobuf/example/client/ClientException.java @@ -1,9 +1,8 @@ package net.badata.protobuf.example.client; /** - * Created by jsjem on 05.05.2016. - * * @author jsjem + * @author Roman Gushel */ public class ClientException extends Exception { diff --git a/example/src/main/java/net/badata/protobuf/example/client/ProtobufClient.java b/example/src/main/java/net/badata/protobuf/example/client/ProtobufClient.java index 9561781..2e46ef4 100644 --- a/example/src/main/java/net/badata/protobuf/example/client/ProtobufClient.java +++ b/example/src/main/java/net/badata/protobuf/example/client/ProtobufClient.java @@ -20,9 +20,8 @@ import java.util.concurrent.TimeUnit; /** - * Created by jsjem on 04.05.2016. - * * @author jsjem + * @author Roman Gushel */ public class ProtobufClient { diff --git a/example/src/main/java/net/badata/protobuf/example/client/domain/BookMapper.java b/example/src/main/java/net/badata/protobuf/example/client/domain/BookMapper.java index de8b144..b09a801 100644 --- a/example/src/main/java/net/badata/protobuf/example/client/domain/BookMapper.java +++ b/example/src/main/java/net/badata/protobuf/example/client/domain/BookMapper.java @@ -8,9 +8,8 @@ import net.badata.protobuf.example.proto.Book; /** - * Created by jsjem on 05.05.2016. - * * @author jsjem + * @author Roman Gushel */ public class BookMapper extends DefaultMapperImpl { diff --git a/example/src/main/java/net/badata/protobuf/example/client/domain/BooleanEnumConverter.java b/example/src/main/java/net/badata/protobuf/example/client/domain/BooleanEnumConverter.java index deeba34..ac2580b 100644 --- a/example/src/main/java/net/badata/protobuf/example/client/domain/BooleanEnumConverter.java +++ b/example/src/main/java/net/badata/protobuf/example/client/domain/BooleanEnumConverter.java @@ -4,9 +4,8 @@ import net.badata.protobuf.example.proto.BookState; /** - * Created by jsjem on 05.05.2016. - * * @author jsjem + * @author Roman Gushel */ public class BooleanEnumConverter implements TypeConverter { diff --git a/example/src/main/java/net/badata/protobuf/example/client/domain/Reader.java b/example/src/main/java/net/badata/protobuf/example/client/domain/Reader.java index 5c25f19..52523fb 100644 --- a/example/src/main/java/net/badata/protobuf/example/client/domain/Reader.java +++ b/example/src/main/java/net/badata/protobuf/example/client/domain/Reader.java @@ -5,9 +5,8 @@ import net.badata.protobuf.example.proto.User; /** - * Created by jsjem on 04.05.2016. - * * @author jsjem + * @author Roman Gushel */ @ProtoClass(User.class) public class Reader { diff --git a/example/src/main/java/net/badata/protobuf/example/client/domain/ReadingBook.java b/example/src/main/java/net/badata/protobuf/example/client/domain/ReadingBook.java index f220d2f..8342619 100644 --- a/example/src/main/java/net/badata/protobuf/example/client/domain/ReadingBook.java +++ b/example/src/main/java/net/badata/protobuf/example/client/domain/ReadingBook.java @@ -5,9 +5,8 @@ import net.badata.protobuf.example.proto.Book; /** - * Created by jsjem on 04.05.2016. - * * @author jsjem + * @author Roman Gushel */ @ProtoClass(value = Book.class, mapper = BookMapper.class) public class ReadingBook { diff --git a/example/src/main/java/net/badata/protobuf/example/client/view/AddBookView.java b/example/src/main/java/net/badata/protobuf/example/client/view/AddBookView.java index 768a961..65e6aaa 100644 --- a/example/src/main/java/net/badata/protobuf/example/client/view/AddBookView.java +++ b/example/src/main/java/net/badata/protobuf/example/client/view/AddBookView.java @@ -7,9 +7,8 @@ import java.text.NumberFormat; /** - * Created by jsjem on 06.05.2016. - * * @author jsjem + * @author Roman Gushel */ public class AddBookView implements ActionListener { diff --git a/example/src/main/java/net/badata/protobuf/example/client/view/ClientWindow.java b/example/src/main/java/net/badata/protobuf/example/client/view/ClientWindow.java index 06fca40..67d5348 100644 --- a/example/src/main/java/net/badata/protobuf/example/client/view/ClientWindow.java +++ b/example/src/main/java/net/badata/protobuf/example/client/view/ClientWindow.java @@ -12,9 +12,8 @@ import java.util.List; /** - * Created by jsjem on 05.05.2016. - * * @author jsjem + * @author Roman Gushel */ public class ClientWindow implements LoginView.OnLoginActionListener, AddBookView.OnAddBookActionListener, LibraryView.OnLibraryActionListener { diff --git a/example/src/main/java/net/badata/protobuf/example/client/view/LibraryView.java b/example/src/main/java/net/badata/protobuf/example/client/view/LibraryView.java index c6d9630..a34a439 100644 --- a/example/src/main/java/net/badata/protobuf/example/client/view/LibraryView.java +++ b/example/src/main/java/net/badata/protobuf/example/client/view/LibraryView.java @@ -12,9 +12,8 @@ import java.util.List; /** - * Created by jsjem on 06.05.2016. - * * @author jsjem + * @author Roman Gushel */ public class LibraryView implements ActionListener, ListSelectionListener { diff --git a/example/src/main/java/net/badata/protobuf/example/client/view/LoginView.java b/example/src/main/java/net/badata/protobuf/example/client/view/LoginView.java index 8aad22f..0d3526a 100644 --- a/example/src/main/java/net/badata/protobuf/example/client/view/LoginView.java +++ b/example/src/main/java/net/badata/protobuf/example/client/view/LoginView.java @@ -5,9 +5,8 @@ import java.awt.event.ActionListener; /** - * Created by jsjem on 06.05.2016. - * * @author jsjem + * @author Roman Gushel */ public class LoginView implements ActionListener { diff --git a/example/src/main/java/net/badata/protobuf/example/server/LibraryService.java b/example/src/main/java/net/badata/protobuf/example/server/LibraryService.java index 14951e9..32612dc 100644 --- a/example/src/main/java/net/badata/protobuf/example/server/LibraryService.java +++ b/example/src/main/java/net/badata/protobuf/example/server/LibraryService.java @@ -20,11 +20,10 @@ import java.util.List; /** - * Created by jsjem on 04.05.2016. - * * @author jsjem + * @author Roman Gushel */ -public class LibraryService implements LibraryServiceGrpc.LibraryService { +public class LibraryService extends LibraryServiceGrpc.LibraryServiceImplBase { private final MemoryDatabase database; diff --git a/example/src/main/java/net/badata/protobuf/example/server/MemoryDatabase.java b/example/src/main/java/net/badata/protobuf/example/server/MemoryDatabase.java index 82bdebd..4f24fdc 100644 --- a/example/src/main/java/net/badata/protobuf/example/server/MemoryDatabase.java +++ b/example/src/main/java/net/badata/protobuf/example/server/MemoryDatabase.java @@ -11,9 +11,8 @@ import java.util.Set; /** - * Created by jsjem on 05.05.2016. - * * @author jsjem + * @author Roman Gushel */ public class MemoryDatabase { diff --git a/example/src/main/java/net/badata/protobuf/example/server/ProtobufServer.java b/example/src/main/java/net/badata/protobuf/example/server/ProtobufServer.java index ec0e3bf..276878f 100644 --- a/example/src/main/java/net/badata/protobuf/example/server/ProtobufServer.java +++ b/example/src/main/java/net/badata/protobuf/example/server/ProtobufServer.java @@ -7,9 +7,8 @@ import java.io.IOException; /** - * Created by jsjem on 04.05.2016. - * * @author jsjem + * @author Roman Gushel */ public class ProtobufServer { @@ -20,7 +19,7 @@ public class ProtobufServer { public void start() throws IOException, InterruptedException { server = ServerBuilder.forPort(PORT) - .addService(LibraryServiceGrpc.bindService(new LibraryService(database))) + .addService(new LibraryService(database)) .build() .start(); Runtime.getRuntime().addShutdownHook(new Thread() { diff --git a/example/src/main/java/net/badata/protobuf/example/server/domain/LibraryBook.java b/example/src/main/java/net/badata/protobuf/example/server/domain/LibraryBook.java index f792382..f33f3a5 100644 --- a/example/src/main/java/net/badata/protobuf/example/server/domain/LibraryBook.java +++ b/example/src/main/java/net/badata/protobuf/example/server/domain/LibraryBook.java @@ -8,9 +8,8 @@ import java.util.Objects; /** - * Created by jsjem on 04.05.2016. - * * @author jsjem + * @author Roman Gushel */ @ProtoClass(Book.class) public class LibraryBook { diff --git a/example/src/main/java/net/badata/protobuf/example/server/domain/Reader.java b/example/src/main/java/net/badata/protobuf/example/server/domain/Reader.java index 32f9825..ece55d9 100644 --- a/example/src/main/java/net/badata/protobuf/example/server/domain/Reader.java +++ b/example/src/main/java/net/badata/protobuf/example/server/domain/Reader.java @@ -5,9 +5,8 @@ import net.badata.protobuf.example.proto.User; /** - * Created by jsjem on 04.05.2016. - * * @author jsjem + * @author Roman Gushel */ @ProtoClass(value = User.class) public class Reader { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c5446d1..9eb9b6b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri May 06 16:25:28 EEST 2016 +#Mon May 14 12:06:50 EEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip diff --git a/src/main/java/net/badata/protobuf/converter/Configuration.java b/src/main/java/net/badata/protobuf/converter/Configuration.java index 96de086..3355af5 100644 --- a/src/main/java/net/badata/protobuf/converter/Configuration.java +++ b/src/main/java/net/badata/protobuf/converter/Configuration.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter; /** @@ -22,6 +5,7 @@ * Converter} during performing of object conversion. * * @author jsjem + * @author Roman Gushel */ public final class Configuration { diff --git a/src/main/java/net/badata/protobuf/converter/Converter.java b/src/main/java/net/badata/protobuf/converter/Converter.java index 6665d61..82f70ae 100644 --- a/src/main/java/net/badata/protobuf/converter/Converter.java +++ b/src/main/java/net/badata/protobuf/converter/Converter.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter; import com.google.protobuf.Message; @@ -41,6 +24,7 @@ * Converts data from Protobuf messages to domain model objects and vice versa. * * @author jsjem + * @author Roman Gushel */ public final class Converter { @@ -73,6 +57,7 @@ public static Converter create(final FieldsIgnore fieldsIgnore) { * Create configured converter. * * @param configuration Parameters for conversion. + * @return Converter instance. */ public static Converter create(final Configuration configuration) { return new Converter(configuration); @@ -321,6 +306,7 @@ private void fillProtobufField(final FieldResolver fieldResolver, final MappingR } } + @SuppressWarnings("unchecked") private Collection createProtobufValueList(final Class type, final Class domainCollectionClass, final Collection domainCollection) { return createNestedConverter() diff --git a/src/main/java/net/badata/protobuf/converter/FieldsIgnore.java b/src/main/java/net/badata/protobuf/converter/FieldsIgnore.java index 029067f..132f8a9 100644 --- a/src/main/java/net/badata/protobuf/converter/FieldsIgnore.java +++ b/src/main/java/net/badata/protobuf/converter/FieldsIgnore.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter; import net.badata.protobuf.converter.annotation.ProtoField; @@ -33,6 +16,7 @@ * Stores fields and classes that have to be ignored during conversion. * * @author jsjem + * @author Roman Gushel */ public class FieldsIgnore { @@ -73,7 +57,7 @@ public FieldsIgnore add(final Class ignoredClass, final String... fields) { * Add all fields from another {@link net.badata.protobuf.converter.FieldsIgnore FieldsIgnore} instance. * * @param ignoredFields Instance of {@link net.badata.protobuf.converter.FieldsIgnore FieldsIgnore}. - * @return + * @return Instance of {@link net.badata.protobuf.converter.FieldsIgnore FieldsIgnore}. */ public FieldsIgnore addAll(final FieldsIgnore ignoredFields) { ignoreMapping.putAll(ignoredFields.ignoreMapping); diff --git a/src/main/java/net/badata/protobuf/converter/annotation/ProtoClass.java b/src/main/java/net/badata/protobuf/converter/annotation/ProtoClass.java index 64a3cff..8bf5016 100644 --- a/src/main/java/net/badata/protobuf/converter/annotation/ProtoClass.java +++ b/src/main/java/net/badata/protobuf/converter/annotation/ProtoClass.java @@ -1,19 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ package net.badata.protobuf.converter.annotation; import com.google.protobuf.Message; @@ -31,6 +15,7 @@ * Annotation that marks domain class that may be converted to Protobuf messages. * * @author jsjem + * @author Roman Gushel */ @Target(value = ElementType.TYPE) @Retention(value = RetentionPolicy.RUNTIME) diff --git a/src/main/java/net/badata/protobuf/converter/annotation/ProtoClasses.java b/src/main/java/net/badata/protobuf/converter/annotation/ProtoClasses.java index 37c385f..882fc50 100644 --- a/src/main/java/net/badata/protobuf/converter/annotation/ProtoClasses.java +++ b/src/main/java/net/badata/protobuf/converter/annotation/ProtoClasses.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.annotation; import java.lang.annotation.ElementType; @@ -27,6 +10,7 @@ * {@link net.badata.protobuf.converter.annotation.ProtoClass ProtoClass} annotations. * * @author jsjem + * @author Roman Gushel */ @Target(value = ElementType.TYPE) @Retention(value = RetentionPolicy.RUNTIME) diff --git a/src/main/java/net/badata/protobuf/converter/annotation/ProtoField.java b/src/main/java/net/badata/protobuf/converter/annotation/ProtoField.java index 44c558c..33177df 100644 --- a/src/main/java/net/badata/protobuf/converter/annotation/ProtoField.java +++ b/src/main/java/net/badata/protobuf/converter/annotation/ProtoField.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.annotation; import net.badata.protobuf.converter.inspection.DefaultValue; @@ -33,6 +16,7 @@ * Annotation that marks domain class fields that may be converted to Protobuf messages fields. * * @author jsjem + * @author Roman Gushel */ @Target(value = ElementType.FIELD) @Retention(value = RetentionPolicy.RUNTIME) diff --git a/src/main/java/net/badata/protobuf/converter/exception/ConverterException.java b/src/main/java/net/badata/protobuf/converter/exception/ConverterException.java index 6812661..5dfa515 100644 --- a/src/main/java/net/badata/protobuf/converter/exception/ConverterException.java +++ b/src/main/java/net/badata/protobuf/converter/exception/ConverterException.java @@ -1,26 +1,10 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.exception; /** * Exception that notifies about conversion errors. * * @author jsjem + * @author Roman Gushel */ public class ConverterException extends RuntimeException { diff --git a/src/main/java/net/badata/protobuf/converter/exception/MappingException.java b/src/main/java/net/badata/protobuf/converter/exception/MappingException.java index 99f4b93..6551a3b 100644 --- a/src/main/java/net/badata/protobuf/converter/exception/MappingException.java +++ b/src/main/java/net/badata/protobuf/converter/exception/MappingException.java @@ -1,26 +1,10 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.exception; /** * Exception that notifies about field mapping errors during conversion. * * @author jsjem + * @author Roman Gushel */ public class MappingException extends Exception { diff --git a/src/main/java/net/badata/protobuf/converter/exception/TypeRelationException.java b/src/main/java/net/badata/protobuf/converter/exception/TypeRelationException.java index e7c52a4..b2d6151 100644 --- a/src/main/java/net/badata/protobuf/converter/exception/TypeRelationException.java +++ b/src/main/java/net/badata/protobuf/converter/exception/TypeRelationException.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.exception; import com.google.protobuf.Message; @@ -24,6 +7,7 @@ * ProtoClass} is different form the required protobuf class. * * @author jsjem + * @author Roman Gushel */ public class TypeRelationException extends Exception { diff --git a/src/main/java/net/badata/protobuf/converter/exception/WriteException.java b/src/main/java/net/badata/protobuf/converter/exception/WriteException.java index 92de774..af0ce9f 100644 --- a/src/main/java/net/badata/protobuf/converter/exception/WriteException.java +++ b/src/main/java/net/badata/protobuf/converter/exception/WriteException.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.exception; /** @@ -22,6 +5,7 @@ * vice versa. * * @author jsjem + * @author Roman Gushel */ public class WriteException extends Exception { diff --git a/src/main/java/net/badata/protobuf/converter/inspection/DefaultNullValueInspectorImpl.java b/src/main/java/net/badata/protobuf/converter/inspection/DefaultNullValueInspectorImpl.java index 2e46aea..ba5a8d9 100644 --- a/src/main/java/net/badata/protobuf/converter/inspection/DefaultNullValueInspectorImpl.java +++ b/src/main/java/net/badata/protobuf/converter/inspection/DefaultNullValueInspectorImpl.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.inspection; /** @@ -22,6 +5,7 @@ * applied by default. * * @author jsjem + * @author Roman Gushel */ public final class DefaultNullValueInspectorImpl implements NullValueInspector { diff --git a/src/main/java/net/badata/protobuf/converter/inspection/DefaultValue.java b/src/main/java/net/badata/protobuf/converter/inspection/DefaultValue.java index 5f530b9..6720eb0 100644 --- a/src/main/java/net/badata/protobuf/converter/inspection/DefaultValue.java +++ b/src/main/java/net/badata/protobuf/converter/inspection/DefaultValue.java @@ -1,26 +1,10 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.inspection; /** * Interface for creating default values for domain fields. * * @author jsjem + * @author Roman Gushel */ public interface DefaultValue { diff --git a/src/main/java/net/badata/protobuf/converter/inspection/NullValueInspector.java b/src/main/java/net/badata/protobuf/converter/inspection/NullValueInspector.java index cf5bb73..3298cf9 100644 --- a/src/main/java/net/badata/protobuf/converter/inspection/NullValueInspector.java +++ b/src/main/java/net/badata/protobuf/converter/inspection/NullValueInspector.java @@ -1,26 +1,10 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.inspection; /** * Interface for examine protobuf fields for null(default) values. * * @author jsjem + * @author Roman Gushel */ public interface NullValueInspector { diff --git a/src/main/java/net/badata/protobuf/converter/inspection/SimpleDefaultValueImpl.java b/src/main/java/net/badata/protobuf/converter/inspection/SimpleDefaultValueImpl.java index cb0ff0e..c189cce 100644 --- a/src/main/java/net/badata/protobuf/converter/inspection/SimpleDefaultValueImpl.java +++ b/src/main/java/net/badata/protobuf/converter/inspection/SimpleDefaultValueImpl.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.inspection; /** @@ -22,6 +5,7 @@ * applied by default. * * @author jsjem + * @author Roman Gushel */ public class SimpleDefaultValueImpl implements DefaultValue { diff --git a/src/main/java/net/badata/protobuf/converter/mapping/DefaultMapperImpl.java b/src/main/java/net/badata/protobuf/converter/mapping/DefaultMapperImpl.java index 32808a1..0e6310f 100644 --- a/src/main/java/net/badata/protobuf/converter/mapping/DefaultMapperImpl.java +++ b/src/main/java/net/badata/protobuf/converter/mapping/DefaultMapperImpl.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.mapping; import com.google.protobuf.Message; @@ -30,6 +13,7 @@ * This implementation maps fields values directly from domain instance to related protobuf instance and vice versa. * * @author jsjem + * @author Roman Gushel */ public class DefaultMapperImpl implements Mapper { diff --git a/src/main/java/net/badata/protobuf/converter/mapping/Mapper.java b/src/main/java/net/badata/protobuf/converter/mapping/Mapper.java index 225429f..b42df22 100644 --- a/src/main/java/net/badata/protobuf/converter/mapping/Mapper.java +++ b/src/main/java/net/badata/protobuf/converter/mapping/Mapper.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.mapping; import com.google.protobuf.Message; @@ -25,6 +8,7 @@ * Interface for mapping field values between domain and protobuf objects. * * @author jsjem + * @author Roman Gushel */ public interface Mapper { diff --git a/src/main/java/net/badata/protobuf/converter/mapping/MappingResult.java b/src/main/java/net/badata/protobuf/converter/mapping/MappingResult.java index e87d6c6..ea0c40f 100644 --- a/src/main/java/net/badata/protobuf/converter/mapping/MappingResult.java +++ b/src/main/java/net/badata/protobuf/converter/mapping/MappingResult.java @@ -1,26 +1,10 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.mapping; /** * Represents results of field mapping performed by {@link net.badata.protobuf.converter.mapping.Mapper} implementation. * * @author jsjem + * @author Roman Gushel */ public class MappingResult { diff --git a/src/main/java/net/badata/protobuf/converter/resolver/AnnotatedFieldResolverFactoryImpl.java b/src/main/java/net/badata/protobuf/converter/resolver/AnnotatedFieldResolverFactoryImpl.java index 7fa7d8c..381a0aa 100644 --- a/src/main/java/net/badata/protobuf/converter/resolver/AnnotatedFieldResolverFactoryImpl.java +++ b/src/main/java/net/badata/protobuf/converter/resolver/AnnotatedFieldResolverFactoryImpl.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.resolver; import net.badata.protobuf.converter.annotation.ProtoField; @@ -31,6 +14,7 @@ * ProtoField} annotation. * * @author jsjem + * @author Roman Gushel */ public class AnnotatedFieldResolverFactoryImpl implements FieldResolverFactory { diff --git a/src/main/java/net/badata/protobuf/converter/resolver/DefaultFieldResolverImpl.java b/src/main/java/net/badata/protobuf/converter/resolver/DefaultFieldResolverImpl.java index 604a17d..e4ba8ca 100644 --- a/src/main/java/net/badata/protobuf/converter/resolver/DefaultFieldResolverImpl.java +++ b/src/main/java/net/badata/protobuf/converter/resolver/DefaultFieldResolverImpl.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.resolver; import net.badata.protobuf.converter.inspection.DefaultNullValueInspectorImpl; @@ -30,6 +13,7 @@ * Default implementation of {@link net.badata.protobuf.converter.resolver.FieldResolver FieldResolver}. * * @author jsjem + * @author Roman Gushel */ public class DefaultFieldResolverImpl implements FieldResolver { diff --git a/src/main/java/net/badata/protobuf/converter/resolver/FieldResolver.java b/src/main/java/net/badata/protobuf/converter/resolver/FieldResolver.java index 692d0b7..2f2c0c0 100644 --- a/src/main/java/net/badata/protobuf/converter/resolver/FieldResolver.java +++ b/src/main/java/net/badata/protobuf/converter/resolver/FieldResolver.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.resolver; import net.badata.protobuf.converter.inspection.DefaultValue; @@ -27,6 +10,7 @@ * Resolver for domain field data that necessary for performing conversion. * * @author jsjem + * @author Roman Gushel */ public interface FieldResolver { diff --git a/src/main/java/net/badata/protobuf/converter/resolver/FieldResolverFactory.java b/src/main/java/net/badata/protobuf/converter/resolver/FieldResolverFactory.java index be69936..a7553c1 100644 --- a/src/main/java/net/badata/protobuf/converter/resolver/FieldResolverFactory.java +++ b/src/main/java/net/badata/protobuf/converter/resolver/FieldResolverFactory.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.resolver; import java.lang.reflect.Field; @@ -23,6 +6,7 @@ * Factory interface for creating field resolvers. * * @author jsjem + * @author Roman Gushel */ public interface FieldResolverFactory { diff --git a/src/main/java/net/badata/protobuf/converter/type/DateLongConverterImpl.java b/src/main/java/net/badata/protobuf/converter/type/DateLongConverterImpl.java index 0b1ebd8..bf57dbb 100644 --- a/src/main/java/net/badata/protobuf/converter/type/DateLongConverterImpl.java +++ b/src/main/java/net/badata/protobuf/converter/type/DateLongConverterImpl.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.type; @@ -24,6 +7,7 @@ * Converts domain {@link java.util.Date Date} field value to protobuf {@link java.lang.Long Long} field value. * * @author jsjem + * @author Roman Gushel */ public class DateLongConverterImpl implements TypeConverter { diff --git a/src/main/java/net/badata/protobuf/converter/type/DefaultConverterImpl.java b/src/main/java/net/badata/protobuf/converter/type/DefaultConverterImpl.java index ad817ed..420475b 100644 --- a/src/main/java/net/badata/protobuf/converter/type/DefaultConverterImpl.java +++ b/src/main/java/net/badata/protobuf/converter/type/DefaultConverterImpl.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.type; @@ -25,6 +8,7 @@ * This implementation does not perform field data conversion. * * @author jsjem + * @author Roman Gushel */ public class DefaultConverterImpl implements TypeConverter { diff --git a/src/main/java/net/badata/protobuf/converter/type/EnumStringConverter.java b/src/main/java/net/badata/protobuf/converter/type/EnumStringConverter.java index 413710b..f789b4a 100644 --- a/src/main/java/net/badata/protobuf/converter/type/EnumStringConverter.java +++ b/src/main/java/net/badata/protobuf/converter/type/EnumStringConverter.java @@ -1,29 +1,12 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.type; - import java.lang.reflect.ParameterizedType; /** - * Converts domain {@link java.lang.Enum Enum} field value to protobuf {@link java.lang.String String} field value. + * Converts domain {@link java.lang.Enum Enum} field value to protobuf {@link java.lang.String String} field value. * - * @author future + * @author jsjem + * @author Roman Gushel */ public class EnumStringConverter> implements TypeConverter { diff --git a/src/main/java/net/badata/protobuf/converter/type/SetListConverterImpl.java b/src/main/java/net/badata/protobuf/converter/type/SetListConverterImpl.java index 10ac260..3a6ee17 100644 --- a/src/main/java/net/badata/protobuf/converter/type/SetListConverterImpl.java +++ b/src/main/java/net/badata/protobuf/converter/type/SetListConverterImpl.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.type; import java.util.ArrayList; @@ -26,6 +9,7 @@ * Converts domain {@link java.util.Set Set} field value to protobuf {@link java.util.List List} field value. * * @author jsjem + * @author Roman Gushel */ public class SetListConverterImpl implements TypeConverter, List> { diff --git a/src/main/java/net/badata/protobuf/converter/type/TypeConverter.java b/src/main/java/net/badata/protobuf/converter/type/TypeConverter.java index 2a92c89..8576e1b 100644 --- a/src/main/java/net/badata/protobuf/converter/type/TypeConverter.java +++ b/src/main/java/net/badata/protobuf/converter/type/TypeConverter.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.type; /** @@ -23,6 +6,7 @@ * @param Field type in the domain object. * @param Field type in the protobuf object. * @author jsjem + * @author Roman Gushel */ public interface TypeConverter { diff --git a/src/main/java/net/badata/protobuf/converter/utils/AnnotationUtils.java b/src/main/java/net/badata/protobuf/converter/utils/AnnotationUtils.java index 2cf50a6..4d23ce2 100644 --- a/src/main/java/net/badata/protobuf/converter/utils/AnnotationUtils.java +++ b/src/main/java/net/badata/protobuf/converter/utils/AnnotationUtils.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.utils; import com.google.protobuf.Message; @@ -33,6 +16,7 @@ * Utilities for extract data stored in the annotations. * * @author jsjem + * @author Roman Gushel */ public class AnnotationUtils { diff --git a/src/main/java/net/badata/protobuf/converter/utils/FieldUtils.java b/src/main/java/net/badata/protobuf/converter/utils/FieldUtils.java index 4efa542..b41c50a 100644 --- a/src/main/java/net/badata/protobuf/converter/utils/FieldUtils.java +++ b/src/main/java/net/badata/protobuf/converter/utils/FieldUtils.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.utils; import net.badata.protobuf.converter.annotation.ProtoClass; @@ -28,7 +11,8 @@ import java.util.Collection; /** - * Created by jsjem on 25.04.2016. + * @author jsjem + * @author Roman Gushel */ public final class FieldUtils { diff --git a/src/main/java/net/badata/protobuf/converter/utils/MessageUtils.java b/src/main/java/net/badata/protobuf/converter/utils/MessageUtils.java index a714f0c..450f117 100644 --- a/src/main/java/net/badata/protobuf/converter/utils/MessageUtils.java +++ b/src/main/java/net/badata/protobuf/converter/utils/MessageUtils.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.utils; import com.google.protobuf.Message; @@ -25,6 +8,7 @@ * Utilities for extract Protobuf messages . * * @author jsjem + * @author Roman Gushel */ public class MessageUtils { diff --git a/src/main/java/net/badata/protobuf/converter/utils/StringUtils.java b/src/main/java/net/badata/protobuf/converter/utils/StringUtils.java index cc4feab..af4f9d7 100644 --- a/src/main/java/net/badata/protobuf/converter/utils/StringUtils.java +++ b/src/main/java/net/badata/protobuf/converter/utils/StringUtils.java @@ -1,24 +1,8 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.utils; /** - * Created by jsjem on 25.04.2016. + * @author jsjem + * @author Roman Gushel */ public final class StringUtils { diff --git a/src/main/java/net/badata/protobuf/converter/writer/AbstractWriter.java b/src/main/java/net/badata/protobuf/converter/writer/AbstractWriter.java index 664ea8c..c1314fc 100644 --- a/src/main/java/net/badata/protobuf/converter/writer/AbstractWriter.java +++ b/src/main/java/net/badata/protobuf/converter/writer/AbstractWriter.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.writer; import net.badata.protobuf.converter.exception.WriteException; @@ -24,6 +7,7 @@ * Abstract class for performing data writing to the objects. * * @author jsjem + * @author Roman Gushel */ public abstract class AbstractWriter { diff --git a/src/main/java/net/badata/protobuf/converter/writer/DomainWriter.java b/src/main/java/net/badata/protobuf/converter/writer/DomainWriter.java index 49e4c2b..c957530 100644 --- a/src/main/java/net/badata/protobuf/converter/writer/DomainWriter.java +++ b/src/main/java/net/badata/protobuf/converter/writer/DomainWriter.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.writer; import net.badata.protobuf.converter.exception.WriteException; @@ -30,6 +13,7 @@ * Writes data to the domain instance. * * @author jsjem + * @author Roman Gushel */ public class DomainWriter extends AbstractWriter { diff --git a/src/main/java/net/badata/protobuf/converter/writer/ProtobufWriter.java b/src/main/java/net/badata/protobuf/converter/writer/ProtobufWriter.java index 22e4054..533a4f5 100644 --- a/src/main/java/net/badata/protobuf/converter/writer/ProtobufWriter.java +++ b/src/main/java/net/badata/protobuf/converter/writer/ProtobufWriter.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.writer; import com.google.protobuf.Message; @@ -31,6 +14,7 @@ * Writes data to the protobuf dto. * * @author jsjem + * @author Roman Gushel */ public class ProtobufWriter extends AbstractWriter { diff --git a/src/test/java/net/badata/protobuf/converter/ConverterTest.java b/src/test/java/net/badata/protobuf/converter/ConverterTest.java index 1ecb43e..d032706 100644 --- a/src/test/java/net/badata/protobuf/converter/ConverterTest.java +++ b/src/test/java/net/badata/protobuf/converter/ConverterTest.java @@ -15,7 +15,8 @@ import static net.badata.protobuf.converter.domain.ConverterDomain.TestEnumConverter.TestEnum; /** - * Created by jsjem on 21.04.2016. + * @author jsjem + * @author Roman Gushel */ public class ConverterTest { diff --git a/src/test/java/net/badata/protobuf/converter/DefaultMapperTest.java b/src/test/java/net/badata/protobuf/converter/DefaultMapperTest.java index 13ff288..53617c0 100644 --- a/src/test/java/net/badata/protobuf/converter/DefaultMapperTest.java +++ b/src/test/java/net/badata/protobuf/converter/DefaultMapperTest.java @@ -20,7 +20,8 @@ import static net.badata.protobuf.converter.mapping.MappingResult.Result; /** - * Created by jsjem on 26.04.2016. + * @author jsjem + * @author Roman Gushel */ public class DefaultMapperTest { diff --git a/src/test/java/net/badata/protobuf/converter/DomainInheritanceTest.java b/src/test/java/net/badata/protobuf/converter/DomainInheritanceTest.java index 7851fd6..a9e96fd 100644 --- a/src/test/java/net/badata/protobuf/converter/DomainInheritanceTest.java +++ b/src/test/java/net/badata/protobuf/converter/DomainInheritanceTest.java @@ -1,6 +1,5 @@ package net.badata.protobuf.converter; - import net.badata.protobuf.converter.domain.DomainInheritanceDomain; import net.badata.protobuf.converter.proto.DomainInheritanceProto; import org.junit.Before; @@ -8,7 +7,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; - +/** + * @author jsjem + * @author Roman Gushel + */ public class DomainInheritanceTest { private DomainInheritanceDomain.Test testDomain; diff --git a/src/test/java/net/badata/protobuf/converter/FieldsIgnoreTest.java b/src/test/java/net/badata/protobuf/converter/FieldsIgnoreTest.java index a0e1353..8564521 100644 --- a/src/test/java/net/badata/protobuf/converter/FieldsIgnoreTest.java +++ b/src/test/java/net/badata/protobuf/converter/FieldsIgnoreTest.java @@ -13,7 +13,8 @@ import static net.badata.protobuf.converter.domain.IgnoreDomain.NoIgnoreDataTest; /** - * Created by jsjem on 22.04.2016. + * @author jsjem + * @author Roman Gushel */ public class FieldsIgnoreTest { diff --git a/src/test/java/net/badata/protobuf/converter/MultiMappingTest.java b/src/test/java/net/badata/protobuf/converter/MultiMappingTest.java index 1417086..80cbcfb 100644 --- a/src/test/java/net/badata/protobuf/converter/MultiMappingTest.java +++ b/src/test/java/net/badata/protobuf/converter/MultiMappingTest.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter; import net.badata.protobuf.converter.domain.MultiMappingDomain; @@ -26,9 +9,8 @@ import java.util.Collections; /** - * Created by jsjem on 19.08.2016. - * * @author jsjem + * @author Roman Gushel */ public class MultiMappingTest { diff --git a/src/test/java/net/badata/protobuf/converter/ResolverTest.java b/src/test/java/net/badata/protobuf/converter/ResolverTest.java index 5a0d592..a54ef2f 100644 --- a/src/test/java/net/badata/protobuf/converter/ResolverTest.java +++ b/src/test/java/net/badata/protobuf/converter/ResolverTest.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2017 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter; import net.badata.protobuf.converter.domain.ResolverDomain; @@ -27,9 +10,8 @@ import java.util.List; /** - * Created by jsjem on 10.03.2017. - * * @author jsjem + * @author Roman Gushel */ public class ResolverTest { private static final String DELIMITED_STRING = "one,two,three"; diff --git a/src/test/java/net/badata/protobuf/converter/domain/ConverterDomain.java b/src/test/java/net/badata/protobuf/converter/domain/ConverterDomain.java index 65e385d..905a71e 100644 --- a/src/test/java/net/badata/protobuf/converter/domain/ConverterDomain.java +++ b/src/test/java/net/badata/protobuf/converter/domain/ConverterDomain.java @@ -23,7 +23,8 @@ import java.util.Set; /** - * Created by jsjem on 26.04.2016. + * @author jsjem + * @author Roman Gushel */ public class ConverterDomain { diff --git a/src/test/java/net/badata/protobuf/converter/domain/DomainInheritanceDomain.java b/src/test/java/net/badata/protobuf/converter/domain/DomainInheritanceDomain.java index d0fcfda..05d5a83 100644 --- a/src/test/java/net/badata/protobuf/converter/domain/DomainInheritanceDomain.java +++ b/src/test/java/net/badata/protobuf/converter/domain/DomainInheritanceDomain.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.domain; import net.badata.protobuf.converter.annotation.ProtoClass; @@ -22,9 +5,8 @@ import net.badata.protobuf.converter.proto.DomainInheritanceProto; /** - * Created by jsjem on 01.08.2016. - * * @author jsjem + * @author Roman Gushel */ public class DomainInheritanceDomain { @ProtoClass(DomainInheritanceProto.Test.class) diff --git a/src/test/java/net/badata/protobuf/converter/domain/IgnoreDomain.java b/src/test/java/net/badata/protobuf/converter/domain/IgnoreDomain.java index 37e06b1..14497b5 100644 --- a/src/test/java/net/badata/protobuf/converter/domain/IgnoreDomain.java +++ b/src/test/java/net/badata/protobuf/converter/domain/IgnoreDomain.java @@ -5,7 +5,8 @@ import java.util.List; /** - * Created by jsjem on 28.04.2016. + * @author jsjem + * @author Roman Gushel */ public class IgnoreDomain { diff --git a/src/test/java/net/badata/protobuf/converter/domain/MappingDomain.java b/src/test/java/net/badata/protobuf/converter/domain/MappingDomain.java index eda1354..e4810b5 100644 --- a/src/test/java/net/badata/protobuf/converter/domain/MappingDomain.java +++ b/src/test/java/net/badata/protobuf/converter/domain/MappingDomain.java @@ -7,7 +7,8 @@ import java.util.List; /** - * Created by jsjem on 26.04.2016. + * @author jsjem + * @author Roman Gushel */ public class MappingDomain { diff --git a/src/test/java/net/badata/protobuf/converter/domain/MultiMappingDomain.java b/src/test/java/net/badata/protobuf/converter/domain/MultiMappingDomain.java index 720212c..f57dc04 100644 --- a/src/test/java/net/badata/protobuf/converter/domain/MultiMappingDomain.java +++ b/src/test/java/net/badata/protobuf/converter/domain/MultiMappingDomain.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2016 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.domain; import com.google.protobuf.Message; @@ -33,9 +16,8 @@ import java.util.List; /** - * Created by jsjem on 19.08.2016. - * * @author jsjem + * @author Roman Gushel */ public class MultiMappingDomain { diff --git a/src/test/java/net/badata/protobuf/converter/domain/ResolverDomain.java b/src/test/java/net/badata/protobuf/converter/domain/ResolverDomain.java index 64c8719..1aa4e27 100644 --- a/src/test/java/net/badata/protobuf/converter/domain/ResolverDomain.java +++ b/src/test/java/net/badata/protobuf/converter/domain/ResolverDomain.java @@ -1,20 +1,3 @@ -/* - * Copyright (C) 2017 BAData Creative Studio - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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, see - */ - package net.badata.protobuf.converter.domain; import net.badata.protobuf.converter.annotation.ProtoClass; @@ -26,9 +9,8 @@ import java.util.List; /** - * Created by jsjem on 10.03.2017. - * * @author jsjem + * @author Roman Gushel */ public class ResolverDomain { diff --git a/src/test/java/net/badata/protobuf/converter/proto/ConverterProto.java b/src/test/java/net/badata/protobuf/converter/proto/ConverterProto.java index 0b82018..746fce7 100644 --- a/src/test/java/net/badata/protobuf/converter/proto/ConverterProto.java +++ b/src/test/java/net/badata/protobuf/converter/proto/ConverterProto.java @@ -5,35 +5,41 @@ public final class ConverterProto { private ConverterProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + public static void registerAllExtensions( com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); } public interface PrimitiveTestOrBuilder extends // @@protoc_insertion_point(interface_extends:net.badata.protobuf.converter.proto.PrimitiveTest) com.google.protobuf.MessageOrBuilder { /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ int getIntValue(); /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ long getLongValue(); /** - * optional float floatValue = 3; + * float floatValue = 3; */ float getFloatValue(); /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ double getDoubleValue(); /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ boolean getBooleanValue(); } @@ -41,11 +47,12 @@ public interface PrimitiveTestOrBuilder extends * Protobuf type {@code net.badata.protobuf.converter.proto.PrimitiveTest} */ public static final class PrimitiveTest extends - com.google.protobuf.GeneratedMessage implements + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:net.badata.protobuf.converter.proto.PrimitiveTest) PrimitiveTestOrBuilder { + private static final long serialVersionUID = 0L; // Use PrimitiveTest.newBuilder() to construct. - private PrimitiveTest(com.google.protobuf.GeneratedMessage.Builder builder) { + private PrimitiveTest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private PrimitiveTest() { @@ -59,13 +66,19 @@ private PrimitiveTest() { @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); + return this.unknownFields; } private PrimitiveTest( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -75,7 +88,8 @@ private PrimitiveTest( done = true; break; default: { - if (!input.skipField(tag)) { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -108,12 +122,12 @@ private PrimitiveTest( } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw new RuntimeException(e.setUnfinishedMessage(this)); + throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new RuntimeException( - new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this)); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { + this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } @@ -122,7 +136,7 @@ private PrimitiveTest( return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_PrimitiveTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_PrimitiveTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -132,7 +146,7 @@ private PrimitiveTest( public static final int INTVALUE_FIELD_NUMBER = 1; private int intValue_; /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public int getIntValue() { return intValue_; @@ -141,7 +155,7 @@ public int getIntValue() { public static final int LONGVALUE_FIELD_NUMBER = 2; private long longValue_; /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public long getLongValue() { return longValue_; @@ -150,7 +164,7 @@ public long getLongValue() { public static final int FLOATVALUE_FIELD_NUMBER = 3; private float floatValue_; /** - * optional float floatValue = 3; + * float floatValue = 3; */ public float getFloatValue() { return floatValue_; @@ -159,7 +173,7 @@ public float getFloatValue() { public static final int DOUBLEVALUE_FIELD_NUMBER = 4; private double doubleValue_; /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ public double getDoubleValue() { return doubleValue_; @@ -168,7 +182,7 @@ public double getDoubleValue() { public static final int BOOLEANVALUE_FIELD_NUMBER = 5; private boolean booleanValue_; /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ public boolean getBooleanValue() { return booleanValue_; @@ -201,6 +215,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (booleanValue_ != false) { output.writeBool(5, booleanValue_); } + unknownFields.writeTo(output); } public int getSerializedSize() { @@ -228,11 +243,77 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBoolSize(5, booleanValue_); } + size += unknownFields.getSerializedSize(); memoizedSize = size; return size; } - private static final long serialVersionUID = 0L; + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest)) { + return super.equals(obj); + } + net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest other = (net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest) obj; + + boolean result = true; + result = result && (getIntValue() + == other.getIntValue()); + result = result && (getLongValue() + == other.getLongValue()); + result = result && ( + java.lang.Float.floatToIntBits(getFloatValue()) + == java.lang.Float.floatToIntBits( + other.getFloatValue())); + result = result && ( + java.lang.Double.doubleToLongBits(getDoubleValue()) + == java.lang.Double.doubleToLongBits( + other.getDoubleValue())); + result = result && (getBooleanValue() + == other.getBooleanValue()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + INTVALUE_FIELD_NUMBER; + hash = (53 * hash) + getIntValue(); + hash = (37 * hash) + LONGVALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getLongValue()); + hash = (37 * hash) + FLOATVALUE_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getFloatValue()); + hash = (37 * hash) + DOUBLEVALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getDoubleValue())); + hash = (37 * hash) + BOOLEANVALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getBooleanValue()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -256,34 +337,40 @@ public static net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest p } public static net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public Builder newBuilderForType() { return newBuilder(); } @@ -300,7 +387,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -308,7 +395,7 @@ protected Builder newBuilderForType( * Protobuf type {@code net.badata.protobuf.converter.proto.PrimitiveTest} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:net.badata.protobuf.converter.proto.PrimitiveTest) net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -316,7 +403,7 @@ public static final class Builder extends return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_PrimitiveTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_PrimitiveTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -329,12 +416,13 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { } } public Builder clear() { @@ -380,6 +468,32 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest buildPar return result; } + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest) { return mergeFrom((net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest)other); @@ -406,6 +520,7 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.ConverterProto.Prim if (other.getBooleanValue() != false) { setBooleanValue(other.getBooleanValue()); } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } @@ -423,7 +538,7 @@ public Builder mergeFrom( parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { parsedMessage = (net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest) e.getUnfinishedMessage(); - throw e; + throw e.unwrapIOException(); } finally { if (parsedMessage != null) { mergeFrom(parsedMessage); @@ -434,13 +549,13 @@ public Builder mergeFrom( private int intValue_ ; /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public int getIntValue() { return intValue_; } /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public Builder setIntValue(int value) { @@ -449,7 +564,7 @@ public Builder setIntValue(int value) { return this; } /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public Builder clearIntValue() { @@ -460,13 +575,13 @@ public Builder clearIntValue() { private long longValue_ ; /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public long getLongValue() { return longValue_; } /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public Builder setLongValue(long value) { @@ -475,7 +590,7 @@ public Builder setLongValue(long value) { return this; } /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public Builder clearLongValue() { @@ -486,13 +601,13 @@ public Builder clearLongValue() { private float floatValue_ ; /** - * optional float floatValue = 3; + * float floatValue = 3; */ public float getFloatValue() { return floatValue_; } /** - * optional float floatValue = 3; + * float floatValue = 3; */ public Builder setFloatValue(float value) { @@ -501,7 +616,7 @@ public Builder setFloatValue(float value) { return this; } /** - * optional float floatValue = 3; + * float floatValue = 3; */ public Builder clearFloatValue() { @@ -512,13 +627,13 @@ public Builder clearFloatValue() { private double doubleValue_ ; /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ public double getDoubleValue() { return doubleValue_; } /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ public Builder setDoubleValue(double value) { @@ -527,7 +642,7 @@ public Builder setDoubleValue(double value) { return this; } /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ public Builder clearDoubleValue() { @@ -538,13 +653,13 @@ public Builder clearDoubleValue() { private boolean booleanValue_ ; /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ public boolean getBooleanValue() { return booleanValue_; } /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ public Builder setBooleanValue(boolean value) { @@ -553,7 +668,7 @@ public Builder setBooleanValue(boolean value) { return this; } /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ public Builder clearBooleanValue() { @@ -563,12 +678,12 @@ public Builder clearBooleanValue() { } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.setUnknownFieldsProto3(unknownFields); } public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.mergeUnknownFields(unknownFields); } @@ -591,16 +706,7 @@ public PrimitiveTest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - try { - return new PrimitiveTest(input, extensionRegistry); - } catch (RuntimeException e) { - if (e.getCause() instanceof - com.google.protobuf.InvalidProtocolBufferException) { - throw (com.google.protobuf.InvalidProtocolBufferException) - e.getCause(); - } - throw e; - } + return new PrimitiveTest(input, extensionRegistry); } }; @@ -624,24 +730,24 @@ public interface FieldConverterTestOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * optional string enumString = 1; + * string enumString = 1; */ java.lang.String getEnumString(); /** - * optional string enumString = 1; + * string enumString = 1; */ com.google.protobuf.ByteString getEnumStringBytes(); /** - * optional int64 dateLong = 2; + * int64 dateLong = 2; */ long getDateLong(); /** * repeated string stringSetValue = 3; */ - com.google.protobuf.ProtocolStringList + java.util.List getStringSetValueList(); /** * repeated string stringSetValue = 3; @@ -661,11 +767,12 @@ public interface FieldConverterTestOrBuilder extends * Protobuf type {@code net.badata.protobuf.converter.proto.FieldConverterTest} */ public static final class FieldConverterTest extends - com.google.protobuf.GeneratedMessage implements + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:net.badata.protobuf.converter.proto.FieldConverterTest) FieldConverterTestOrBuilder { + private static final long serialVersionUID = 0L; // Use FieldConverterTest.newBuilder() to construct. - private FieldConverterTest(com.google.protobuf.GeneratedMessage.Builder builder) { + private FieldConverterTest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private FieldConverterTest() { @@ -677,13 +784,19 @@ private FieldConverterTest() { @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); + return this.unknownFields; } private FieldConverterTest( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -693,13 +806,14 @@ private FieldConverterTest( done = true; break; default: { - if (!input.skipField(tag)) { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { done = true; } break; } case 10: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); enumString_ = s; break; @@ -710,7 +824,7 @@ private FieldConverterTest( break; } case 26: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { stringSetValue_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000004; @@ -721,15 +835,15 @@ private FieldConverterTest( } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw new RuntimeException(e.setUnfinishedMessage(this)); + throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new RuntimeException( - new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this)); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { stringSetValue_ = stringSetValue_.getUnmodifiableView(); } + this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } @@ -738,7 +852,7 @@ private FieldConverterTest( return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_FieldConverterTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_FieldConverterTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -749,7 +863,7 @@ private FieldConverterTest( public static final int ENUMSTRING_FIELD_NUMBER = 1; private volatile java.lang.Object enumString_; /** - * optional string enumString = 1; + * string enumString = 1; */ public java.lang.String getEnumString() { java.lang.Object ref = enumString_; @@ -764,7 +878,7 @@ public java.lang.String getEnumString() { } } /** - * optional string enumString = 1; + * string enumString = 1; */ public com.google.protobuf.ByteString getEnumStringBytes() { @@ -783,7 +897,7 @@ public java.lang.String getEnumString() { public static final int DATELONG_FIELD_NUMBER = 2; private long dateLong_; /** - * optional int64 dateLong = 2; + * int64 dateLong = 2; */ public long getDateLong() { return dateLong_; @@ -831,14 +945,15 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getEnumStringBytes().isEmpty()) { - com.google.protobuf.GeneratedMessage.writeString(output, 1, enumString_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, enumString_); } if (dateLong_ != 0L) { output.writeInt64(2, dateLong_); } for (int i = 0; i < stringSetValue_.size(); i++) { - com.google.protobuf.GeneratedMessage.writeString(output, 3, stringSetValue_.getRaw(i)); + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, stringSetValue_.getRaw(i)); } + unknownFields.writeTo(output); } public int getSerializedSize() { @@ -847,7 +962,7 @@ public int getSerializedSize() { size = 0; if (!getEnumStringBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(1, enumString_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, enumString_); } if (dateLong_ != 0L) { size += com.google.protobuf.CodedOutputStream @@ -861,11 +976,64 @@ public int getSerializedSize() { size += dataSize; size += 1 * getStringSetValueList().size(); } + size += unknownFields.getSerializedSize(); memoizedSize = size; return size; } - private static final long serialVersionUID = 0L; + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest)) { + return super.equals(obj); + } + net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest other = (net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest) obj; + + boolean result = true; + result = result && getEnumString() + .equals(other.getEnumString()); + result = result && (getDateLong() + == other.getDateLong()); + result = result && getStringSetValueList() + .equals(other.getStringSetValueList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ENUMSTRING_FIELD_NUMBER; + hash = (53 * hash) + getEnumString().hashCode(); + hash = (37 * hash) + DATELONG_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getDateLong()); + if (getStringSetValueCount() > 0) { + hash = (37 * hash) + STRINGSETVALUE_FIELD_NUMBER; + hash = (53 * hash) + getStringSetValueList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -889,34 +1057,40 @@ public static net.badata.protobuf.converter.proto.ConverterProto.FieldConverterT } public static net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public Builder newBuilderForType() { return newBuilder(); } @@ -933,7 +1107,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -941,7 +1115,7 @@ protected Builder newBuilderForType( * Protobuf type {@code net.badata.protobuf.converter.proto.FieldConverterTest} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:net.badata.protobuf.converter.proto.FieldConverterTest) net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -949,7 +1123,7 @@ public static final class Builder extends return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_FieldConverterTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_FieldConverterTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -962,12 +1136,13 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { } } public Builder clear() { @@ -1014,6 +1189,32 @@ public net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest bui return result; } + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest) { return mergeFrom((net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest)other); @@ -1042,6 +1243,7 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.ConverterProto.Fiel } onChanged(); } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } @@ -1059,7 +1261,7 @@ public Builder mergeFrom( parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { parsedMessage = (net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest) e.getUnfinishedMessage(); - throw e; + throw e.unwrapIOException(); } finally { if (parsedMessage != null) { mergeFrom(parsedMessage); @@ -1071,7 +1273,7 @@ public Builder mergeFrom( private java.lang.Object enumString_ = ""; /** - * optional string enumString = 1; + * string enumString = 1; */ public java.lang.String getEnumString() { java.lang.Object ref = enumString_; @@ -1086,7 +1288,7 @@ public java.lang.String getEnumString() { } } /** - * optional string enumString = 1; + * string enumString = 1; */ public com.google.protobuf.ByteString getEnumStringBytes() { @@ -1102,7 +1304,7 @@ public java.lang.String getEnumString() { } } /** - * optional string enumString = 1; + * string enumString = 1; */ public Builder setEnumString( java.lang.String value) { @@ -1115,7 +1317,7 @@ public Builder setEnumString( return this; } /** - * optional string enumString = 1; + * string enumString = 1; */ public Builder clearEnumString() { @@ -1124,7 +1326,7 @@ public Builder clearEnumString() { return this; } /** - * optional string enumString = 1; + * string enumString = 1; */ public Builder setEnumStringBytes( com.google.protobuf.ByteString value) { @@ -1140,13 +1342,13 @@ public Builder setEnumStringBytes( private long dateLong_ ; /** - * optional int64 dateLong = 2; + * int64 dateLong = 2; */ public long getDateLong() { return dateLong_; } /** - * optional int64 dateLong = 2; + * int64 dateLong = 2; */ public Builder setDateLong(long value) { @@ -1155,7 +1357,7 @@ public Builder setDateLong(long value) { return this; } /** - * optional int64 dateLong = 2; + * int64 dateLong = 2; */ public Builder clearDateLong() { @@ -1259,12 +1461,12 @@ public Builder addStringSetValueBytes( } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.setUnknownFieldsProto3(unknownFields); } public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.mergeUnknownFields(unknownFields); } @@ -1287,16 +1489,7 @@ public FieldConverterTest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - try { - return new FieldConverterTest(input, extensionRegistry); - } catch (RuntimeException e) { - if (e.getCause() instanceof - com.google.protobuf.InvalidProtocolBufferException) { - throw (com.google.protobuf.InvalidProtocolBufferException) - e.getCause(); - } - throw e; - } + return new FieldConverterTest(input, extensionRegistry); } }; @@ -1320,35 +1513,35 @@ public interface NullDefaultTestOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * optional string nullString = 1; + * string nullString = 1; */ java.lang.String getNullString(); /** - * optional string nullString = 1; + * string nullString = 1; */ com.google.protobuf.ByteString getNullStringBytes(); /** - * optional string customInspectionString = 2; + * string customInspectionString = 2; */ java.lang.String getCustomInspectionString(); /** - * optional string customInspectionString = 2; + * string customInspectionString = 2; */ com.google.protobuf.ByteString getCustomInspectionStringBytes(); /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ boolean hasDefaultPrimitives(); /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest getDefaultPrimitives(); /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder getDefaultPrimitivesOrBuilder(); } @@ -1356,11 +1549,12 @@ public interface NullDefaultTestOrBuilder extends * Protobuf type {@code net.badata.protobuf.converter.proto.NullDefaultTest} */ public static final class NullDefaultTest extends - com.google.protobuf.GeneratedMessage implements + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:net.badata.protobuf.converter.proto.NullDefaultTest) NullDefaultTestOrBuilder { + private static final long serialVersionUID = 0L; // Use NullDefaultTest.newBuilder() to construct. - private NullDefaultTest(com.google.protobuf.GeneratedMessage.Builder builder) { + private NullDefaultTest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private NullDefaultTest() { @@ -1371,13 +1565,19 @@ private NullDefaultTest() { @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); + return this.unknownFields; } private NullDefaultTest( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -1387,19 +1587,20 @@ private NullDefaultTest( done = true; break; default: { - if (!input.skipField(tag)) { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { done = true; } break; } case 10: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); nullString_ = s; break; } case 18: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); customInspectionString_ = s; break; @@ -1420,12 +1621,12 @@ private NullDefaultTest( } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw new RuntimeException(e.setUnfinishedMessage(this)); + throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new RuntimeException( - new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this)); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { + this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } @@ -1434,7 +1635,7 @@ private NullDefaultTest( return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_NullDefaultTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_NullDefaultTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -1444,7 +1645,7 @@ private NullDefaultTest( public static final int NULLSTRING_FIELD_NUMBER = 1; private volatile java.lang.Object nullString_; /** - * optional string nullString = 1; + * string nullString = 1; */ public java.lang.String getNullString() { java.lang.Object ref = nullString_; @@ -1459,7 +1660,7 @@ public java.lang.String getNullString() { } } /** - * optional string nullString = 1; + * string nullString = 1; */ public com.google.protobuf.ByteString getNullStringBytes() { @@ -1478,7 +1679,7 @@ public java.lang.String getNullString() { public static final int CUSTOMINSPECTIONSTRING_FIELD_NUMBER = 2; private volatile java.lang.Object customInspectionString_; /** - * optional string customInspectionString = 2; + * string customInspectionString = 2; */ public java.lang.String getCustomInspectionString() { java.lang.Object ref = customInspectionString_; @@ -1493,7 +1694,7 @@ public java.lang.String getCustomInspectionString() { } } /** - * optional string customInspectionString = 2; + * string customInspectionString = 2; */ public com.google.protobuf.ByteString getCustomInspectionStringBytes() { @@ -1512,19 +1713,19 @@ public java.lang.String getCustomInspectionString() { public static final int DEFAULTPRIMITIVES_FIELD_NUMBER = 3; private net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest defaultPrimitives_; /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ public boolean hasDefaultPrimitives() { return defaultPrimitives_ != null; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest getDefaultPrimitives() { return defaultPrimitives_ == null ? net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.getDefaultInstance() : defaultPrimitives_; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder getDefaultPrimitivesOrBuilder() { return getDefaultPrimitives(); @@ -1543,14 +1744,15 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNullStringBytes().isEmpty()) { - com.google.protobuf.GeneratedMessage.writeString(output, 1, nullString_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, nullString_); } if (!getCustomInspectionStringBytes().isEmpty()) { - com.google.protobuf.GeneratedMessage.writeString(output, 2, customInspectionString_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, customInspectionString_); } if (defaultPrimitives_ != null) { output.writeMessage(3, getDefaultPrimitives()); } + unknownFields.writeTo(output); } public int getSerializedSize() { @@ -1559,20 +1761,75 @@ public int getSerializedSize() { size = 0; if (!getNullStringBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(1, nullString_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, nullString_); } if (!getCustomInspectionStringBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(2, customInspectionString_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, customInspectionString_); } if (defaultPrimitives_ != null) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, getDefaultPrimitives()); } + size += unknownFields.getSerializedSize(); memoizedSize = size; return size; } - private static final long serialVersionUID = 0L; + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest)) { + return super.equals(obj); + } + net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest other = (net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest) obj; + + boolean result = true; + result = result && getNullString() + .equals(other.getNullString()); + result = result && getCustomInspectionString() + .equals(other.getCustomInspectionString()); + result = result && (hasDefaultPrimitives() == other.hasDefaultPrimitives()); + if (hasDefaultPrimitives()) { + result = result && getDefaultPrimitives() + .equals(other.getDefaultPrimitives()); + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + NULLSTRING_FIELD_NUMBER; + hash = (53 * hash) + getNullString().hashCode(); + hash = (37 * hash) + CUSTOMINSPECTIONSTRING_FIELD_NUMBER; + hash = (53 * hash) + getCustomInspectionString().hashCode(); + if (hasDefaultPrimitives()) { + hash = (37 * hash) + DEFAULTPRIMITIVES_FIELD_NUMBER; + hash = (53 * hash) + getDefaultPrimitives().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -1596,34 +1853,40 @@ public static net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest } public static net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public Builder newBuilderForType() { return newBuilder(); } @@ -1640,7 +1903,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -1648,7 +1911,7 @@ protected Builder newBuilderForType( * Protobuf type {@code net.badata.protobuf.converter.proto.NullDefaultTest} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:net.badata.protobuf.converter.proto.NullDefaultTest) net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -1656,7 +1919,7 @@ public static final class Builder extends return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_NullDefaultTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_NullDefaultTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -1669,12 +1932,13 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { } } public Builder clear() { @@ -1722,6 +1986,32 @@ public net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest buildP return result; } + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest) { return mergeFrom((net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest)other); @@ -1744,6 +2034,7 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.ConverterProto.Null if (other.hasDefaultPrimitives()) { mergeDefaultPrimitives(other.getDefaultPrimitives()); } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } @@ -1761,7 +2052,7 @@ public Builder mergeFrom( parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { parsedMessage = (net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest) e.getUnfinishedMessage(); - throw e; + throw e.unwrapIOException(); } finally { if (parsedMessage != null) { mergeFrom(parsedMessage); @@ -1772,7 +2063,7 @@ public Builder mergeFrom( private java.lang.Object nullString_ = ""; /** - * optional string nullString = 1; + * string nullString = 1; */ public java.lang.String getNullString() { java.lang.Object ref = nullString_; @@ -1787,7 +2078,7 @@ public java.lang.String getNullString() { } } /** - * optional string nullString = 1; + * string nullString = 1; */ public com.google.protobuf.ByteString getNullStringBytes() { @@ -1803,7 +2094,7 @@ public java.lang.String getNullString() { } } /** - * optional string nullString = 1; + * string nullString = 1; */ public Builder setNullString( java.lang.String value) { @@ -1816,7 +2107,7 @@ public Builder setNullString( return this; } /** - * optional string nullString = 1; + * string nullString = 1; */ public Builder clearNullString() { @@ -1825,7 +2116,7 @@ public Builder clearNullString() { return this; } /** - * optional string nullString = 1; + * string nullString = 1; */ public Builder setNullStringBytes( com.google.protobuf.ByteString value) { @@ -1841,7 +2132,7 @@ public Builder setNullStringBytes( private java.lang.Object customInspectionString_ = ""; /** - * optional string customInspectionString = 2; + * string customInspectionString = 2; */ public java.lang.String getCustomInspectionString() { java.lang.Object ref = customInspectionString_; @@ -1856,7 +2147,7 @@ public java.lang.String getCustomInspectionString() { } } /** - * optional string customInspectionString = 2; + * string customInspectionString = 2; */ public com.google.protobuf.ByteString getCustomInspectionStringBytes() { @@ -1872,7 +2163,7 @@ public java.lang.String getCustomInspectionString() { } } /** - * optional string customInspectionString = 2; + * string customInspectionString = 2; */ public Builder setCustomInspectionString( java.lang.String value) { @@ -1885,7 +2176,7 @@ public Builder setCustomInspectionString( return this; } /** - * optional string customInspectionString = 2; + * string customInspectionString = 2; */ public Builder clearCustomInspectionString() { @@ -1894,7 +2185,7 @@ public Builder clearCustomInspectionString() { return this; } /** - * optional string customInspectionString = 2; + * string customInspectionString = 2; */ public Builder setCustomInspectionStringBytes( com.google.protobuf.ByteString value) { @@ -1909,16 +2200,16 @@ public Builder setCustomInspectionStringBytes( } private net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest defaultPrimitives_ = null; - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder> defaultPrimitivesBuilder_; /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ public boolean hasDefaultPrimitives() { return defaultPrimitivesBuilder_ != null || defaultPrimitives_ != null; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest getDefaultPrimitives() { if (defaultPrimitivesBuilder_ == null) { @@ -1928,7 +2219,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest getDefau } } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ public Builder setDefaultPrimitives(net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest value) { if (defaultPrimitivesBuilder_ == null) { @@ -1944,7 +2235,7 @@ public Builder setDefaultPrimitives(net.badata.protobuf.converter.proto.Converte return this; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ public Builder setDefaultPrimitives( net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder builderForValue) { @@ -1958,7 +2249,7 @@ public Builder setDefaultPrimitives( return this; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ public Builder mergeDefaultPrimitives(net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest value) { if (defaultPrimitivesBuilder_ == null) { @@ -1976,7 +2267,7 @@ public Builder mergeDefaultPrimitives(net.badata.protobuf.converter.proto.Conver return this; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ public Builder clearDefaultPrimitives() { if (defaultPrimitivesBuilder_ == null) { @@ -1990,7 +2281,7 @@ public Builder clearDefaultPrimitives() { return this; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder getDefaultPrimitivesBuilder() { @@ -1998,7 +2289,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder return getDefaultPrimitivesFieldBuilder().getBuilder(); } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder getDefaultPrimitivesOrBuilder() { if (defaultPrimitivesBuilder_ != null) { @@ -2009,13 +2300,13 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder } } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; + * .net.badata.protobuf.converter.proto.PrimitiveTest defaultPrimitives = 3; */ - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder> getDefaultPrimitivesFieldBuilder() { if (defaultPrimitivesBuilder_ == null) { - defaultPrimitivesBuilder_ = new com.google.protobuf.SingleFieldBuilder< + defaultPrimitivesBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder>( getDefaultPrimitives(), getParentForChildren(), @@ -2026,12 +2317,12 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.setUnknownFieldsProto3(unknownFields); } public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.mergeUnknownFields(unknownFields); } @@ -2054,16 +2345,7 @@ public NullDefaultTest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - try { - return new NullDefaultTest(input, extensionRegistry); - } catch (RuntimeException e) { - if (e.getCause() instanceof - com.google.protobuf.InvalidProtocolBufferException) { - throw (com.google.protobuf.InvalidProtocolBufferException) - e.getCause(); - } - throw e; - } + return new NullDefaultTest(input, extensionRegistry); } }; @@ -2087,83 +2369,83 @@ public interface ConverterTestOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ int getIntValue(); /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ long getLongValue(); /** - * optional float floatValue = 3; + * float floatValue = 3; */ float getFloatValue(); /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ double getDoubleValue(); /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ boolean getBooleanValue(); /** - * optional string stringValue = 6; + * string stringValue = 6; */ java.lang.String getStringValue(); /** - * optional string stringValue = 6; + * string stringValue = 6; */ com.google.protobuf.ByteString getStringValueBytes(); /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ boolean hasPrimitiveValue(); /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest getPrimitiveValue(); /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder getPrimitiveValueOrBuilder(); /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ boolean hasFieldConversionValue(); /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest getFieldConversionValue(); /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTestOrBuilder getFieldConversionValueOrBuilder(); /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ boolean hasNullDefaultValue(); /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest getNullDefaultValue(); /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTestOrBuilder getNullDefaultValueOrBuilder(); /** * repeated string stringListValue = 10; */ - com.google.protobuf.ProtocolStringList + java.util.List getStringListValueList(); /** * repeated string stringListValue = 10; @@ -2252,20 +2534,20 @@ net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder getCom int index); /** - * optional bytes bytesValue = 14; + * bytes bytesValue = 14; */ com.google.protobuf.ByteString getBytesValue(); /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ boolean hasRecursiveValue(); /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ net.badata.protobuf.converter.proto.ConverterProto.ConverterTest getRecursiveValue(); /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ net.badata.protobuf.converter.proto.ConverterProto.ConverterTestOrBuilder getRecursiveValueOrBuilder(); } @@ -2273,11 +2555,12 @@ net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder getCom * Protobuf type {@code net.badata.protobuf.converter.proto.ConverterTest} */ public static final class ConverterTest extends - com.google.protobuf.GeneratedMessage implements + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:net.badata.protobuf.converter.proto.ConverterTest) ConverterTestOrBuilder { + private static final long serialVersionUID = 0L; // Use ConverterTest.newBuilder() to construct. - private ConverterTest(com.google.protobuf.GeneratedMessage.Builder builder) { + private ConverterTest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private ConverterTest() { @@ -2297,13 +2580,19 @@ private ConverterTest() { @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); + return this.unknownFields; } private ConverterTest( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -2313,7 +2602,8 @@ private ConverterTest( done = true; break; default: { - if (!input.skipField(tag)) { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2344,7 +2634,7 @@ private ConverterTest( break; } case 50: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); stringValue_ = s; break; @@ -2389,7 +2679,7 @@ private ConverterTest( break; } case 82: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) { stringListValue_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000200; @@ -2402,7 +2692,8 @@ private ConverterTest( complexListValue_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000400; } - complexListValue_.add(input.readMessage(net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.parser(), extensionRegistry)); + complexListValue_.add( + input.readMessage(net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.parser(), extensionRegistry)); break; } case 98: { @@ -2410,7 +2701,8 @@ private ConverterTest( complexSetValue_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000800; } - complexSetValue_.add(input.readMessage(net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.parser(), extensionRegistry)); + complexSetValue_.add( + input.readMessage(net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.parser(), extensionRegistry)); break; } case 106: { @@ -2418,7 +2710,8 @@ private ConverterTest( complexNullableCollectionValue_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00001000; } - complexNullableCollectionValue_.add(input.readMessage(net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.parser(), extensionRegistry)); + complexNullableCollectionValue_.add( + input.readMessage(net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.parser(), extensionRegistry)); break; } case 114: { @@ -2442,11 +2735,10 @@ private ConverterTest( } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw new RuntimeException(e.setUnfinishedMessage(this)); + throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new RuntimeException( - new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this)); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) { stringListValue_ = stringListValue_.getUnmodifiableView(); @@ -2460,6 +2752,7 @@ private ConverterTest( if (((mutable_bitField0_ & 0x00001000) == 0x00001000)) { complexNullableCollectionValue_ = java.util.Collections.unmodifiableList(complexNullableCollectionValue_); } + this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } @@ -2468,7 +2761,7 @@ private ConverterTest( return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_ConverterTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_ConverterTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -2479,7 +2772,7 @@ private ConverterTest( public static final int INTVALUE_FIELD_NUMBER = 1; private int intValue_; /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public int getIntValue() { return intValue_; @@ -2488,7 +2781,7 @@ public int getIntValue() { public static final int LONGVALUE_FIELD_NUMBER = 2; private long longValue_; /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public long getLongValue() { return longValue_; @@ -2497,7 +2790,7 @@ public long getLongValue() { public static final int FLOATVALUE_FIELD_NUMBER = 3; private float floatValue_; /** - * optional float floatValue = 3; + * float floatValue = 3; */ public float getFloatValue() { return floatValue_; @@ -2506,7 +2799,7 @@ public float getFloatValue() { public static final int DOUBLEVALUE_FIELD_NUMBER = 4; private double doubleValue_; /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ public double getDoubleValue() { return doubleValue_; @@ -2515,7 +2808,7 @@ public double getDoubleValue() { public static final int BOOLEANVALUE_FIELD_NUMBER = 5; private boolean booleanValue_; /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ public boolean getBooleanValue() { return booleanValue_; @@ -2524,7 +2817,7 @@ public boolean getBooleanValue() { public static final int STRINGVALUE_FIELD_NUMBER = 6; private volatile java.lang.Object stringValue_; /** - * optional string stringValue = 6; + * string stringValue = 6; */ public java.lang.String getStringValue() { java.lang.Object ref = stringValue_; @@ -2539,7 +2832,7 @@ public java.lang.String getStringValue() { } } /** - * optional string stringValue = 6; + * string stringValue = 6; */ public com.google.protobuf.ByteString getStringValueBytes() { @@ -2558,19 +2851,19 @@ public java.lang.String getStringValue() { public static final int PRIMITIVEVALUE_FIELD_NUMBER = 7; private net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest primitiveValue_; /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ public boolean hasPrimitiveValue() { return primitiveValue_ != null; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest getPrimitiveValue() { return primitiveValue_ == null ? net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.getDefaultInstance() : primitiveValue_; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder getPrimitiveValueOrBuilder() { return getPrimitiveValue(); @@ -2579,19 +2872,19 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder public static final int FIELDCONVERSIONVALUE_FIELD_NUMBER = 8; private net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest fieldConversionValue_; /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ public boolean hasFieldConversionValue() { return fieldConversionValue_ != null; } /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ public net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest getFieldConversionValue() { return fieldConversionValue_ == null ? net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest.getDefaultInstance() : fieldConversionValue_; } /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ public net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTestOrBuilder getFieldConversionValueOrBuilder() { return getFieldConversionValue(); @@ -2600,19 +2893,19 @@ public net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTestOrBu public static final int NULLDEFAULTVALUE_FIELD_NUMBER = 9; private net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest nullDefaultValue_; /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ public boolean hasNullDefaultValue() { return nullDefaultValue_ != null; } /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ public net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest getNullDefaultValue() { return nullDefaultValue_ == null ? net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest.getDefaultInstance() : nullDefaultValue_; } /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ public net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTestOrBuilder getNullDefaultValueOrBuilder() { return getNullDefaultValue(); @@ -2755,7 +3048,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder public static final int BYTESVALUE_FIELD_NUMBER = 14; private com.google.protobuf.ByteString bytesValue_; /** - * optional bytes bytesValue = 14; + * bytes bytesValue = 14; */ public com.google.protobuf.ByteString getBytesValue() { return bytesValue_; @@ -2764,19 +3057,19 @@ public com.google.protobuf.ByteString getBytesValue() { public static final int RECURSIVEVALUE_FIELD_NUMBER = 15; private net.badata.protobuf.converter.proto.ConverterProto.ConverterTest recursiveValue_; /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ public boolean hasRecursiveValue() { return recursiveValue_ != null; } /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTest getRecursiveValue() { return recursiveValue_ == null ? net.badata.protobuf.converter.proto.ConverterProto.ConverterTest.getDefaultInstance() : recursiveValue_; } /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTestOrBuilder getRecursiveValueOrBuilder() { return getRecursiveValue(); @@ -2810,7 +3103,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeBool(5, booleanValue_); } if (!getStringValueBytes().isEmpty()) { - com.google.protobuf.GeneratedMessage.writeString(output, 6, stringValue_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, stringValue_); } if (primitiveValue_ != null) { output.writeMessage(7, getPrimitiveValue()); @@ -2822,7 +3115,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeMessage(9, getNullDefaultValue()); } for (int i = 0; i < stringListValue_.size(); i++) { - com.google.protobuf.GeneratedMessage.writeString(output, 10, stringListValue_.getRaw(i)); + com.google.protobuf.GeneratedMessageV3.writeString(output, 10, stringListValue_.getRaw(i)); } for (int i = 0; i < complexListValue_.size(); i++) { output.writeMessage(11, complexListValue_.get(i)); @@ -2839,6 +3132,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (recursiveValue_ != null) { output.writeMessage(15, getRecursiveValue()); } + unknownFields.writeTo(output); } public int getSerializedSize() { @@ -2867,7 +3161,7 @@ public int getSerializedSize() { .computeBoolSize(5, booleanValue_); } if (!getStringValueBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(6, stringValue_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, stringValue_); } if (primitiveValue_ != null) { size += com.google.protobuf.CodedOutputStream @@ -2909,11 +3203,145 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(15, getRecursiveValue()); } + size += unknownFields.getSerializedSize(); memoizedSize = size; return size; } - private static final long serialVersionUID = 0L; + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.badata.protobuf.converter.proto.ConverterProto.ConverterTest)) { + return super.equals(obj); + } + net.badata.protobuf.converter.proto.ConverterProto.ConverterTest other = (net.badata.protobuf.converter.proto.ConverterProto.ConverterTest) obj; + + boolean result = true; + result = result && (getIntValue() + == other.getIntValue()); + result = result && (getLongValue() + == other.getLongValue()); + result = result && ( + java.lang.Float.floatToIntBits(getFloatValue()) + == java.lang.Float.floatToIntBits( + other.getFloatValue())); + result = result && ( + java.lang.Double.doubleToLongBits(getDoubleValue()) + == java.lang.Double.doubleToLongBits( + other.getDoubleValue())); + result = result && (getBooleanValue() + == other.getBooleanValue()); + result = result && getStringValue() + .equals(other.getStringValue()); + result = result && (hasPrimitiveValue() == other.hasPrimitiveValue()); + if (hasPrimitiveValue()) { + result = result && getPrimitiveValue() + .equals(other.getPrimitiveValue()); + } + result = result && (hasFieldConversionValue() == other.hasFieldConversionValue()); + if (hasFieldConversionValue()) { + result = result && getFieldConversionValue() + .equals(other.getFieldConversionValue()); + } + result = result && (hasNullDefaultValue() == other.hasNullDefaultValue()); + if (hasNullDefaultValue()) { + result = result && getNullDefaultValue() + .equals(other.getNullDefaultValue()); + } + result = result && getStringListValueList() + .equals(other.getStringListValueList()); + result = result && getComplexListValueList() + .equals(other.getComplexListValueList()); + result = result && getComplexSetValueList() + .equals(other.getComplexSetValueList()); + result = result && getComplexNullableCollectionValueList() + .equals(other.getComplexNullableCollectionValueList()); + result = result && getBytesValue() + .equals(other.getBytesValue()); + result = result && (hasRecursiveValue() == other.hasRecursiveValue()); + if (hasRecursiveValue()) { + result = result && getRecursiveValue() + .equals(other.getRecursiveValue()); + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + INTVALUE_FIELD_NUMBER; + hash = (53 * hash) + getIntValue(); + hash = (37 * hash) + LONGVALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getLongValue()); + hash = (37 * hash) + FLOATVALUE_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getFloatValue()); + hash = (37 * hash) + DOUBLEVALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getDoubleValue())); + hash = (37 * hash) + BOOLEANVALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getBooleanValue()); + hash = (37 * hash) + STRINGVALUE_FIELD_NUMBER; + hash = (53 * hash) + getStringValue().hashCode(); + if (hasPrimitiveValue()) { + hash = (37 * hash) + PRIMITIVEVALUE_FIELD_NUMBER; + hash = (53 * hash) + getPrimitiveValue().hashCode(); + } + if (hasFieldConversionValue()) { + hash = (37 * hash) + FIELDCONVERSIONVALUE_FIELD_NUMBER; + hash = (53 * hash) + getFieldConversionValue().hashCode(); + } + if (hasNullDefaultValue()) { + hash = (37 * hash) + NULLDEFAULTVALUE_FIELD_NUMBER; + hash = (53 * hash) + getNullDefaultValue().hashCode(); + } + if (getStringListValueCount() > 0) { + hash = (37 * hash) + STRINGLISTVALUE_FIELD_NUMBER; + hash = (53 * hash) + getStringListValueList().hashCode(); + } + if (getComplexListValueCount() > 0) { + hash = (37 * hash) + COMPLEXLISTVALUE_FIELD_NUMBER; + hash = (53 * hash) + getComplexListValueList().hashCode(); + } + if (getComplexSetValueCount() > 0) { + hash = (37 * hash) + COMPLEXSETVALUE_FIELD_NUMBER; + hash = (53 * hash) + getComplexSetValueList().hashCode(); + } + if (getComplexNullableCollectionValueCount() > 0) { + hash = (37 * hash) + COMPLEXNULLABLECOLLECTIONVALUE_FIELD_NUMBER; + hash = (53 * hash) + getComplexNullableCollectionValueList().hashCode(); + } + hash = (37 * hash) + BYTESVALUE_FIELD_NUMBER; + hash = (53 * hash) + getBytesValue().hashCode(); + if (hasRecursiveValue()) { + hash = (37 * hash) + RECURSIVEVALUE_FIELD_NUMBER; + hash = (53 * hash) + getRecursiveValue().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.badata.protobuf.converter.proto.ConverterProto.ConverterTest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.badata.protobuf.converter.proto.ConverterProto.ConverterTest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static net.badata.protobuf.converter.proto.ConverterProto.ConverterTest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -2937,34 +3365,40 @@ public static net.badata.protobuf.converter.proto.ConverterProto.ConverterTest p } public static net.badata.protobuf.converter.proto.ConverterProto.ConverterTest parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ConverterProto.ConverterTest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.ConverterProto.ConverterTest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ConverterProto.ConverterTest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.ConverterProto.ConverterTest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ConverterProto.ConverterTest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public Builder newBuilderForType() { return newBuilder(); } @@ -2981,7 +3415,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -2989,7 +3423,7 @@ protected Builder newBuilderForType( * Protobuf type {@code net.badata.protobuf.converter.proto.ConverterTest} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:net.badata.protobuf.converter.proto.ConverterTest) net.badata.protobuf.converter.proto.ConverterProto.ConverterTestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -2997,7 +3431,7 @@ public static final class Builder extends return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_ConverterTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.ConverterProto.internal_static_net_badata_protobuf_converter_proto_ConverterTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -3010,12 +3444,13 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { getComplexListValueFieldBuilder(); getComplexSetValueFieldBuilder(); getComplexNullableCollectionValueFieldBuilder(); @@ -3169,6 +3604,32 @@ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTest buildPar return result; } + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof net.badata.protobuf.converter.proto.ConverterProto.ConverterTest) { return mergeFrom((net.badata.protobuf.converter.proto.ConverterProto.ConverterTest)other); @@ -3237,7 +3698,7 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.ConverterProto.Conv complexListValue_ = other.complexListValue_; bitField0_ = (bitField0_ & ~0x00000400); complexListValueBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getComplexListValueFieldBuilder() : null; } else { complexListValueBuilder_.addAllMessages(other.complexListValue_); @@ -3263,7 +3724,7 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.ConverterProto.Conv complexSetValue_ = other.complexSetValue_; bitField0_ = (bitField0_ & ~0x00000800); complexSetValueBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getComplexSetValueFieldBuilder() : null; } else { complexSetValueBuilder_.addAllMessages(other.complexSetValue_); @@ -3289,7 +3750,7 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.ConverterProto.Conv complexNullableCollectionValue_ = other.complexNullableCollectionValue_; bitField0_ = (bitField0_ & ~0x00001000); complexNullableCollectionValueBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getComplexNullableCollectionValueFieldBuilder() : null; } else { complexNullableCollectionValueBuilder_.addAllMessages(other.complexNullableCollectionValue_); @@ -3302,6 +3763,7 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.ConverterProto.Conv if (other.hasRecursiveValue()) { mergeRecursiveValue(other.getRecursiveValue()); } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } @@ -3319,7 +3781,7 @@ public Builder mergeFrom( parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { parsedMessage = (net.badata.protobuf.converter.proto.ConverterProto.ConverterTest) e.getUnfinishedMessage(); - throw e; + throw e.unwrapIOException(); } finally { if (parsedMessage != null) { mergeFrom(parsedMessage); @@ -3331,13 +3793,13 @@ public Builder mergeFrom( private int intValue_ ; /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public int getIntValue() { return intValue_; } /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public Builder setIntValue(int value) { @@ -3346,7 +3808,7 @@ public Builder setIntValue(int value) { return this; } /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public Builder clearIntValue() { @@ -3357,13 +3819,13 @@ public Builder clearIntValue() { private long longValue_ ; /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public long getLongValue() { return longValue_; } /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public Builder setLongValue(long value) { @@ -3372,7 +3834,7 @@ public Builder setLongValue(long value) { return this; } /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public Builder clearLongValue() { @@ -3383,13 +3845,13 @@ public Builder clearLongValue() { private float floatValue_ ; /** - * optional float floatValue = 3; + * float floatValue = 3; */ public float getFloatValue() { return floatValue_; } /** - * optional float floatValue = 3; + * float floatValue = 3; */ public Builder setFloatValue(float value) { @@ -3398,7 +3860,7 @@ public Builder setFloatValue(float value) { return this; } /** - * optional float floatValue = 3; + * float floatValue = 3; */ public Builder clearFloatValue() { @@ -3409,13 +3871,13 @@ public Builder clearFloatValue() { private double doubleValue_ ; /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ public double getDoubleValue() { return doubleValue_; } /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ public Builder setDoubleValue(double value) { @@ -3424,7 +3886,7 @@ public Builder setDoubleValue(double value) { return this; } /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ public Builder clearDoubleValue() { @@ -3435,13 +3897,13 @@ public Builder clearDoubleValue() { private boolean booleanValue_ ; /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ public boolean getBooleanValue() { return booleanValue_; } /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ public Builder setBooleanValue(boolean value) { @@ -3450,7 +3912,7 @@ public Builder setBooleanValue(boolean value) { return this; } /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ public Builder clearBooleanValue() { @@ -3461,7 +3923,7 @@ public Builder clearBooleanValue() { private java.lang.Object stringValue_ = ""; /** - * optional string stringValue = 6; + * string stringValue = 6; */ public java.lang.String getStringValue() { java.lang.Object ref = stringValue_; @@ -3476,7 +3938,7 @@ public java.lang.String getStringValue() { } } /** - * optional string stringValue = 6; + * string stringValue = 6; */ public com.google.protobuf.ByteString getStringValueBytes() { @@ -3492,7 +3954,7 @@ public java.lang.String getStringValue() { } } /** - * optional string stringValue = 6; + * string stringValue = 6; */ public Builder setStringValue( java.lang.String value) { @@ -3505,7 +3967,7 @@ public Builder setStringValue( return this; } /** - * optional string stringValue = 6; + * string stringValue = 6; */ public Builder clearStringValue() { @@ -3514,7 +3976,7 @@ public Builder clearStringValue() { return this; } /** - * optional string stringValue = 6; + * string stringValue = 6; */ public Builder setStringValueBytes( com.google.protobuf.ByteString value) { @@ -3529,16 +3991,16 @@ public Builder setStringValueBytes( } private net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest primitiveValue_ = null; - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder> primitiveValueBuilder_; /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ public boolean hasPrimitiveValue() { return primitiveValueBuilder_ != null || primitiveValue_ != null; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest getPrimitiveValue() { if (primitiveValueBuilder_ == null) { @@ -3548,7 +4010,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest getPrimi } } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ public Builder setPrimitiveValue(net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest value) { if (primitiveValueBuilder_ == null) { @@ -3564,7 +4026,7 @@ public Builder setPrimitiveValue(net.badata.protobuf.converter.proto.ConverterPr return this; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ public Builder setPrimitiveValue( net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder builderForValue) { @@ -3578,7 +4040,7 @@ public Builder setPrimitiveValue( return this; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ public Builder mergePrimitiveValue(net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest value) { if (primitiveValueBuilder_ == null) { @@ -3596,7 +4058,7 @@ public Builder mergePrimitiveValue(net.badata.protobuf.converter.proto.Converter return this; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ public Builder clearPrimitiveValue() { if (primitiveValueBuilder_ == null) { @@ -3610,7 +4072,7 @@ public Builder clearPrimitiveValue() { return this; } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder getPrimitiveValueBuilder() { @@ -3618,7 +4080,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder return getPrimitiveValueFieldBuilder().getBuilder(); } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder getPrimitiveValueOrBuilder() { if (primitiveValueBuilder_ != null) { @@ -3629,13 +4091,13 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder } } /** - * optional .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; + * .net.badata.protobuf.converter.proto.PrimitiveTest primitiveValue = 7; */ - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder> getPrimitiveValueFieldBuilder() { if (primitiveValueBuilder_ == null) { - primitiveValueBuilder_ = new com.google.protobuf.SingleFieldBuilder< + primitiveValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder>( getPrimitiveValue(), getParentForChildren(), @@ -3646,16 +4108,16 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder } private net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest fieldConversionValue_ = null; - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest, net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTestOrBuilder> fieldConversionValueBuilder_; /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ public boolean hasFieldConversionValue() { return fieldConversionValueBuilder_ != null || fieldConversionValue_ != null; } /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ public net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest getFieldConversionValue() { if (fieldConversionValueBuilder_ == null) { @@ -3665,7 +4127,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest get } } /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ public Builder setFieldConversionValue(net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest value) { if (fieldConversionValueBuilder_ == null) { @@ -3681,7 +4143,7 @@ public Builder setFieldConversionValue(net.badata.protobuf.converter.proto.Conve return this; } /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ public Builder setFieldConversionValue( net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest.Builder builderForValue) { @@ -3695,7 +4157,7 @@ public Builder setFieldConversionValue( return this; } /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ public Builder mergeFieldConversionValue(net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest value) { if (fieldConversionValueBuilder_ == null) { @@ -3713,7 +4175,7 @@ public Builder mergeFieldConversionValue(net.badata.protobuf.converter.proto.Con return this; } /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ public Builder clearFieldConversionValue() { if (fieldConversionValueBuilder_ == null) { @@ -3727,7 +4189,7 @@ public Builder clearFieldConversionValue() { return this; } /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ public net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest.Builder getFieldConversionValueBuilder() { @@ -3735,7 +4197,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest.Bui return getFieldConversionValueFieldBuilder().getBuilder(); } /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ public net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTestOrBuilder getFieldConversionValueOrBuilder() { if (fieldConversionValueBuilder_ != null) { @@ -3746,13 +4208,13 @@ public net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTestOrBu } } /** - * optional .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; + * .net.badata.protobuf.converter.proto.FieldConverterTest fieldConversionValue = 8; */ - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest, net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTestOrBuilder> getFieldConversionValueFieldBuilder() { if (fieldConversionValueBuilder_ == null) { - fieldConversionValueBuilder_ = new com.google.protobuf.SingleFieldBuilder< + fieldConversionValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest, net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTestOrBuilder>( getFieldConversionValue(), getParentForChildren(), @@ -3763,16 +4225,16 @@ public net.badata.protobuf.converter.proto.ConverterProto.FieldConverterTestOrBu } private net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest nullDefaultValue_ = null; - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest, net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTestOrBuilder> nullDefaultValueBuilder_; /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ public boolean hasNullDefaultValue() { return nullDefaultValueBuilder_ != null || nullDefaultValue_ != null; } /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ public net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest getNullDefaultValue() { if (nullDefaultValueBuilder_ == null) { @@ -3782,7 +4244,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest getNul } } /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ public Builder setNullDefaultValue(net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest value) { if (nullDefaultValueBuilder_ == null) { @@ -3798,7 +4260,7 @@ public Builder setNullDefaultValue(net.badata.protobuf.converter.proto.Converter return this; } /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ public Builder setNullDefaultValue( net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest.Builder builderForValue) { @@ -3812,7 +4274,7 @@ public Builder setNullDefaultValue( return this; } /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ public Builder mergeNullDefaultValue(net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest value) { if (nullDefaultValueBuilder_ == null) { @@ -3830,7 +4292,7 @@ public Builder mergeNullDefaultValue(net.badata.protobuf.converter.proto.Convert return this; } /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ public Builder clearNullDefaultValue() { if (nullDefaultValueBuilder_ == null) { @@ -3844,7 +4306,7 @@ public Builder clearNullDefaultValue() { return this; } /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ public net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest.Builder getNullDefaultValueBuilder() { @@ -3852,7 +4314,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest.Builde return getNullDefaultValueFieldBuilder().getBuilder(); } /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ public net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTestOrBuilder getNullDefaultValueOrBuilder() { if (nullDefaultValueBuilder_ != null) { @@ -3863,13 +4325,13 @@ public net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTestOrBuild } } /** - * optional .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; + * .net.badata.protobuf.converter.proto.NullDefaultTest nullDefaultValue = 9; */ - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest, net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTestOrBuilder> getNullDefaultValueFieldBuilder() { if (nullDefaultValueBuilder_ == null) { - nullDefaultValueBuilder_ = new com.google.protobuf.SingleFieldBuilder< + nullDefaultValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest, net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.NullDefaultTestOrBuilder>( getNullDefaultValue(), getParentForChildren(), @@ -3982,7 +4444,7 @@ private void ensureComplexListValueIsMutable() { } } - private com.google.protobuf.RepeatedFieldBuilder< + private com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder> complexListValueBuilder_; /** @@ -4198,11 +4660,11 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder getComplexListValueBuilderList() { return getComplexListValueFieldBuilder().getBuilderList(); } - private com.google.protobuf.RepeatedFieldBuilder< + private com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder> getComplexListValueFieldBuilder() { if (complexListValueBuilder_ == null) { - complexListValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + complexListValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder>( complexListValue_, ((bitField0_ & 0x00000400) == 0x00000400), @@ -4222,7 +4684,7 @@ private void ensureComplexSetValueIsMutable() { } } - private com.google.protobuf.RepeatedFieldBuilder< + private com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder> complexSetValueBuilder_; /** @@ -4438,11 +4900,11 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder getComplexSetValueBuilderList() { return getComplexSetValueFieldBuilder().getBuilderList(); } - private com.google.protobuf.RepeatedFieldBuilder< + private com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder> getComplexSetValueFieldBuilder() { if (complexSetValueBuilder_ == null) { - complexSetValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + complexSetValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder>( complexSetValue_, ((bitField0_ & 0x00000800) == 0x00000800), @@ -4462,7 +4924,7 @@ private void ensureComplexNullableCollectionValueIsMutable() { } } - private com.google.protobuf.RepeatedFieldBuilder< + private com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder> complexNullableCollectionValueBuilder_; /** @@ -4678,11 +5140,11 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder getComplexNullableCollectionValueBuilderList() { return getComplexNullableCollectionValueFieldBuilder().getBuilderList(); } - private com.google.protobuf.RepeatedFieldBuilder< + private com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder> getComplexNullableCollectionValueFieldBuilder() { if (complexNullableCollectionValueBuilder_ == null) { - complexNullableCollectionValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + complexNullableCollectionValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTestOrBuilder>( complexNullableCollectionValue_, ((bitField0_ & 0x00001000) == 0x00001000), @@ -4695,13 +5157,13 @@ public net.badata.protobuf.converter.proto.ConverterProto.PrimitiveTest.Builder private com.google.protobuf.ByteString bytesValue_ = com.google.protobuf.ByteString.EMPTY; /** - * optional bytes bytesValue = 14; + * bytes bytesValue = 14; */ public com.google.protobuf.ByteString getBytesValue() { return bytesValue_; } /** - * optional bytes bytesValue = 14; + * bytes bytesValue = 14; */ public Builder setBytesValue(com.google.protobuf.ByteString value) { if (value == null) { @@ -4713,7 +5175,7 @@ public Builder setBytesValue(com.google.protobuf.ByteString value) { return this; } /** - * optional bytes bytesValue = 14; + * bytes bytesValue = 14; */ public Builder clearBytesValue() { @@ -4723,16 +5185,16 @@ public Builder clearBytesValue() { } private net.badata.protobuf.converter.proto.ConverterProto.ConverterTest recursiveValue_ = null; - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.ConverterTest, net.badata.protobuf.converter.proto.ConverterProto.ConverterTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.ConverterTestOrBuilder> recursiveValueBuilder_; /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ public boolean hasRecursiveValue() { return recursiveValueBuilder_ != null || recursiveValue_ != null; } /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTest getRecursiveValue() { if (recursiveValueBuilder_ == null) { @@ -4742,7 +5204,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTest getRecur } } /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ public Builder setRecursiveValue(net.badata.protobuf.converter.proto.ConverterProto.ConverterTest value) { if (recursiveValueBuilder_ == null) { @@ -4758,7 +5220,7 @@ public Builder setRecursiveValue(net.badata.protobuf.converter.proto.ConverterPr return this; } /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ public Builder setRecursiveValue( net.badata.protobuf.converter.proto.ConverterProto.ConverterTest.Builder builderForValue) { @@ -4772,7 +5234,7 @@ public Builder setRecursiveValue( return this; } /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ public Builder mergeRecursiveValue(net.badata.protobuf.converter.proto.ConverterProto.ConverterTest value) { if (recursiveValueBuilder_ == null) { @@ -4790,7 +5252,7 @@ public Builder mergeRecursiveValue(net.badata.protobuf.converter.proto.Converter return this; } /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ public Builder clearRecursiveValue() { if (recursiveValueBuilder_ == null) { @@ -4804,7 +5266,7 @@ public Builder clearRecursiveValue() { return this; } /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTest.Builder getRecursiveValueBuilder() { @@ -4812,7 +5274,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTest.Builder return getRecursiveValueFieldBuilder().getBuilder(); } /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTestOrBuilder getRecursiveValueOrBuilder() { if (recursiveValueBuilder_ != null) { @@ -4823,13 +5285,13 @@ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTestOrBuilder } } /** - * optional .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; + * .net.badata.protobuf.converter.proto.ConverterTest recursiveValue = 15; */ - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.ConverterTest, net.badata.protobuf.converter.proto.ConverterProto.ConverterTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.ConverterTestOrBuilder> getRecursiveValueFieldBuilder() { if (recursiveValueBuilder_ == null) { - recursiveValueBuilder_ = new com.google.protobuf.SingleFieldBuilder< + recursiveValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.ConverterProto.ConverterTest, net.badata.protobuf.converter.proto.ConverterProto.ConverterTest.Builder, net.badata.protobuf.converter.proto.ConverterProto.ConverterTestOrBuilder>( getRecursiveValue(), getParentForChildren(), @@ -4840,12 +5302,12 @@ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTestOrBuilder } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.setUnknownFieldsProto3(unknownFields); } public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.mergeUnknownFields(unknownFields); } @@ -4868,16 +5330,7 @@ public ConverterTest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - try { - return new ConverterTest(input, extensionRegistry); - } catch (RuntimeException e) { - if (e.getCause() instanceof - com.google.protobuf.InvalidProtocolBufferException) { - throw (com.google.protobuf.InvalidProtocolBufferException) - e.getCause(); - } - throw e; - } + return new ConverterTest(input, extensionRegistry); } }; @@ -4896,32 +5349,32 @@ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTest getDefau } - private static com.google.protobuf.Descriptors.Descriptor + private static final com.google.protobuf.Descriptors.Descriptor internal_static_net_badata_protobuf_converter_proto_PrimitiveTest_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_net_badata_protobuf_converter_proto_PrimitiveTest_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor + private static final com.google.protobuf.Descriptors.Descriptor internal_static_net_badata_protobuf_converter_proto_FieldConverterTest_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_net_badata_protobuf_converter_proto_FieldConverterTest_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor + private static final com.google.protobuf.Descriptors.Descriptor internal_static_net_badata_protobuf_converter_proto_NullDefaultTest_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_net_badata_protobuf_converter_proto_NullDefaultTest_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor + private static final com.google.protobuf.Descriptors.Descriptor internal_static_net_badata_protobuf_converter_proto_ConverterTest_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_net_badata_protobuf_converter_proto_ConverterTest_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; } - private static com.google.protobuf.Descriptors.FileDescriptor + private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { java.lang.String[] descriptorData = { @@ -4934,7 +5387,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTest getDefau "stringSetValue\030\003 \003(\t\"\224\001\n\017NullDefaultTest" + "\022\022\n\nnullString\030\001 \001(\t\022\036\n\026customInspection" + "String\030\002 \001(\t\022M\n\021defaultPrimitives\030\003 \001(\0132" + - "2.net.badata.protobuf.converter.proto.Pr", + "2.net.badata.protobuf.converter.proto.Pr" + "imitiveTest\"\353\005\n\rConverterTest\022\020\n\010intValu" + "e\030\001 \001(\005\022\021\n\tlongValue\030\002 \001(\003\022\022\n\nfloatValue" + "\030\003 \001(\002\022\023\n\013doubleValue\030\004 \001(\001\022\024\n\014booleanVa" + @@ -4944,7 +5397,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTest getDefau "rsionValue\030\010 \001(\01327.net.badata.protobuf.c" + "onverter.proto.FieldConverterTest\022N\n\020nul" + "lDefaultValue\030\t \001(\01324.net.badata.protobu" + - "f.converter.proto.NullDefaultTest\022\027\n\017str", + "f.converter.proto.NullDefaultTest\022\027\n\017str" + "ingListValue\030\n \003(\t\022L\n\020complexListValue\030\013" + " \003(\01322.net.badata.protobuf.converter.pro" + "to.PrimitiveTest\022K\n\017complexSetValue\030\014 \003(" + @@ -4954,7 +5407,7 @@ public net.badata.protobuf.converter.proto.ConverterProto.ConverterTest getDefau "erter.proto.PrimitiveTest\022\022\n\nbytesValue\030" + "\016 \001(\014\022J\n\016recursiveValue\030\017 \001(\01322.net.bada" + "ta.protobuf.converter.proto.ConverterTes" + - "tB5\n#net.badata.protobuf.converter.proto", + "tB5\n#net.badata.protobuf.converter.proto" + "B\016ConverterProtob\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = @@ -4972,25 +5425,25 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_net_badata_protobuf_converter_proto_PrimitiveTest_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_net_badata_protobuf_converter_proto_PrimitiveTest_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_net_badata_protobuf_converter_proto_PrimitiveTest_descriptor, new java.lang.String[] { "IntValue", "LongValue", "FloatValue", "DoubleValue", "BooleanValue", }); internal_static_net_badata_protobuf_converter_proto_FieldConverterTest_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_net_badata_protobuf_converter_proto_FieldConverterTest_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_net_badata_protobuf_converter_proto_FieldConverterTest_descriptor, new java.lang.String[] { "EnumString", "DateLong", "StringSetValue", }); internal_static_net_badata_protobuf_converter_proto_NullDefaultTest_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_net_badata_protobuf_converter_proto_NullDefaultTest_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_net_badata_protobuf_converter_proto_NullDefaultTest_descriptor, new java.lang.String[] { "NullString", "CustomInspectionString", "DefaultPrimitives", }); internal_static_net_badata_protobuf_converter_proto_ConverterTest_descriptor = getDescriptor().getMessageTypes().get(3); internal_static_net_badata_protobuf_converter_proto_ConverterTest_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_net_badata_protobuf_converter_proto_ConverterTest_descriptor, new java.lang.String[] { "IntValue", "LongValue", "FloatValue", "DoubleValue", "BooleanValue", "StringValue", "PrimitiveValue", "FieldConversionValue", "NullDefaultValue", "StringListValue", "ComplexListValue", "ComplexSetValue", "ComplexNullableCollectionValue", "BytesValue", "RecursiveValue", }); } diff --git a/src/test/java/net/badata/protobuf/converter/proto/DomainInheritanceProto.java b/src/test/java/net/badata/protobuf/converter/proto/DomainInheritanceProto.java index 3b4b963..e9d6513 100644 --- a/src/test/java/net/badata/protobuf/converter/proto/DomainInheritanceProto.java +++ b/src/test/java/net/badata/protobuf/converter/proto/DomainInheritanceProto.java @@ -5,30 +5,36 @@ public final class DomainInheritanceProto { private DomainInheritanceProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + public static void registerAllExtensions( com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); } public interface TestOrBuilder extends // @@protoc_insertion_point(interface_extends:net.badata.protobuf.converter.proto.Test) com.google.protobuf.MessageOrBuilder { /** - * optional int32 inheritedInt = 1; + * int32 inheritedInt = 1; */ int getInheritedInt(); /** - * optional float inheritedFloat = 2; + * float inheritedFloat = 2; */ float getInheritedFloat(); /** - * optional int64 ownLong = 3; + * int64 ownLong = 3; */ long getOwnLong(); /** - * optional double ownDouble = 4; + * double ownDouble = 4; */ double getOwnDouble(); } @@ -36,11 +42,12 @@ public interface TestOrBuilder extends * Protobuf type {@code net.badata.protobuf.converter.proto.Test} */ public static final class Test extends - com.google.protobuf.GeneratedMessage implements + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:net.badata.protobuf.converter.proto.Test) TestOrBuilder { + private static final long serialVersionUID = 0L; // Use Test.newBuilder() to construct. - private Test(com.google.protobuf.GeneratedMessage.Builder builder) { + private Test(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private Test() { @@ -53,13 +60,19 @@ private Test() { @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); + return this.unknownFields; } private Test( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -69,7 +82,8 @@ private Test( done = true; break; default: { - if (!input.skipField(tag)) { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -97,12 +111,12 @@ private Test( } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw new RuntimeException(e.setUnfinishedMessage(this)); + throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new RuntimeException( - new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this)); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { + this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } @@ -111,7 +125,7 @@ private Test( return net.badata.protobuf.converter.proto.DomainInheritanceProto.internal_static_net_badata_protobuf_converter_proto_Test_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.DomainInheritanceProto.internal_static_net_badata_protobuf_converter_proto_Test_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -121,7 +135,7 @@ private Test( public static final int INHERITEDINT_FIELD_NUMBER = 1; private int inheritedInt_; /** - * optional int32 inheritedInt = 1; + * int32 inheritedInt = 1; */ public int getInheritedInt() { return inheritedInt_; @@ -130,7 +144,7 @@ public int getInheritedInt() { public static final int INHERITEDFLOAT_FIELD_NUMBER = 2; private float inheritedFloat_; /** - * optional float inheritedFloat = 2; + * float inheritedFloat = 2; */ public float getInheritedFloat() { return inheritedFloat_; @@ -139,7 +153,7 @@ public float getInheritedFloat() { public static final int OWNLONG_FIELD_NUMBER = 3; private long ownLong_; /** - * optional int64 ownLong = 3; + * int64 ownLong = 3; */ public long getOwnLong() { return ownLong_; @@ -148,7 +162,7 @@ public long getOwnLong() { public static final int OWNDOUBLE_FIELD_NUMBER = 4; private double ownDouble_; /** - * optional double ownDouble = 4; + * double ownDouble = 4; */ public double getOwnDouble() { return ownDouble_; @@ -178,6 +192,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (ownDouble_ != 0D) { output.writeDouble(4, ownDouble_); } + unknownFields.writeTo(output); } public int getSerializedSize() { @@ -201,11 +216,72 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeDoubleSize(4, ownDouble_); } + size += unknownFields.getSerializedSize(); memoizedSize = size; return size; } - private static final long serialVersionUID = 0L; + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.badata.protobuf.converter.proto.DomainInheritanceProto.Test)) { + return super.equals(obj); + } + net.badata.protobuf.converter.proto.DomainInheritanceProto.Test other = (net.badata.protobuf.converter.proto.DomainInheritanceProto.Test) obj; + + boolean result = true; + result = result && (getInheritedInt() + == other.getInheritedInt()); + result = result && ( + java.lang.Float.floatToIntBits(getInheritedFloat()) + == java.lang.Float.floatToIntBits( + other.getInheritedFloat())); + result = result && (getOwnLong() + == other.getOwnLong()); + result = result && ( + java.lang.Double.doubleToLongBits(getOwnDouble()) + == java.lang.Double.doubleToLongBits( + other.getOwnDouble())); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + INHERITEDINT_FIELD_NUMBER; + hash = (53 * hash) + getInheritedInt(); + hash = (37 * hash) + INHERITEDFLOAT_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getInheritedFloat()); + hash = (37 * hash) + OWNLONG_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getOwnLong()); + hash = (37 * hash) + OWNDOUBLE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getOwnDouble())); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.badata.protobuf.converter.proto.DomainInheritanceProto.Test parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.badata.protobuf.converter.proto.DomainInheritanceProto.Test parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static net.badata.protobuf.converter.proto.DomainInheritanceProto.Test parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -229,34 +305,40 @@ public static net.badata.protobuf.converter.proto.DomainInheritanceProto.Test pa } public static net.badata.protobuf.converter.proto.DomainInheritanceProto.Test parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.DomainInheritanceProto.Test parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.DomainInheritanceProto.Test parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.DomainInheritanceProto.Test parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.DomainInheritanceProto.Test parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.DomainInheritanceProto.Test parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public Builder newBuilderForType() { return newBuilder(); } @@ -273,7 +355,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -281,7 +363,7 @@ protected Builder newBuilderForType( * Protobuf type {@code net.badata.protobuf.converter.proto.Test} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:net.badata.protobuf.converter.proto.Test) net.badata.protobuf.converter.proto.DomainInheritanceProto.TestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -289,7 +371,7 @@ public static final class Builder extends return net.badata.protobuf.converter.proto.DomainInheritanceProto.internal_static_net_badata_protobuf_converter_proto_Test_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.DomainInheritanceProto.internal_static_net_badata_protobuf_converter_proto_Test_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -302,12 +384,13 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { } } public Builder clear() { @@ -350,6 +433,32 @@ public net.badata.protobuf.converter.proto.DomainInheritanceProto.Test buildPart return result; } + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof net.badata.protobuf.converter.proto.DomainInheritanceProto.Test) { return mergeFrom((net.badata.protobuf.converter.proto.DomainInheritanceProto.Test)other); @@ -373,6 +482,7 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.DomainInheritancePr if (other.getOwnDouble() != 0D) { setOwnDouble(other.getOwnDouble()); } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } @@ -390,7 +500,7 @@ public Builder mergeFrom( parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { parsedMessage = (net.badata.protobuf.converter.proto.DomainInheritanceProto.Test) e.getUnfinishedMessage(); - throw e; + throw e.unwrapIOException(); } finally { if (parsedMessage != null) { mergeFrom(parsedMessage); @@ -401,13 +511,13 @@ public Builder mergeFrom( private int inheritedInt_ ; /** - * optional int32 inheritedInt = 1; + * int32 inheritedInt = 1; */ public int getInheritedInt() { return inheritedInt_; } /** - * optional int32 inheritedInt = 1; + * int32 inheritedInt = 1; */ public Builder setInheritedInt(int value) { @@ -416,7 +526,7 @@ public Builder setInheritedInt(int value) { return this; } /** - * optional int32 inheritedInt = 1; + * int32 inheritedInt = 1; */ public Builder clearInheritedInt() { @@ -427,13 +537,13 @@ public Builder clearInheritedInt() { private float inheritedFloat_ ; /** - * optional float inheritedFloat = 2; + * float inheritedFloat = 2; */ public float getInheritedFloat() { return inheritedFloat_; } /** - * optional float inheritedFloat = 2; + * float inheritedFloat = 2; */ public Builder setInheritedFloat(float value) { @@ -442,7 +552,7 @@ public Builder setInheritedFloat(float value) { return this; } /** - * optional float inheritedFloat = 2; + * float inheritedFloat = 2; */ public Builder clearInheritedFloat() { @@ -453,13 +563,13 @@ public Builder clearInheritedFloat() { private long ownLong_ ; /** - * optional int64 ownLong = 3; + * int64 ownLong = 3; */ public long getOwnLong() { return ownLong_; } /** - * optional int64 ownLong = 3; + * int64 ownLong = 3; */ public Builder setOwnLong(long value) { @@ -468,7 +578,7 @@ public Builder setOwnLong(long value) { return this; } /** - * optional int64 ownLong = 3; + * int64 ownLong = 3; */ public Builder clearOwnLong() { @@ -479,13 +589,13 @@ public Builder clearOwnLong() { private double ownDouble_ ; /** - * optional double ownDouble = 4; + * double ownDouble = 4; */ public double getOwnDouble() { return ownDouble_; } /** - * optional double ownDouble = 4; + * double ownDouble = 4; */ public Builder setOwnDouble(double value) { @@ -494,7 +604,7 @@ public Builder setOwnDouble(double value) { return this; } /** - * optional double ownDouble = 4; + * double ownDouble = 4; */ public Builder clearOwnDouble() { @@ -504,12 +614,12 @@ public Builder clearOwnDouble() { } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.setUnknownFieldsProto3(unknownFields); } public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.mergeUnknownFields(unknownFields); } @@ -532,16 +642,7 @@ public Test parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - try { - return new Test(input, extensionRegistry); - } catch (RuntimeException e) { - if (e.getCause() instanceof - com.google.protobuf.InvalidProtocolBufferException) { - throw (com.google.protobuf.InvalidProtocolBufferException) - e.getCause(); - } - throw e; - } + return new Test(input, extensionRegistry); } }; @@ -560,17 +661,17 @@ public net.badata.protobuf.converter.proto.DomainInheritanceProto.Test getDefaul } - private static com.google.protobuf.Descriptors.Descriptor + private static final com.google.protobuf.Descriptors.Descriptor internal_static_net_badata_protobuf_converter_proto_Test_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_net_badata_protobuf_converter_proto_Test_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; } - private static com.google.protobuf.Descriptors.FileDescriptor + private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { java.lang.String[] descriptorData = { @@ -596,7 +697,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_net_badata_protobuf_converter_proto_Test_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_net_badata_protobuf_converter_proto_Test_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_net_badata_protobuf_converter_proto_Test_descriptor, new java.lang.String[] { "InheritedInt", "InheritedFloat", "OwnLong", "OwnDouble", }); } diff --git a/src/test/java/net/badata/protobuf/converter/proto/MappingProto.java b/src/test/java/net/badata/protobuf/converter/proto/MappingProto.java index 74b4672..f3c16b6 100644 --- a/src/test/java/net/badata/protobuf/converter/proto/MappingProto.java +++ b/src/test/java/net/badata/protobuf/converter/proto/MappingProto.java @@ -5,19 +5,25 @@ public final class MappingProto { private MappingProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + public static void registerAllExtensions( com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); } public interface NestedTestOrBuilder extends // @@protoc_insertion_point(interface_extends:net.badata.protobuf.converter.proto.NestedTest) com.google.protobuf.MessageOrBuilder { /** - * optional string stringValue = 1; + * string stringValue = 1; */ java.lang.String getStringValue(); /** - * optional string stringValue = 1; + * string stringValue = 1; */ com.google.protobuf.ByteString getStringValueBytes(); @@ -26,11 +32,12 @@ public interface NestedTestOrBuilder extends * Protobuf type {@code net.badata.protobuf.converter.proto.NestedTest} */ public static final class NestedTest extends - com.google.protobuf.GeneratedMessage implements + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:net.badata.protobuf.converter.proto.NestedTest) NestedTestOrBuilder { + private static final long serialVersionUID = 0L; // Use NestedTest.newBuilder() to construct. - private NestedTest(com.google.protobuf.GeneratedMessage.Builder builder) { + private NestedTest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private NestedTest() { @@ -40,13 +47,19 @@ private NestedTest() { @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); + return this.unknownFields; } private NestedTest( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -56,13 +69,14 @@ private NestedTest( done = true; break; default: { - if (!input.skipField(tag)) { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { done = true; } break; } case 10: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); stringValue_ = s; break; @@ -70,12 +84,12 @@ private NestedTest( } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw new RuntimeException(e.setUnfinishedMessage(this)); + throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new RuntimeException( - new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this)); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { + this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } @@ -84,7 +98,7 @@ private NestedTest( return net.badata.protobuf.converter.proto.MappingProto.internal_static_net_badata_protobuf_converter_proto_NestedTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.MappingProto.internal_static_net_badata_protobuf_converter_proto_NestedTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -94,7 +108,7 @@ private NestedTest( public static final int STRINGVALUE_FIELD_NUMBER = 1; private volatile java.lang.Object stringValue_; /** - * optional string stringValue = 1; + * string stringValue = 1; */ public java.lang.String getStringValue() { java.lang.Object ref = stringValue_; @@ -109,7 +123,7 @@ public java.lang.String getStringValue() { } } /** - * optional string stringValue = 1; + * string stringValue = 1; */ public com.google.protobuf.ByteString getStringValueBytes() { @@ -138,8 +152,9 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getStringValueBytes().isEmpty()) { - com.google.protobuf.GeneratedMessage.writeString(output, 1, stringValue_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, stringValue_); } + unknownFields.writeTo(output); } public int getSerializedSize() { @@ -148,13 +163,55 @@ public int getSerializedSize() { size = 0; if (!getStringValueBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(1, stringValue_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, stringValue_); } + size += unknownFields.getSerializedSize(); memoizedSize = size; return size; } - private static final long serialVersionUID = 0L; + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.badata.protobuf.converter.proto.MappingProto.NestedTest)) { + return super.equals(obj); + } + net.badata.protobuf.converter.proto.MappingProto.NestedTest other = (net.badata.protobuf.converter.proto.MappingProto.NestedTest) obj; + + boolean result = true; + result = result && getStringValue() + .equals(other.getStringValue()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + STRINGVALUE_FIELD_NUMBER; + hash = (53 * hash) + getStringValue().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.badata.protobuf.converter.proto.MappingProto.NestedTest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.badata.protobuf.converter.proto.MappingProto.NestedTest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static net.badata.protobuf.converter.proto.MappingProto.NestedTest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -178,34 +235,40 @@ public static net.badata.protobuf.converter.proto.MappingProto.NestedTest parseF } public static net.badata.protobuf.converter.proto.MappingProto.NestedTest parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MappingProto.NestedTest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.MappingProto.NestedTest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MappingProto.NestedTest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.MappingProto.NestedTest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MappingProto.NestedTest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public Builder newBuilderForType() { return newBuilder(); } @@ -222,7 +285,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -230,7 +293,7 @@ protected Builder newBuilderForType( * Protobuf type {@code net.badata.protobuf.converter.proto.NestedTest} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:net.badata.protobuf.converter.proto.NestedTest) net.badata.protobuf.converter.proto.MappingProto.NestedTestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -238,7 +301,7 @@ public static final class Builder extends return net.badata.protobuf.converter.proto.MappingProto.internal_static_net_badata_protobuf_converter_proto_NestedTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.MappingProto.internal_static_net_badata_protobuf_converter_proto_NestedTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -251,12 +314,13 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { } } public Builder clear() { @@ -290,6 +354,32 @@ public net.badata.protobuf.converter.proto.MappingProto.NestedTest buildPartial( return result; } + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof net.badata.protobuf.converter.proto.MappingProto.NestedTest) { return mergeFrom((net.badata.protobuf.converter.proto.MappingProto.NestedTest)other); @@ -305,6 +395,7 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.MappingProto.Nested stringValue_ = other.stringValue_; onChanged(); } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } @@ -322,7 +413,7 @@ public Builder mergeFrom( parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { parsedMessage = (net.badata.protobuf.converter.proto.MappingProto.NestedTest) e.getUnfinishedMessage(); - throw e; + throw e.unwrapIOException(); } finally { if (parsedMessage != null) { mergeFrom(parsedMessage); @@ -333,7 +424,7 @@ public Builder mergeFrom( private java.lang.Object stringValue_ = ""; /** - * optional string stringValue = 1; + * string stringValue = 1; */ public java.lang.String getStringValue() { java.lang.Object ref = stringValue_; @@ -348,7 +439,7 @@ public java.lang.String getStringValue() { } } /** - * optional string stringValue = 1; + * string stringValue = 1; */ public com.google.protobuf.ByteString getStringValueBytes() { @@ -364,7 +455,7 @@ public java.lang.String getStringValue() { } } /** - * optional string stringValue = 1; + * string stringValue = 1; */ public Builder setStringValue( java.lang.String value) { @@ -377,7 +468,7 @@ public Builder setStringValue( return this; } /** - * optional string stringValue = 1; + * string stringValue = 1; */ public Builder clearStringValue() { @@ -386,7 +477,7 @@ public Builder clearStringValue() { return this; } /** - * optional string stringValue = 1; + * string stringValue = 1; */ public Builder setStringValueBytes( com.google.protobuf.ByteString value) { @@ -401,12 +492,12 @@ public Builder setStringValueBytes( } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.setUnknownFieldsProto3(unknownFields); } public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.mergeUnknownFields(unknownFields); } @@ -429,16 +520,7 @@ public NestedTest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - try { - return new NestedTest(input, extensionRegistry); - } catch (RuntimeException e) { - if (e.getCause() instanceof - com.google.protobuf.InvalidProtocolBufferException) { - throw (com.google.protobuf.InvalidProtocolBufferException) - e.getCause(); - } - throw e; - } + return new NestedTest(input, extensionRegistry); } }; @@ -462,57 +544,57 @@ public interface MappingTestOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ int getIntValue(); /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ long getLongValue(); /** - * optional float floatValue = 3; + * float floatValue = 3; */ float getFloatValue(); /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ double getDoubleValue(); /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ boolean getBooleanValue(); /** - * optional string stringValue = 6; + * string stringValue = 6; */ java.lang.String getStringValue(); /** - * optional string stringValue = 6; + * string stringValue = 6; */ com.google.protobuf.ByteString getStringValueBytes(); /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ boolean hasNestedValue(); /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ net.badata.protobuf.converter.proto.MappingProto.NestedTest getNestedValue(); /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ net.badata.protobuf.converter.proto.MappingProto.NestedTestOrBuilder getNestedValueOrBuilder(); /** * repeated string stringListValue = 8; */ - com.google.protobuf.ProtocolStringList + java.util.List getStringListValueList(); /** * repeated string stringListValue = 8; @@ -556,11 +638,12 @@ net.badata.protobuf.converter.proto.MappingProto.NestedTestOrBuilder getNestedLi * Protobuf type {@code net.badata.protobuf.converter.proto.MappingTest} */ public static final class MappingTest extends - com.google.protobuf.GeneratedMessage implements + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:net.badata.protobuf.converter.proto.MappingTest) MappingTestOrBuilder { + private static final long serialVersionUID = 0L; // Use MappingTest.newBuilder() to construct. - private MappingTest(com.google.protobuf.GeneratedMessage.Builder builder) { + private MappingTest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private MappingTest() { @@ -577,13 +660,19 @@ private MappingTest() { @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); + return this.unknownFields; } private MappingTest( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -593,7 +682,8 @@ private MappingTest( done = true; break; default: { - if (!input.skipField(tag)) { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -624,7 +714,7 @@ private MappingTest( break; } case 50: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); stringValue_ = s; break; @@ -643,7 +733,7 @@ private MappingTest( break; } case 66: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { stringListValue_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000080; @@ -656,17 +746,17 @@ private MappingTest( nestedListValue_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000100; } - nestedListValue_.add(input.readMessage(net.badata.protobuf.converter.proto.MappingProto.NestedTest.parser(), extensionRegistry)); + nestedListValue_.add( + input.readMessage(net.badata.protobuf.converter.proto.MappingProto.NestedTest.parser(), extensionRegistry)); break; } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw new RuntimeException(e.setUnfinishedMessage(this)); + throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new RuntimeException( - new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this)); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { stringListValue_ = stringListValue_.getUnmodifiableView(); @@ -674,6 +764,7 @@ private MappingTest( if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { nestedListValue_ = java.util.Collections.unmodifiableList(nestedListValue_); } + this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } @@ -682,7 +773,7 @@ private MappingTest( return net.badata.protobuf.converter.proto.MappingProto.internal_static_net_badata_protobuf_converter_proto_MappingTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.MappingProto.internal_static_net_badata_protobuf_converter_proto_MappingTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -693,7 +784,7 @@ private MappingTest( public static final int INTVALUE_FIELD_NUMBER = 1; private int intValue_; /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public int getIntValue() { return intValue_; @@ -702,7 +793,7 @@ public int getIntValue() { public static final int LONGVALUE_FIELD_NUMBER = 2; private long longValue_; /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public long getLongValue() { return longValue_; @@ -711,7 +802,7 @@ public long getLongValue() { public static final int FLOATVALUE_FIELD_NUMBER = 3; private float floatValue_; /** - * optional float floatValue = 3; + * float floatValue = 3; */ public float getFloatValue() { return floatValue_; @@ -720,7 +811,7 @@ public float getFloatValue() { public static final int DOUBLEVALUE_FIELD_NUMBER = 4; private double doubleValue_; /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ public double getDoubleValue() { return doubleValue_; @@ -729,7 +820,7 @@ public double getDoubleValue() { public static final int BOOLEANVALUE_FIELD_NUMBER = 5; private boolean booleanValue_; /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ public boolean getBooleanValue() { return booleanValue_; @@ -738,7 +829,7 @@ public boolean getBooleanValue() { public static final int STRINGVALUE_FIELD_NUMBER = 6; private volatile java.lang.Object stringValue_; /** - * optional string stringValue = 6; + * string stringValue = 6; */ public java.lang.String getStringValue() { java.lang.Object ref = stringValue_; @@ -753,7 +844,7 @@ public java.lang.String getStringValue() { } } /** - * optional string stringValue = 6; + * string stringValue = 6; */ public com.google.protobuf.ByteString getStringValueBytes() { @@ -772,19 +863,19 @@ public java.lang.String getStringValue() { public static final int NESTEDVALUE_FIELD_NUMBER = 7; private net.badata.protobuf.converter.proto.MappingProto.NestedTest nestedValue_; /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ public boolean hasNestedValue() { return nestedValue_ != null; } /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ public net.badata.protobuf.converter.proto.MappingProto.NestedTest getNestedValue() { return nestedValue_ == null ? net.badata.protobuf.converter.proto.MappingProto.NestedTest.getDefaultInstance() : nestedValue_; } /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ public net.badata.protobuf.converter.proto.MappingProto.NestedTestOrBuilder getNestedValueOrBuilder() { return getNestedValue(); @@ -882,17 +973,18 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeBool(5, booleanValue_); } if (!getStringValueBytes().isEmpty()) { - com.google.protobuf.GeneratedMessage.writeString(output, 6, stringValue_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, stringValue_); } if (nestedValue_ != null) { output.writeMessage(7, getNestedValue()); } for (int i = 0; i < stringListValue_.size(); i++) { - com.google.protobuf.GeneratedMessage.writeString(output, 8, stringListValue_.getRaw(i)); + com.google.protobuf.GeneratedMessageV3.writeString(output, 8, stringListValue_.getRaw(i)); } for (int i = 0; i < nestedListValue_.size(); i++) { output.writeMessage(9, nestedListValue_.get(i)); } + unknownFields.writeTo(output); } public int getSerializedSize() { @@ -921,7 +1013,7 @@ public int getSerializedSize() { .computeBoolSize(5, booleanValue_); } if (!getStringValueBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(6, stringValue_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, stringValue_); } if (nestedValue_ != null) { size += com.google.protobuf.CodedOutputStream @@ -939,11 +1031,102 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(9, nestedListValue_.get(i)); } + size += unknownFields.getSerializedSize(); memoizedSize = size; return size; } - private static final long serialVersionUID = 0L; + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.badata.protobuf.converter.proto.MappingProto.MappingTest)) { + return super.equals(obj); + } + net.badata.protobuf.converter.proto.MappingProto.MappingTest other = (net.badata.protobuf.converter.proto.MappingProto.MappingTest) obj; + + boolean result = true; + result = result && (getIntValue() + == other.getIntValue()); + result = result && (getLongValue() + == other.getLongValue()); + result = result && ( + java.lang.Float.floatToIntBits(getFloatValue()) + == java.lang.Float.floatToIntBits( + other.getFloatValue())); + result = result && ( + java.lang.Double.doubleToLongBits(getDoubleValue()) + == java.lang.Double.doubleToLongBits( + other.getDoubleValue())); + result = result && (getBooleanValue() + == other.getBooleanValue()); + result = result && getStringValue() + .equals(other.getStringValue()); + result = result && (hasNestedValue() == other.hasNestedValue()); + if (hasNestedValue()) { + result = result && getNestedValue() + .equals(other.getNestedValue()); + } + result = result && getStringListValueList() + .equals(other.getStringListValueList()); + result = result && getNestedListValueList() + .equals(other.getNestedListValueList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + INTVALUE_FIELD_NUMBER; + hash = (53 * hash) + getIntValue(); + hash = (37 * hash) + LONGVALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getLongValue()); + hash = (37 * hash) + FLOATVALUE_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getFloatValue()); + hash = (37 * hash) + DOUBLEVALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getDoubleValue())); + hash = (37 * hash) + BOOLEANVALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getBooleanValue()); + hash = (37 * hash) + STRINGVALUE_FIELD_NUMBER; + hash = (53 * hash) + getStringValue().hashCode(); + if (hasNestedValue()) { + hash = (37 * hash) + NESTEDVALUE_FIELD_NUMBER; + hash = (53 * hash) + getNestedValue().hashCode(); + } + if (getStringListValueCount() > 0) { + hash = (37 * hash) + STRINGLISTVALUE_FIELD_NUMBER; + hash = (53 * hash) + getStringListValueList().hashCode(); + } + if (getNestedListValueCount() > 0) { + hash = (37 * hash) + NESTEDLISTVALUE_FIELD_NUMBER; + hash = (53 * hash) + getNestedListValueList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.badata.protobuf.converter.proto.MappingProto.MappingTest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.badata.protobuf.converter.proto.MappingProto.MappingTest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static net.badata.protobuf.converter.proto.MappingProto.MappingTest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -967,34 +1150,40 @@ public static net.badata.protobuf.converter.proto.MappingProto.MappingTest parse } public static net.badata.protobuf.converter.proto.MappingProto.MappingTest parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MappingProto.MappingTest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.MappingProto.MappingTest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MappingProto.MappingTest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.MappingProto.MappingTest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MappingProto.MappingTest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public Builder newBuilderForType() { return newBuilder(); } @@ -1011,7 +1200,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -1019,7 +1208,7 @@ protected Builder newBuilderForType( * Protobuf type {@code net.badata.protobuf.converter.proto.MappingTest} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:net.badata.protobuf.converter.proto.MappingTest) net.badata.protobuf.converter.proto.MappingProto.MappingTestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -1027,7 +1216,7 @@ public static final class Builder extends return net.badata.protobuf.converter.proto.MappingProto.internal_static_net_badata_protobuf_converter_proto_MappingTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.MappingProto.internal_static_net_badata_protobuf_converter_proto_MappingTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -1040,12 +1229,13 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { getNestedListValueFieldBuilder(); } } @@ -1131,6 +1321,32 @@ public net.badata.protobuf.converter.proto.MappingProto.MappingTest buildPartial return result; } + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof net.badata.protobuf.converter.proto.MappingProto.MappingTest) { return mergeFrom((net.badata.protobuf.converter.proto.MappingProto.MappingTest)other); @@ -1193,13 +1409,14 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.MappingProto.Mappin nestedListValue_ = other.nestedListValue_; bitField0_ = (bitField0_ & ~0x00000100); nestedListValueBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getNestedListValueFieldBuilder() : null; } else { nestedListValueBuilder_.addAllMessages(other.nestedListValue_); } } } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } @@ -1217,7 +1434,7 @@ public Builder mergeFrom( parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { parsedMessage = (net.badata.protobuf.converter.proto.MappingProto.MappingTest) e.getUnfinishedMessage(); - throw e; + throw e.unwrapIOException(); } finally { if (parsedMessage != null) { mergeFrom(parsedMessage); @@ -1229,13 +1446,13 @@ public Builder mergeFrom( private int intValue_ ; /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public int getIntValue() { return intValue_; } /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public Builder setIntValue(int value) { @@ -1244,7 +1461,7 @@ public Builder setIntValue(int value) { return this; } /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public Builder clearIntValue() { @@ -1255,13 +1472,13 @@ public Builder clearIntValue() { private long longValue_ ; /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public long getLongValue() { return longValue_; } /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public Builder setLongValue(long value) { @@ -1270,7 +1487,7 @@ public Builder setLongValue(long value) { return this; } /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public Builder clearLongValue() { @@ -1281,13 +1498,13 @@ public Builder clearLongValue() { private float floatValue_ ; /** - * optional float floatValue = 3; + * float floatValue = 3; */ public float getFloatValue() { return floatValue_; } /** - * optional float floatValue = 3; + * float floatValue = 3; */ public Builder setFloatValue(float value) { @@ -1296,7 +1513,7 @@ public Builder setFloatValue(float value) { return this; } /** - * optional float floatValue = 3; + * float floatValue = 3; */ public Builder clearFloatValue() { @@ -1307,13 +1524,13 @@ public Builder clearFloatValue() { private double doubleValue_ ; /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ public double getDoubleValue() { return doubleValue_; } /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ public Builder setDoubleValue(double value) { @@ -1322,7 +1539,7 @@ public Builder setDoubleValue(double value) { return this; } /** - * optional double doubleValue = 4; + * double doubleValue = 4; */ public Builder clearDoubleValue() { @@ -1333,13 +1550,13 @@ public Builder clearDoubleValue() { private boolean booleanValue_ ; /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ public boolean getBooleanValue() { return booleanValue_; } /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ public Builder setBooleanValue(boolean value) { @@ -1348,7 +1565,7 @@ public Builder setBooleanValue(boolean value) { return this; } /** - * optional bool booleanValue = 5; + * bool booleanValue = 5; */ public Builder clearBooleanValue() { @@ -1359,7 +1576,7 @@ public Builder clearBooleanValue() { private java.lang.Object stringValue_ = ""; /** - * optional string stringValue = 6; + * string stringValue = 6; */ public java.lang.String getStringValue() { java.lang.Object ref = stringValue_; @@ -1374,7 +1591,7 @@ public java.lang.String getStringValue() { } } /** - * optional string stringValue = 6; + * string stringValue = 6; */ public com.google.protobuf.ByteString getStringValueBytes() { @@ -1390,7 +1607,7 @@ public java.lang.String getStringValue() { } } /** - * optional string stringValue = 6; + * string stringValue = 6; */ public Builder setStringValue( java.lang.String value) { @@ -1403,7 +1620,7 @@ public Builder setStringValue( return this; } /** - * optional string stringValue = 6; + * string stringValue = 6; */ public Builder clearStringValue() { @@ -1412,7 +1629,7 @@ public Builder clearStringValue() { return this; } /** - * optional string stringValue = 6; + * string stringValue = 6; */ public Builder setStringValueBytes( com.google.protobuf.ByteString value) { @@ -1427,16 +1644,16 @@ public Builder setStringValueBytes( } private net.badata.protobuf.converter.proto.MappingProto.NestedTest nestedValue_ = null; - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.MappingProto.NestedTest, net.badata.protobuf.converter.proto.MappingProto.NestedTest.Builder, net.badata.protobuf.converter.proto.MappingProto.NestedTestOrBuilder> nestedValueBuilder_; /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ public boolean hasNestedValue() { return nestedValueBuilder_ != null || nestedValue_ != null; } /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ public net.badata.protobuf.converter.proto.MappingProto.NestedTest getNestedValue() { if (nestedValueBuilder_ == null) { @@ -1446,7 +1663,7 @@ public net.badata.protobuf.converter.proto.MappingProto.NestedTest getNestedValu } } /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ public Builder setNestedValue(net.badata.protobuf.converter.proto.MappingProto.NestedTest value) { if (nestedValueBuilder_ == null) { @@ -1462,7 +1679,7 @@ public Builder setNestedValue(net.badata.protobuf.converter.proto.MappingProto.N return this; } /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ public Builder setNestedValue( net.badata.protobuf.converter.proto.MappingProto.NestedTest.Builder builderForValue) { @@ -1476,7 +1693,7 @@ public Builder setNestedValue( return this; } /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ public Builder mergeNestedValue(net.badata.protobuf.converter.proto.MappingProto.NestedTest value) { if (nestedValueBuilder_ == null) { @@ -1494,7 +1711,7 @@ public Builder mergeNestedValue(net.badata.protobuf.converter.proto.MappingProto return this; } /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ public Builder clearNestedValue() { if (nestedValueBuilder_ == null) { @@ -1508,7 +1725,7 @@ public Builder clearNestedValue() { return this; } /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ public net.badata.protobuf.converter.proto.MappingProto.NestedTest.Builder getNestedValueBuilder() { @@ -1516,7 +1733,7 @@ public net.badata.protobuf.converter.proto.MappingProto.NestedTest.Builder getNe return getNestedValueFieldBuilder().getBuilder(); } /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ public net.badata.protobuf.converter.proto.MappingProto.NestedTestOrBuilder getNestedValueOrBuilder() { if (nestedValueBuilder_ != null) { @@ -1527,13 +1744,13 @@ public net.badata.protobuf.converter.proto.MappingProto.NestedTestOrBuilder getN } } /** - * optional .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; + * .net.badata.protobuf.converter.proto.NestedTest nestedValue = 7; */ - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.MappingProto.NestedTest, net.badata.protobuf.converter.proto.MappingProto.NestedTest.Builder, net.badata.protobuf.converter.proto.MappingProto.NestedTestOrBuilder> getNestedValueFieldBuilder() { if (nestedValueBuilder_ == null) { - nestedValueBuilder_ = new com.google.protobuf.SingleFieldBuilder< + nestedValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.MappingProto.NestedTest, net.badata.protobuf.converter.proto.MappingProto.NestedTest.Builder, net.badata.protobuf.converter.proto.MappingProto.NestedTestOrBuilder>( getNestedValue(), getParentForChildren(), @@ -1646,7 +1863,7 @@ private void ensureNestedListValueIsMutable() { } } - private com.google.protobuf.RepeatedFieldBuilder< + private com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.MappingProto.NestedTest, net.badata.protobuf.converter.proto.MappingProto.NestedTest.Builder, net.badata.protobuf.converter.proto.MappingProto.NestedTestOrBuilder> nestedListValueBuilder_; /** @@ -1862,11 +2079,11 @@ public net.badata.protobuf.converter.proto.MappingProto.NestedTest.Builder addNe getNestedListValueBuilderList() { return getNestedListValueFieldBuilder().getBuilderList(); } - private com.google.protobuf.RepeatedFieldBuilder< + private com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.MappingProto.NestedTest, net.badata.protobuf.converter.proto.MappingProto.NestedTest.Builder, net.badata.protobuf.converter.proto.MappingProto.NestedTestOrBuilder> getNestedListValueFieldBuilder() { if (nestedListValueBuilder_ == null) { - nestedListValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + nestedListValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.MappingProto.NestedTest, net.badata.protobuf.converter.proto.MappingProto.NestedTest.Builder, net.badata.protobuf.converter.proto.MappingProto.NestedTestOrBuilder>( nestedListValue_, ((bitField0_ & 0x00000100) == 0x00000100), @@ -1878,12 +2095,12 @@ public net.badata.protobuf.converter.proto.MappingProto.NestedTest.Builder addNe } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.setUnknownFieldsProto3(unknownFields); } public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.mergeUnknownFields(unknownFields); } @@ -1906,16 +2123,7 @@ public MappingTest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - try { - return new MappingTest(input, extensionRegistry); - } catch (RuntimeException e) { - if (e.getCause() instanceof - com.google.protobuf.InvalidProtocolBufferException) { - throw (com.google.protobuf.InvalidProtocolBufferException) - e.getCause(); - } - throw e; - } + return new MappingTest(input, extensionRegistry); } }; @@ -1934,22 +2142,22 @@ public net.badata.protobuf.converter.proto.MappingProto.MappingTest getDefaultIn } - private static com.google.protobuf.Descriptors.Descriptor + private static final com.google.protobuf.Descriptors.Descriptor internal_static_net_badata_protobuf_converter_proto_NestedTest_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_net_badata_protobuf_converter_proto_NestedTest_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor + private static final com.google.protobuf.Descriptors.Descriptor internal_static_net_badata_protobuf_converter_proto_MappingTest_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_net_badata_protobuf_converter_proto_MappingTest_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; } - private static com.google.protobuf.Descriptors.FileDescriptor + private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { java.lang.String[] descriptorData = { @@ -1962,7 +2170,7 @@ public net.badata.protobuf.converter.proto.MappingProto.MappingTest getDefaultIn "alue\030\007 \001(\0132/.net.badata.protobuf.convert" + "er.proto.NestedTest\022\027\n\017stringListValue\030\010" + " \003(\t\022H\n\017nestedListValue\030\t \003(\0132/.net.bada" + - "ta.protobuf.converter.proto.NestedTestB3", + "ta.protobuf.converter.proto.NestedTestB3" + "\n#net.badata.protobuf.converter.protoB\014M" + "appingProtob\006proto3" }; @@ -1981,13 +2189,13 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_net_badata_protobuf_converter_proto_NestedTest_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_net_badata_protobuf_converter_proto_NestedTest_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_net_badata_protobuf_converter_proto_NestedTest_descriptor, new java.lang.String[] { "StringValue", }); internal_static_net_badata_protobuf_converter_proto_MappingTest_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_net_badata_protobuf_converter_proto_MappingTest_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_net_badata_protobuf_converter_proto_MappingTest_descriptor, new java.lang.String[] { "IntValue", "LongValue", "FloatValue", "DoubleValue", "BooleanValue", "StringValue", "NestedValue", "StringListValue", "NestedListValue", }); } diff --git a/src/test/java/net/badata/protobuf/converter/proto/MultiMappingProto.java b/src/test/java/net/badata/protobuf/converter/proto/MultiMappingProto.java index 50ecc21..88a6c43 100644 --- a/src/test/java/net/badata/protobuf/converter/proto/MultiMappingProto.java +++ b/src/test/java/net/badata/protobuf/converter/proto/MultiMappingProto.java @@ -5,20 +5,26 @@ public final class MultiMappingProto { private MultiMappingProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + public static void registerAllExtensions( com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); } public interface MultiMappingFirstOrBuilder extends // @@protoc_insertion_point(interface_extends:net.badata.protobuf.converter.proto.MultiMappingFirst) com.google.protobuf.MessageOrBuilder { /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ int getIntValue(); /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ long getLongValue(); } @@ -26,11 +32,12 @@ public interface MultiMappingFirstOrBuilder extends * Protobuf type {@code net.badata.protobuf.converter.proto.MultiMappingFirst} */ public static final class MultiMappingFirst extends - com.google.protobuf.GeneratedMessage implements + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:net.badata.protobuf.converter.proto.MultiMappingFirst) MultiMappingFirstOrBuilder { + private static final long serialVersionUID = 0L; // Use MultiMappingFirst.newBuilder() to construct. - private MultiMappingFirst(com.google.protobuf.GeneratedMessage.Builder builder) { + private MultiMappingFirst(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private MultiMappingFirst() { @@ -41,13 +48,19 @@ private MultiMappingFirst() { @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); + return this.unknownFields; } private MultiMappingFirst( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -57,7 +70,8 @@ private MultiMappingFirst( done = true; break; default: { - if (!input.skipField(tag)) { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,12 +89,12 @@ private MultiMappingFirst( } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw new RuntimeException(e.setUnfinishedMessage(this)); + throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new RuntimeException( - new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this)); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { + this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } @@ -89,7 +103,7 @@ private MultiMappingFirst( return net.badata.protobuf.converter.proto.MultiMappingProto.internal_static_net_badata_protobuf_converter_proto_MultiMappingFirst_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.MultiMappingProto.internal_static_net_badata_protobuf_converter_proto_MultiMappingFirst_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -99,7 +113,7 @@ private MultiMappingFirst( public static final int INTVALUE_FIELD_NUMBER = 1; private int intValue_; /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public int getIntValue() { return intValue_; @@ -108,7 +122,7 @@ public int getIntValue() { public static final int LONGVALUE_FIELD_NUMBER = 2; private long longValue_; /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public long getLongValue() { return longValue_; @@ -132,6 +146,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (longValue_ != 0L) { output.writeInt64(2, longValue_); } + unknownFields.writeTo(output); } public int getSerializedSize() { @@ -147,11 +162,58 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeInt64Size(2, longValue_); } + size += unknownFields.getSerializedSize(); memoizedSize = size; return size; } - private static final long serialVersionUID = 0L; + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst)) { + return super.equals(obj); + } + net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst other = (net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst) obj; + + boolean result = true; + result = result && (getIntValue() + == other.getIntValue()); + result = result && (getLongValue() + == other.getLongValue()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + INTVALUE_FIELD_NUMBER; + hash = (53 * hash) + getIntValue(); + hash = (37 * hash) + LONGVALUE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getLongValue()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -175,34 +237,40 @@ public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMapping } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public Builder newBuilderForType() { return newBuilder(); } @@ -219,7 +287,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -227,7 +295,7 @@ protected Builder newBuilderForType( * Protobuf type {@code net.badata.protobuf.converter.proto.MultiMappingFirst} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:net.badata.protobuf.converter.proto.MultiMappingFirst) net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirstOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -235,7 +303,7 @@ public static final class Builder extends return net.badata.protobuf.converter.proto.MultiMappingProto.internal_static_net_badata_protobuf_converter_proto_MultiMappingFirst_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.MultiMappingProto.internal_static_net_badata_protobuf_converter_proto_MultiMappingFirst_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -248,12 +316,13 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { } } public Builder clear() { @@ -290,6 +359,32 @@ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst b return result; } + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst) { return mergeFrom((net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst)other); @@ -307,6 +402,7 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.MultiMappingProto.M if (other.getLongValue() != 0L) { setLongValue(other.getLongValue()); } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } @@ -324,7 +420,7 @@ public Builder mergeFrom( parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { parsedMessage = (net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst) e.getUnfinishedMessage(); - throw e; + throw e.unwrapIOException(); } finally { if (parsedMessage != null) { mergeFrom(parsedMessage); @@ -335,13 +431,13 @@ public Builder mergeFrom( private int intValue_ ; /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public int getIntValue() { return intValue_; } /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public Builder setIntValue(int value) { @@ -350,7 +446,7 @@ public Builder setIntValue(int value) { return this; } /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public Builder clearIntValue() { @@ -361,13 +457,13 @@ public Builder clearIntValue() { private long longValue_ ; /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public long getLongValue() { return longValue_; } /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public Builder setLongValue(long value) { @@ -376,7 +472,7 @@ public Builder setLongValue(long value) { return this; } /** - * optional int64 longValue = 2; + * int64 longValue = 2; */ public Builder clearLongValue() { @@ -386,12 +482,12 @@ public Builder clearLongValue() { } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.setUnknownFieldsProto3(unknownFields); } public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.mergeUnknownFields(unknownFields); } @@ -414,16 +510,7 @@ public MultiMappingFirst parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - try { - return new MultiMappingFirst(input, extensionRegistry); - } catch (RuntimeException e) { - if (e.getCause() instanceof - com.google.protobuf.InvalidProtocolBufferException) { - throw (com.google.protobuf.InvalidProtocolBufferException) - e.getCause(); - } - throw e; - } + return new MultiMappingFirst(input, extensionRegistry); } }; @@ -447,21 +534,21 @@ public interface MultiMappingSecondOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ int getIntValue(); /** - * optional int64 longValueChanged = 2; + * int64 longValueChanged = 2; */ long getLongValueChanged(); /** - * optional string unusableValue = 3; + * string unusableValue = 3; */ java.lang.String getUnusableValue(); /** - * optional string unusableValue = 3; + * string unusableValue = 3; */ com.google.protobuf.ByteString getUnusableValueBytes(); @@ -470,11 +557,12 @@ public interface MultiMappingSecondOrBuilder extends * Protobuf type {@code net.badata.protobuf.converter.proto.MultiMappingSecond} */ public static final class MultiMappingSecond extends - com.google.protobuf.GeneratedMessage implements + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:net.badata.protobuf.converter.proto.MultiMappingSecond) MultiMappingSecondOrBuilder { + private static final long serialVersionUID = 0L; // Use MultiMappingSecond.newBuilder() to construct. - private MultiMappingSecond(com.google.protobuf.GeneratedMessage.Builder builder) { + private MultiMappingSecond(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private MultiMappingSecond() { @@ -486,13 +574,19 @@ private MultiMappingSecond() { @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); + return this.unknownFields; } private MultiMappingSecond( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -502,7 +596,8 @@ private MultiMappingSecond( done = true; break; default: { - if (!input.skipField(tag)) { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -518,7 +613,7 @@ private MultiMappingSecond( break; } case 26: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); unusableValue_ = s; break; @@ -526,12 +621,12 @@ private MultiMappingSecond( } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw new RuntimeException(e.setUnfinishedMessage(this)); + throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new RuntimeException( - new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this)); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { + this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } @@ -540,7 +635,7 @@ private MultiMappingSecond( return net.badata.protobuf.converter.proto.MultiMappingProto.internal_static_net_badata_protobuf_converter_proto_MultiMappingSecond_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.MultiMappingProto.internal_static_net_badata_protobuf_converter_proto_MultiMappingSecond_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -550,7 +645,7 @@ private MultiMappingSecond( public static final int INTVALUE_FIELD_NUMBER = 1; private int intValue_; /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public int getIntValue() { return intValue_; @@ -559,7 +654,7 @@ public int getIntValue() { public static final int LONGVALUECHANGED_FIELD_NUMBER = 2; private long longValueChanged_; /** - * optional int64 longValueChanged = 2; + * int64 longValueChanged = 2; */ public long getLongValueChanged() { return longValueChanged_; @@ -568,7 +663,7 @@ public long getLongValueChanged() { public static final int UNUSABLEVALUE_FIELD_NUMBER = 3; private volatile java.lang.Object unusableValue_; /** - * optional string unusableValue = 3; + * string unusableValue = 3; */ public java.lang.String getUnusableValue() { java.lang.Object ref = unusableValue_; @@ -583,7 +678,7 @@ public java.lang.String getUnusableValue() { } } /** - * optional string unusableValue = 3; + * string unusableValue = 3; */ public com.google.protobuf.ByteString getUnusableValueBytes() { @@ -618,8 +713,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeInt64(2, longValueChanged_); } if (!getUnusableValueBytes().isEmpty()) { - com.google.protobuf.GeneratedMessage.writeString(output, 3, unusableValue_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, unusableValue_); } + unknownFields.writeTo(output); } public int getSerializedSize() { @@ -636,13 +732,64 @@ public int getSerializedSize() { .computeInt64Size(2, longValueChanged_); } if (!getUnusableValueBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(3, unusableValue_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, unusableValue_); } + size += unknownFields.getSerializedSize(); memoizedSize = size; return size; } - private static final long serialVersionUID = 0L; + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond)) { + return super.equals(obj); + } + net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond other = (net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond) obj; + + boolean result = true; + result = result && (getIntValue() + == other.getIntValue()); + result = result && (getLongValueChanged() + == other.getLongValueChanged()); + result = result && getUnusableValue() + .equals(other.getUnusableValue()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + INTVALUE_FIELD_NUMBER; + hash = (53 * hash) + getIntValue(); + hash = (37 * hash) + LONGVALUECHANGED_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getLongValueChanged()); + hash = (37 * hash) + UNUSABLEVALUE_FIELD_NUMBER; + hash = (53 * hash) + getUnusableValue().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -666,34 +813,40 @@ public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMapping } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public Builder newBuilderForType() { return newBuilder(); } @@ -710,7 +863,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -718,7 +871,7 @@ protected Builder newBuilderForType( * Protobuf type {@code net.badata.protobuf.converter.proto.MultiMappingSecond} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:net.badata.protobuf.converter.proto.MultiMappingSecond) net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecondOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -726,7 +879,7 @@ public static final class Builder extends return net.badata.protobuf.converter.proto.MultiMappingProto.internal_static_net_badata_protobuf_converter_proto_MultiMappingSecond_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.MultiMappingProto.internal_static_net_badata_protobuf_converter_proto_MultiMappingSecond_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -739,12 +892,13 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { } } public Builder clear() { @@ -784,6 +938,32 @@ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond return result; } + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond) { return mergeFrom((net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond)other); @@ -805,6 +985,7 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.MultiMappingProto.M unusableValue_ = other.unusableValue_; onChanged(); } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } @@ -822,7 +1003,7 @@ public Builder mergeFrom( parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { parsedMessage = (net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond) e.getUnfinishedMessage(); - throw e; + throw e.unwrapIOException(); } finally { if (parsedMessage != null) { mergeFrom(parsedMessage); @@ -833,13 +1014,13 @@ public Builder mergeFrom( private int intValue_ ; /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public int getIntValue() { return intValue_; } /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public Builder setIntValue(int value) { @@ -848,7 +1029,7 @@ public Builder setIntValue(int value) { return this; } /** - * optional int32 intValue = 1; + * int32 intValue = 1; */ public Builder clearIntValue() { @@ -859,13 +1040,13 @@ public Builder clearIntValue() { private long longValueChanged_ ; /** - * optional int64 longValueChanged = 2; + * int64 longValueChanged = 2; */ public long getLongValueChanged() { return longValueChanged_; } /** - * optional int64 longValueChanged = 2; + * int64 longValueChanged = 2; */ public Builder setLongValueChanged(long value) { @@ -874,7 +1055,7 @@ public Builder setLongValueChanged(long value) { return this; } /** - * optional int64 longValueChanged = 2; + * int64 longValueChanged = 2; */ public Builder clearLongValueChanged() { @@ -885,7 +1066,7 @@ public Builder clearLongValueChanged() { private java.lang.Object unusableValue_ = ""; /** - * optional string unusableValue = 3; + * string unusableValue = 3; */ public java.lang.String getUnusableValue() { java.lang.Object ref = unusableValue_; @@ -900,7 +1081,7 @@ public java.lang.String getUnusableValue() { } } /** - * optional string unusableValue = 3; + * string unusableValue = 3; */ public com.google.protobuf.ByteString getUnusableValueBytes() { @@ -916,7 +1097,7 @@ public java.lang.String getUnusableValue() { } } /** - * optional string unusableValue = 3; + * string unusableValue = 3; */ public Builder setUnusableValue( java.lang.String value) { @@ -929,7 +1110,7 @@ public Builder setUnusableValue( return this; } /** - * optional string unusableValue = 3; + * string unusableValue = 3; */ public Builder clearUnusableValue() { @@ -938,7 +1119,7 @@ public Builder clearUnusableValue() { return this; } /** - * optional string unusableValue = 3; + * string unusableValue = 3; */ public Builder setUnusableValueBytes( com.google.protobuf.ByteString value) { @@ -953,12 +1134,12 @@ public Builder setUnusableValueBytes( } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.setUnknownFieldsProto3(unknownFields); } public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.mergeUnknownFields(unknownFields); } @@ -981,16 +1162,7 @@ public MultiMappingSecond parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - try { - return new MultiMappingSecond(input, extensionRegistry); - } catch (RuntimeException e) { - if (e.getCause() instanceof - com.google.protobuf.InvalidProtocolBufferException) { - throw (com.google.protobuf.InvalidProtocolBufferException) - e.getCause(); - } - throw e; - } + return new MultiMappingSecond(input, extensionRegistry); } }; @@ -1014,15 +1186,15 @@ public interface MultiMappingTestOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ boolean hasMultiMappingValue(); /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst getMultiMappingValue(); /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirstOrBuilder getMultiMappingValueOrBuilder(); @@ -1054,11 +1226,12 @@ net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecondOrBuilde * Protobuf type {@code net.badata.protobuf.converter.proto.MultiMappingTest} */ public static final class MultiMappingTest extends - com.google.protobuf.GeneratedMessage implements + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:net.badata.protobuf.converter.proto.MultiMappingTest) MultiMappingTestOrBuilder { + private static final long serialVersionUID = 0L; // Use MultiMappingTest.newBuilder() to construct. - private MultiMappingTest(com.google.protobuf.GeneratedMessage.Builder builder) { + private MultiMappingTest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private MultiMappingTest() { @@ -1068,13 +1241,19 @@ private MultiMappingTest() { @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); + return this.unknownFields; } private MultiMappingTest( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -1084,7 +1263,8 @@ private MultiMappingTest( done = true; break; default: { - if (!input.skipField(tag)) { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1107,21 +1287,22 @@ private MultiMappingTest( multiMappingListValue_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } - multiMappingListValue_.add(input.readMessage(net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond.parser(), extensionRegistry)); + multiMappingListValue_.add( + input.readMessage(net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond.parser(), extensionRegistry)); break; } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw new RuntimeException(e.setUnfinishedMessage(this)); + throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new RuntimeException( - new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this)); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { multiMappingListValue_ = java.util.Collections.unmodifiableList(multiMappingListValue_); } + this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } @@ -1130,7 +1311,7 @@ private MultiMappingTest( return net.badata.protobuf.converter.proto.MultiMappingProto.internal_static_net_badata_protobuf_converter_proto_MultiMappingTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.MultiMappingProto.internal_static_net_badata_protobuf_converter_proto_MultiMappingTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -1141,19 +1322,19 @@ private MultiMappingTest( public static final int MULTIMAPPINGVALUE_FIELD_NUMBER = 1; private net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst multiMappingValue_; /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ public boolean hasMultiMappingValue() { return multiMappingValue_ != null; } /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst getMultiMappingValue() { return multiMappingValue_ == null ? net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst.getDefaultInstance() : multiMappingValue_; } /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirstOrBuilder getMultiMappingValueOrBuilder() { return getMultiMappingValue(); @@ -1212,6 +1393,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < multiMappingListValue_.size(); i++) { output.writeMessage(2, multiMappingListValue_.get(i)); } + unknownFields.writeTo(output); } public int getSerializedSize() { @@ -1227,11 +1409,64 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(2, multiMappingListValue_.get(i)); } + size += unknownFields.getSerializedSize(); memoizedSize = size; return size; } - private static final long serialVersionUID = 0L; + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest)) { + return super.equals(obj); + } + net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest other = (net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest) obj; + + boolean result = true; + result = result && (hasMultiMappingValue() == other.hasMultiMappingValue()); + if (hasMultiMappingValue()) { + result = result && getMultiMappingValue() + .equals(other.getMultiMappingValue()); + } + result = result && getMultiMappingListValueList() + .equals(other.getMultiMappingListValueList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasMultiMappingValue()) { + hash = (37 * hash) + MULTIMAPPINGVALUE_FIELD_NUMBER; + hash = (53 * hash) + getMultiMappingValue().hashCode(); + } + if (getMultiMappingListValueCount() > 0) { + hash = (37 * hash) + MULTIMAPPINGLISTVALUE_FIELD_NUMBER; + hash = (53 * hash) + getMultiMappingListValueList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -1255,34 +1490,40 @@ public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMapping } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public Builder newBuilderForType() { return newBuilder(); } @@ -1299,7 +1540,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -1307,7 +1548,7 @@ protected Builder newBuilderForType( * Protobuf type {@code net.badata.protobuf.converter.proto.MultiMappingTest} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:net.badata.protobuf.converter.proto.MultiMappingTest) net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -1315,7 +1556,7 @@ public static final class Builder extends return net.badata.protobuf.converter.proto.MultiMappingProto.internal_static_net_badata_protobuf_converter_proto_MultiMappingTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.MultiMappingProto.internal_static_net_badata_protobuf_converter_proto_MultiMappingTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -1328,12 +1569,13 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { getMultiMappingListValueFieldBuilder(); } } @@ -1394,6 +1636,32 @@ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest bu return result; } + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest) { return mergeFrom((net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest)other); @@ -1427,13 +1695,14 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.MultiMappingProto.M multiMappingListValue_ = other.multiMappingListValue_; bitField0_ = (bitField0_ & ~0x00000002); multiMappingListValueBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getMultiMappingListValueFieldBuilder() : null; } else { multiMappingListValueBuilder_.addAllMessages(other.multiMappingListValue_); } } } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } @@ -1451,7 +1720,7 @@ public Builder mergeFrom( parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { parsedMessage = (net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest) e.getUnfinishedMessage(); - throw e; + throw e.unwrapIOException(); } finally { if (parsedMessage != null) { mergeFrom(parsedMessage); @@ -1462,16 +1731,16 @@ public Builder mergeFrom( private int bitField0_; private net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst multiMappingValue_ = null; - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst, net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst.Builder, net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirstOrBuilder> multiMappingValueBuilder_; /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ public boolean hasMultiMappingValue() { return multiMappingValueBuilder_ != null || multiMappingValue_ != null; } /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst getMultiMappingValue() { if (multiMappingValueBuilder_ == null) { @@ -1481,7 +1750,7 @@ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst g } } /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ public Builder setMultiMappingValue(net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst value) { if (multiMappingValueBuilder_ == null) { @@ -1497,7 +1766,7 @@ public Builder setMultiMappingValue(net.badata.protobuf.converter.proto.MultiMap return this; } /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ public Builder setMultiMappingValue( net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst.Builder builderForValue) { @@ -1511,7 +1780,7 @@ public Builder setMultiMappingValue( return this; } /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ public Builder mergeMultiMappingValue(net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst value) { if (multiMappingValueBuilder_ == null) { @@ -1529,7 +1798,7 @@ public Builder mergeMultiMappingValue(net.badata.protobuf.converter.proto.MultiM return this; } /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ public Builder clearMultiMappingValue() { if (multiMappingValueBuilder_ == null) { @@ -1543,7 +1812,7 @@ public Builder clearMultiMappingValue() { return this; } /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst.Builder getMultiMappingValueBuilder() { @@ -1551,7 +1820,7 @@ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst.B return getMultiMappingValueFieldBuilder().getBuilder(); } /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirstOrBuilder getMultiMappingValueOrBuilder() { if (multiMappingValueBuilder_ != null) { @@ -1562,13 +1831,13 @@ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirstOr } } /** - * optional .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; + * .net.badata.protobuf.converter.proto.MultiMappingFirst multiMappingValue = 1; */ - private com.google.protobuf.SingleFieldBuilder< + private com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst, net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst.Builder, net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirstOrBuilder> getMultiMappingValueFieldBuilder() { if (multiMappingValueBuilder_ == null) { - multiMappingValueBuilder_ = new com.google.protobuf.SingleFieldBuilder< + multiMappingValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst, net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirst.Builder, net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingFirstOrBuilder>( getMultiMappingValue(), getParentForChildren(), @@ -1587,7 +1856,7 @@ private void ensureMultiMappingListValueIsMutable() { } } - private com.google.protobuf.RepeatedFieldBuilder< + private com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond, net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond.Builder, net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecondOrBuilder> multiMappingListValueBuilder_; /** @@ -1803,11 +2072,11 @@ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond. getMultiMappingListValueBuilderList() { return getMultiMappingListValueFieldBuilder().getBuilderList(); } - private com.google.protobuf.RepeatedFieldBuilder< + private com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond, net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond.Builder, net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecondOrBuilder> getMultiMappingListValueFieldBuilder() { if (multiMappingListValueBuilder_ == null) { - multiMappingListValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + multiMappingListValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond, net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond.Builder, net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecondOrBuilder>( multiMappingListValue_, ((bitField0_ & 0x00000002) == 0x00000002), @@ -1819,12 +2088,12 @@ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingSecond. } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.setUnknownFieldsProto3(unknownFields); } public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.mergeUnknownFields(unknownFields); } @@ -1847,16 +2116,7 @@ public MultiMappingTest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - try { - return new MultiMappingTest(input, extensionRegistry); - } catch (RuntimeException e) { - if (e.getCause() instanceof - com.google.protobuf.InvalidProtocolBufferException) { - throw (com.google.protobuf.InvalidProtocolBufferException) - e.getCause(); - } - throw e; - } + return new MultiMappingTest(input, extensionRegistry); } }; @@ -1875,27 +2135,27 @@ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest ge } - private static com.google.protobuf.Descriptors.Descriptor + private static final com.google.protobuf.Descriptors.Descriptor internal_static_net_badata_protobuf_converter_proto_MultiMappingFirst_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_net_badata_protobuf_converter_proto_MultiMappingFirst_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor + private static final com.google.protobuf.Descriptors.Descriptor internal_static_net_badata_protobuf_converter_proto_MultiMappingSecond_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_net_badata_protobuf_converter_proto_MultiMappingSecond_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor + private static final com.google.protobuf.Descriptors.Descriptor internal_static_net_badata_protobuf_converter_proto_MultiMappingTest_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_net_badata_protobuf_converter_proto_MultiMappingTest_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; } - private static com.google.protobuf.Descriptors.FileDescriptor + private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { java.lang.String[] descriptorData = { @@ -1908,7 +2168,7 @@ public net.badata.protobuf.converter.proto.MultiMappingProto.MultiMappingTest ge "MappingValue\030\001 \001(\01326.net.badata.protobuf" + ".converter.proto.MultiMappingFirst\022V\n\025mu" + "ltiMappingListValue\030\002 \003(\01327.net.badata.p" + - "rotobuf.converter.proto.MultiMappingSeco", + "rotobuf.converter.proto.MultiMappingSeco" + "ndB8\n#net.badata.protobuf.converter.prot" + "oB\021MultiMappingProtob\006proto3" }; @@ -1927,19 +2187,19 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_net_badata_protobuf_converter_proto_MultiMappingFirst_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_net_badata_protobuf_converter_proto_MultiMappingFirst_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_net_badata_protobuf_converter_proto_MultiMappingFirst_descriptor, new java.lang.String[] { "IntValue", "LongValue", }); internal_static_net_badata_protobuf_converter_proto_MultiMappingSecond_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_net_badata_protobuf_converter_proto_MultiMappingSecond_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_net_badata_protobuf_converter_proto_MultiMappingSecond_descriptor, new java.lang.String[] { "IntValue", "LongValueChanged", "UnusableValue", }); internal_static_net_badata_protobuf_converter_proto_MultiMappingTest_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_net_badata_protobuf_converter_proto_MultiMappingTest_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_net_badata_protobuf_converter_proto_MultiMappingTest_descriptor, new java.lang.String[] { "MultiMappingValue", "MultiMappingListValue", }); } diff --git a/src/test/java/net/badata/protobuf/converter/proto/ResolverProto.java b/src/test/java/net/badata/protobuf/converter/proto/ResolverProto.java index f6a0af2..587e814 100644 --- a/src/test/java/net/badata/protobuf/converter/proto/ResolverProto.java +++ b/src/test/java/net/badata/protobuf/converter/proto/ResolverProto.java @@ -5,8 +5,14 @@ public final class ResolverProto { private ResolverProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + public static void registerAllExtensions( com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); } public interface ResolverTestOrBuilder extends // @@protoc_insertion_point(interface_extends:net.badata.protobuf.converter.proto.ResolverTest) @@ -15,7 +21,7 @@ public interface ResolverTestOrBuilder extends /** * repeated string stringListValue = 1; */ - com.google.protobuf.ProtocolStringList + java.util.List getStringListValueList(); /** * repeated string stringListValue = 1; @@ -32,11 +38,11 @@ public interface ResolverTestOrBuilder extends getStringListValueBytes(int index); /** - * optional string delimitedStringValue = 3; + * string delimitedStringValue = 3; */ java.lang.String getDelimitedStringValue(); /** - * optional string delimitedStringValue = 3; + * string delimitedStringValue = 3; */ com.google.protobuf.ByteString getDelimitedStringValueBytes(); @@ -45,11 +51,12 @@ public interface ResolverTestOrBuilder extends * Protobuf type {@code net.badata.protobuf.converter.proto.ResolverTest} */ public static final class ResolverTest extends - com.google.protobuf.GeneratedMessage implements + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:net.badata.protobuf.converter.proto.ResolverTest) ResolverTestOrBuilder { + private static final long serialVersionUID = 0L; // Use ResolverTest.newBuilder() to construct. - private ResolverTest(com.google.protobuf.GeneratedMessage.Builder builder) { + private ResolverTest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private ResolverTest() { @@ -60,13 +67,19 @@ private ResolverTest() { @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); + return this.unknownFields; } private ResolverTest( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -76,13 +89,14 @@ private ResolverTest( done = true; break; default: { - if (!input.skipField(tag)) { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { done = true; } break; } case 10: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { stringListValue_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; @@ -91,7 +105,7 @@ private ResolverTest( break; } case 26: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); delimitedStringValue_ = s; break; @@ -99,15 +113,15 @@ private ResolverTest( } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw new RuntimeException(e.setUnfinishedMessage(this)); + throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new RuntimeException( - new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this)); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { stringListValue_ = stringListValue_.getUnmodifiableView(); } + this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } @@ -116,7 +130,7 @@ private ResolverTest( return net.badata.protobuf.converter.proto.ResolverProto.internal_static_net_badata_protobuf_converter_proto_ResolverTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.ResolverProto.internal_static_net_badata_protobuf_converter_proto_ResolverTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -156,7 +170,7 @@ public java.lang.String getStringListValue(int index) { public static final int DELIMITEDSTRINGVALUE_FIELD_NUMBER = 3; private volatile java.lang.Object delimitedStringValue_; /** - * optional string delimitedStringValue = 3; + * string delimitedStringValue = 3; */ public java.lang.String getDelimitedStringValue() { java.lang.Object ref = delimitedStringValue_; @@ -171,7 +185,7 @@ public java.lang.String getDelimitedStringValue() { } } /** - * optional string delimitedStringValue = 3; + * string delimitedStringValue = 3; */ public com.google.protobuf.ByteString getDelimitedStringValueBytes() { @@ -200,11 +214,12 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < stringListValue_.size(); i++) { - com.google.protobuf.GeneratedMessage.writeString(output, 1, stringListValue_.getRaw(i)); + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, stringListValue_.getRaw(i)); } if (!getDelimitedStringValueBytes().isEmpty()) { - com.google.protobuf.GeneratedMessage.writeString(output, 3, delimitedStringValue_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, delimitedStringValue_); } + unknownFields.writeTo(output); } public int getSerializedSize() { @@ -221,13 +236,61 @@ public int getSerializedSize() { size += 1 * getStringListValueList().size(); } if (!getDelimitedStringValueBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(3, delimitedStringValue_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, delimitedStringValue_); } + size += unknownFields.getSerializedSize(); memoizedSize = size; return size; } - private static final long serialVersionUID = 0L; + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.badata.protobuf.converter.proto.ResolverProto.ResolverTest)) { + return super.equals(obj); + } + net.badata.protobuf.converter.proto.ResolverProto.ResolverTest other = (net.badata.protobuf.converter.proto.ResolverProto.ResolverTest) obj; + + boolean result = true; + result = result && getStringListValueList() + .equals(other.getStringListValueList()); + result = result && getDelimitedStringValue() + .equals(other.getDelimitedStringValue()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getStringListValueCount() > 0) { + hash = (37 * hash) + STRINGLISTVALUE_FIELD_NUMBER; + hash = (53 * hash) + getStringListValueList().hashCode(); + } + hash = (37 * hash) + DELIMITEDSTRINGVALUE_FIELD_NUMBER; + hash = (53 * hash) + getDelimitedStringValue().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.badata.protobuf.converter.proto.ResolverProto.ResolverTest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.badata.protobuf.converter.proto.ResolverProto.ResolverTest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static net.badata.protobuf.converter.proto.ResolverProto.ResolverTest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -251,34 +314,40 @@ public static net.badata.protobuf.converter.proto.ResolverProto.ResolverTest par } public static net.badata.protobuf.converter.proto.ResolverProto.ResolverTest parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ResolverProto.ResolverTest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.ResolverProto.ResolverTest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ResolverProto.ResolverTest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static net.badata.protobuf.converter.proto.ResolverProto.ResolverTest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static net.badata.protobuf.converter.proto.ResolverProto.ResolverTest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public Builder newBuilderForType() { return newBuilder(); } @@ -295,7 +364,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -303,7 +372,7 @@ protected Builder newBuilderForType( * Protobuf type {@code net.badata.protobuf.converter.proto.ResolverTest} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:net.badata.protobuf.converter.proto.ResolverTest) net.badata.protobuf.converter.proto.ResolverProto.ResolverTestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -311,7 +380,7 @@ public static final class Builder extends return net.badata.protobuf.converter.proto.ResolverProto.internal_static_net_badata_protobuf_converter_proto_ResolverTest_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return net.badata.protobuf.converter.proto.ResolverProto.internal_static_net_badata_protobuf_converter_proto_ResolverTest_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -324,12 +393,13 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { } } public Builder clear() { @@ -373,6 +443,32 @@ public net.badata.protobuf.converter.proto.ResolverProto.ResolverTest buildParti return result; } + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof net.badata.protobuf.converter.proto.ResolverProto.ResolverTest) { return mergeFrom((net.badata.protobuf.converter.proto.ResolverProto.ResolverTest)other); @@ -398,6 +494,7 @@ public Builder mergeFrom(net.badata.protobuf.converter.proto.ResolverProto.Resol delimitedStringValue_ = other.delimitedStringValue_; onChanged(); } + this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } @@ -415,7 +512,7 @@ public Builder mergeFrom( parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { parsedMessage = (net.badata.protobuf.converter.proto.ResolverProto.ResolverTest) e.getUnfinishedMessage(); - throw e; + throw e.unwrapIOException(); } finally { if (parsedMessage != null) { mergeFrom(parsedMessage); @@ -521,7 +618,7 @@ public Builder addStringListValueBytes( private java.lang.Object delimitedStringValue_ = ""; /** - * optional string delimitedStringValue = 3; + * string delimitedStringValue = 3; */ public java.lang.String getDelimitedStringValue() { java.lang.Object ref = delimitedStringValue_; @@ -536,7 +633,7 @@ public java.lang.String getDelimitedStringValue() { } } /** - * optional string delimitedStringValue = 3; + * string delimitedStringValue = 3; */ public com.google.protobuf.ByteString getDelimitedStringValueBytes() { @@ -552,7 +649,7 @@ public java.lang.String getDelimitedStringValue() { } } /** - * optional string delimitedStringValue = 3; + * string delimitedStringValue = 3; */ public Builder setDelimitedStringValue( java.lang.String value) { @@ -565,7 +662,7 @@ public Builder setDelimitedStringValue( return this; } /** - * optional string delimitedStringValue = 3; + * string delimitedStringValue = 3; */ public Builder clearDelimitedStringValue() { @@ -574,7 +671,7 @@ public Builder clearDelimitedStringValue() { return this; } /** - * optional string delimitedStringValue = 3; + * string delimitedStringValue = 3; */ public Builder setDelimitedStringValueBytes( com.google.protobuf.ByteString value) { @@ -589,12 +686,12 @@ public Builder setDelimitedStringValueBytes( } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.setUnknownFieldsProto3(unknownFields); } public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; + return super.mergeUnknownFields(unknownFields); } @@ -617,16 +714,7 @@ public ResolverTest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - try { - return new ResolverTest(input, extensionRegistry); - } catch (RuntimeException e) { - if (e.getCause() instanceof - com.google.protobuf.InvalidProtocolBufferException) { - throw (com.google.protobuf.InvalidProtocolBufferException) - e.getCause(); - } - throw e; - } + return new ResolverTest(input, extensionRegistry); } }; @@ -645,17 +733,17 @@ public net.badata.protobuf.converter.proto.ResolverProto.ResolverTest getDefault } - private static com.google.protobuf.Descriptors.Descriptor + private static final com.google.protobuf.Descriptors.Descriptor internal_static_net_badata_protobuf_converter_proto_ResolverTest_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_net_badata_protobuf_converter_proto_ResolverTest_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; } - private static com.google.protobuf.Descriptors.FileDescriptor + private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { java.lang.String[] descriptorData = { @@ -680,7 +768,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_net_badata_protobuf_converter_proto_ResolverTest_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_net_badata_protobuf_converter_proto_ResolverTest_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_net_badata_protobuf_converter_proto_ResolverTest_descriptor, new java.lang.String[] { "StringListValue", "DelimitedStringValue", }); }