[Git][debian-gis-team/osmosis][master] 2 commits: Drop patches for protobuf 3.0.0.
Bas Couwenberg
gitlab at salsa.debian.org
Fri Oct 12 08:51:27 BST 2018
Bas Couwenberg pushed to branch master at Debian GIS Project / osmosis
Commits:
46340fde by Bas Couwenberg at 2018-10-12T07:40:41Z
Drop patches for protobuf 3.0.0.
- - - - -
77f20773 by Bas Couwenberg at 2018-10-12T07:50:31Z
Require at least libprotobuf-java 3.6.1.
- - - - -
5 changed files:
- debian/changelog
- debian/control
- − debian/patches/protobuf-3.0.0.patch
- − debian/patches/revert-protobuf-3.6.1-changes.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+osmosis (0.47-2) UNRELEASED; urgency=medium
+
+ * Drop patches for protobuf 3.0.0.
+ * Require at least libprotobuf-java 3.6.1.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 12 Oct 2018 09:40:09 +0200
+
osmosis (0.47-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/control
=====================================
@@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 9),
libstax2-api-java,
libosmpbf-java,
libplexus-classworlds2-java,
- libprotobuf-java,
+ libprotobuf-java (>= 3.6.1),
libwoodstox-java,
libxerces2-java,
libxz-java,
=====================================
debian/patches/protobuf-3.0.0.patch deleted
=====================================
@@ -1,1448 +0,0 @@
-Description: Regenerate protobuf files with protobuf 3.0.0.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Fileformat.java
-+++ b/osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Fileformat.java
-@@ -400,19 +400,6 @@ public final class Fileformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -474,10 +461,10 @@ public final class Fileformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Fileformat.Blob prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -721,10 +708,9 @@ public final class Fileformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.Blob)
- }
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Fileformat.Blob();
-@@ -767,9 +753,6 @@ public final class Fileformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -820,7 +803,6 @@ public final class Fileformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -832,13 +814,7 @@ public final class Fileformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return (byte) 1;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
-@@ -1060,19 +1036,6 @@ public final class Fileformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -1134,10 +1097,10 @@ public final class Fileformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -1260,11 +1223,10 @@ public final class Fileformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.BlobHeader)
- }
-- private byte memoizedIsInitialized = 2;
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ private byte memoizedIsInitialized = -1;
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader();
-@@ -1276,11 +1238,18 @@ public final class Fileformat {
-
- boolean shouldMemoize = ((Boolean) arg0).booleanValue();
- if (!hasType()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- if (!hasDatasize()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
-+ if (shouldMemoize) memoizedIsInitialized = 1;
- return DEFAULT_INSTANCE;
-
- }
-@@ -1313,9 +1282,6 @@ public final class Fileformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -1331,7 +1297,7 @@ public final class Fileformat {
- break;
- }
- case 10: {
-- java.lang.String s = input.readString();
-+ String s = input.readString();
- bitField0_ |= 0x00000001;
- type_ = s;
- break;
-@@ -1357,7 +1323,6 @@ public final class Fileformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -1369,14 +1334,7 @@ public final class Fileformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return memoizedIsInitialized;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
---- a/osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Osmformat.java
-+++ b/osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Osmformat.java
-@@ -28,7 +28,7 @@ public final class Osmformat {
- *
- * <code>repeated string required_features = 4;</code>
- */
-- java.util.List<java.lang.String>
-+ java.util.List<String>
- getRequiredFeaturesList();
- /**
- * <pre>
-@@ -59,7 +59,7 @@ public final class Osmformat {
- /**
- * <code>repeated string optional_features = 5;</code>
- */
-- java.util.List<java.lang.String>
-+ java.util.List<String>
- getOptionalFeaturesList();
- /**
- * <code>repeated string optional_features = 5;</code>
-@@ -248,7 +248,7 @@ public final class Osmformat {
- }
-
- public static final int REQUIRED_FEATURES_FIELD_NUMBER = 4;
-- private com.google.protobuf.Internal.ProtobufList<java.lang.String> requiredFeatures_;
-+ private com.google.protobuf.Internal.ProtobufList<String> requiredFeatures_;
- /**
- * <pre>
- * Additional tags to aid in parsing this dataset
-@@ -256,7 +256,7 @@ public final class Osmformat {
- *
- * <code>repeated string required_features = 4;</code>
- */
-- public java.util.List<java.lang.String> getRequiredFeaturesList() {
-+ public java.util.List<String> getRequiredFeaturesList() {
- return requiredFeatures_;
- }
- /**
-@@ -367,11 +367,11 @@ public final class Osmformat {
- }
-
- public static final int OPTIONAL_FEATURES_FIELD_NUMBER = 5;
-- private com.google.protobuf.Internal.ProtobufList<java.lang.String> optionalFeatures_;
-+ private com.google.protobuf.Internal.ProtobufList<String> optionalFeatures_;
- /**
- * <code>repeated string optional_features = 5;</code>
- */
-- public java.util.List<java.lang.String> getOptionalFeaturesList() {
-+ public java.util.List<String> getOptionalFeaturesList() {
- return optionalFeatures_;
- }
- /**
-@@ -830,19 +830,6 @@ public final class Osmformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -904,10 +891,10 @@ public final class Osmformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -976,7 +963,7 @@ public final class Osmformat {
- *
- * <code>repeated string required_features = 4;</code>
- */
-- public java.util.List<java.lang.String>
-+ public java.util.List<String>
- getRequiredFeaturesList() {
- return java.util.Collections.unmodifiableList(
- instance.getRequiredFeaturesList());
-@@ -1080,7 +1067,7 @@ public final class Osmformat {
- /**
- * <code>repeated string optional_features = 5;</code>
- */
-- public java.util.List<java.lang.String>
-+ public java.util.List<String>
- getOptionalFeaturesList() {
- return java.util.Collections.unmodifiableList(
- instance.getOptionalFeaturesList());
-@@ -1435,11 +1422,10 @@ public final class Osmformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.HeaderBlock)
- }
-- private byte memoizedIsInitialized = 2;
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ private byte memoizedIsInitialized = -1;
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock();
-@@ -1452,9 +1438,13 @@ public final class Osmformat {
- boolean shouldMemoize = ((Boolean) arg0).booleanValue();
- if (hasBbox()) {
- if (!getBbox().isInitialized()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- }
-+ if (shouldMemoize) memoizedIsInitialized = 1;
- return DEFAULT_INSTANCE;
-
- }
-@@ -1498,9 +1488,6 @@ public final class Osmformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -1529,7 +1516,7 @@ public final class Osmformat {
- break;
- }
- case 34: {
-- java.lang.String s = input.readString();
-+ String s = input.readString();
- if (!requiredFeatures_.isModifiable()) {
- requiredFeatures_ =
- com.google.protobuf.GeneratedMessageLite.mutableCopy(requiredFeatures_);
-@@ -1538,7 +1525,7 @@ public final class Osmformat {
- break;
- }
- case 42: {
-- java.lang.String s = input.readString();
-+ String s = input.readString();
- if (!optionalFeatures_.isModifiable()) {
- optionalFeatures_ =
- com.google.protobuf.GeneratedMessageLite.mutableCopy(optionalFeatures_);
-@@ -1547,13 +1534,13 @@ public final class Osmformat {
- break;
- }
- case 130: {
-- java.lang.String s = input.readString();
-+ String s = input.readString();
- bitField0_ |= 0x00000002;
- writingprogram_ = s;
- break;
- }
- case 138: {
-- java.lang.String s = input.readString();
-+ String s = input.readString();
- bitField0_ |= 0x00000004;
- source_ = s;
- break;
-@@ -1569,7 +1556,7 @@ public final class Osmformat {
- break;
- }
- case 274: {
-- java.lang.String s = input.readString();
-+ String s = input.readString();
- bitField0_ |= 0x00000020;
- osmosisReplicationBaseUrl_ = s;
- break;
-@@ -1585,7 +1572,6 @@ public final class Osmformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -1597,14 +1583,7 @@ public final class Osmformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return memoizedIsInitialized;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
-@@ -1839,19 +1818,6 @@ public final class Osmformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -1913,10 +1879,10 @@ public final class Osmformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -2051,11 +2017,10 @@ public final class Osmformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.HeaderBBox)
- }
-- private byte memoizedIsInitialized = 2;
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ private byte memoizedIsInitialized = -1;
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox();
-@@ -2067,17 +2032,30 @@ public final class Osmformat {
-
- boolean shouldMemoize = ((Boolean) arg0).booleanValue();
- if (!hasLeft()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- if (!hasRight()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- if (!hasTop()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- if (!hasBottom()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
-+ if (shouldMemoize) memoizedIsInitialized = 1;
- return DEFAULT_INSTANCE;
-
- }
-@@ -2113,9 +2091,6 @@ public final class Osmformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -2161,7 +2136,6 @@ public final class Osmformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -2173,14 +2147,7 @@ public final class Osmformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return memoizedIsInitialized;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
-@@ -2699,19 +2666,6 @@ public final class Osmformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -2773,10 +2727,10 @@ public final class Osmformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -3101,11 +3055,10 @@ public final class Osmformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.PrimitiveBlock)
- }
-- private byte memoizedIsInitialized = 2;
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ private byte memoizedIsInitialized = -1;
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock();
-@@ -3117,13 +3070,20 @@ public final class Osmformat {
-
- boolean shouldMemoize = ((Boolean) arg0).booleanValue();
- if (!hasStringtable()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- for (int i = 0; i < getPrimitivegroupCount(); i++) {
- if (!getPrimitivegroup(i).isInitialized()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- }
-+ if (shouldMemoize) memoizedIsInitialized = 1;
- return DEFAULT_INSTANCE;
-
- }
-@@ -3162,9 +3122,6 @@ public final class Osmformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -3232,7 +3189,6 @@ public final class Osmformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -3244,14 +3200,7 @@ public final class Osmformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return memoizedIsInitialized;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
-@@ -3946,19 +3895,6 @@ public final class Osmformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -4020,10 +3956,10 @@ public final class Osmformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -4479,11 +4415,10 @@ public final class Osmformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.PrimitiveGroup)
- }
-- private byte memoizedIsInitialized = 2;
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ private byte memoizedIsInitialized = -1;
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup();
-@@ -4496,24 +4431,37 @@ public final class Osmformat {
- boolean shouldMemoize = ((Boolean) arg0).booleanValue();
- for (int i = 0; i < getNodesCount(); i++) {
- if (!getNodes(i).isInitialized()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- }
- for (int i = 0; i < getWaysCount(); i++) {
- if (!getWays(i).isInitialized()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- }
- for (int i = 0; i < getRelationsCount(); i++) {
- if (!getRelations(i).isInitialized()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- }
- for (int i = 0; i < getChangesetsCount(); i++) {
- if (!getChangesets(i).isInitialized()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- }
-+ if (shouldMemoize) memoizedIsInitialized = 1;
- return DEFAULT_INSTANCE;
-
- }
-@@ -4546,9 +4494,6 @@ public final class Osmformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -4623,7 +4568,6 @@ public final class Osmformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -4635,14 +4579,7 @@ public final class Osmformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return memoizedIsInitialized;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
-@@ -4792,19 +4729,6 @@ public final class Osmformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -4866,10 +4790,10 @@ public final class Osmformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -4949,10 +4873,9 @@ public final class Osmformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.StringTable)
- }
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable();
-@@ -4981,9 +4904,6 @@ public final class Osmformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -5017,7 +4937,6 @@ public final class Osmformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -5029,13 +4948,7 @@ public final class Osmformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return (byte) 1;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
-@@ -5455,19 +5368,6 @@ public final class Osmformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -5529,10 +5429,10 @@ public final class Osmformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.Info prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -5789,10 +5689,9 @@ public final class Osmformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.Info)
- }
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Osmformat.Info();
-@@ -5838,9 +5737,6 @@ public final class Osmformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -5896,7 +5792,6 @@ public final class Osmformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -5908,13 +5803,7 @@ public final class Osmformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return (byte) 1;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
-@@ -6804,19 +6693,6 @@ public final class Osmformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -6878,10 +6754,10 @@ public final class Osmformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -7423,10 +7299,9 @@ public final class Osmformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.DenseInfo)
- }
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo();
-@@ -7465,9 +7340,6 @@ public final class Osmformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -7620,7 +7492,6 @@ public final class Osmformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -7632,13 +7503,7 @@ public final class Osmformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return (byte) 1;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
-@@ -7791,19 +7656,6 @@ public final class Osmformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -7865,10 +7717,10 @@ public final class Osmformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -7953,11 +7805,10 @@ public final class Osmformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.ChangeSet)
- }
-- private byte memoizedIsInitialized = 2;
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ private byte memoizedIsInitialized = -1;
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet();
-@@ -7969,8 +7820,12 @@ public final class Osmformat {
-
- boolean shouldMemoize = ((Boolean) arg0).booleanValue();
- if (!hasId()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
-+ if (shouldMemoize) memoizedIsInitialized = 1;
- return DEFAULT_INSTANCE;
-
- }
-@@ -7997,9 +7852,6 @@ public final class Osmformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -8030,7 +7882,6 @@ public final class Osmformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -8042,14 +7893,7 @@ public final class Osmformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return memoizedIsInitialized;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
-@@ -8608,19 +8452,6 @@ public final class Osmformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -8682,10 +8513,10 @@ public final class Osmformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.Node prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -9026,11 +8857,10 @@ public final class Osmformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.Node)
- }
-- private byte memoizedIsInitialized = 2;
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ private byte memoizedIsInitialized = -1;
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Osmformat.Node();
-@@ -9042,14 +8872,24 @@ public final class Osmformat {
-
- boolean shouldMemoize = ((Boolean) arg0).booleanValue();
- if (!hasId()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- if (!hasLat()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
- if (!hasLon()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
-+ if (shouldMemoize) memoizedIsInitialized = 1;
- return DEFAULT_INSTANCE;
-
- }
-@@ -9087,9 +8927,6 @@ public final class Osmformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -9185,7 +9022,6 @@ public final class Osmformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -9197,14 +9033,7 @@ public final class Osmformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return memoizedIsInitialized;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
-@@ -9896,19 +9725,6 @@ public final class Osmformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -9970,10 +9786,10 @@ public final class Osmformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -10393,10 +10209,9 @@ public final class Osmformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.DenseNodes)
- }
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes();
-@@ -10433,9 +10248,6 @@ public final class Osmformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -10558,7 +10370,6 @@ public final class Osmformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -10570,13 +10381,7 @@ public final class Osmformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return (byte) 1;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
-@@ -11295,19 +11100,6 @@ public final class Osmformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -11369,10 +11161,10 @@ public final class Osmformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.Way prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -11796,11 +11588,10 @@ public final class Osmformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.Way)
- }
-- private byte memoizedIsInitialized = 2;
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ private byte memoizedIsInitialized = -1;
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Osmformat.Way();
-@@ -11812,8 +11603,12 @@ public final class Osmformat {
-
- boolean shouldMemoize = ((Boolean) arg0).booleanValue();
- if (!hasId()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
-+ if (shouldMemoize) memoizedIsInitialized = 1;
- return DEFAULT_INSTANCE;
-
- }
-@@ -11851,9 +11646,6 @@ public final class Osmformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -12002,7 +11794,6 @@ public final class Osmformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -12014,14 +11805,7 @@ public final class Osmformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return memoizedIsInitialized;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
-@@ -12869,19 +12653,6 @@ public final class Osmformat {
- }
-
- public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(
-- java.nio.ByteBuffer data)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(
-- java.nio.ByteBuffer data,
-- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-- throws com.google.protobuf.InvalidProtocolBufferException {
-- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-- DEFAULT_INSTANCE, data, extensionRegistry);
-- }
-- public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return com.google.protobuf.GeneratedMessageLite.parseFrom(
-@@ -12943,10 +12714,10 @@ public final class Osmformat {
- }
-
- public static Builder newBuilder() {
-- return (Builder) DEFAULT_INSTANCE.createBuilder();
-+ return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.Relation prototype) {
-- return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
-+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- /**
-@@ -13395,11 +13166,10 @@ public final class Osmformat {
-
- // @@protoc_insertion_point(builder_scope:OSMPBF.Relation)
- }
-- private byte memoizedIsInitialized = 2;
-- @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-- protected final java.lang.Object dynamicMethod(
-+ private byte memoizedIsInitialized = -1;
-+ protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-- java.lang.Object arg0, java.lang.Object arg1) {
-+ Object arg0, Object arg1) {
- switch (method) {
- case NEW_MUTABLE_INSTANCE: {
- return new org.openstreetmap.osmosis.osmbinary.Osmformat.Relation();
-@@ -13411,8 +13181,12 @@ public final class Osmformat {
-
- boolean shouldMemoize = ((Boolean) arg0).booleanValue();
- if (!hasId()) {
-+ if (shouldMemoize) {
-+ memoizedIsInitialized = 0;
-+ }
- return null;
- }
-+ if (shouldMemoize) memoizedIsInitialized = 1;
- return DEFAULT_INSTANCE;
-
- }
-@@ -13450,9 +13224,6 @@ public final class Osmformat {
- (com.google.protobuf.CodedInputStream) arg0;
- com.google.protobuf.ExtensionRegistryLite extensionRegistry =
- (com.google.protobuf.ExtensionRegistryLite) arg1;
-- if (extensionRegistry == null) {
-- throw new java.lang.NullPointerException();
-- }
- try {
- boolean done = false;
- while (!done) {
-@@ -13613,7 +13384,6 @@ public final class Osmformat {
- } finally {
- }
- }
-- // fall through
- case GET_DEFAULT_INSTANCE: {
- return DEFAULT_INSTANCE;
- }
-@@ -13625,14 +13395,7 @@ public final class Osmformat {
- }
- }
- return PARSER;
-- }
-- case GET_MEMOIZED_IS_INITIALIZED: {
-- return memoizedIsInitialized;
-- }
-- case SET_MEMOIZED_IS_INITIALIZED: {
-- memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
-- return null;
-- }
-+ }
- }
- throw new UnsupportedOperationException();
- }
=====================================
debian/patches/revert-protobuf-3.6.1-changes.patch deleted
=====================================
The diff for this file was not included because it is too large.
=====================================
debian/patches/series
=====================================
@@ -2,5 +2,3 @@
02-fix_plexus.patch
04-osmosis-version.patch
disable-netty3.patch
-revert-protobuf-3.6.1-changes.patch
-protobuf-3.0.0.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/compare/237814c3a0156b7cb3e17907124ac840456e3dc8...77f207735d63337172a5c3153edd7aa48352645f
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/compare/237814c3a0156b7cb3e17907124ac840456e3dc8...77f207735d63337172a5c3153edd7aa48352645f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181012/3efb7525/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list