Skip to content

Commit 156266e

Browse files
committed
Address review comments
1 parent d4c5704 commit 156266e

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

rewrite-core/src/main/java/org/openrewrite/marketplace/RecipeBundleReader.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
import org.openrewrite.Recipe;
1919
import org.openrewrite.config.RecipeDescriptor;
2020

21-
import java.io.Closeable;
22-
import java.io.IOException;
2321
import java.util.Map;
2422

25-
public interface RecipeBundleReader extends Closeable {
23+
public interface RecipeBundleReader extends AutoCloseable {
2624
RecipeBundle getBundle();
2725

2826
RecipeMarketplace read();
@@ -31,7 +29,7 @@ public interface RecipeBundleReader extends Closeable {
3129

3230
Recipe prepare(RecipeListing listing, Map<String, Object> options);
3331

34-
default void close() throws IOException {
32+
default void close() throws Exception {
3533
// no-op
3634
}
3735
}

rewrite-core/src/main/java/org/openrewrite/marketplace/RecipeBundleResolver.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@
1515
*/
1616
package org.openrewrite.marketplace;
1717

18-
import java.io.Closeable;
19-
import java.io.IOException;
20-
21-
public interface RecipeBundleResolver extends Closeable {
18+
public interface RecipeBundleResolver extends AutoCloseable {
2219
String getEcosystem();
2320

2421
RecipeBundleReader resolve(RecipeBundle bundle);
2522

26-
default void close() throws IOException {
23+
default void close() throws Exception {
2724
// no-op
2825
}
2926
}

rewrite-core/src/main/java/org/openrewrite/marketplace/RecipeListing.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class RecipeListing implements Comparable<RecipeListing> {
6666
@With(AccessLevel.PACKAGE)
6767
private final RecipeBundle bundle;
6868

69-
private RecipeBundleReader resolve(List<RecipeBundleResolver> resolvers) {
69+
private RecipeBundleReader resolve(Collection<RecipeBundleResolver> resolvers) {
7070
for (RecipeBundleResolver resolver : resolvers) {
7171
if (resolver.getEcosystem().equals(bundle.getPackageEcosystem())) {
7272
return resolver.resolve(bundle);
@@ -75,11 +75,13 @@ private RecipeBundleReader resolve(List<RecipeBundleResolver> resolvers) {
7575
throw new IllegalStateException(String.format("No available resolver for '%s' ecosystem", bundle.getPackageEcosystem()));
7676
}
7777

78-
public RecipeDescriptor describe(List<RecipeBundleResolver> resolvers) {
78+
public RecipeDescriptor describe(Collection<RecipeBundleResolver> resolvers) {
79+
// noinspection resource
7980
return resolve(resolvers).describe(this);
8081
}
8182

82-
public Recipe prepare(List<RecipeBundleResolver> resolvers, Map<String, Object> options) {
83+
public Recipe prepare(Collection<RecipeBundleResolver> resolvers, Map<String, Object> options) {
84+
// noinspection resource
8385
return resolve(resolvers).prepare(this, options);
8486
}
8587

rewrite-core/src/test/java/org/openrewrite/rpc/RewriteRpcTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
import java.io.IOException;
3838
import java.io.PipedInputStream;
3939
import java.io.PipedOutputStream;
40+
import java.util.List;
4041
import java.util.Map;
4142
import java.util.concurrent.CountDownLatch;
4243

43-
import static java.util.Collections.singletonList;
4444
import static java.util.Objects.requireNonNull;
4545
import static org.assertj.core.api.Assertions.assertThat;
4646
import static org.openrewrite.marketplace.RecipeBundle.runtimeClasspath;
@@ -71,7 +71,7 @@ void before() throws IOException {
7171
client = new RewriteRpc(new JsonRpc(new HeaderDelimitedMessageHandler(clientFormatter, clientIn, clientOut)), marketplace)
7272
.batchSize(1);
7373

74-
server = new RewriteRpc(new JsonRpc(new HeaderDelimitedMessageHandler(serverFormatter, serverIn, serverOut)), marketplace, singletonList(new TestRecipeBundleResolver()))
74+
server = new RewriteRpc(new JsonRpc(new HeaderDelimitedMessageHandler(serverFormatter, serverIn, serverOut)), marketplace, List.of(new TestRecipeBundleResolver()))
7575
.batchSize(1);
7676
}
7777

rewrite-maven/src/main/java/org/openrewrite/maven/marketplace/MavenRecipeBundleResolver.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.openrewrite.maven.tree.Scope;
2828
import org.openrewrite.maven.utilities.MavenArtifactDownloader;
2929

30-
import java.io.IOException;
3130
import java.util.Optional;
3231

3332
public class MavenRecipeBundleResolver implements RecipeBundleResolver {
@@ -91,7 +90,7 @@ private Optional<MavenResolutionResult> resolveDependencies(GroupArtifactVersion
9190
}
9291

9392
@Override
94-
public void close() throws IOException {
93+
public void close() throws Exception {
9594
if (reader != null) {
9695
reader.close();
9796
}

0 commit comments

Comments
 (0)