Include well-known types in Java runtime.
Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc
This commit is contained in:
parent
56095026cc
commit
1aacb4fbbf
29
java/pom.xml
29
java/pom.xml
@ -81,7 +81,17 @@
|
||||
<exec executable="../src/protoc">
|
||||
<arg value="--java_out=target/generated-sources" />
|
||||
<arg value="--proto_path=../src" />
|
||||
<arg value="../src/google/protobuf/any.proto" />
|
||||
<arg value="../src/google/protobuf/api.proto" />
|
||||
<arg value="../src/google/protobuf/descriptor.proto" />
|
||||
<arg value="../src/google/protobuf/duration.proto" />
|
||||
<arg value="../src/google/protobuf/empty.proto" />
|
||||
<arg value="../src/google/protobuf/field_mask.proto" />
|
||||
<arg value="../src/google/protobuf/source_context.proto" />
|
||||
<arg value="../src/google/protobuf/struct.proto" />
|
||||
<arg value="../src/google/protobuf/timestamp.proto" />
|
||||
<arg value="../src/google/protobuf/type.proto" />
|
||||
<arg value="../src/google/protobuf/wrappers.proto" />
|
||||
</exec>
|
||||
</tasks>
|
||||
<sourceRoot>target/generated-sources</sourceRoot>
|
||||
@ -130,6 +140,7 @@
|
||||
<arg value="../src/google/protobuf/unittest_lite_imports_nonlite.proto" />
|
||||
<arg value="../src/google/protobuf/unittest_enormous_descriptor.proto" />
|
||||
<arg value="../src/google/protobuf/unittest_no_generic_services.proto" />
|
||||
<arg value="../src/google/protobuf/unittest_well_known_types.proto" />
|
||||
<arg value="src/test/java/com/google/protobuf/field_presence_test.proto" />
|
||||
<arg value="src/test/java/com/google/protobuf/map_for_proto2_lite_test.proto" />
|
||||
<arg value="src/test/java/com/google/protobuf/map_for_proto2_test.proto" />
|
||||
@ -157,6 +168,24 @@
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>../src</directory>
|
||||
<includes>
|
||||
<include>google/protobuf/any.proto</include>
|
||||
<include>google/protobuf/api.proto</include>
|
||||
<include>google/protobuf/descriptor.proto</include>
|
||||
<include>google/protobuf/duration.proto</include>
|
||||
<include>google/protobuf/empty.proto</include>
|
||||
<include>google/protobuf/field_mask.proto</include>
|
||||
<include>google/protobuf/source_context.proto</include>
|
||||
<include>google/protobuf/struct.proto</include>
|
||||
<include>google/protobuf/timestamp.proto</include>
|
||||
<include>google/protobuf/type.proto</include>
|
||||
<include>google/protobuf/wrappers.proto</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
</build>
|
||||
<profiles>
|
||||
<profile>
|
||||
|
@ -0,0 +1,65 @@
|
||||
// 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.
|
||||
|
||||
package com.google.protobuf;
|
||||
|
||||
import com.google.protobuf.Descriptors.Descriptor;
|
||||
import com.google.protobuf.Descriptors.EnumDescriptor;
|
||||
import com.google.protobuf.Descriptors.EnumValueDescriptor;
|
||||
import com.google.protobuf.Descriptors.FieldDescriptor;
|
||||
import com.google.protobuf.test.TestWellKnownTypes;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* This test ensures that well-known types are included in protobuf Java
|
||||
* runtime library.
|
||||
*/
|
||||
public class WellKnownTypesTest extends TestCase {
|
||||
public void testWellKnownTypes() {
|
||||
// The test passes if it compiles.
|
||||
TestWellKnownTypes message = TestWellKnownTypes.newBuilder().build();
|
||||
assertEquals(0, message.getAnyField().getSerializedSize());
|
||||
assertEquals(0, message.getApiField().getSerializedSize());
|
||||
assertEquals(0, message.getDurationField().getSerializedSize());
|
||||
assertEquals(0, message.getEmptyField().getSerializedSize());
|
||||
assertEquals(0, message.getFieldMaskField().getSerializedSize());
|
||||
assertEquals(0, message.getSourceContextField().getSerializedSize());
|
||||
assertEquals(0, message.getStructField().getSerializedSize());
|
||||
assertEquals(0, message.getTimestampField().getSerializedSize());
|
||||
assertEquals(0, message.getTypeField().getSerializedSize());
|
||||
assertEquals(0, message.getInt32Field().getSerializedSize());
|
||||
}
|
||||
}
|
@ -2,6 +2,9 @@ syntax = "proto3";
|
||||
|
||||
package protobuf_unittest;
|
||||
|
||||
option java_multiple_files = true;
|
||||
option java_package = "com.google.protobuf.test";
|
||||
|
||||
import "google/protobuf/any.proto";
|
||||
import "google/protobuf/api.proto";
|
||||
import "google/protobuf/duration.proto";
|
||||
|
Loading…
Reference in New Issue
Block a user