Fix test expectations which appear to fail with differences in generated proto classes (#36680)

* Fix test expectations which appear to fail with differences in proto generation

* fix spotless

Author: scwhittle

sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java

@@ -21,13 +21,10 @@
 import static org.apache.beam.fn.harness.control.ProcessBundleHandler.REGISTERED_RUNNER_FACTORIES;
 import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkState;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.emptyIterable;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.hasProperty;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.collection.IsEmptyCollection.empty;
 import static org.junit.Assert.assertEquals;
@@ -1998,19 +1995,13 @@ public void testTimerMetrics() throws Exception {
     for (MetricsApi.MonitoringInfo info : response.getProcessBundle().getMonitoringInfosList()) {
       if (info.getLabelsOrDefault("NAME", "").equals("timersFired")) {
         ++timerCounterFound;
-        assertThat(
-            info,
-            allOf(
-                hasProperty("urn", equalTo("beam:metric:user:sum_int64:v1")),
-                hasProperty("type", equalTo("beam:metrics:sum_int64:v1")),
-                hasProperty("payload", equalTo(ByteString.copyFromUtf8("\001"))),
-                hasProperty(
-                    "labels",
-                    hasEntry(
-                        equalTo("NAMESPACE"),
-                        equalTo(
-                            "org.apache.beam.fn.harness.control.ProcessBundleHandlerTest$SimpleDoFn"))),
-                hasProperty("labels", hasEntry(equalTo("PTRANSFORM"), equalTo("3L")))));
+        assertEquals("beam:metric:user:sum_int64:v1", info.getUrn());
+        assertEquals("beam:metrics:sum_int64:v1", info.getType());
+        assertEquals(
+            "org.apache.beam.fn.harness.control.ProcessBundleHandlerTest$SimpleDoFn",
+            info.getLabelsOrDefault("NAMESPACE", ""));
+        assertEquals("3L", info.getLabelsOrDefault("PTRANSFORM", ""));
+        assertEquals(ByteString.copyFromUtf8("\001"), info.getPayload());
       }
     }
     assertEquals(1, timerCounterFound);
@@ -2057,19 +2048,13 @@ public void testStartFinishBundleMetrics() throws Exception {
       } else {
         continue;
       }
-      assertThat(
-          info,
-          allOf(
-              hasProperty("urn", equalTo("beam:metric:user:sum_int64:v1")),
-              hasProperty("type", equalTo("beam:metrics:sum_int64:v1")),
-              hasProperty("payload", equalTo(ByteString.copyFromUtf8("\001"))),
-              hasProperty(
-                  "labels",
-                  hasEntry(
-                      equalTo("NAMESPACE"),
-                      equalTo(
-                          "org.apache.beam.fn.harness.control.ProcessBundleHandlerTest$SimpleDoFn"))),
-              hasProperty("labels", hasEntry(equalTo("PTRANSFORM"), equalTo("3L")))));
+      assertEquals("beam:metric:user:sum_int64:v1", info.getUrn());
+      assertEquals("beam:metrics:sum_int64:v1", info.getType());
+      assertEquals(
+          "org.apache.beam.fn.harness.control.ProcessBundleHandlerTest$SimpleDoFn",
+          info.getLabelsOrDefault("NAMESPACE", ""));
+      assertEquals("3L", info.getLabelsOrDefault("PTRANSFORM", ""));
+      assertEquals(ByteString.copyFromUtf8("\001"), info.getPayload());
     }
     assertEquals(1, startCounterFound);
     assertEquals(1, finishCounterFound);