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

@@ -15,15 +15,12 @@
  */
 package dev.sigstore;
 
-import com.google.common.base.Preconditions;
-import dev.sigstore.trustroot.SigstoreConfigurationException;
-import dev.sigstore.trustroot.SigstoreTrustedRoot;
-import dev.sigstore.tuf.SigstoreTufClient;
 import java.io.IOException;
 import java.nio.file.Files;
 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;
@@ -36,7 +33,7 @@
 public interface TrustedRootProvider {
 
   SigstoreTrustedRoot get() throws SigstoreConfigurationException;
-
+  
   static TrustedRootProvider from(SigstoreTufClient.Builder tufClientBuilder) {
     Preconditions.checkNotNull(tufClientBuilder);
     return () -> {

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

@@ -15,12 +15,6 @@
  */
 package dev.sigstore.trustroot;
 
-import java.io.IOException;
-import java.io.InputStream;
-import com.google.protobuf.util.JsonFormat;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import dev.sigstore.proto.trustroot.v1.TrustedRootOrBuilder;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -53,8 +47,8 @@ public interface SigstoreTrustedRoot {
   List<CertificateAuthority> getTSAs();
 
   /** Create an instance from an input stream of a json representation of a trustedroot. */
-  static SigstoreTrustedRoot from(InputStream json)
-      throws SigstoreConfigurationException, CertificateException {
+  static SigstoreTrustedRoot from(InputStream json) 
+    throws SigstoreConfigurationException, CertificateException {
     var trustedRootBuilder = TrustedRoot.newBuilder();
     try (var reader = new InputStreamReader(json, StandardCharsets.UTF_8)) {
       JsonFormat.parser().merge(reader, trustedRootBuilder);
@@ -65,8 +59,8 @@ static SigstoreTrustedRoot from(InputStream json)
   }
 
   /** Create an instance from a parsed proto definition of a trustedroot. */
-  static SigstoreTrustedRoot from(TrustedRootOrBuilder proto)
-      throws SigstoreConfigurationException, CertificateException {
+  static SigstoreTrustedRoot from(TrustedRootOrBuilder proto) 
+    throws SigstoreConfigurationException, CertificateException {
     List<CertificateAuthority> cas = Lists.newArrayList();
     for (var certAuthority : proto.getCertificateAuthoritiesList()) {
       try {

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

@@ -23,6 +23,7 @@
 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;

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(