Skip to content

Commit 615e704

Browse files
zhangskzzhangskz
authored
Work around windows path length limitations by moving immutable -> full in open source (new generator paths) and shortening long file names. (#16825)
Re-enable windows bazel test. Cherry-pick of cd83a75 PiperOrigin-RevId: 630443328
1 parent 0b3d880 commit 615e704

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+101
-103
lines changed

‎.github/workflows/test_bazel.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ jobs:
4747

4848
- name: Run tests
4949
uses: protocolbuffers/protobuf-ci/bazel@v3
50-
# TODO Silence this until we have a fix.
51-
if: runner.os != 'Windows' || matrix.bzlmod
5250
with:
5351
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
5452
bazel-cache: examples

‎src/file_lists.cmake

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -332,28 +332,28 @@ set(libprotoc_srcs
332332
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/doc_comment.cc
333333
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/field_common.cc
334334
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/file.cc
335+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/enum.cc
336+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/enum_field.cc
337+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/extension.cc
338+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/generator_factory.cc
339+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/make_field_gens.cc
340+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/map_field.cc
341+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/message.cc
342+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/message_builder.cc
343+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/message_field.cc
344+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/primitive_field.cc
345+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/service.cc
346+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/string_field.cc
335347
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator.cc
336348
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/helpers.cc
337-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/enum.cc
338-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/enum_field.cc
339-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/extension.cc
340-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/generator_factory.cc
341-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/make_field_generators.cc
342-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/map_field.cc
343-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/message.cc
344-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/message_builder.cc
345-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/message_field.cc
346-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/primitive_field.cc
347-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/service.cc
348-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/string_field.cc
349349
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/internal_helpers.cc
350350
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_features.pb.cc
351351
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.cc
352352
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/enum.cc
353353
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/enum_field.cc
354354
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/extension.cc
355355
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/generator_factory.cc
356-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/make_field_generators.cc
356+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/make_field_gens.cc
357357
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/map_field.cc
358358
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/message.cc
359359
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/message_builder.cc
@@ -379,7 +379,7 @@ set(libprotoc_srcs
379379
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/names.cc
380380
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/oneof.cc
381381
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/primitive_field.cc
382-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/text_format_decode_data.cc
382+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/tf_decode_data.cc
383383
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/names.cc
384384
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/php_generator.cc
385385
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.cc
@@ -458,23 +458,23 @@ set(libprotoc_hdrs
458458
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/doc_comment.h
459459
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/field_common.h
460460
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/file.h
461+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/enum.h
462+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/enum_field.h
463+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/extension.h
464+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/field_generator.h
465+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/generator_factory.h
466+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/make_field_gens.h
467+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/map_field.h
468+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/message.h
469+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/message_builder.h
470+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/message_field.h
471+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/primitive_field.h
472+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/service.h
473+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/string_field.h
461474
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator.h
462475
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator_common.h
463476
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator_factory.h
464477
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/helpers.h
465-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/enum.h
466-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/enum_field.h
467-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/extension.h
468-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/field_generator.h
469-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/generator_factory.h
470-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/make_field_generators.h
471-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/map_field.h
472-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/message.h
473-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/message_builder.h
474-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/message_field.h
475-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/primitive_field.h
476-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/service.h
477-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/string_field.h
478478
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/internal_helpers.h
479479
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_features.pb.h
480480
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.h
@@ -483,7 +483,7 @@ set(libprotoc_hdrs
483483
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/extension.h
484484
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/field_generator.h
485485
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/generator_factory.h
486-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/make_field_generators.h
486+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/make_field_gens.h
487487
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/map_field.h
488488
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/message.h
489489
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/message_builder.h
@@ -512,7 +512,7 @@ set(libprotoc_hdrs
512512
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/oneof.h
513513
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/options.h
514514
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/primitive_field.h
515-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/text_format_decode_data.h
515+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/tf_decode_data.h
516516
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/names.h
517517
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/php_generator.h
518518
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.h
@@ -523,8 +523,8 @@ set(libprotoc_hdrs
523523
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/retention.h
524524
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator.h
525525
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/accessors/accessor_case.h
526-
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/accessors/accessor_generator.h
527526
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/accessors/accessors.h
527+
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/accessors/generator.h
528528
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/accessors/helpers.h
529529
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/context.h
530530
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/crate_mapping.h

‎src/google/protobuf/compiler/java/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ cc_library(
128128
"//src/google/protobuf/compiler:code_generator",
129129
"//src/google/protobuf/compiler:retention",
130130
"//src/google/protobuf/compiler:versions",
131-
"//src/google/protobuf/compiler/java/immutable",
131+
"//src/google/protobuf/compiler/java/full",
132132
"//src/google/protobuf/compiler/java/lite",
133133
"//src/google/protobuf/io",
134134
"//src/google/protobuf/io:printer",

‎src/google/protobuf/compiler/java/file.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "google/protobuf/compiler/java/generator_common.h"
2626
#include "google/protobuf/compiler/java/generator_factory.h"
2727
#include "google/protobuf/compiler/java/helpers.h"
28-
#include "google/protobuf/compiler/java/immutable/generator_factory.h"
28+
#include "google/protobuf/compiler/java/full/generator_factory.h"
2929
#include "google/protobuf/compiler/java/lite/generator_factory.h"
3030
#include "google/protobuf/compiler/java/name_resolver.h"
3131
#include "google/protobuf/compiler/java/options.h"

‎src/google/protobuf/compiler/java/immutable/BUILD.bazel renamed to ‎src/google/protobuf/compiler/java/full/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ cc_library(
4646

4747
cc_library(
4848
name = "mfg",
49-
srcs = ["make_field_generators.cc"],
50-
hdrs = ["make_field_generators.h"],
49+
srcs = ["make_field_gens.cc"],
50+
hdrs = ["make_field_gens.h"],
5151
strip_include_prefix = "/src",
5252
deps = [
5353
":fg",
@@ -92,7 +92,7 @@ cc_library(
9292
)
9393

9494
cc_library(
95-
name = "immutable",
95+
name = "full",
9696
srcs = [
9797
"extension.cc",
9898
"generator_factory.cc",

‎src/google/protobuf/compiler/java/immutable/enum.cc renamed to ‎src/google/protobuf/compiler/java/full/enum.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Based on original Protocol Buffers design by
1010
// Sanjay Ghemawat, Jeff Dean, and others.
1111

12-
#include "google/protobuf/compiler/java/immutable/enum.h"
12+
#include "google/protobuf/compiler/java/full/enum.h"
1313

1414
#include <string>
1515

‎src/google/protobuf/compiler/java/immutable/enum.h renamed to ‎src/google/protobuf/compiler/java/full/enum.h

File renamed without changes.

‎src/google/protobuf/compiler/java/immutable/enum_field.cc renamed to ‎src/google/protobuf/compiler/java/full/enum_field.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Based on original Protocol Buffers design by
1010
// Sanjay Ghemawat, Jeff Dean, and others.
1111

12-
#include "google/protobuf/compiler/java/immutable/enum_field.h"
12+
#include "google/protobuf/compiler/java/full/enum_field.h"
1313

1414
#include <cstdint>
1515
#include <string>

‎src/google/protobuf/compiler/java/immutable/enum_field.h renamed to ‎src/google/protobuf/compiler/java/full/enum_field.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <string>
1616

1717
#include "absl/container/flat_hash_map.h"
18-
#include "google/protobuf/compiler/java/immutable/field_generator.h"
18+
#include "google/protobuf/compiler/java/full/field_generator.h"
1919
#include "google/protobuf/descriptor.h"
2020
#include "google/protobuf/io/printer.h"
2121

‎src/google/protobuf/compiler/java/immutable/extension.cc renamed to ‎src/google/protobuf/compiler/java/full/extension.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Based on original Protocol Buffers design by
1010
// Sanjay Ghemawat, Jeff Dean, and others.
1111

12-
#include "google/protobuf/compiler/java/immutable/extension.h"
12+
#include "google/protobuf/compiler/java/full/extension.h"
1313

1414
#include "google/protobuf/compiler/java/context.h"
1515
#include "google/protobuf/compiler/java/doc_comment.h"

‎src/google/protobuf/compiler/java/immutable/extension.h renamed to ‎src/google/protobuf/compiler/java/full/extension.h

File renamed without changes.

‎src/google/protobuf/compiler/java/immutable/field_generator.h renamed to ‎src/google/protobuf/compiler/java/full/field_generator.h

File renamed without changes.

‎src/google/protobuf/compiler/java/immutable/generator_factory.cc renamed to ‎src/google/protobuf/compiler/java/full/generator_factory.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
#include <memory>
1313

1414
#include "google/protobuf/compiler/java/context.h"
15-
#include "google/protobuf/compiler/java/immutable/enum.h"
16-
#include "google/protobuf/compiler/java/immutable/extension.h"
17-
#include "google/protobuf/compiler/java/immutable/message.h"
18-
#include "google/protobuf/compiler/java/immutable/service.h"
15+
#include "google/protobuf/compiler/java/full/enum.h"
16+
#include "google/protobuf/compiler/java/full/extension.h"
17+
#include "google/protobuf/compiler/java/full/message.h"
18+
#include "google/protobuf/compiler/java/full/service.h"
1919
#include "google/protobuf/descriptor.h"
2020

2121
namespace google {

‎src/google/protobuf/compiler/java/immutable/generator_factory.h renamed to ‎src/google/protobuf/compiler/java/full/generator_factory.h

File renamed without changes.

‎src/google/protobuf/compiler/java/immutable/make_field_generators.cc renamed to ‎src/google/protobuf/compiler/java/full/make_field_gens.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
#include "google/protobuf/compiler/java/context.h"
1616
#include "google/protobuf/compiler/java/generator_common.h"
1717
#include "google/protobuf/compiler/java/helpers.h"
18-
#include "google/protobuf/compiler/java/immutable/enum_field.h"
19-
#include "google/protobuf/compiler/java/immutable/field_generator.h"
20-
#include "google/protobuf/compiler/java/immutable/map_field.h"
21-
#include "google/protobuf/compiler/java/immutable/message_field.h"
22-
#include "google/protobuf/compiler/java/immutable/primitive_field.h"
23-
#include "google/protobuf/compiler/java/immutable/string_field.h"
18+
#include "google/protobuf/compiler/java/full/enum_field.h"
19+
#include "google/protobuf/compiler/java/full/field_generator.h"
20+
#include "google/protobuf/compiler/java/full/map_field.h"
21+
#include "google/protobuf/compiler/java/full/message_field.h"
22+
#include "google/protobuf/compiler/java/full/primitive_field.h"
23+
#include "google/protobuf/compiler/java/full/string_field.h"
2424
#include "google/protobuf/descriptor.h"
2525

2626
namespace google {

‎src/google/protobuf/compiler/java/immutable/make_field_generators.h renamed to ‎src/google/protobuf/compiler/java/full/make_field_gens.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
// license that can be found in the LICENSE file or at
66
// https://developers.google.com/open-source/licenses/bsd
77

8-
#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENERATORS_H__
9-
#define GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENERATORS_H__
8+
#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENS_H__
9+
#define GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENS_H__
1010

1111
#include "google/protobuf/compiler/java/context.h"
1212
#include "google/protobuf/compiler/java/generator_common.h"
13-
#include "google/protobuf/compiler/java/immutable/field_generator.h"
13+
#include "google/protobuf/compiler/java/full/field_generator.h"
1414
#include "google/protobuf/descriptor.h"
1515

1616
namespace google {
@@ -26,4 +26,4 @@ FieldGeneratorMap<ImmutableFieldGenerator> MakeImmutableFieldGenerators(
2626
} // namespace protobuf
2727
} // namespace google
2828

29-
#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENERATORS_H__
29+
#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENS_H__

‎src/google/protobuf/compiler/java/immutable/map_field.cc renamed to ‎src/google/protobuf/compiler/java/full/map_field.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// license that can be found in the LICENSE file or at
66
// https://developers.google.com/open-source/licenses/bsd
77

8-
#include "google/protobuf/compiler/java/immutable/map_field.h"
8+
#include "google/protobuf/compiler/java/full/map_field.h"
99

1010
#include <string>
1111

‎src/google/protobuf/compiler/java/immutable/map_field.h renamed to ‎src/google/protobuf/compiler/java/full/map_field.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_H__
1010

1111
#include "google/protobuf/compiler/java/context.h"
12-
#include "google/protobuf/compiler/java/immutable/field_generator.h"
12+
#include "google/protobuf/compiler/java/full/field_generator.h"
1313
#include "google/protobuf/descriptor.h"
1414
#include "google/protobuf/io/printer.h"
1515

‎src/google/protobuf/compiler/java/immutable/message.cc renamed to ‎src/google/protobuf/compiler/java/full/message.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Based on original Protocol Buffers design by
1010
// Sanjay Ghemawat, Jeff Dean, and others.
1111

12-
#include "google/protobuf/compiler/java/immutable/message.h"
12+
#include "google/protobuf/compiler/java/full/message.h"
1313

1414
#include <algorithm>
1515
#include <cstdint>
@@ -28,10 +28,10 @@
2828
#include "google/protobuf/compiler/java/field_common.h"
2929
#include "google/protobuf/compiler/java/generator_common.h"
3030
#include "google/protobuf/compiler/java/helpers.h"
31-
#include "google/protobuf/compiler/java/immutable/enum.h"
32-
#include "google/protobuf/compiler/java/immutable/extension.h"
33-
#include "google/protobuf/compiler/java/immutable/make_field_generators.h"
34-
#include "google/protobuf/compiler/java/immutable/message_builder.h"
31+
#include "google/protobuf/compiler/java/full/enum.h"
32+
#include "google/protobuf/compiler/java/full/extension.h"
33+
#include "google/protobuf/compiler/java/full/make_field_gens.h"
34+
#include "google/protobuf/compiler/java/full/message_builder.h"
3535
#include "google/protobuf/compiler/java/message_serialization.h"
3636
#include "google/protobuf/compiler/java/name_resolver.h"
3737
#include "google/protobuf/descriptor.h"

‎src/google/protobuf/compiler/java/immutable/message.h renamed to ‎src/google/protobuf/compiler/java/full/message.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <vector>
1818

1919
#include "google/protobuf/compiler/java/generator_factory.h"
20-
#include "google/protobuf/compiler/java/immutable/field_generator.h"
20+
#include "google/protobuf/compiler/java/full/field_generator.h"
2121
#include "google/protobuf/descriptor.h"
2222

2323
namespace google {

‎src/google/protobuf/compiler/java/immutable/message_builder.cc renamed to ‎src/google/protobuf/compiler/java/full/message_builder.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Based on original Protocol Buffers design by
1010
// Sanjay Ghemawat, Jeff Dean, and others.
1111

12-
#include "google/protobuf/compiler/java/immutable/message_builder.h"
12+
#include "google/protobuf/compiler/java/full/message_builder.h"
1313

1414
#include <cstdint>
1515
#include <memory>
@@ -27,10 +27,10 @@
2727
#include "google/protobuf/compiler/java/field_common.h"
2828
#include "google/protobuf/compiler/java/generator_factory.h"
2929
#include "google/protobuf/compiler/java/helpers.h"
30-
#include "google/protobuf/compiler/java/immutable/enum.h"
31-
#include "google/protobuf/compiler/java/immutable/extension.h"
32-
#include "google/protobuf/compiler/java/immutable/field_generator.h"
33-
#include "google/protobuf/compiler/java/immutable/make_field_generators.h"
30+
#include "google/protobuf/compiler/java/full/enum.h"
31+
#include "google/protobuf/compiler/java/full/extension.h"
32+
#include "google/protobuf/compiler/java/full/field_generator.h"
33+
#include "google/protobuf/compiler/java/full/make_field_gens.h"
3434
#include "google/protobuf/compiler/java/name_resolver.h"
3535
#include "google/protobuf/descriptor.pb.h"
3636
#include "google/protobuf/io/printer.h"

‎src/google/protobuf/compiler/java/immutable/message_builder.h renamed to ‎src/google/protobuf/compiler/java/full/message_builder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <vector>
1818

1919
#include "absl/container/btree_map.h"
20-
#include "google/protobuf/compiler/java/immutable/field_generator.h"
20+
#include "google/protobuf/compiler/java/full/field_generator.h"
2121
#include "google/protobuf/descriptor.h"
2222

2323
namespace google {

‎src/google/protobuf/compiler/java/immutable/message_field.cc renamed to ‎src/google/protobuf/compiler/java/full/message_field.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Based on original Protocol Buffers design by
1010
// Sanjay Ghemawat, Jeff Dean, and others.
1111

12-
#include "google/protobuf/compiler/java/immutable/message_field.h"
12+
#include "google/protobuf/compiler/java/full/message_field.h"
1313

1414
#include <string>
1515

‎src/google/protobuf/compiler/java/immutable/message_field.h renamed to ‎src/google/protobuf/compiler/java/full/message_field.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include <string>
1616

17-
#include "google/protobuf/compiler/java/immutable/field_generator.h"
17+
#include "google/protobuf/compiler/java/full/field_generator.h"
1818
#include "google/protobuf/descriptor.h"
1919
#include "google/protobuf/io/printer.h"
2020

‎src/google/protobuf/compiler/java/immutable/primitive_field.cc renamed to ‎src/google/protobuf/compiler/java/full/primitive_field.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Based on original Protocol Buffers design by
1010
// Sanjay Ghemawat, Jeff Dean, and others.
1111

12-
#include "google/protobuf/compiler/java/immutable/primitive_field.h"
12+
#include "google/protobuf/compiler/java/full/primitive_field.h"
1313

1414
#include <cstdint>
1515
#include <string>

‎src/google/protobuf/compiler/java/immutable/primitive_field.h renamed to ‎src/google/protobuf/compiler/java/full/primitive_field.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include <string>
1616

17-
#include "google/protobuf/compiler/java/immutable/field_generator.h"
17+
#include "google/protobuf/compiler/java/full/field_generator.h"
1818
#include "google/protobuf/descriptor.h"
1919

2020
namespace google {

‎src/google/protobuf/compiler/java/immutable/service.cc renamed to ‎src/google/protobuf/compiler/java/full/service.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Based on original Protocol Buffers design by
1010
// Sanjay Ghemawat, Jeff Dean, and others.
1111

12-
#include "google/protobuf/compiler/java/immutable/service.h"
12+
#include "google/protobuf/compiler/java/full/service.h"
1313

1414
#include "absl/log/absl_log.h"
1515
#include "absl/strings/str_cat.h"

‎src/google/protobuf/compiler/java/immutable/service.h renamed to ‎src/google/protobuf/compiler/java/full/service.h

File renamed without changes.

‎src/google/protobuf/compiler/java/immutable/string_field.cc renamed to ‎src/google/protobuf/compiler/java/full/string_field.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// Based on original Protocol Buffers design by
1111
// Sanjay Ghemawat, Jeff Dean, and others.
1212

13-
#include "google/protobuf/compiler/java/immutable/string_field.h"
13+
#include "google/protobuf/compiler/java/full/string_field.h"
1414

1515
#include <cstdint>
1616
#include <string>

0 commit comments

Comments
 (0)