Skip to content

Commit 3db457f

Browse files
authored
Merge pull request #540 from jonesbusy/feature/use-single-class-import
Use single classs imports
2 parents 68a18ae + c0ea4b1 commit 3db457f

20 files changed

Lines changed: 89 additions & 54 deletions

File tree

plugin-modernizer-cli/src/main/java/io/jenkins/tools/pluginmodernizer/cli/Main.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package io.jenkins.tools.pluginmodernizer.cli;
22

3-
import io.jenkins.tools.pluginmodernizer.cli.command.*;
3+
import io.jenkins.tools.pluginmodernizer.cli.command.BuildMetadataCommand;
4+
import io.jenkins.tools.pluginmodernizer.cli.command.CleanupCommand;
5+
import io.jenkins.tools.pluginmodernizer.cli.command.DryRunCommand;
6+
import io.jenkins.tools.pluginmodernizer.cli.command.ListRecipesCommand;
7+
import io.jenkins.tools.pluginmodernizer.cli.command.RunCommand;
8+
import io.jenkins.tools.pluginmodernizer.cli.command.ValidateCommand;
9+
import io.jenkins.tools.pluginmodernizer.cli.command.VersionCommand;
410
import org.slf4j.bridge.SLF4JBridgeHandler;
511
import picocli.CommandLine;
612
import picocli.CommandLine.Command;

plugin-modernizer-cli/src/test/java/io/jenkins/tools/pluginmodernizer/cli/CommandLineITCase.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package io.jenkins.tools.pluginmodernizer.cli;
22

3-
import static org.junit.jupiter.api.Assertions.assertAll;
4-
import static org.junit.jupiter.api.Assertions.assertEquals;
5-
import static org.junit.jupiter.api.Assertions.assertNotNull;
6-
import static org.junit.jupiter.api.Assertions.assertTrue;
3+
import static org.junit.jupiter.api.Assertions.*;
74

85
import com.github.tomakehurst.wiremock.client.WireMock;
96
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/extractor/PluginMetadata.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@
88
import java.io.Serial;
99
import java.io.Serializable;
1010
import java.nio.file.Path;
11-
import java.util.*;
11+
import java.util.ArrayList;
12+
import java.util.Collection;
13+
import java.util.Collections;
14+
import java.util.HashMap;
15+
import java.util.HashSet;
16+
import java.util.List;
17+
import java.util.Map;
18+
import java.util.Set;
1219

1320
/**
1421
* Metadata of a plugin extracted from its POM file or code

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/github/GHService.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@
2727
import org.eclipse.jgit.api.errors.RefAlreadyExistsException;
2828
import org.eclipse.jgit.errors.UnsupportedCredentialItem;
2929
import org.eclipse.jgit.lib.Ref;
30-
import org.eclipse.jgit.transport.*;
30+
import org.eclipse.jgit.transport.CredentialItem;
31+
import org.eclipse.jgit.transport.CredentialsProvider;
32+
import org.eclipse.jgit.transport.PushResult;
33+
import org.eclipse.jgit.transport.RefSpec;
34+
import org.eclipse.jgit.transport.SshSessionFactory;
35+
import org.eclipse.jgit.transport.URIish;
36+
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
3137
import org.kohsuke.github.GHApp;
3238
import org.kohsuke.github.GHAppInstallationToken;
3339
import org.kohsuke.github.GHBranchSync;

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/recipes/FetchMetadata.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
import io.jenkins.tools.pluginmodernizer.core.extractor.MetadataVisitor;
44
import io.jenkins.tools.pluginmodernizer.core.extractor.PluginMetadata;
5-
import org.openrewrite.*;
5+
import org.openrewrite.ExecutionContext;
6+
import org.openrewrite.Recipe;
7+
import org.openrewrite.RecipeList;
8+
import org.openrewrite.TreeVisitor;
69
import org.slf4j.Logger;
710
import org.slf4j.LoggerFactory;
811

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/recipes/IsUsingArchetypeCommonFile.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
import io.jenkins.tools.pluginmodernizer.core.extractor.ArchetypeCommonFile;
44
import io.jenkins.tools.pluginmodernizer.core.extractor.ArchetypeCommonFileVisitor;
55
import io.jenkins.tools.pluginmodernizer.core.extractor.PluginMetadata;
6-
import org.openrewrite.*;
6+
import org.openrewrite.ExecutionContext;
7+
import org.openrewrite.Recipe;
8+
import org.openrewrite.SourceFile;
9+
import org.openrewrite.Tree;
10+
import org.openrewrite.TreeVisitor;
711
import org.openrewrite.marker.SearchResult;
812

913
/**

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/recipes/MetadataFinalizer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package io.jenkins.tools.pluginmodernizer.core.recipes;
22

33
import io.jenkins.tools.pluginmodernizer.core.extractor.MetadataFinalizerVisitor;
4-
import org.openrewrite.*;
4+
import org.openrewrite.ExecutionContext;
5+
import org.openrewrite.Recipe;
6+
import org.openrewrite.TreeVisitor;
57

68
/**
79
* Metadata finalizer. Executed after FetchMetadata to finalize the metadata and store it.

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/recipes/MigrateToJenkinsBaseLineProperty.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
import io.jenkins.tools.pluginmodernizer.core.visitors.AddBeforePropertyVisitor;
66
import io.jenkins.tools.pluginmodernizer.core.visitors.AddPropertyCommentVisitor;
77
import org.jspecify.annotations.Nullable;
8-
import org.openrewrite.*;
98
import org.openrewrite.Cursor;
9+
import org.openrewrite.ExecutionContext;
10+
import org.openrewrite.Recipe;
11+
import org.openrewrite.Tree;
12+
import org.openrewrite.TreeVisitor;
1013
import org.openrewrite.maven.AddPropertyVisitor;
1114
import org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId;
1215
import org.openrewrite.maven.MavenIsoVisitor;

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/recipes/RemoveReleaseDrafter.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
44
import io.jenkins.tools.pluginmodernizer.core.extractor.ArchetypeCommonFile;
55
import java.util.concurrent.atomic.AtomicBoolean;
6-
import org.openrewrite.*;
6+
import org.openrewrite.ExecutionContext;
7+
import org.openrewrite.ScanningRecipe;
8+
import org.openrewrite.SourceFile;
9+
import org.openrewrite.Tree;
10+
import org.openrewrite.TreeVisitor;
711
import org.slf4j.Logger;
812
import org.slf4j.LoggerFactory;
913

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/recipes/SetupDependabot.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
import java.util.concurrent.atomic.AtomicBoolean;
88
import java.util.stream.Collectors;
99
import org.intellij.lang.annotations.Language;
10-
import org.openrewrite.*;
10+
import org.openrewrite.ExecutionContext;
11+
import org.openrewrite.ScanningRecipe;
12+
import org.openrewrite.SourceFile;
13+
import org.openrewrite.Tree;
14+
import org.openrewrite.TreeVisitor;
1115
import org.openrewrite.yaml.YamlParser;
1216
import org.slf4j.Logger;
1317
import org.slf4j.LoggerFactory;

0 commit comments

Comments
 (0)