commit 6af119088affa46e1d03c4bf228d2e030d53b3aa
author Joshua Haberman <haberman@google.com> Wed Sep 17 19:44:15 2025 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Sep 17 19:48:12 2025 -0700
tree 9921ab5008d7ed17504291535779df15879f06d4
parent f526514801b6198da97a14e329a38c835322d156

Removed the final member variable from `ClassNameResolver`.

This is now an empty class that there is no reason to instantiate.  We can remove all instances of it and begin moving its implementation into `names.cc`.

PiperOrigin-RevId: 808359217

src/google/protobuf/compiler/java/context.cc

diff --git a/src/google/protobuf/compiler/java/context.cc b/src/google/protobuf/compiler/java/context.cc
index 11d40e9..93c8c5d 100644
--- a/src/google/protobuf/compiler/java/context.cc
+++ b/src/google/protobuf/compiler/java/context.cc
@@ -25,7 +25,7 @@
 namespace java {
 
 Context::Context(const FileDescriptor* file, const Options& options)
-    : name_resolver_(new ClassNameResolver(options)), options_(options) {
+    : name_resolver_(new ClassNameResolver()), options_(options) {
   InitializeFieldGeneratorInfo(file);
 }
 

src/google/protobuf/compiler/java/name_resolver.h

diff --git a/src/google/protobuf/compiler/java/name_resolver.h b/src/google/protobuf/compiler/java/name_resolver.h
index 7eade35..3d20748 100644
--- a/src/google/protobuf/compiler/java/name_resolver.h
+++ b/src/google/protobuf/compiler/java/name_resolver.h
@@ -37,7 +37,7 @@
 // Thread-safety note: This class is *not* thread-safe.
 class PROTOC_EXPORT ClassNameResolver {
  public:
-  explicit ClassNameResolver(const Options& options = {}) : options_(options) {}
+  ClassNameResolver() = default;
   ~ClassNameResolver() = default;
 
   ClassNameResolver(const ClassNameResolver&) = delete;
@@ -113,8 +113,6 @@
                                const FileDescriptor* file, bool immutable,
                                bool is_own_file, bool kotlin);
 
-  Options options_;
-
  private:
   // Get the Java Class style full name of a message.
   template <typename Descriptor>

src/google/protobuf/compiler/java/names.cc

diff --git a/src/google/protobuf/compiler/java/names.cc b/src/google/protobuf/compiler/java/names.cc
index d4aa44b..fe58f51 100644
--- a/src/google/protobuf/compiler/java/names.cc
+++ b/src/google/protobuf/compiler/java/names.cc
@@ -117,7 +117,7 @@
 
 std::string FileJavaPackage(const FileDescriptor* file, bool immutable,
                             Options options) {
-  return ClassNameResolver(options).GetFileJavaPackage(file, immutable);
+  return ClassNameResolver().GetFileJavaPackage(file, immutable);
 }
 
 std::string FileJavaPackage(const FileDescriptor* file, Options options) {

src/google/protobuf/compiler/java/shared_code_generator.cc

diff --git a/src/google/protobuf/compiler/java/shared_code_generator.cc b/src/google/protobuf/compiler/java/shared_code_generator.cc
index 3a6ece5..6905c46 100644
--- a/src/google/protobuf/compiler/java/shared_code_generator.cc
+++ b/src/google/protobuf/compiler/java/shared_code_generator.cc
@@ -33,9 +33,7 @@
 
 SharedCodeGenerator::SharedCodeGenerator(const FileDescriptor* file,
                                          const Options& options)
-    : name_resolver_(new ClassNameResolver(options)),
-      file_(file),
-      options_(options) {}
+    : name_resolver_(new ClassNameResolver()), file_(file), options_(options) {}
 
 SharedCodeGenerator::~SharedCodeGenerator() = default;