Fix the Optional wrapping in the description of NonCanonicalStaticMemberImport.

PiperOrigin-RevId: 835159948

Author: graememorgan

core/src/main/java/com/google/errorprone/bugpatterns/NonCanonicalStaticMemberImport.java

@@ -48,7 +48,7 @@ public Description matchImport(ImportTree tree, VisitorState state) {
         .setMessage(
             String.format(
                 "Static import of '%s' uses non-canonical name; prefer '%s'",
-                importInfo.simpleName(), importInfo.canonicalName()))
+                importInfo.simpleName().get(), importInfo.canonicalName()))
         .build();
   }
 }

core/src/test/java/com/google/errorprone/bugpatterns/NonCanonicalStaticMemberImportTest.java

@@ -39,6 +39,10 @@ public class A {
               public static final int foo() {
                 return 42;
               }
+
+              public static final int bar() {
+                return 42;
+              }
             }
             """)
         .addSourceLines(
@@ -57,6 +61,8 @@ public class B extends A {}
 
             // BUG: Diagnostic contains: import static a.A.foo;
             import static b.B.foo;
+            // BUG: Diagnostic contains: of 'bar'
+            import static b.B.bar;
 
             class Test {}
             """)