forked from apache/pulsar
-
Notifications
You must be signed in to change notification settings - Fork 0
/
protobuf.patch
1170 lines (1126 loc) · 59 KB
/
protobuf.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/src/google/protobuf/compiler/java/java_enum.cc b/src/google/protobuf/compiler/java/java_enum.cc
index 9d7bcab6..71c4ab70 100644
--- a/src/google/protobuf/compiler/java/java_enum.cc
+++ b/src/google/protobuf/compiler/java/java_enum.cc
@@ -70,12 +70,12 @@ void EnumGenerator::Generate(io::Printer* printer) {
if (HasDescriptorMethods(descriptor_)) {
printer->Print(
"public enum $classname$\n"
- " implements com.google.protobuf.ProtocolMessageEnum {\n",
+ " implements org.apache.pulsar.shaded.com.google.protobuf.v241.ProtocolMessageEnum {\n",
"classname", descriptor_->name());
} else {
printer->Print(
"public enum $classname$\n"
- " implements com.google.protobuf.Internal.EnumLite {\n",
+ " implements org.apache.pulsar.shaded.com.google.protobuf.v241.Internal.EnumLite {\n",
"classname", descriptor_->name());
}
printer->Indent();
@@ -139,13 +139,13 @@ void EnumGenerator::Generate(io::Printer* printer) {
" }\n"
"}\n"
"\n"
- "public static com.google.protobuf.Internal.EnumLiteMap<$classname$>\n"
+ "public static org.apache.pulsar.shaded.com.google.protobuf.v241.Internal.EnumLiteMap<$classname$>\n"
" internalGetValueMap() {\n"
" return internalValueMap;\n"
"}\n"
- "private static com.google.protobuf.Internal.EnumLiteMap<$classname$>\n"
+ "private static org.apache.pulsar.shaded.com.google.protobuf.v241.Internal.EnumLiteMap<$classname$>\n"
" internalValueMap =\n"
- " new com.google.protobuf.Internal.EnumLiteMap<$classname$>() {\n"
+ " new org.apache.pulsar.shaded.com.google.protobuf.v241.Internal.EnumLiteMap<$classname$>() {\n"
" public $classname$ findValueByNumber(int number) {\n"
" return $classname$.valueOf(number);\n"
" }\n"
@@ -158,15 +158,15 @@ void EnumGenerator::Generate(io::Printer* printer) {
if (HasDescriptorMethods(descriptor_)) {
printer->Print(
- "public final com.google.protobuf.Descriptors.EnumValueDescriptor\n"
+ "public final org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.EnumValueDescriptor\n"
" getValueDescriptor() {\n"
" return getDescriptor().getValues().get(index);\n"
"}\n"
- "public final com.google.protobuf.Descriptors.EnumDescriptor\n"
+ "public final org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.EnumDescriptor\n"
" getDescriptorForType() {\n"
" return getDescriptor();\n"
"}\n"
- "public static final com.google.protobuf.Descriptors.EnumDescriptor\n"
+ "public static final org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.EnumDescriptor\n"
" getDescriptor() {\n");
// TODO(kenton): Cache statically? Note that we can't access descriptors
@@ -201,7 +201,7 @@ void EnumGenerator::Generate(io::Printer* printer) {
"};\n"
"\n"
"public static $classname$ valueOf(\n"
- " com.google.protobuf.Descriptors.EnumValueDescriptor desc) {\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.EnumValueDescriptor desc) {\n"
" if (desc.getType() != getDescriptor()) {\n"
" throw new java.lang.IllegalArgumentException(\n"
" \"EnumValueDescriptor is not for this type.\");\n"
diff --git a/src/google/protobuf/compiler/java/java_enum_field.cc b/src/google/protobuf/compiler/java/java_enum_field.cc
index 72caa10b..fb7ef574 100644
--- a/src/google/protobuf/compiler/java/java_enum_field.cc
+++ b/src/google/protobuf/compiler/java/java_enum_field.cc
@@ -227,7 +227,7 @@ void EnumFieldGenerator::
GenerateSerializedSizeCode(io::Printer* printer) const {
printer->Print(variables_,
"if ($get_has_field_bit_message$) {\n"
- " size += com.google.protobuf.CodedOutputStream\n"
+ " size += org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream\n"
" .computeEnumSize($number$, $name$_.getNumber());\n"
"}\n");
}
@@ -484,7 +484,7 @@ GenerateSerializedSizeCode(io::Printer* printer) const {
printer->Print(variables_,
"for (int i = 0; i < $name$_.size(); i++) {\n"
- " dataSize += com.google.protobuf.CodedOutputStream\n"
+ " dataSize += org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream\n"
" .computeEnumSizeNoTag($name$_.get(i).getNumber());\n"
"}\n");
printer->Print(
@@ -493,7 +493,7 @@ GenerateSerializedSizeCode(io::Printer* printer) const {
printer->Print(variables_,
"if (!get$capitalized_name$List().isEmpty()) {"
" size += $tag_size$;\n"
- " size += com.google.protobuf.CodedOutputStream\n"
+ " size += org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream\n"
" .computeRawVarint32Size(dataSize);\n"
"}");
} else {
diff --git a/src/google/protobuf/compiler/java/java_extension.cc b/src/google/protobuf/compiler/java/java_extension.cc
index 9b147c77..99846474 100644
--- a/src/google/protobuf/compiler/java/java_extension.cc
+++ b/src/google/protobuf/compiler/java/java_extension.cc
@@ -137,9 +137,9 @@ void ExtensionGenerator::Generate(io::Printer* printer) {
printer->Print(
vars,
"public static final\n"
- " com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage.GeneratedExtension<\n"
" $containing_type$,\n"
- " $type$> $name$ = com.google.protobuf.GeneratedMessage\n"
+ " $type$> $name$ = org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage\n"
" .newFileScopedGeneratedExtension(\n"
" $singular_type$.class,\n"
" $prototype$);\n");
@@ -148,9 +148,9 @@ void ExtensionGenerator::Generate(io::Printer* printer) {
printer->Print(
vars,
"public static final\n"
- " com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage.GeneratedExtension<\n"
" $containing_type$,\n"
- " $type$> $name$ = com.google.protobuf.GeneratedMessage\n"
+ " $type$> $name$ = org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage\n"
" .newMessageScopedGeneratedExtension(\n"
" $scope$.getDefaultInstance(),\n"
" $index$,\n"
@@ -163,30 +163,30 @@ void ExtensionGenerator::Generate(io::Printer* printer) {
printer->Print(
vars,
"public static final\n"
- " com.google.protobuf.GeneratedMessageLite.GeneratedExtension<\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessageLite.GeneratedExtension<\n"
" $containing_type$,\n"
- " $type$> $name$ = com.google.protobuf.GeneratedMessageLite\n"
+ " $type$> $name$ = org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessageLite\n"
" .newRepeatedGeneratedExtension(\n"
" $containing_type$.getDefaultInstance(),\n"
" $prototype$,\n"
" $enum_map$,\n"
" $number$,\n"
- " com.google.protobuf.WireFormat.FieldType.$type_constant$,\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.WireFormat.FieldType.$type_constant$,\n"
" $packed$);\n");
} else {
printer->Print(
vars,
"public static final\n"
- " com.google.protobuf.GeneratedMessageLite.GeneratedExtension<\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessageLite.GeneratedExtension<\n"
" $containing_type$,\n"
- " $type$> $name$ = com.google.protobuf.GeneratedMessageLite\n"
+ " $type$> $name$ = org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessageLite\n"
" .newSingularGeneratedExtension(\n"
" $containing_type$.getDefaultInstance(),\n"
" $default$,\n"
" $prototype$,\n"
" $enum_map$,\n"
" $number$,\n"
- " com.google.protobuf.WireFormat.FieldType.$type_constant$);\n");
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.WireFormat.FieldType.$type_constant$);\n");
}
}
}
diff --git a/src/google/protobuf/compiler/java/java_file.cc b/src/google/protobuf/compiler/java/java_file.cc
index 8968069f..86620b74 100644
--- a/src/google/protobuf/compiler/java/java_file.cc
+++ b/src/google/protobuf/compiler/java/java_file.cc
@@ -155,7 +155,7 @@ void FileGenerator::Generate(io::Printer* printer) {
printer->Print(
"public static void registerAllExtensions(\n"
- " com.google.protobuf.ExtensionRegistry$lite$ registry) {\n",
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistry$lite$ registry) {\n",
"lite", HasDescriptorMethods(file_) ? "" : "Lite");
printer->Indent();
@@ -249,11 +249,11 @@ void FileGenerator::GenerateEmbeddedDescriptor(io::Printer* printer) {
file_proto.SerializeToString(&file_data);
printer->Print(
- "public static com.google.protobuf.Descriptors.FileDescriptor\n"
+ "public static org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.FileDescriptor\n"
" getDescriptor() {\n"
" return descriptor;\n"
"}\n"
- "private static com.google.protobuf.Descriptors.FileDescriptor\n"
+ "private static org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.FileDescriptor\n"
" descriptor;\n"
"static {\n"
" java.lang.String[] descriptorData = {\n");
@@ -283,12 +283,12 @@ void FileGenerator::GenerateEmbeddedDescriptor(io::Printer* printer) {
// Create the InternalDescriptorAssigner.
printer->Print(
- "com.google.protobuf.Descriptors.FileDescriptor."
+ "org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.FileDescriptor."
"InternalDescriptorAssigner assigner =\n"
- " new com.google.protobuf.Descriptors.FileDescriptor."
+ " new org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.FileDescriptor."
"InternalDescriptorAssigner() {\n"
- " public com.google.protobuf.ExtensionRegistry assignDescriptors(\n"
- " com.google.protobuf.Descriptors.FileDescriptor root) {\n"
+ " public org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistry assignDescriptors(\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.FileDescriptor root) {\n"
" descriptor = root;\n");
printer->Indent();
@@ -310,8 +310,8 @@ void FileGenerator::GenerateEmbeddedDescriptor(io::Printer* printer) {
// Must construct an ExtensionRegistry containing all possible extensions
// and return it.
printer->Print(
- "com.google.protobuf.ExtensionRegistry registry =\n"
- " com.google.protobuf.ExtensionRegistry.newInstance();\n"
+ "org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistry registry =\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistry.newInstance();\n"
"registerAllExtensions(registry);\n");
for (int i = 0; i < file_->dependency_count(); i++) {
if (ShouldIncludeDependency(file_->dependency(i))) {
@@ -339,9 +339,9 @@ void FileGenerator::GenerateEmbeddedDescriptor(io::Printer* printer) {
// Invoke internalBuildGeneratedFileFrom() to build the file.
printer->Print(
- "com.google.protobuf.Descriptors.FileDescriptor\n"
+ "org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.FileDescriptor\n"
" .internalBuildGeneratedFileFrom(descriptorData,\n"
- " new com.google.protobuf.Descriptors.FileDescriptor[] {\n");
+ " new org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.FileDescriptor[] {\n");
for (int i = 0; i < file_->dependency_count(); i++) {
if (ShouldIncludeDependency(file_->dependency(i))) {
diff --git a/src/google/protobuf/compiler/java/java_helpers.cc b/src/google/protobuf/compiler/java/java_helpers.cc
index 1b6f1653..25a6e300 100644
--- a/src/google/protobuf/compiler/java/java_helpers.cc
+++ b/src/google/protobuf/compiler/java/java_helpers.cc
@@ -248,7 +248,7 @@ const char* BoxedPrimitiveTypeName(JavaType type) {
case JAVATYPE_DOUBLE : return "java.lang.Double";
case JAVATYPE_BOOLEAN: return "java.lang.Boolean";
case JAVATYPE_STRING : return "java.lang.String";
- case JAVATYPE_BYTES : return "com.google.protobuf.ByteString";
+ case JAVATYPE_BYTES : return "org.apache.pulsar.shaded.com.google.protobuf.v241.ByteString";
case JAVATYPE_ENUM : return NULL;
case JAVATYPE_MESSAGE: return NULL;
@@ -314,10 +314,10 @@ string DefaultValue(const FieldDescriptor* field) {
if (field->has_default_value()) {
// See comments in Internal.java for gory details.
return strings::Substitute(
- "com.google.protobuf.Internal.bytesDefaultValue(\"$0\")",
+ "org.apache.pulsar.shaded.com.google.protobuf.v241.Internal.bytesDefaultValue(\"$0\")",
CEscape(field->default_value_string()));
} else {
- return "com.google.protobuf.ByteString.EMPTY";
+ return "org.apache.pulsar.shaded.com.google.protobuf.v241.ByteString.EMPTY";
}
} else {
if (AllAscii(field->default_value_string())) {
@@ -326,7 +326,7 @@ string DefaultValue(const FieldDescriptor* field) {
} else {
// See comments in Internal.java for gory details.
return strings::Substitute(
- "com.google.protobuf.Internal.stringDefaultValue(\"$0\")",
+ "org.apache.pulsar.shaded.com.google.protobuf.v241.Internal.stringDefaultValue(\"$0\")",
CEscape(field->default_value_string()));
}
}
diff --git a/src/google/protobuf/compiler/java/java_message.cc b/src/google/protobuf/compiler/java/java_message.cc
index 4c087db5..3ae1c14c 100644
--- a/src/google/protobuf/compiler/java/java_message.cc
+++ b/src/google/protobuf/compiler/java/java_message.cc
@@ -155,7 +155,7 @@ MessageGenerator::~MessageGenerator() {}
void MessageGenerator::GenerateStaticVariables(io::Printer* printer) {
if (HasDescriptorMethods(descriptor_)) {
- // Because descriptor.proto (com.google.protobuf.DescriptorProtos) is
+ // Because descriptor.proto (org.apache.pulsar.shaded.com.google.protobuf.v241.DescriptorProtos) is
// used in the construction of descriptors, we have a tricky bootstrapping
// problem. To help control static initialization order, we make sure all
// descriptors and other static data that depends on them are members of
@@ -180,13 +180,13 @@ void MessageGenerator::GenerateStaticVariables(io::Printer* printer) {
// The descriptor for this type.
printer->Print(vars,
- "$private$static com.google.protobuf.Descriptors.Descriptor\n"
+ "$private$static org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.Descriptor\n"
" internal_$identifier$_descriptor;\n");
// And the FieldAccessorTable.
printer->Print(vars,
"$private$static\n"
- " com.google.protobuf.GeneratedMessage.FieldAccessorTable\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage.FieldAccessorTable\n"
" internal_$identifier$_fieldAccessorTable;\n");
}
@@ -224,7 +224,7 @@ void MessageGenerator::GenerateStaticVariableInitializers(
// And the FieldAccessorTable.
printer->Print(vars,
"internal_$identifier$_fieldAccessorTable = new\n"
- " com.google.protobuf.GeneratedMessage.FieldAccessorTable(\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage.FieldAccessorTable(\n"
" internal_$identifier$_descriptor,\n"
" new java.lang.String[] { ");
for (int i = 0; i < descriptor_->field_count(); i++) {
@@ -255,13 +255,13 @@ void MessageGenerator::GenerateInterface(io::Printer* printer) {
if (HasDescriptorMethods(descriptor_)) {
printer->Print(
"public interface $classname$OrBuilder extends\n"
- " com.google.protobuf.GeneratedMessage.\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage.\n"
" ExtendableMessageOrBuilder<$classname$> {\n",
"classname", descriptor_->name());
} else {
printer->Print(
"public interface $classname$OrBuilder extends \n"
- " com.google.protobuf.GeneratedMessageLite.\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessageLite.\n"
" ExtendableMessageOrBuilder<$classname$> {\n",
"classname", descriptor_->name());
}
@@ -269,12 +269,12 @@ void MessageGenerator::GenerateInterface(io::Printer* printer) {
if (HasDescriptorMethods(descriptor_)) {
printer->Print(
"public interface $classname$OrBuilder\n"
- " extends com.google.protobuf.MessageOrBuilder {\n",
+ " extends org.apache.pulsar.shaded.com.google.protobuf.v241.MessageOrBuilder {\n",
"classname", descriptor_->name());
} else {
printer->Print(
"public interface $classname$OrBuilder\n"
- " extends com.google.protobuf.MessageLiteOrBuilder {\n",
+ " extends org.apache.pulsar.shaded.com.google.protobuf.v241.MessageLiteOrBuilder {\n",
"classname", descriptor_->name());
}
}
@@ -302,15 +302,15 @@ void MessageGenerator::Generate(io::Printer* printer) {
if (HasDescriptorMethods(descriptor_)) {
printer->Print(
"public $static$ final class $classname$ extends\n"
- " com.google.protobuf.GeneratedMessage.ExtendableMessage<\n"
- " $classname$> implements $classname$OrBuilder {\n",
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage.ExtendableMessage<\n"
+ " $classname$> implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage {\n",
"static", is_own_file ? "" : "static",
"classname", descriptor_->name());
} else {
printer->Print(
"public $static$ final class $classname$ extends\n"
- " com.google.protobuf.GeneratedMessageLite.ExtendableMessage<\n"
- " $classname$> implements $classname$OrBuilder {\n",
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessageLite.ExtendableMessage<\n"
+ " $classname$> implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage {\n",
"static", is_own_file ? "" : "static",
"classname", descriptor_->name());
}
@@ -318,25 +318,57 @@ void MessageGenerator::Generate(io::Printer* printer) {
if (HasDescriptorMethods(descriptor_)) {
printer->Print(
"public $static$ final class $classname$ extends\n"
- " com.google.protobuf.GeneratedMessage\n"
- " implements $classname$OrBuilder {\n",
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage\n"
+ " implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage {\n",
"static", is_own_file ? "" : "static",
"classname", descriptor_->name());
} else {
printer->Print(
"public $static$ final class $classname$ extends\n"
- " com.google.protobuf.GeneratedMessageLite\n"
- " implements $classname$OrBuilder {\n",
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessageLite\n"
+ " implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage {\n",
"static", is_own_file ? "" : "static",
"classname", descriptor_->name());
}
}
+
+ // Integers for bit fields.
+ int totalBits = 0;
+ for (int i = 0; i < descriptor_->field_count(); i++) {
+ totalBits += field_generators_.get(descriptor_->field(i))
+ .GetNumBitsForMessage();
+ }
+ int totalInts = (totalBits + 31) / 32;
+
printer->Indent();
printer->Print(
"// Use $classname$.newBuilder() to construct.\n"
- "private $classname$(Builder builder) {\n"
- " super(builder);\n"
+ "private io.netty.util.Recycler.Handle handle;\n"
+ "private $classname$(io.netty.util.Recycler.Handle handle) {\n"
+ " this.handle = handle;\n"
"}\n"
+ "\n"
+ " private static final io.netty.util.Recycler<$classname$> RECYCLER = new io.netty.util.Recycler<$classname$>() {\n"
+ " protected $classname$ newObject(Handle handle) {\n"
+ " return new $classname$(handle);\n"
+ " }\n"
+ " };\n"
+ " \n"
+ " public void recycle() {\n"
+ " this.initFields();\n"
+ " this.memoizedIsInitialized = -1;\n",
+ "classname", descriptor_->name());
+
+ for (int i = 0; i < totalInts; i++) {
+ printer->Print(" this.$bit_field_name$ = 0;\n",
+ "bit_field_name", GetBitFieldName(i));
+ }
+
+ printer->Print(
+ " this.memoizedSerializedSize = -1;\n"
+ " if (handle != null) { RECYCLER.recycle(this, handle); }\n"
+ " }\n"
+ " \n"
// Used when constructing the default instance, which cannot be initialized
// immediately because it may cyclically refer to other default instances.
"private $classname$(boolean noInit) {}\n"
@@ -365,13 +397,6 @@ void MessageGenerator::Generate(io::Printer* printer) {
messageGenerator.Generate(printer);
}
- // Integers for bit fields.
- int totalBits = 0;
- for (int i = 0; i < descriptor_->field_count(); i++) {
- totalBits += field_generators_.get(descriptor_->field(i))
- .GetNumBitsForMessage();
- }
- int totalInts = (totalBits + 31) / 32;
for (int i = 0; i < totalInts; i++) {
printer->Print("private int $bit_field_name$;\n",
"bit_field_name", GetBitFieldName(i));
@@ -450,7 +475,12 @@ GenerateMessageSerializationMethods(io::Printer* printer) {
ExtensionRangeOrdering());
printer->Print(
- "public void writeTo(com.google.protobuf.CodedOutputStream output)\n"
+ "public void writeTo(org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream output)\n"
+ " throws java.io.IOException {\n"
+ " throw new RuntimeException(\"Cannot use CodedOutputStream\");\n"
+ "}\n\n"
+
+ "public void writeTo(org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream output)\n"
" throws java.io.IOException {\n");
printer->Indent();
// writeTo(CodedOutputStream output) might be invoked without
@@ -465,14 +495,14 @@ GenerateMessageSerializationMethods(io::Printer* printer) {
if (descriptor_->extension_range_count() > 0) {
if (descriptor_->options().message_set_wire_format()) {
printer->Print(
- "com.google.protobuf.GeneratedMessage$lite$\n"
+ "org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage$lite$\n"
" .ExtendableMessage<$classname$>.ExtensionWriter extensionWriter =\n"
" newMessageSetExtensionWriter();\n",
"lite", HasDescriptorMethods(descriptor_) ? "" : "Lite",
"classname", ClassName(descriptor_));
} else {
printer->Print(
- "com.google.protobuf.GeneratedMessage$lite$\n"
+ "org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage$lite$\n"
" .ExtendableMessage<$classname$>.ExtensionWriter extensionWriter =\n"
" newExtensionWriter();\n",
"lite", HasDescriptorMethods(descriptor_) ? "" : "Lite",
@@ -565,25 +595,27 @@ GenerateParseFromMethods(io::Printer* printer) {
// for code size.
printer->Print(
"public static $classname$ parseFrom(\n"
- " com.google.protobuf.ByteString data)\n"
- " throws com.google.protobuf.InvalidProtocolBufferException {\n"
- " return newBuilder().mergeFrom(data).buildParsed();\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.ByteString data)\n"
+ " throws org.apache.pulsar.shaded.com.google.protobuf.v241.InvalidProtocolBufferException {\n"
+ // " return newBuilder().mergeFrom(data).buildParsed();\n"
+ " throw new RuntimeException(\"Disabled\");\n"
"}\n"
"public static $classname$ parseFrom(\n"
- " com.google.protobuf.ByteString data,\n"
- " com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
- " throws com.google.protobuf.InvalidProtocolBufferException {\n"
- " return newBuilder().mergeFrom(data, extensionRegistry)\n"
- " .buildParsed();\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.ByteString data,\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)\n"
+ " throws org.apache.pulsar.shaded.com.google.protobuf.v241.InvalidProtocolBufferException {\n"
+ // " return newBuilder().mergeFrom(data, extensionRegistry)\n"
+ // " .buildParsed();\n"
+ " throw new RuntimeException(\"Disabled\");\n"
"}\n"
"public static $classname$ parseFrom(byte[] data)\n"
- " throws com.google.protobuf.InvalidProtocolBufferException {\n"
+ " throws org.apache.pulsar.shaded.com.google.protobuf.v241.InvalidProtocolBufferException {\n"
" return newBuilder().mergeFrom(data).buildParsed();\n"
"}\n"
"public static $classname$ parseFrom(\n"
" byte[] data,\n"
- " com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
- " throws com.google.protobuf.InvalidProtocolBufferException {\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)\n"
+ " throws org.apache.pulsar.shaded.com.google.protobuf.v241.InvalidProtocolBufferException {\n"
" return newBuilder().mergeFrom(data, extensionRegistry)\n"
" .buildParsed();\n"
"}\n"
@@ -593,7 +625,7 @@ GenerateParseFromMethods(io::Printer* printer) {
"}\n"
"public static $classname$ parseFrom(\n"
" java.io.InputStream input,\n"
- " com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)\n"
" throws java.io.IOException {\n"
" return newBuilder().mergeFrom(input, extensionRegistry)\n"
" .buildParsed();\n"
@@ -609,7 +641,7 @@ GenerateParseFromMethods(io::Printer* printer) {
"}\n"
"public static $classname$ parseDelimitedFrom(\n"
" java.io.InputStream input,\n"
- " com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)\n"
" throws java.io.IOException {\n"
" Builder builder = newBuilder();\n"
" if (builder.mergeDelimitedFrom(input, extensionRegistry)) {\n"
@@ -619,13 +651,13 @@ GenerateParseFromMethods(io::Printer* printer) {
" }\n"
"}\n"
"public static $classname$ parseFrom(\n"
- " com.google.protobuf.CodedInputStream input)\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.CodedInputStream input)\n"
" throws java.io.IOException {\n"
" return newBuilder().mergeFrom(input).buildParsed();\n"
"}\n"
"public static $classname$ parseFrom(\n"
- " com.google.protobuf.CodedInputStream input,\n"
- " com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.CodedInputStream input,\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)\n"
" throws java.io.IOException {\n"
" return newBuilder().mergeFrom(input, extensionRegistry)\n"
" .buildParsed();\n"
@@ -663,7 +695,7 @@ void MessageGenerator::GenerateBuilder(io::Printer* printer) {
printer->Print(
"@java.lang.Override\n"
"protected Builder newBuilderForType(\n"
- " com.google.protobuf.GeneratedMessage.BuilderParent parent) {\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage.BuilderParent parent) {\n"
" Builder builder = new Builder(parent);\n"
" return builder;\n"
"}\n");
@@ -673,29 +705,29 @@ void MessageGenerator::GenerateBuilder(io::Printer* printer) {
if (HasDescriptorMethods(descriptor_)) {
printer->Print(
"public static final class Builder extends\n"
- " com.google.protobuf.GeneratedMessage.ExtendableBuilder<\n"
- " $classname$, Builder> implements $classname$OrBuilder {\n",
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage.ExtendableBuilder<\n"
+ " $classname$, Builder> implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder {\n",
"classname", ClassName(descriptor_));
} else {
printer->Print(
"public static final class Builder extends\n"
- " com.google.protobuf.GeneratedMessageLite.ExtendableBuilder<\n"
- " $classname$, Builder> implements $classname$OrBuilder {\n",
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessageLite.ExtendableBuilder<\n"
+ " $classname$, Builder> implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder {\n",
"classname", ClassName(descriptor_));
}
} else {
if (HasDescriptorMethods(descriptor_)) {
printer->Print(
"public static final class Builder extends\n"
- " com.google.protobuf.GeneratedMessage.Builder<Builder>\n"
- " implements $classname$OrBuilder {\n",
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage.Builder<Builder>\n"
+ " implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder {\n",
"classname", ClassName(descriptor_));
} else {
printer->Print(
"public static final class Builder extends\n"
- " com.google.protobuf.GeneratedMessageLite.Builder<\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessageLite.Builder<\n"
" $classname$, Builder>\n"
- " implements $classname$OrBuilder {\n",
+ " implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder {\n",
"classname", ClassName(descriptor_));
}
}
@@ -740,12 +772,12 @@ void MessageGenerator::GenerateBuilder(io::Printer* printer) {
void MessageGenerator::GenerateDescriptorMethods(io::Printer* printer) {
if (HasDescriptorMethods(descriptor_)) {
printer->Print(
- "public static final com.google.protobuf.Descriptors.Descriptor\n"
+ "public static final org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.Descriptor\n"
" getDescriptor() {\n"
" return $fileclass$.internal_$identifier$_descriptor;\n"
"}\n"
"\n"
- "protected com.google.protobuf.GeneratedMessage.FieldAccessorTable\n"
+ "protected org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage.FieldAccessorTable\n"
" internalGetFieldAccessorTable() {\n"
" return $fileclass$.internal_$identifier$_fieldAccessorTable;\n"
"}\n"
@@ -760,9 +792,21 @@ void MessageGenerator::GenerateDescriptorMethods(io::Printer* printer) {
void MessageGenerator::GenerateCommonBuilderMethods(io::Printer* printer) {
printer->Print(
"// Construct using $classname$.newBuilder()\n"
- "private Builder() {\n"
+ "private final io.netty.util.Recycler.Handle handle;\n"
+ "private Builder(io.netty.util.Recycler.Handle handle) {\n"
+ " this.handle = handle;\n"
" maybeForceBuilderInitialization();\n"
"}\n"
+ "private final static io.netty.util.Recycler<Builder> RECYCLER = new io.netty.util.Recycler<Builder>() {\n"
+ " protected Builder newObject(io.netty.util.Recycler.Handle handle) {\n"
+ " return new Builder(handle);\n"
+ " }\n"
+ " };\n"
+ "\n"
+ " public void recycle() {\n"
+ " clear();\n"
+ " if (handle != null) {RECYCLER.recycle(this, handle);}\n"
+ " }\n"
"\n",
"classname", ClassName(descriptor_));
@@ -779,7 +823,7 @@ void MessageGenerator::GenerateCommonBuilderMethods(io::Printer* printer) {
if (HasNestedBuilders(descriptor_)) {
printer->Print(
"private void maybeForceBuilderInitialization() {\n"
- " if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {\n");
+ " if (org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage.alwaysUseFieldBuilders) {\n");
printer->Indent();
printer->Indent();
@@ -801,7 +845,8 @@ void MessageGenerator::GenerateCommonBuilderMethods(io::Printer* printer) {
printer->Print(
"private static Builder create() {\n"
- " return new Builder();\n"
+ " return RECYCLER.get();\n"
+ // " return new Builder(null);\n"
"}\n"
"\n"
"public Builder clear() {\n"
@@ -828,7 +873,7 @@ void MessageGenerator::GenerateCommonBuilderMethods(io::Printer* printer) {
"classname", ClassName(descriptor_));
if (HasDescriptorMethods(descriptor_)) {
printer->Print(
- "public com.google.protobuf.Descriptors.Descriptor\n"
+ "public org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.Descriptor\n"
" getDescriptorForType() {\n"
" return $classname$.getDescriptor();\n"
"}\n"
@@ -854,7 +899,7 @@ void MessageGenerator::GenerateCommonBuilderMethods(io::Printer* printer) {
"}\n"
"\n"
"private $classname$ buildParsed()\n"
- " throws com.google.protobuf.InvalidProtocolBufferException {\n"
+ " throws org.apache.pulsar.shaded.com.google.protobuf.v241.InvalidProtocolBufferException {\n"
" $classname$ result = buildPartial();\n"
" if (!result.isInitialized()) {\n"
" throw newUninitializedMessageException(\n"
@@ -864,7 +909,8 @@ void MessageGenerator::GenerateCommonBuilderMethods(io::Printer* printer) {
"}\n"
"\n"
"public $classname$ buildPartial() {\n"
- " $classname$ result = new $classname$(this);\n",
+ " $classname$ result = $classname$.RECYCLER.get();\n",
+ // " $classname$ result = new $classname$(null);\n",
"classname", ClassName(descriptor_));
printer->Indent();
@@ -922,7 +968,7 @@ void MessageGenerator::GenerateCommonBuilderMethods(io::Printer* printer) {
// messages type by its descriptor.
if (HasDescriptorMethods(descriptor_)) {
printer->Print(
- "public Builder mergeFrom(com.google.protobuf.Message other) {\n"
+ "public Builder mergeFrom(org.apache.pulsar.shaded.com.google.protobuf.v241.Message other) {\n"
" if (other instanceof $classname$) {\n"
" return mergeFrom(($classname$)other);\n"
" } else {\n"
@@ -973,16 +1019,21 @@ void MessageGenerator::GenerateBuilderParsingMethods(io::Printer* printer) {
SortFieldsByNumber(descriptor_));
printer->Print(
+ "public Builder mergeFrom(org.apache.pulsar.shaded.com.google.protobuf.v241.CodedInputStream input,\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)\n"
+ " throws java.io.IOException {\n"
+ " throw new java.io.IOException(\"Merge from CodedInputStream is disabled\");\n"
+ " }\n"
"public Builder mergeFrom(\n"
- " com.google.protobuf.CodedInputStream input,\n"
- " com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
+ " org.apache.pulsar.common.util.protobuf.ByteBufCodedInputStream input,\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)\n"
" throws java.io.IOException {\n");
printer->Indent();
if (HasUnknownFields(descriptor_)) {
printer->Print(
- "com.google.protobuf.UnknownFieldSet.Builder unknownFields =\n"
- " com.google.protobuf.UnknownFieldSet.newBuilder(\n"
+ "org.apache.pulsar.shaded.com.google.protobuf.v241.UnknownFieldSet.Builder unknownFields =\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.UnknownFieldSet.newBuilder(\n"
" this.getUnknownFields());\n");
}
@@ -1017,7 +1068,7 @@ void MessageGenerator::GenerateBuilderParsingMethods(io::Printer* printer) {
" $on_changed$\n"
" return this;\n"
"default: {\n"
- " if (!parseUnknownField(input, extensionRegistry, tag)) {\n"
+ " if (!input.skipField(tag)) {\n"
" $on_changed$\n"
" return this;\n" // it's an endgroup tag
" }\n"
diff --git a/src/google/protobuf/compiler/java/java_message_field.cc b/src/google/protobuf/compiler/java/java_message_field.cc
index 251945af..e19cfa58 100644
--- a/src/google/protobuf/compiler/java/java_message_field.cc
+++ b/src/google/protobuf/compiler/java/java_message_field.cc
@@ -199,7 +199,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
printer->Print(variables_,
// If this builder is non-null, it is used and the other fields are
// ignored.
- "private com.google.protobuf.SingleFieldBuilder<\n"
+ "private org.apache.pulsar.shaded.com.google.protobuf.v241.SingleFieldBuilder<\n"
" $type$, $type$.Builder, $type$OrBuilder> $name$Builder_;"
"\n");
}
@@ -295,11 +295,11 @@ GenerateBuilderMembers(io::Printer* printer) const {
" return $name$_;\n"
" }\n"
"}\n"
- "private com.google.protobuf.SingleFieldBuilder<\n"
+ "private org.apache.pulsar.shaded.com.google.protobuf.v241.SingleFieldBuilder<\n"
" $type$, $type$.Builder, $type$OrBuilder> \n"
" get$capitalized_name$FieldBuilder() {\n"
" if ($name$Builder_ == null) {\n"
- " $name$Builder_ = new com.google.protobuf.SingleFieldBuilder<\n"
+ " $name$Builder_ = new org.apache.pulsar.shaded.com.google.protobuf.v241.SingleFieldBuilder<\n"
" $type$, $type$.Builder, $type$OrBuilder>(\n"
" $name$_,\n"
" getParentForChildren(),\n"
@@ -371,7 +371,8 @@ GenerateParsingCode(io::Printer* printer) const {
}
printer->Print(variables_,
- "set$capitalized_name$(subBuilder.buildPartial());\n");
+ "set$capitalized_name$(subBuilder.buildPartial());\n"
+ "subBuilder.recycle();\n");
}
void MessageFieldGenerator::
@@ -386,7 +387,7 @@ void MessageFieldGenerator::
GenerateSerializedSizeCode(io::Printer* printer) const {
printer->Print(variables_,
"if ($get_has_field_bit_message$) {\n"
- " size += com.google.protobuf.CodedOutputStream\n"
+ " size += org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream\n"
" .compute$group_or_message$Size($number$, $name$_);\n"
"}\n");
}
@@ -543,7 +544,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
printer->Print(variables_,
// If this builder is non-null, it is used and the other fields are
// ignored.
- "private com.google.protobuf.RepeatedFieldBuilder<\n"
+ "private org.apache.pulsar.shaded.com.google.protobuf.v241.RepeatedFieldBuilder<\n"
" $type$, $type$.Builder, $type$OrBuilder> $name$Builder_;\n"
"\n");
}
@@ -738,11 +739,11 @@ GenerateBuilderMembers(io::Printer* printer) const {
" get$capitalized_name$BuilderList() {\n"
" return get$capitalized_name$FieldBuilder().getBuilderList();\n"
"}\n"
- "private com.google.protobuf.RepeatedFieldBuilder<\n"
+ "private org.apache.pulsar.shaded.com.google.protobuf.v241.RepeatedFieldBuilder<\n"
" $type$, $type$.Builder, $type$OrBuilder> \n"
" get$capitalized_name$FieldBuilder() {\n"
" if ($name$Builder_ == null) {\n"
- " $name$Builder_ = new com.google.protobuf.RepeatedFieldBuilder<\n"
+ " $name$Builder_ = new org.apache.pulsar.shaded.com.google.protobuf.v241.RepeatedFieldBuilder<\n"
" $type$, $type$.Builder, $type$OrBuilder>(\n"
" $name$_,\n"
" $get_mutable_bit_builder$,\n"
@@ -801,7 +802,7 @@ GenerateMergingCode(io::Printer* printer) const {
" $name$_ = other.$name$_;\n"
" $clear_mutable_bit_builder$;\n"
" $name$Builder_ = \n"
- " com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessage.alwaysUseFieldBuilders ?\n"
" get$capitalized_name$FieldBuilder() : null;\n"
" } else {\n"
" $name$Builder_.addAllMessages(other.$name$_);\n"
@@ -853,7 +854,7 @@ void RepeatedMessageFieldGenerator::
GenerateSerializedSizeCode(io::Printer* printer) const {
printer->Print(variables_,
"for (int i = 0; i < $name$_.size(); i++) {\n"
- " size += com.google.protobuf.CodedOutputStream\n"
+ " size += org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream\n"
" .compute$group_or_message$Size($number$, $name$_.get(i));\n"
"}\n");
}
diff --git a/src/google/protobuf/compiler/java/java_primitive_field.cc b/src/google/protobuf/compiler/java/java_primitive_field.cc
index addb8819..3d72a15d 100644
--- a/src/google/protobuf/compiler/java/java_primitive_field.cc
+++ b/src/google/protobuf/compiler/java/java_primitive_field.cc
@@ -60,7 +60,7 @@ const char* PrimitiveTypeName(JavaType type) {
case JAVATYPE_DOUBLE : return "double";
case JAVATYPE_BOOLEAN: return "boolean";
case JAVATYPE_STRING : return "java.lang.String";
- case JAVATYPE_BYTES : return "com.google.protobuf.ByteString";
+ case JAVATYPE_BYTES : return "org.apache.pulsar.shaded.com.google.protobuf.v241.ByteString";
case JAVATYPE_ENUM : return NULL;
case JAVATYPE_MESSAGE: return NULL;
@@ -351,7 +351,7 @@ void PrimitiveFieldGenerator::
GenerateSerializedSizeCode(io::Printer* printer) const {
printer->Print(variables_,
"if ($get_has_field_bit_message$) {\n"
- " size += com.google.protobuf.CodedOutputStream\n"
+ " size += org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream\n"
" .compute$capitalized_type$Size($number$, $name$_);\n"
"}\n");
}
@@ -660,7 +660,7 @@ GenerateSerializedSizeCode(io::Printer* printer) const {
if (FixedSize(GetType(descriptor_)) == -1) {
printer->Print(variables_,
"for (int i = 0; i < $name$_.size(); i++) {\n"
- " dataSize += com.google.protobuf.CodedOutputStream\n"
+ " dataSize += org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream\n"
" .compute$capitalized_type$SizeNoTag($name$_.get(i));\n"
"}\n");
} else {
@@ -675,7 +675,7 @@ GenerateSerializedSizeCode(io::Printer* printer) const {
printer->Print(variables_,
"if (!get$capitalized_name$List().isEmpty()) {\n"
" size += $tag_size$;\n"
- " size += com.google.protobuf.CodedOutputStream\n"
+ " size += org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream\n"
" .computeInt32SizeNoTag(dataSize);\n"
"}\n");
} else {
diff --git a/src/google/protobuf/compiler/java/java_service.cc b/src/google/protobuf/compiler/java/java_service.cc
index 1ae4f461..831aec03 100644
--- a/src/google/protobuf/compiler/java/java_service.cc
+++ b/src/google/protobuf/compiler/java/java_service.cc
@@ -52,7 +52,7 @@ void ServiceGenerator::Generate(io::Printer* printer) {
bool is_own_file = descriptor_->file()->options().java_multiple_files();
printer->Print(
"public $static$ abstract class $classname$\n"
- " implements com.google.protobuf.Service {\n",
+ " implements org.apache.pulsar.shaded.com.google.protobuf.v241.Service {\n",
"static", is_own_file ? "" : "static",
"classname", descriptor_->name());
printer->Indent();
@@ -71,7 +71,7 @@ void ServiceGenerator::Generate(io::Printer* printer) {
// Generate getDescriptor() and getDescriptorForType().
printer->Print(
"public static final\n"
- " com.google.protobuf.Descriptors.ServiceDescriptor\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.ServiceDescriptor\n"
" getDescriptor() {\n"
" return $file$.getDescriptor().getServices().get($index$);\n"
"}\n",
@@ -92,7 +92,7 @@ void ServiceGenerator::Generate(io::Printer* printer) {
void ServiceGenerator::GenerateGetDescriptorForType(io::Printer* printer) {
printer->Print(
- "public final com.google.protobuf.Descriptors.ServiceDescriptor\n"
+ "public final org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.ServiceDescriptor\n"
" getDescriptorForType() {\n"
" return getDescriptor();\n"
"}\n");
@@ -109,7 +109,7 @@ void ServiceGenerator::GenerateInterface(io::Printer* printer) {
void ServiceGenerator::GenerateNewReflectiveServiceMethod(
io::Printer* printer) {
printer->Print(
- "public static com.google.protobuf.Service newReflectiveService(\n"
+ "public static org.apache.pulsar.shaded.com.google.protobuf.v241.Service newReflectiveService(\n"
" final Interface impl) {\n"
" return new $classname$() {\n",
"classname", descriptor_->name());
@@ -136,9 +136,9 @@ void ServiceGenerator::GenerateNewReflectiveServiceMethod(
void ServiceGenerator::GenerateNewReflectiveBlockingServiceMethod(
io::Printer* printer) {
printer->Print(
- "public static com.google.protobuf.BlockingService\n"
+ "public static org.apache.pulsar.shaded.com.google.protobuf.v241.BlockingService\n"
" newReflectiveBlockingService(final BlockingInterface impl) {\n"
- " return new com.google.protobuf.BlockingService() {\n");
+ " return new org.apache.pulsar.shaded.com.google.protobuf.v241.BlockingService() {\n");
printer->Indent();
printer->Indent();
@@ -166,11 +166,11 @@ void ServiceGenerator::GenerateCallMethod(io::Printer* printer) {
printer->Print(
"\n"
"public final void callMethod(\n"
- " com.google.protobuf.Descriptors.MethodDescriptor method,\n"
- " com.google.protobuf.RpcController controller,\n"
- " com.google.protobuf.Message request,\n"
- " com.google.protobuf.RpcCallback<\n"
- " com.google.protobuf.Message> done) {\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.MethodDescriptor method,\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.RpcController controller,\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.Message request,\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.RpcCallback<\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.Message> done) {\n"
" if (method.getService() != getDescriptor()) {\n"
" throw new java.lang.IllegalArgumentException(\n"
" \"Service.callMethod() given method descriptor for wrong \" +\n"
@@ -190,7 +190,7 @@ void ServiceGenerator::GenerateCallMethod(io::Printer* printer) {
printer->Print(vars,
"case $index$:\n"
" this.$method$(controller, ($input$)request,\n"
- " com.google.protobuf.RpcUtil.<$output$>specializeCallback(\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.RpcUtil.<$output$>specializeCallback(\n"
" done));\n"
" return;\n");
}
@@ -211,11 +211,11 @@ void ServiceGenerator::GenerateCallMethod(io::Printer* printer) {
void ServiceGenerator::GenerateCallBlockingMethod(io::Printer* printer) {
printer->Print(
"\n"
- "public final com.google.protobuf.Message callBlockingMethod(\n"
- " com.google.protobuf.Descriptors.MethodDescriptor method,\n"
- " com.google.protobuf.RpcController controller,\n"
- " com.google.protobuf.Message request)\n"
- " throws com.google.protobuf.ServiceException {\n"
+ "public final org.apache.pulsar.shaded.com.google.protobuf.v241.Message callBlockingMethod(\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.MethodDescriptor method,\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.RpcController controller,\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.Message request)\n"
+ " throws org.apache.pulsar.shaded.com.google.protobuf.v241.ServiceException {\n"
" if (method.getService() != getDescriptor()) {\n"
" throw new java.lang.IllegalArgumentException(\n"
" \"Service.callBlockingMethod() given method descriptor for \" +\n"
@@ -257,9 +257,9 @@ void ServiceGenerator::GenerateGetPrototype(RequestOrResponse which,
* "BlockingService.foo." Consider fixing.
*/
printer->Print(
- "public final com.google.protobuf.Message\n"
+ "public final org.apache.pulsar.shaded.com.google.protobuf.v241.Message\n"
" get$request_or_response$Prototype(\n"
- " com.google.protobuf.Descriptors.MethodDescriptor method) {\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.Descriptors.MethodDescriptor method) {\n"
" if (method.getService() != getDescriptor()) {\n"
" throw new java.lang.IllegalArgumentException(\n"
" \"Service.get$request_or_response$Prototype() given method \" +\n"
@@ -297,7 +297,7 @@ void ServiceGenerator::GenerateGetPrototype(RequestOrResponse which,
void ServiceGenerator::GenerateStub(io::Printer* printer) {
printer->Print(
"public static Stub newStub(\n"
- " com.google.protobuf.RpcChannel channel) {\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.RpcChannel channel) {\n"
" return new Stub(channel);\n"
"}\n"
"\n"
@@ -307,13 +307,13 @@ void ServiceGenerator::GenerateStub(io::Printer* printer) {
printer->Indent();
printer->Print(
- "private Stub(com.google.protobuf.RpcChannel channel) {\n"
+ "private Stub(org.apache.pulsar.shaded.com.google.protobuf.v241.RpcChannel channel) {\n"
" this.channel = channel;\n"
"}\n"
"\n"
- "private final com.google.protobuf.RpcChannel channel;\n"
+ "private final org.apache.pulsar.shaded.com.google.protobuf.v241.RpcChannel channel;\n"
"\n"
- "public com.google.protobuf.RpcChannel getChannel() {\n"
+ "public org.apache.pulsar.shaded.com.google.protobuf.v241.RpcChannel getChannel() {\n"
" return channel;\n"
"}\n");
@@ -333,7 +333,7 @@ void ServiceGenerator::GenerateStub(io::Printer* printer) {
" controller,\n"
" request,\n"
" $output$.getDefaultInstance(),\n"
- " com.google.protobuf.RpcUtil.generalizeCallback(\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.RpcUtil.generalizeCallback(\n"
" done,\n"
" $output$.class,\n"
" $output$.getDefaultInstance()));\n");
@@ -351,7 +351,7 @@ void ServiceGenerator::GenerateStub(io::Printer* printer) {
void ServiceGenerator::GenerateBlockingStub(io::Printer* printer) {
printer->Print(
"public static BlockingInterface newBlockingStub(\n"
- " com.google.protobuf.BlockingRpcChannel channel) {\n"
+ " org.apache.pulsar.shaded.com.google.protobuf.v241.BlockingRpcChannel channel) {\n"
" return new BlockingStub(channel);\n"
"}\n"
"\n");
@@ -376,11 +376,11 @@ void ServiceGenerator::GenerateBlockingStub(io::Printer* printer) {
printer->Indent();
printer->Print(
- "private BlockingStub(com.google.protobuf.BlockingRpcChannel channel) {\n"
+ "private BlockingStub(org.apache.pulsar.shaded.com.google.protobuf.v241.BlockingRpcChannel channel) {\n"
" this.channel = channel;\n"
"}\n"
"\n"
- "private final com.google.protobuf.BlockingRpcChannel channel;\n");
+ "private final org.apache.pulsar.shaded.com.google.protobuf.v241.BlockingRpcChannel channel;\n");