Work around windows path length limitations by moving immutable -> f…

…ull in open source (new generator paths) and shortening long file names. (#16825) Re-enable windows bazel test. Cherry-pick of cd83a75 PiperOrigin-RevId: 630443328
protocolbuffers · May 13, 2024 · 615e704 · 615e704
1 parent 0b3d880
commit 615e704
Show file tree

Hide file tree

Showing 51 changed files with 101 additions and 103 deletions.
diff --git a/.github/workflows/test_bazel.yml b/.github/workflows/test_bazel.yml
@@ -47,8 +47,6 @@ jobs:
 
       - name: Run tests
         uses: protocolbuffers/protobuf-ci/bazel@v3
-        # TODO Silence this until we have a fix.
-        if: runner.os != 'Windows' || matrix.bzlmod
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           bazel-cache: examples

diff --git a/src/file_lists.cmake b/src/file_lists.cmake
@@ -332,28 +332,28 @@ set(libprotoc_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/doc_comment.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/field_common.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/file.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/enum.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/enum_field.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/extension.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/generator_factory.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/make_field_gens.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/map_field.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/message.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/message_builder.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/message_field.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/primitive_field.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/service.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/string_field.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/helpers.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/enum.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/enum_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/extension.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/generator_factory.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/make_field_generators.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/map_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/message.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/message_builder.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/message_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/primitive_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/service.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/string_field.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/internal_helpers.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_features.pb.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/enum.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/enum_field.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/extension.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/generator_factory.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/make_field_generators.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/make_field_gens.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/map_field.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/message.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/message_builder.cc
@@ -379,7 +379,7 @@ set(libprotoc_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/names.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/oneof.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/primitive_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/text_format_decode_data.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/tf_decode_data.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/names.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/php_generator.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.cc
@@ -458,23 +458,23 @@ set(libprotoc_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/doc_comment.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/field_common.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/file.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/enum.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/enum_field.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/extension.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/field_generator.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/generator_factory.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/make_field_gens.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/map_field.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/message.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/message_builder.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/message_field.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/primitive_field.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/service.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/full/string_field.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator_common.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator_factory.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/helpers.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/enum.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/enum_field.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/extension.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/field_generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/generator_factory.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/make_field_generators.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/map_field.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/message.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/message_builder.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/message_field.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/primitive_field.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/service.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/immutable/string_field.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/internal_helpers.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_features.pb.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.h
@@ -483,7 +483,7 @@ set(libprotoc_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/extension.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/field_generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/generator_factory.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/make_field_generators.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/make_field_gens.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/map_field.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/message.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/lite/message_builder.h
@@ -512,7 +512,7 @@ set(libprotoc_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/oneof.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/options.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/primitive_field.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/text_format_decode_data.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/tf_decode_data.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/names.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/php_generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.h
@@ -523,8 +523,8 @@ set(libprotoc_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/retention.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/accessors/accessor_case.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/accessors/accessor_generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/accessors/accessors.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/accessors/generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/accessors/helpers.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/context.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/rust/crate_mapping.h

diff --git a/src/google/protobuf/compiler/java/BUILD.bazel b/src/google/protobuf/compiler/java/BUILD.bazel
@@ -128,7 +128,7 @@ cc_library(
         "//src/google/protobuf/compiler:code_generator",
         "//src/google/protobuf/compiler:retention",
         "//src/google/protobuf/compiler:versions",
-        "//src/google/protobuf/compiler/java/immutable",
+        "//src/google/protobuf/compiler/java/full",
         "//src/google/protobuf/compiler/java/lite",
         "//src/google/protobuf/io",
         "//src/google/protobuf/io:printer",

diff --git a/src/google/protobuf/compiler/java/file.cc b/src/google/protobuf/compiler/java/file.cc
@@ -25,7 +25,7 @@
 #include "google/protobuf/compiler/java/generator_common.h"
 #include "google/protobuf/compiler/java/generator_factory.h"
 #include "google/protobuf/compiler/java/helpers.h"
-#include "google/protobuf/compiler/java/immutable/generator_factory.h"
+#include "google/protobuf/compiler/java/full/generator_factory.h"
 #include "google/protobuf/compiler/java/lite/generator_factory.h"
 #include "google/protobuf/compiler/java/name_resolver.h"
 #include "google/protobuf/compiler/java/options.h"

diff --git a/...tobuf/compiler/java/immutable/BUILD.bazel → ...e/protobuf/compiler/java/full/BUILD.bazel b/...tobuf/compiler/java/immutable/BUILD.bazel → ...e/protobuf/compiler/java/full/BUILD.bazel
@@ -46,8 +46,8 @@ cc_library(
 
 cc_library(
     name = "mfg",
-    srcs = ["make_field_generators.cc"],
-    hdrs = ["make_field_generators.h"],
+    srcs = ["make_field_gens.cc"],
+    hdrs = ["make_field_gens.h"],
     strip_include_prefix = "/src",
     deps = [
         ":fg",
@@ -92,7 +92,7 @@ cc_library(
 )
 
 cc_library(
-    name = "immutable",
+    name = "full",
     srcs = [
         "extension.cc",
         "generator_factory.cc",

diff --git a/.../protobuf/compiler/java/immutable/enum.cc → ...oogle/protobuf/compiler/java/full/enum.cc b/.../protobuf/compiler/java/immutable/enum.cc → ...oogle/protobuf/compiler/java/full/enum.cc
@@ -9,7 +9,7 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-#include "google/protobuf/compiler/java/immutable/enum.h"
+#include "google/protobuf/compiler/java/full/enum.h"
 
 #include <string>
 

diff --git a/...e/protobuf/compiler/java/immutable/enum.h → ...google/protobuf/compiler/java/full/enum.h b/...e/protobuf/compiler/java/immutable/enum.h → ...google/protobuf/compiler/java/full/enum.h
diff --git a/...buf/compiler/java/immutable/enum_field.cc → ...protobuf/compiler/java/full/enum_field.cc b/...buf/compiler/java/immutable/enum_field.cc → ...protobuf/compiler/java/full/enum_field.cc
@@ -9,7 +9,7 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-#include "google/protobuf/compiler/java/immutable/enum_field.h"
+#include "google/protobuf/compiler/java/full/enum_field.h"
 
 #include <cstdint>
 #include <string>

diff --git a/...obuf/compiler/java/immutable/enum_field.h → .../protobuf/compiler/java/full/enum_field.h b/...obuf/compiler/java/immutable/enum_field.h → .../protobuf/compiler/java/full/enum_field.h
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "absl/container/flat_hash_map.h"
-#include "google/protobuf/compiler/java/immutable/field_generator.h"
+#include "google/protobuf/compiler/java/full/field_generator.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/printer.h"
 

diff --git a/...obuf/compiler/java/immutable/extension.cc → .../protobuf/compiler/java/full/extension.cc b/...obuf/compiler/java/immutable/extension.cc → .../protobuf/compiler/java/full/extension.cc
@@ -9,7 +9,7 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-#include "google/protobuf/compiler/java/immutable/extension.h"
+#include "google/protobuf/compiler/java/full/extension.h"
 
 #include "google/protobuf/compiler/java/context.h"
 #include "google/protobuf/compiler/java/doc_comment.h"

diff --git a/...tobuf/compiler/java/immutable/extension.h → ...e/protobuf/compiler/java/full/extension.h b/...tobuf/compiler/java/immutable/extension.h → ...e/protobuf/compiler/java/full/extension.h
diff --git a/...compiler/java/immutable/field_generator.h → ...obuf/compiler/java/full/field_generator.h b/...compiler/java/immutable/field_generator.h → ...obuf/compiler/java/full/field_generator.h
diff --git a/...piler/java/immutable/generator_factory.cc → ...f/compiler/java/full/generator_factory.cc b/...piler/java/immutable/generator_factory.cc → ...f/compiler/java/full/generator_factory.cc
@@ -12,10 +12,10 @@
 #include <memory>
 
 #include "google/protobuf/compiler/java/context.h"
-#include "google/protobuf/compiler/java/immutable/enum.h"
-#include "google/protobuf/compiler/java/immutable/extension.h"
-#include "google/protobuf/compiler/java/immutable/message.h"
-#include "google/protobuf/compiler/java/immutable/service.h"
+#include "google/protobuf/compiler/java/full/enum.h"
+#include "google/protobuf/compiler/java/full/extension.h"
+#include "google/protobuf/compiler/java/full/message.h"
+#include "google/protobuf/compiler/java/full/service.h"
 #include "google/protobuf/descriptor.h"
 
 namespace google {

diff --git a/...mpiler/java/immutable/generator_factory.h → ...uf/compiler/java/full/generator_factory.h b/...mpiler/java/immutable/generator_factory.h → ...uf/compiler/java/full/generator_factory.h
diff --git a/...r/java/immutable/make_field_generators.cc → ...buf/compiler/java/full/make_field_gens.cc b/...r/java/immutable/make_field_generators.cc → ...buf/compiler/java/full/make_field_gens.cc
@@ -15,12 +15,12 @@
 #include "google/protobuf/compiler/java/context.h"
 #include "google/protobuf/compiler/java/generator_common.h"
 #include "google/protobuf/compiler/java/helpers.h"
-#include "google/protobuf/compiler/java/immutable/enum_field.h"
-#include "google/protobuf/compiler/java/immutable/field_generator.h"
-#include "google/protobuf/compiler/java/immutable/map_field.h"
-#include "google/protobuf/compiler/java/immutable/message_field.h"
-#include "google/protobuf/compiler/java/immutable/primitive_field.h"
-#include "google/protobuf/compiler/java/immutable/string_field.h"
+#include "google/protobuf/compiler/java/full/enum_field.h"
+#include "google/protobuf/compiler/java/full/field_generator.h"
+#include "google/protobuf/compiler/java/full/map_field.h"
+#include "google/protobuf/compiler/java/full/message_field.h"
+#include "google/protobuf/compiler/java/full/primitive_field.h"
+#include "google/protobuf/compiler/java/full/string_field.h"
 #include "google/protobuf/descriptor.h"
 
 namespace google {

diff --git a/...er/java/immutable/make_field_generators.h → ...obuf/compiler/java/full/make_field_gens.h b/...er/java/immutable/make_field_generators.h → ...obuf/compiler/java/full/make_field_gens.h
@@ -5,12 +5,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENERATORS_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENERATORS_H__
+#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENS_H__
+#define GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENS_H__
 
 #include "google/protobuf/compiler/java/context.h"
 #include "google/protobuf/compiler/java/generator_common.h"
-#include "google/protobuf/compiler/java/immutable/field_generator.h"
+#include "google/protobuf/compiler/java/full/field_generator.h"
 #include "google/protobuf/descriptor.h"
 
 namespace google {
@@ -26,4 +26,4 @@ FieldGeneratorMap<ImmutableFieldGenerator> MakeImmutableFieldGenerators(
 }  // namespace protobuf
 }  // namespace google
 
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENERATORS_H__
+#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENS_H__
diff --git a/...obuf/compiler/java/immutable/map_field.cc → .../protobuf/compiler/java/full/map_field.cc b/...obuf/compiler/java/immutable/map_field.cc → .../protobuf/compiler/java/full/map_field.cc
@@ -5,7 +5,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "google/protobuf/compiler/java/immutable/map_field.h"
+#include "google/protobuf/compiler/java/full/map_field.h"
 
 #include <string>
 

diff --git a/...tobuf/compiler/java/immutable/map_field.h → ...e/protobuf/compiler/java/full/map_field.h b/...tobuf/compiler/java/immutable/map_field.h → ...e/protobuf/compiler/java/full/map_field.h
@@ -9,7 +9,7 @@
 #define GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_H__
 
 #include "google/protobuf/compiler/java/context.h"
-#include "google/protobuf/compiler/java/immutable/field_generator.h"
+#include "google/protobuf/compiler/java/full/field_generator.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/printer.h"
 

diff --git a/...otobuf/compiler/java/immutable/message.cc → ...le/protobuf/compiler/java/full/message.cc b/...otobuf/compiler/java/immutable/message.cc → ...le/protobuf/compiler/java/full/message.cc
@@ -9,7 +9,7 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-#include "google/protobuf/compiler/java/immutable/message.h"
+#include "google/protobuf/compiler/java/full/message.h"
 
 #include <algorithm>
 #include <cstdint>
@@ -28,10 +28,10 @@
 #include "google/protobuf/compiler/java/field_common.h"
 #include "google/protobuf/compiler/java/generator_common.h"
 #include "google/protobuf/compiler/java/helpers.h"
-#include "google/protobuf/compiler/java/immutable/enum.h"
-#include "google/protobuf/compiler/java/immutable/extension.h"
-#include "google/protobuf/compiler/java/immutable/make_field_generators.h"
-#include "google/protobuf/compiler/java/immutable/message_builder.h"
+#include "google/protobuf/compiler/java/full/enum.h"
+#include "google/protobuf/compiler/java/full/extension.h"
+#include "google/protobuf/compiler/java/full/make_field_gens.h"
+#include "google/protobuf/compiler/java/full/message_builder.h"
 #include "google/protobuf/compiler/java/message_serialization.h"
 #include "google/protobuf/compiler/java/name_resolver.h"
 #include "google/protobuf/descriptor.h"

diff --git a/...rotobuf/compiler/java/immutable/message.h → ...gle/protobuf/compiler/java/full/message.h b/...rotobuf/compiler/java/immutable/message.h → ...gle/protobuf/compiler/java/full/message.h
@@ -17,7 +17,7 @@
 #include <vector>
 
 #include "google/protobuf/compiler/java/generator_factory.h"
-#include "google/protobuf/compiler/java/immutable/field_generator.h"
+#include "google/protobuf/compiler/java/full/field_generator.h"
 #include "google/protobuf/descriptor.h"
 
 namespace google {

diff --git a/...ompiler/java/immutable/message_builder.cc → ...buf/compiler/java/full/message_builder.cc b/...ompiler/java/immutable/message_builder.cc → ...buf/compiler/java/full/message_builder.cc
@@ -9,7 +9,7 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-#include "google/protobuf/compiler/java/immutable/message_builder.h"
+#include "google/protobuf/compiler/java/full/message_builder.h"
 
 #include <cstdint>
 #include <memory>
@@ -27,10 +27,10 @@
 #include "google/protobuf/compiler/java/field_common.h"
 #include "google/protobuf/compiler/java/generator_factory.h"
 #include "google/protobuf/compiler/java/helpers.h"
-#include "google/protobuf/compiler/java/immutable/enum.h"
-#include "google/protobuf/compiler/java/immutable/extension.h"
-#include "google/protobuf/compiler/java/immutable/field_generator.h"
-#include "google/protobuf/compiler/java/immutable/make_field_generators.h"
+#include "google/protobuf/compiler/java/full/enum.h"
+#include "google/protobuf/compiler/java/full/extension.h"
+#include "google/protobuf/compiler/java/full/field_generator.h"
+#include "google/protobuf/compiler/java/full/make_field_gens.h"
 #include "google/protobuf/compiler/java/name_resolver.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/io/printer.h"

diff --git a/...compiler/java/immutable/message_builder.h → ...obuf/compiler/java/full/message_builder.h b/...compiler/java/immutable/message_builder.h → ...obuf/compiler/java/full/message_builder.h
@@ -17,7 +17,7 @@
 #include <vector>
 
 #include "absl/container/btree_map.h"
-#include "google/protobuf/compiler/java/immutable/field_generator.h"
+#include "google/protobuf/compiler/java/full/field_generator.h"
 #include "google/protobuf/descriptor.h"
 
 namespace google {

diff --git a/.../compiler/java/immutable/message_field.cc → ...tobuf/compiler/java/full/message_field.cc b/.../compiler/java/immutable/message_field.cc → ...tobuf/compiler/java/full/message_field.cc
@@ -9,7 +9,7 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-#include "google/protobuf/compiler/java/immutable/message_field.h"
+#include "google/protobuf/compiler/java/full/message_field.h"
 
 #include <string>
 

diff --git a/...f/compiler/java/immutable/message_field.h → ...otobuf/compiler/java/full/message_field.h b/...f/compiler/java/immutable/message_field.h → ...otobuf/compiler/java/full/message_field.h
@@ -14,7 +14,7 @@
 
 #include <string>
 
-#include "google/protobuf/compiler/java/immutable/field_generator.h"
+#include "google/protobuf/compiler/java/full/field_generator.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/printer.h"
 

diff --git a/...ompiler/java/immutable/primitive_field.cc → ...buf/compiler/java/full/primitive_field.cc b/...ompiler/java/immutable/primitive_field.cc → ...buf/compiler/java/full/primitive_field.cc
@@ -9,7 +9,7 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-#include "google/protobuf/compiler/java/immutable/primitive_field.h"
+#include "google/protobuf/compiler/java/full/primitive_field.h"
 
 #include <cstdint>
 #include <string>

diff --git a/...compiler/java/immutable/primitive_field.h → ...obuf/compiler/java/full/primitive_field.h b/...compiler/java/immutable/primitive_field.h → ...obuf/compiler/java/full/primitive_field.h
@@ -14,7 +14,7 @@
 
 #include <string>
 
-#include "google/protobuf/compiler/java/immutable/field_generator.h"
+#include "google/protobuf/compiler/java/full/field_generator.h"
 #include "google/protobuf/descriptor.h"
 
 namespace google {

diff --git a/...otobuf/compiler/java/immutable/service.cc → ...le/protobuf/compiler/java/full/service.cc b/...otobuf/compiler/java/immutable/service.cc → ...le/protobuf/compiler/java/full/service.cc
@@ -9,7 +9,7 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-#include "google/protobuf/compiler/java/immutable/service.h"
+#include "google/protobuf/compiler/java/full/service.h"
 
 #include "absl/log/absl_log.h"
 #include "absl/strings/str_cat.h"

diff --git a/...rotobuf/compiler/java/immutable/service.h → ...gle/protobuf/compiler/java/full/service.h b/...rotobuf/compiler/java/immutable/service.h → ...gle/protobuf/compiler/java/full/service.h
diff --git a/...f/compiler/java/immutable/string_field.cc → ...otobuf/compiler/java/full/string_field.cc b/...f/compiler/java/immutable/string_field.cc → ...otobuf/compiler/java/full/string_field.cc
@@ -10,7 +10,7 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-#include "google/protobuf/compiler/java/immutable/string_field.h"
+#include "google/protobuf/compiler/java/full/string_field.h"
 
 #include <cstdint>
 #include <string>