Fix merge issues

Signed-off-by: Aaron Lew <64337293+aaronlew02@users.noreply.github.com>

Author: aaronlew02

sigstore-java/src/main/java/dev/sigstore/TrustedRootProvider.java

@@ -24,14 +24,9 @@
 import java.nio.file.Path;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 import java.security.spec.InvalidKeySpecException;
 
-import com.google.common.base.Preconditions;
-
-import dev.sigstore.trustroot.SigstoreConfigurationException;
-import dev.sigstore.trustroot.SigstoreTrustedRoot;
-import dev.sigstore.tuf.SigstoreTufClient;
-
 @FunctionalInterface
 public interface TrustedRootProvider {
 
@@ -47,7 +42,7 @@ static TrustedRootProvider from(SigstoreTufClient.Builder tufClientBuilder) {
       } catch (IOException
           | NoSuchAlgorithmException
           | InvalidKeySpecException
-          | InvalidKeyException 
+          | InvalidKeyException
           | CertificateException ex) {
         throw new SigstoreConfigurationException(ex);
       }

sigstore-java/src/main/java/dev/sigstore/trustroot/SigstoreTrustedRoot.java

@@ -15,11 +15,9 @@
  */
 package dev.sigstore.trustroot;
 
-import java.io.IOException;
-import java.io.InputStream;
+import com.google.api.client.util.Lists;
 import com.google.protobuf.util.JsonFormat;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
+import dev.sigstore.proto.trustroot.v1.TrustedRoot;
 import dev.sigstore.proto.trustroot.v1.TrustedRootOrBuilder;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,15 +26,8 @@
 import java.security.cert.CertificateException;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.immutables.value.Value.Immutable;
 
-import com.google.api.client.util.Lists;
-import com.google.protobuf.util.JsonFormat;
-
-import dev.sigstore.proto.trustroot.v1.TrustedRoot;
-import dev.sigstore.proto.trustroot.v1.TrustedRootOrBuilder;
-
 @Immutable
 public interface SigstoreTrustedRoot {
 

sigstore-java/src/main/java/dev/sigstore/tuf/SigstoreTufClient.java

@@ -15,6 +15,12 @@
  */
 package dev.sigstore.tuf;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.protobuf.util.JsonFormat;
+import dev.sigstore.proto.trustroot.v1.TrustedRoot;
+import dev.sigstore.trustroot.SigstoreConfigurationException;
+import dev.sigstore.trustroot.SigstoreTrustedRoot;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -23,18 +29,11 @@
 import java.nio.file.Path;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 import java.security.spec.InvalidKeySpecException;
 import java.time.Duration;
 import java.time.Instant;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.protobuf.util.JsonFormat;
-
-import dev.sigstore.proto.trustroot.v1.TrustedRoot;
-import dev.sigstore.trustroot.SigstoreConfigurationException;
-import dev.sigstore.trustroot.SigstoreTrustedRoot;
-
 /**
  * Wrapper around {@link dev.sigstore.tuf.Updater} that provides access to sigstore specific
  * metadata items in a convenient API.

sigstore-java/src/test/java/dev/sigstore/timestamp/client/TimestampClientHttpTest.java

@@ -129,8 +129,7 @@ public void timestamp_failure_badResponse_nonRetryableError() throws Exception {
   public void timestamp_failure_badResponse_RetryableError() throws Exception {
     try (var server = new MockWebServer()) {
       for (var i = 0; i < 6; i++) {
-        server.enqueue(new
-         MockResponse().setResponseCode(500));
+        server.enqueue(new MockResponse().setResponseCode(500));
       }
       server.start();
 

sigstore-java/src/test/java/dev/sigstore/trustroot/SigstoreTrustedRootTest.java

@@ -32,10 +32,6 @@ class SigstoreTrustedRootTest {
   private static SigstoreTrustedRoot trustRoot;
 
   @BeforeAll
-  public static void initTrustRoot() throws Exception {
-    trustRoot =
-        SigstoreTrustedRoot.from(
-            Resources.getResource("dev/sigstore/trustroot/trusted_root.json").openStream());
   public static void initTrustRoot() throws Exception {
     trustRoot =
         SigstoreTrustedRoot.from(