From 49efe9d7db877022e76375df2d4daadab98619b6 Mon Sep 17 00:00:00 2001 From: nmittler Date: Fri, 8 Jan 2016 09:19:11 -0800 Subject: Restructuring protobuf to multiple modules protobuf/java will become a parent pom that will contain two modules: core - contains all of the code for the protobuf-java artifact util - contains all of the code for the protobuf-java-util artifact Also cleaned up various Maven warnings. --- java/util/pom.xml | 189 +++++---------------- .../java/com/google/protobuf/util/json_test.proto | 170 ------------------ .../proto/com/google/protobuf/util/json_test.proto | 170 ++++++++++++++++++ 3 files changed, 217 insertions(+), 312 deletions(-) delete mode 100644 java/util/src/test/java/com/google/protobuf/util/json_test.proto create mode 100644 java/util/src/test/proto/com/google/protobuf/util/json_test.proto (limited to 'java/util') diff --git a/java/util/pom.xml b/java/util/pom.xml index 70401a4b..26c12c82 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,110 +4,73 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.google - google - 1 + com.google.protobuf + protobuf-parent + 3.0.0-beta-2 - com.google.protobuf + protobuf-java-util - 3.0.0-beta-2 bundle - Protocol Buffer Java API - - Protocol Buffers are a way of encoding structured data in an efficient yet - extensible format. - - 2008 - https://developers.google.com/protocol-buffers/ - - - New BSD license - http://www.opensource.org/licenses/bsd-license.php - repo - - - - https://github.com/google/protobuf - - scm:git:https://github.com/google/protobuf.git - - + + Protocol Buffers [Util] + Utilities for Protocol Buffers + - com.google.protobuf + ${project.groupId} protobuf-java - 3.0.0-beta-2 - compile + ${project.version} com.google.guava guava - 18.0 - compile com.google.code.gson gson 2.3 - compile junit junit - 4.4 - test org.easymock easymock - 2.2 - test org.easymock easymockclassextension - 2.2.1 - test + + + + ../core/src/test/proto + + - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Test.java - ../src/main/java/com/google/protobuf/TestUtil.java - - - maven-antrun-plugin + generate-test-sources generate-test-sources - - - - - - - - - - + + + + + + + + + + - - target/generated-test-sources + run @@ -115,6 +78,16 @@ + + + maven-compiler-plugin + + + ${generated.testsources.dir} + + + + org.apache.felix maven-bundle-plugin @@ -123,88 +96,20 @@ https://developers.google.com/protocol-buffers/ com.google.protobuf.util - com.google.protobuf.util;version=3.0.0-beta-2 + com.google.protobuf.util;version=${project.version} + + - maven-assembly-plugin - - - jar-with-dependencies - - + maven-assembly-plugin + + + jar-with-dependencies + + - - - release - - - sonatype-nexus-staging - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.3 - true - - sonatype-nexus-staging - https://oss.sonatype.org/ - false - - - - - - diff --git a/java/util/src/test/java/com/google/protobuf/util/json_test.proto b/java/util/src/test/java/com/google/protobuf/util/json_test.proto deleted file mode 100644 index 509c1d69..00000000 --- a/java/util/src/test/java/com/google/protobuf/util/json_test.proto +++ /dev/null @@ -1,170 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package json_test; - -option java_package = "com.google.protobuf.util"; -option java_outer_classname = "JsonTestProto"; - -import "google/protobuf/any.proto"; -import "google/protobuf/wrappers.proto"; -import "google/protobuf/timestamp.proto"; -import "google/protobuf/duration.proto"; -import "google/protobuf/field_mask.proto"; -import "google/protobuf/struct.proto"; - -message TestAllTypes { - enum NestedEnum { - FOO = 0; - BAR = 1; - BAZ = 2; - } - message NestedMessage { - int32 value = 1; - } - - int32 optional_int32 = 1; - int64 optional_int64 = 2; - uint32 optional_uint32 = 3; - uint64 optional_uint64 = 4; - sint32 optional_sint32 = 5; - sint64 optional_sint64 = 6; - fixed32 optional_fixed32 = 7; - fixed64 optional_fixed64 = 8; - sfixed32 optional_sfixed32 = 9; - sfixed64 optional_sfixed64 = 10; - float optional_float = 11; - double optional_double = 12; - bool optional_bool = 13; - string optional_string = 14; - bytes optional_bytes = 15; - NestedMessage optional_nested_message = 18; - NestedEnum optional_nested_enum = 21; - - // Repeated - repeated int32 repeated_int32 = 31; - repeated int64 repeated_int64 = 32; - repeated uint32 repeated_uint32 = 33; - repeated uint64 repeated_uint64 = 34; - repeated sint32 repeated_sint32 = 35; - repeated sint64 repeated_sint64 = 36; - repeated fixed32 repeated_fixed32 = 37; - repeated fixed64 repeated_fixed64 = 38; - repeated sfixed32 repeated_sfixed32 = 39; - repeated sfixed64 repeated_sfixed64 = 40; - repeated float repeated_float = 41; - repeated double repeated_double = 42; - repeated bool repeated_bool = 43; - repeated string repeated_string = 44; - repeated bytes repeated_bytes = 45; - repeated NestedMessage repeated_nested_message = 48; - repeated NestedEnum repeated_nested_enum = 51; -} - -message TestOneof { - oneof oneof_field { - int32 oneof_int32 = 1; - TestAllTypes.NestedMessage oneof_nested_message = 2; - } -} - -message TestMap { - // Instead of testing all combinations (too many), we only make sure all - // valid types have been used at least in one field as key and in one - // field as value. - map int32_to_int32_map = 1; - map int64_to_int32_map = 2; - map uint32_to_int32_map = 3; - map uint64_to_int32_map = 4; - map sint32_to_int32_map = 5; - map sint64_to_int32_map = 6; - map fixed32_to_int32_map = 7; - map fixed64_to_int32_map = 8; - map sfixed32_to_int32_map = 9; - map sfixed64_to_int32_map = 10; - map bool_to_int32_map = 11; - map string_to_int32_map = 12; - - map int32_to_int64_map = 101; - map int32_to_uint32_map = 102; - map int32_to_uint64_map = 103; - map int32_to_sint32_map = 104; - map int32_to_sint64_map = 105; - map int32_to_fixed32_map = 106; - map int32_to_fixed64_map = 107; - map int32_to_sfixed32_map = 108; - map int32_to_sfixed64_map = 109; - map int32_to_float_map = 110; - map int32_to_double_map = 111; - map int32_to_bool_map = 112; - map int32_to_string_map = 113; - map int32_to_bytes_map = 114; - map int32_to_message_map = 115; - map int32_to_enum_map = 116; -} - -message TestWrappers { - google.protobuf.Int32Value int32_value = 1; - google.protobuf.UInt32Value uint32_value = 2; - google.protobuf.Int64Value int64_value = 3; - google.protobuf.UInt64Value uint64_value = 4; - google.protobuf.FloatValue float_value = 5; - google.protobuf.DoubleValue double_value = 6; - google.protobuf.BoolValue bool_value = 7; - google.protobuf.StringValue string_value = 8; - google.protobuf.BytesValue bytes_value = 9; -} - -message TestTimestamp { - google.protobuf.Timestamp timestamp_value = 1; -} - -message TestDuration { - google.protobuf.Duration duration_value = 1; -} - -message TestFieldMask { - google.protobuf.FieldMask field_mask_value = 1; -} - -message TestStruct { - google.protobuf.Struct struct_value = 1; - google.protobuf.Value value = 2; -} - -message TestAny { - google.protobuf.Any any_value = 1; -} - -message TestCustomJsonName { - int32 value = 1 [json_name = "@value"]; -} diff --git a/java/util/src/test/proto/com/google/protobuf/util/json_test.proto b/java/util/src/test/proto/com/google/protobuf/util/json_test.proto new file mode 100644 index 00000000..509c1d69 --- /dev/null +++ b/java/util/src/test/proto/com/google/protobuf/util/json_test.proto @@ -0,0 +1,170 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package json_test; + +option java_package = "com.google.protobuf.util"; +option java_outer_classname = "JsonTestProto"; + +import "google/protobuf/any.proto"; +import "google/protobuf/wrappers.proto"; +import "google/protobuf/timestamp.proto"; +import "google/protobuf/duration.proto"; +import "google/protobuf/field_mask.proto"; +import "google/protobuf/struct.proto"; + +message TestAllTypes { + enum NestedEnum { + FOO = 0; + BAR = 1; + BAZ = 2; + } + message NestedMessage { + int32 value = 1; + } + + int32 optional_int32 = 1; + int64 optional_int64 = 2; + uint32 optional_uint32 = 3; + uint64 optional_uint64 = 4; + sint32 optional_sint32 = 5; + sint64 optional_sint64 = 6; + fixed32 optional_fixed32 = 7; + fixed64 optional_fixed64 = 8; + sfixed32 optional_sfixed32 = 9; + sfixed64 optional_sfixed64 = 10; + float optional_float = 11; + double optional_double = 12; + bool optional_bool = 13; + string optional_string = 14; + bytes optional_bytes = 15; + NestedMessage optional_nested_message = 18; + NestedEnum optional_nested_enum = 21; + + // Repeated + repeated int32 repeated_int32 = 31; + repeated int64 repeated_int64 = 32; + repeated uint32 repeated_uint32 = 33; + repeated uint64 repeated_uint64 = 34; + repeated sint32 repeated_sint32 = 35; + repeated sint64 repeated_sint64 = 36; + repeated fixed32 repeated_fixed32 = 37; + repeated fixed64 repeated_fixed64 = 38; + repeated sfixed32 repeated_sfixed32 = 39; + repeated sfixed64 repeated_sfixed64 = 40; + repeated float repeated_float = 41; + repeated double repeated_double = 42; + repeated bool repeated_bool = 43; + repeated string repeated_string = 44; + repeated bytes repeated_bytes = 45; + repeated NestedMessage repeated_nested_message = 48; + repeated NestedEnum repeated_nested_enum = 51; +} + +message TestOneof { + oneof oneof_field { + int32 oneof_int32 = 1; + TestAllTypes.NestedMessage oneof_nested_message = 2; + } +} + +message TestMap { + // Instead of testing all combinations (too many), we only make sure all + // valid types have been used at least in one field as key and in one + // field as value. + map int32_to_int32_map = 1; + map int64_to_int32_map = 2; + map uint32_to_int32_map = 3; + map uint64_to_int32_map = 4; + map sint32_to_int32_map = 5; + map sint64_to_int32_map = 6; + map fixed32_to_int32_map = 7; + map fixed64_to_int32_map = 8; + map sfixed32_to_int32_map = 9; + map sfixed64_to_int32_map = 10; + map bool_to_int32_map = 11; + map string_to_int32_map = 12; + + map int32_to_int64_map = 101; + map int32_to_uint32_map = 102; + map int32_to_uint64_map = 103; + map int32_to_sint32_map = 104; + map int32_to_sint64_map = 105; + map int32_to_fixed32_map = 106; + map int32_to_fixed64_map = 107; + map int32_to_sfixed32_map = 108; + map int32_to_sfixed64_map = 109; + map int32_to_float_map = 110; + map int32_to_double_map = 111; + map int32_to_bool_map = 112; + map int32_to_string_map = 113; + map int32_to_bytes_map = 114; + map int32_to_message_map = 115; + map int32_to_enum_map = 116; +} + +message TestWrappers { + google.protobuf.Int32Value int32_value = 1; + google.protobuf.UInt32Value uint32_value = 2; + google.protobuf.Int64Value int64_value = 3; + google.protobuf.UInt64Value uint64_value = 4; + google.protobuf.FloatValue float_value = 5; + google.protobuf.DoubleValue double_value = 6; + google.protobuf.BoolValue bool_value = 7; + google.protobuf.StringValue string_value = 8; + google.protobuf.BytesValue bytes_value = 9; +} + +message TestTimestamp { + google.protobuf.Timestamp timestamp_value = 1; +} + +message TestDuration { + google.protobuf.Duration duration_value = 1; +} + +message TestFieldMask { + google.protobuf.FieldMask field_mask_value = 1; +} + +message TestStruct { + google.protobuf.Struct struct_value = 1; + google.protobuf.Value value = 2; +} + +message TestAny { + google.protobuf.Any any_value = 1; +} + +message TestCustomJsonName { + int32 value = 1 [json_name = "@value"]; +} -- cgit v1.2.3