diff --git a/auth/src/main/java/org/jboss/pnc/bacon/auth/KeycloakClientImpl.java b/auth/src/main/java/org/jboss/pnc/bacon/auth/KeycloakClientImpl.java index 1d41ca544..112c206a8 100644 --- a/auth/src/main/java/org/jboss/pnc/bacon/auth/KeycloakClientImpl.java +++ b/auth/src/main/java/org/jboss/pnc/bacon/auth/KeycloakClientImpl.java @@ -1,9 +1,12 @@ package org.jboss.pnc.bacon.auth; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.time.Instant; +import java.util.Optional; + +import javax.net.ssl.SSLHandshakeException; + import kong.unirest.HttpResponse; import kong.unirest.MultipartBody; import kong.unirest.Unirest; @@ -12,6 +15,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.auth.model.CacheFile; import org.jboss.pnc.bacon.auth.model.Credential; import org.jboss.pnc.bacon.auth.model.KeycloakResponse; @@ -20,12 +24,10 @@ import org.keycloak.adapters.installed.KeycloakInstalled; import org.keycloak.representations.AccessToken; -import javax.net.ssl.SSLHandshakeException; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.time.Instant; -import java.util.Optional; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; /** * Authenticates to Keycloak using direct flow! diff --git a/auth/src/main/java/org/jboss/pnc/bacon/auth/model/CacheFile.java b/auth/src/main/java/org/jboss/pnc/bacon/auth/model/CacheFile.java index 99cc8e27a..0f7aeefff 100644 --- a/auth/src/main/java/org/jboss/pnc/bacon/auth/model/CacheFile.java +++ b/auth/src/main/java/org/jboss/pnc/bacon/auth/model/CacheFile.java @@ -1,14 +1,5 @@ package org.jboss.pnc.bacon.auth.model; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import lombok.Getter; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.codec.digest.DigestUtils; -import org.jboss.pnc.bacon.common.Constant; -import org.jboss.pnc.bacon.config.Config; - import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -21,6 +12,17 @@ import java.util.Optional; import java.util.Set; +import lombok.Getter; +import lombok.Setter; +import lombok.extern.slf4j.Slf4j; + +import org.apache.commons.codec.digest.DigestUtils; +import org.jboss.pnc.bacon.common.Constant; +import org.jboss.pnc.bacon.config.Config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; + @Getter @Setter @Slf4j diff --git a/auth/src/main/java/org/jboss/pnc/bacon/auth/model/Credential.java b/auth/src/main/java/org/jboss/pnc/bacon/auth/model/Credential.java index ca70a0030..12bf0434c 100644 --- a/auth/src/main/java/org/jboss/pnc/bacon/auth/model/Credential.java +++ b/auth/src/main/java/org/jboss/pnc/bacon/auth/model/Credential.java @@ -1,14 +1,15 @@ package org.jboss.pnc.bacon.auth.model; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; +import java.time.Instant; +import java.time.temporal.ChronoUnit; + import lombok.Builder; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import java.time.Instant; -import java.time.temporal.ChronoUnit; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; @Data @Builder(toBuilder = true, builderClassName = "Builder") diff --git a/auth/src/main/java/org/jboss/pnc/bacon/auth/model/KeycloakResponse.java b/auth/src/main/java/org/jboss/pnc/bacon/auth/model/KeycloakResponse.java index d05377a7c..868962219 100644 --- a/auth/src/main/java/org/jboss/pnc/bacon/auth/model/KeycloakResponse.java +++ b/auth/src/main/java/org/jboss/pnc/bacon/auth/model/KeycloakResponse.java @@ -1,8 +1,9 @@ package org.jboss.pnc.bacon.auth.model; +import lombok.Data; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; @Data @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/auth/src/test/java/org/jboss/pnc/bacon/auth/KeycloakClientImplTest.java b/auth/src/test/java/org/jboss/pnc/bacon/auth/KeycloakClientImplTest.java index f35a4c1b5..eabba29a7 100644 --- a/auth/src/test/java/org/jboss/pnc/bacon/auth/KeycloakClientImplTest.java +++ b/auth/src/test/java/org/jboss/pnc/bacon/auth/KeycloakClientImplTest.java @@ -1,11 +1,11 @@ package org.jboss.pnc.bacon.auth; +import static org.junit.jupiter.api.Assertions.*; + import org.jboss.pnc.bacon.auth.spi.KeycloakClient; import org.jboss.pnc.bacon.common.exception.FatalException; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - class KeycloakClientImplTest { @Test diff --git a/cli/src/main/java/org/codehaus/plexus/logging/console/ConsoleLogger.java b/cli/src/main/java/org/codehaus/plexus/logging/console/ConsoleLogger.java index 3ad9fbd22..4e5715859 100644 --- a/cli/src/main/java/org/codehaus/plexus/logging/console/ConsoleLogger.java +++ b/cli/src/main/java/org/codehaus/plexus/logging/console/ConsoleLogger.java @@ -18,6 +18,7 @@ package org.codehaus.plexus.logging.console; import lombok.extern.slf4j.Slf4j; + import org.codehaus.plexus.logging.AbstractLogger; import org.codehaus.plexus.logging.Logger; diff --git a/cli/src/main/java/org/jboss/pnc/bacon/cli/App.java b/cli/src/main/java/org/jboss/pnc/bacon/cli/App.java index 28714828c..937bae739 100644 --- a/cli/src/main/java/org/jboss/pnc/bacon/cli/App.java +++ b/cli/src/main/java/org/jboss/pnc/bacon/cli/App.java @@ -17,15 +17,14 @@ */ package org.jboss.pnc.bacon.cli; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.encoder.PatternLayoutEncoder; -import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.ConsoleAppender; -import com.redhat.resilience.otel.OTelCLIHelper; -import io.opentelemetry.api.trace.Span; -import io.opentelemetry.api.trace.SpanContext; +import static picocli.CommandLine.ScopeType.INHERIT; + +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; + import lombok.extern.slf4j.Slf4j; + import org.fusesource.jansi.AnsiConsole; import org.jboss.bacon.da.Da; import org.jboss.bacon.experimental.Experimental; @@ -54,17 +53,22 @@ import org.jline.terminal.TerminalBuilder; import org.jline.widget.TailTipWidgets; import org.slf4j.LoggerFactory; + import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.IExecutionExceptionHandler; import picocli.CommandLine.Option; import picocli.shell.jline3.PicocliCommands; +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.encoder.PatternLayoutEncoder; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.ConsoleAppender; -import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; +import com.redhat.resilience.otel.OTelCLIHelper; -import static picocli.CommandLine.ScopeType.INHERIT; +import io.opentelemetry.api.trace.Span; +import io.opentelemetry.api.trace.SpanContext; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/cli/src/test/java/org/jboss/pnc/bacon/cli/AppTest.java b/cli/src/test/java/org/jboss/pnc/bacon/cli/AppTest.java index 297c62f6a..2a01c624c 100644 --- a/cli/src/test/java/org/jboss/pnc/bacon/cli/AppTest.java +++ b/cli/src/test/java/org/jboss/pnc/bacon/cli/AppTest.java @@ -1,16 +1,5 @@ package org.jboss.pnc.bacon.cli; -import ch.qos.logback.classic.Level; -import ch.qos.logback.core.pattern.color.ANSIConstants; -import org.apache.commons.io.FilenameUtils; -import org.jboss.pnc.bacon.common.ObjectHelper; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import static com.github.stefanbirkner.systemlambda.SystemLambda.restoreSystemProperties; import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemErr; import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut; @@ -18,6 +7,18 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.apache.commons.io.FilenameUtils; +import org.jboss.pnc.bacon.common.ObjectHelper; +import org.junit.jupiter.api.Test; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.core.pattern.color.ANSIConstants; + class AppTest { private static final String PNC_TEST_CLASSES = FilenameUtils.separatorsToSystem("pnc/target/test-classes"); diff --git a/common/src/main/java/org/jboss/pnc/bacon/common/ObjectHelper.java b/common/src/main/java/org/jboss/pnc/bacon/common/ObjectHelper.java index fd1330848..6b247bc63 100644 --- a/common/src/main/java/org/jboss/pnc/bacon/common/ObjectHelper.java +++ b/common/src/main/java/org/jboss/pnc/bacon/common/ObjectHelper.java @@ -2,6 +2,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; + import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/common/src/main/java/org/jboss/pnc/bacon/common/cli/AbstractBuildListCommand.java b/common/src/main/java/org/jboss/pnc/bacon/common/cli/AbstractBuildListCommand.java index 795060a56..683786545 100644 --- a/common/src/main/java/org/jboss/pnc/bacon/common/cli/AbstractBuildListCommand.java +++ b/common/src/main/java/org/jboss/pnc/bacon/common/cli/AbstractBuildListCommand.java @@ -17,12 +17,13 @@ */ package org.jboss.pnc.bacon.common.cli; +import java.util.Collection; + import org.jboss.pnc.client.RemoteResourceException; import org.jboss.pnc.dto.Build; import org.jboss.pnc.rest.api.parameters.BuildsFilterParameters; -import picocli.CommandLine.Option; -import java.util.Collection; +import picocli.CommandLine.Option; /** * Class used to provide a default implementation for List* type commands. diff --git a/common/src/main/java/org/jboss/pnc/bacon/common/cli/AbstractGetSpecificCommand.java b/common/src/main/java/org/jboss/pnc/bacon/common/cli/AbstractGetSpecificCommand.java index 742cacee2..ca9d9082b 100644 --- a/common/src/main/java/org/jboss/pnc/bacon/common/cli/AbstractGetSpecificCommand.java +++ b/common/src/main/java/org/jboss/pnc/bacon/common/cli/AbstractGetSpecificCommand.java @@ -17,14 +17,17 @@ */ package org.jboss.pnc.bacon.common.cli; -import com.fasterxml.jackson.core.JsonProcessingException; +import java.util.concurrent.Callable; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.exception.FatalException; import org.jboss.pnc.client.ClientException; + import picocli.CommandLine.Parameters; -import java.util.concurrent.Callable; +import com.fasterxml.jackson.core.JsonProcessingException; /** * Class used to get specific item from PNC. The subclass only has to implement 'getSpecific' to teach it how to diff --git a/common/src/main/java/org/jboss/pnc/bacon/common/cli/AbstractListCommand.java b/common/src/main/java/org/jboss/pnc/bacon/common/cli/AbstractListCommand.java index 423976f91..ef4f6b68e 100644 --- a/common/src/main/java/org/jboss/pnc/bacon/common/cli/AbstractListCommand.java +++ b/common/src/main/java/org/jboss/pnc/bacon/common/cli/AbstractListCommand.java @@ -17,16 +17,19 @@ */ package org.jboss.pnc.bacon.common.cli; -import com.fasterxml.jackson.core.JsonProcessingException; +import java.util.Collection; +import java.util.concurrent.Callable; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.exception.FatalException; import org.jboss.pnc.client.ClientException; import org.jboss.pnc.client.RemoteResourceException; + import picocli.CommandLine.Option; -import java.util.Collection; -import java.util.concurrent.Callable; +import com.fasterxml.jackson.core.JsonProcessingException; /** * Class used to provide a default implementation for List* type commands. diff --git a/common/src/main/java/org/jboss/pnc/bacon/common/cli/JSONCommandHandler.java b/common/src/main/java/org/jboss/pnc/bacon/common/cli/JSONCommandHandler.java index d5cfe7a50..052d08297 100644 --- a/common/src/main/java/org/jboss/pnc/bacon/common/cli/JSONCommandHandler.java +++ b/common/src/main/java/org/jboss/pnc/bacon/common/cli/JSONCommandHandler.java @@ -1,8 +1,10 @@ package org.jboss.pnc.bacon.common.cli; import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.exception.FatalException; + import picocli.CommandLine; import picocli.CommandLine.Model.CommandSpec; import picocli.CommandLine.Spec; diff --git a/common/src/main/java/org/jboss/pnc/bacon/common/cli/VersionProvider.java b/common/src/main/java/org/jboss/pnc/bacon/common/cli/VersionProvider.java index 5f797034c..feaed6a44 100644 --- a/common/src/main/java/org/jboss/pnc/bacon/common/cli/VersionProvider.java +++ b/common/src/main/java/org/jboss/pnc/bacon/common/cli/VersionProvider.java @@ -1,6 +1,7 @@ package org.jboss.pnc.bacon.common.cli; import org.commonjava.maven.ext.common.util.ManifestUtils; + import picocli.CommandLine; public class VersionProvider implements CommandLine.IVersionProvider { diff --git a/common/src/test/java/org/jboss/pnc/bacon/common/ObjectHelperTest.java b/common/src/test/java/org/jboss/pnc/bacon/common/ObjectHelperTest.java index 35863be3e..b96c75365 100644 --- a/common/src/test/java/org/jboss/pnc/bacon/common/ObjectHelperTest.java +++ b/common/src/test/java/org/jboss/pnc/bacon/common/ObjectHelperTest.java @@ -1,13 +1,14 @@ package org.jboss.pnc.bacon.common; -import ch.qos.logback.classic.Level; -import org.junit.jupiter.api.Test; +import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut; +import static org.junit.jupiter.api.Assertions.*; import java.util.HashMap; import java.util.Map; -import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; + +import ch.qos.logback.classic.Level; class ObjectHelperTest { diff --git a/config/src/main/java/org/jboss/pnc/bacon/config/Config.java b/config/src/main/java/org/jboss/pnc/bacon/config/Config.java index d33e70621..f73b8b3bb 100644 --- a/config/src/main/java/org/jboss/pnc/bacon/config/Config.java +++ b/config/src/main/java/org/jboss/pnc/bacon/config/Config.java @@ -17,12 +17,6 @@ */ package org.jboss.pnc.bacon.config; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; - import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -30,6 +24,13 @@ import java.util.List; import java.util.stream.Collectors; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 12/14/18 diff --git a/config/src/main/java/org/jboss/pnc/bacon/config/ConfigProfile.java b/config/src/main/java/org/jboss/pnc/bacon/config/ConfigProfile.java index 2a674e682..88eb412cb 100644 --- a/config/src/main/java/org/jboss/pnc/bacon/config/ConfigProfile.java +++ b/config/src/main/java/org/jboss/pnc/bacon/config/ConfigProfile.java @@ -17,10 +17,10 @@ */ package org.jboss.pnc.bacon.config; -import lombok.Data; - import java.util.Map; +import lombok.Data; + @Data public class ConfigProfile { diff --git a/config/src/main/java/org/jboss/pnc/bacon/config/Validate.java b/config/src/main/java/org/jboss/pnc/bacon/config/Validate.java index d06ccca5a..2963a85b3 100644 --- a/config/src/main/java/org/jboss/pnc/bacon/config/Validate.java +++ b/config/src/main/java/org/jboss/pnc/bacon/config/Validate.java @@ -1,13 +1,13 @@ package org.jboss.pnc.bacon.config; -import javax.validation.ConstraintViolation; - import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; import java.util.Set; +import javax.validation.ConstraintViolation; + public interface Validate { /** diff --git a/da/src/main/java/org/jboss/bacon/da/CustomRestHeaderFilter.java b/da/src/main/java/org/jboss/bacon/da/CustomRestHeaderFilter.java index e23360103..3ce5c1966 100644 --- a/da/src/main/java/org/jboss/bacon/da/CustomRestHeaderFilter.java +++ b/da/src/main/java/org/jboss/bacon/da/CustomRestHeaderFilter.java @@ -1,13 +1,14 @@ package org.jboss.bacon.da; -import io.opentelemetry.api.trace.SpanContext; -import org.jboss.pnc.api.constants.MDCHeaderKeys; -import org.jboss.pnc.common.otel.OtelUtils; +import java.io.IOException; import javax.ws.rs.client.ClientRequestContext; import javax.ws.rs.client.ClientRequestFilter; -import java.io.IOException; +import org.jboss.pnc.api.constants.MDCHeaderKeys; +import org.jboss.pnc.common.otel.OtelUtils; + +import io.opentelemetry.api.trace.SpanContext; public class CustomRestHeaderFilter implements ClientRequestFilter { diff --git a/da/src/main/java/org/jboss/bacon/da/DABlockListCli.java b/da/src/main/java/org/jboss/bacon/da/DABlockListCli.java index e42a02677..ac798fcff 100644 --- a/da/src/main/java/org/jboss/bacon/da/DABlockListCli.java +++ b/da/src/main/java/org/jboss/bacon/da/DABlockListCli.java @@ -17,19 +17,21 @@ */ package org.jboss.bacon.da; +import java.io.IOException; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.Callable; + import lombok.extern.slf4j.Slf4j; + import org.jboss.bacon.da.rest.endpoint.ListingsApi; import org.jboss.da.listings.model.rest.RestArtifact; import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.JSONCommandHandler; import org.jboss.pnc.bacon.common.exception.FatalException; -import picocli.CommandLine; -import java.io.IOException; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.Callable; +import picocli.CommandLine; @CommandLine.Command( name = "blocklist", diff --git a/da/src/main/java/org/jboss/bacon/da/DALookupCli.java b/da/src/main/java/org/jboss/bacon/da/DALookupCli.java index dc5589979..23a87fa46 100644 --- a/da/src/main/java/org/jboss/bacon/da/DALookupCli.java +++ b/da/src/main/java/org/jboss/bacon/da/DALookupCli.java @@ -17,7 +17,17 @@ */ package org.jboss.bacon.da; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Scanner; +import java.util.Set; +import java.util.concurrent.Callable; + import lombok.extern.slf4j.Slf4j; + import org.jboss.bacon.da.rest.endpoint.LookupApi; import org.jboss.da.lookup.model.MavenLatestRequest; import org.jboss.da.lookup.model.MavenLatestResult; @@ -30,16 +40,8 @@ import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.JSONCommandHandler; import org.jboss.pnc.bacon.common.exception.FatalException; -import picocli.CommandLine; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Scanner; -import java.util.Set; -import java.util.concurrent.Callable; +import picocli.CommandLine; @CommandLine.Command( name = "lookup", diff --git a/da/src/main/java/org/jboss/bacon/da/DAReportsCli.java b/da/src/main/java/org/jboss/bacon/da/DAReportsCli.java index 51a4e9324..dedd32ea6 100644 --- a/da/src/main/java/org/jboss/bacon/da/DAReportsCli.java +++ b/da/src/main/java/org/jboss/bacon/da/DAReportsCli.java @@ -1,6 +1,14 @@ package org.jboss.bacon.da; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.concurrent.Callable; + import lombok.extern.slf4j.Slf4j; + import org.jboss.bacon.da.rest.endpoint.ReportsApi; import org.jboss.da.model.rest.GAV; import org.jboss.da.model.rest.NPMPackage; @@ -18,14 +26,8 @@ import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.JSONCommandHandler; import org.jboss.pnc.bacon.common.exception.FatalException; -import picocli.CommandLine; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.concurrent.Callable; +import picocli.CommandLine; @CommandLine.Command( name = "reports", diff --git a/da/src/main/java/org/jboss/bacon/da/DaHelper.java b/da/src/main/java/org/jboss/bacon/da/DaHelper.java index ddf20683b..172177c2f 100644 --- a/da/src/main/java/org/jboss/bacon/da/DaHelper.java +++ b/da/src/main/java/org/jboss/bacon/da/DaHelper.java @@ -17,8 +17,17 @@ */ package org.jboss.bacon.da; -import com.redhat.resilience.otel.OTelCLIHelper; -import io.opentelemetry.api.trace.Span; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import javax.ws.rs.client.ClientRequestContext; +import javax.ws.rs.client.ClientRequestFilter; +import javax.ws.rs.core.MultivaluedMap; + import org.jboss.bacon.da.rest.endpoint.ListingsApi; import org.jboss.bacon.da.rest.endpoint.LookupApi; import org.jboss.bacon.da.rest.endpoint.ReportsApi; @@ -39,16 +48,8 @@ import org.jboss.resteasy.plugins.providers.RegisterBuiltin; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.MultivaluedMap; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; +import com.redhat.resilience.otel.OTelCLIHelper; +import io.opentelemetry.api.trace.Span; /** * Helper methods for DA stuff diff --git a/da/src/main/java/org/jboss/bacon/da/rest/endpoint/ListingsApi.java b/da/src/main/java/org/jboss/bacon/da/rest/endpoint/ListingsApi.java index 8f21aaf6a..5bf0f23fc 100644 --- a/da/src/main/java/org/jboss/bacon/da/rest/endpoint/ListingsApi.java +++ b/da/src/main/java/org/jboss/bacon/da/rest/endpoint/ListingsApi.java @@ -17,15 +17,8 @@ */ package org.jboss.bacon.da.rest.endpoint; -import org.jboss.da.listings.model.ProductSupportStatus; -import org.jboss.da.listings.model.rest.ContainsResponse; -import org.jboss.da.listings.model.rest.RestArtifact; -import org.jboss.da.listings.model.rest.RestProduct; -import org.jboss.da.listings.model.rest.RestProductArtifact; -import org.jboss.da.listings.model.rest.RestProductGAV; -import org.jboss.da.listings.model.rest.RestProductInput; -import org.jboss.da.listings.model.rest.SuccessResponse; -import org.jboss.da.listings.model.rest.WLFill; +import java.util.Collection; +import java.util.List; import javax.validation.Valid; import javax.ws.rs.Consumes; @@ -38,8 +31,15 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; -import java.util.Collection; -import java.util.List; +import org.jboss.da.listings.model.ProductSupportStatus; +import org.jboss.da.listings.model.rest.ContainsResponse; +import org.jboss.da.listings.model.rest.RestArtifact; +import org.jboss.da.listings.model.rest.RestProduct; +import org.jboss.da.listings.model.rest.RestProductArtifact; +import org.jboss.da.listings.model.rest.RestProductGAV; +import org.jboss.da.listings.model.rest.RestProductInput; +import org.jboss.da.listings.model.rest.SuccessResponse; +import org.jboss.da.listings.model.rest.WLFill; @Path("/listings") @javax.annotation.Generated( diff --git a/da/src/main/java/org/jboss/bacon/da/rest/endpoint/LookupApi.java b/da/src/main/java/org/jboss/bacon/da/rest/endpoint/LookupApi.java index ce06ee64e..7b285d0ab 100644 --- a/da/src/main/java/org/jboss/bacon/da/rest/endpoint/LookupApi.java +++ b/da/src/main/java/org/jboss/bacon/da/rest/endpoint/LookupApi.java @@ -17,6 +17,13 @@ */ package org.jboss.bacon.da.rest.endpoint; +import java.util.Set; + +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; + import org.jboss.da.lookup.model.MavenLatestRequest; import org.jboss.da.lookup.model.MavenLatestResult; import org.jboss.da.lookup.model.MavenLookupRequest; @@ -26,13 +33,6 @@ import org.jboss.da.lookup.model.NPMLookupRequest; import org.jboss.da.lookup.model.NPMLookupResult; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - -import java.util.Set; - @Path("/lookup") @Consumes({ "application/json" }) @Produces({ "application/json" }) diff --git a/da/src/main/java/org/jboss/bacon/da/rest/endpoint/ReportsApi.java b/da/src/main/java/org/jboss/bacon/da/rest/endpoint/ReportsApi.java index 34b562a8e..345a4e9d3 100644 --- a/da/src/main/java/org/jboss/bacon/da/rest/endpoint/ReportsApi.java +++ b/da/src/main/java/org/jboss/bacon/da/rest/endpoint/ReportsApi.java @@ -17,6 +17,14 @@ */ package org.jboss.bacon.da.rest.endpoint; +import java.util.List; +import java.util.Set; + +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; + import org.jboss.da.reports.model.request.AlignReportRequest; import org.jboss.da.reports.model.request.BuiltReportRequest; import org.jboss.da.reports.model.request.LookupGAVsRequest; @@ -29,14 +37,6 @@ import org.jboss.da.reports.model.response.NPMVersionsReport; import org.jboss.da.reports.model.response.Report; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - -import java.util.List; -import java.util.Set; - @Path("/reports") @Consumes({ "application/json" }) @Produces({ "application/json" }) diff --git a/da/src/test/java/org/jboss/bacon/da/DaHelperTest.java b/da/src/test/java/org/jboss/bacon/da/DaHelperTest.java index 23bd1ac9d..82088c9f7 100644 --- a/da/src/test/java/org/jboss/bacon/da/DaHelperTest.java +++ b/da/src/test/java/org/jboss/bacon/da/DaHelperTest.java @@ -17,12 +17,12 @@ */ package org.jboss.bacon.da; +import static org.junit.jupiter.api.Assertions.*; + import org.jboss.da.model.rest.GAV; import org.jboss.da.model.rest.NPMPackage; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - class DaHelperTest { @Test diff --git a/eclipse-codeStyle.xml b/eclipse-codeStyle.xml deleted file mode 100644 index b5fdd4b83..000000000 --- a/eclipse-codeStyle.xml +++ /dev/null @@ -1,303 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/DependencyGenerator.java b/experimental/src/main/java/org/jboss/bacon/experimental/DependencyGenerator.java index 1681b0c50..8e816db9b 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/DependencyGenerator.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/DependencyGenerator.java @@ -17,9 +17,14 @@ */ package org.jboss.bacon.experimental; -import com.fasterxml.jackson.core.JsonProcessingException; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.Stack; + import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; + import org.jboss.bacon.experimental.cli.DependencyGeneratorCommand; import org.jboss.bacon.experimental.impl.config.GeneratorConfig; import org.jboss.bacon.experimental.impl.dependencies.DependencyResolver; @@ -33,12 +38,10 @@ import org.jboss.pnc.bacon.common.exception.FatalException; import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; + import picocli.CommandLine; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.Stack; +import com.fasterxml.jackson.core.JsonProcessingException; @CommandLine.Command( name = "dependency-generator", diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/cli/DependencyGeneratorCommand.java b/experimental/src/main/java/org/jboss/bacon/experimental/cli/DependencyGeneratorCommand.java index 23219d57b..7c03d7d89 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/cli/DependencyGeneratorCommand.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/cli/DependencyGeneratorCommand.java @@ -1,21 +1,22 @@ package org.jboss.bacon.experimental.cli; -import org.jboss.bacon.experimental.impl.config.GeneratorConfig; -import org.jboss.pnc.bacon.common.exception.FatalException; -import org.jboss.pnc.bacon.config.Validate; -import org.yaml.snakeyaml.Yaml; -import picocli.CommandLine; +import java.io.BufferedReader; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Set; import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; -import java.io.BufferedReader; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Set; +import org.jboss.bacon.experimental.impl.config.GeneratorConfig; +import org.jboss.pnc.bacon.common.exception.FatalException; +import org.jboss.pnc.bacon.config.Validate; +import org.yaml.snakeyaml.Yaml; + +import picocli.CommandLine; public class DependencyGeneratorCommand extends ExperimentalCommand { @CommandLine.Option(names = { "--project-dir" }, description = "Project directory") diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/cli/ExperimentalCommand.java b/experimental/src/main/java/org/jboss/bacon/experimental/cli/ExperimentalCommand.java index d978dda1c..8b5030448 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/cli/ExperimentalCommand.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/cli/ExperimentalCommand.java @@ -1,12 +1,12 @@ package org.jboss.bacon.experimental.cli; +import java.util.concurrent.Callable; + import org.jboss.pnc.bacon.common.cli.JSONCommandHandler; import org.jboss.pnc.bacon.common.exception.FatalException; import org.jboss.pnc.bacon.config.Config; import org.jboss.pnc.bacon.config.ConfigProfile; -import java.util.concurrent.Callable; - public abstract class ExperimentalCommand extends JSONCommandHandler implements Callable { @Override diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/BuildConfigGeneratorConfig.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/BuildConfigGeneratorConfig.java index c381c8a4d..213440095 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/BuildConfigGeneratorConfig.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/BuildConfigGeneratorConfig.java @@ -1,14 +1,16 @@ package org.jboss.bacon.experimental.impl.config; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import java.util.LinkedHashMap; +import java.util.Set; import javax.validation.Valid; import javax.validation.constraints.NotNull; -import java.util.LinkedHashMap; -import java.util.Set; +import lombok.Data; + +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; + +import com.fasterxml.jackson.annotation.JsonInclude; /** * Configuration for how the new build configs should be created. diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/DefaultBuildConfigValues.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/DefaultBuildConfigValues.java index 074a01f69..924d1e2a6 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/DefaultBuildConfigValues.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/DefaultBuildConfigValues.java @@ -1,11 +1,13 @@ package org.jboss.bacon.experimental.impl.config; -import com.fasterxml.jackson.annotation.JsonInclude; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + import lombok.Data; + import org.jboss.pnc.dto.validation.constraints.SCMUrl; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import com.fasterxml.jackson.annotation.JsonInclude; /** * Default values to be used when generating build config. diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/DependencyResolutionConfig.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/DependencyResolutionConfig.java index 1c0249d44..f107ab65f 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/DependencyResolutionConfig.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/DependencyResolutionConfig.java @@ -1,12 +1,13 @@ package org.jboss.bacon.experimental.impl.config; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; +import java.util.List; +import java.util.Set; import javax.validation.constraints.NotNull; -import java.util.List; -import java.util.Set; +import lombok.Data; + +import com.fasterxml.jackson.annotation.JsonInclude; /** * Configuration for the autobuilder dependency resolution. diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/GeneratorConfig.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/GeneratorConfig.java index 93d5dd46b..6b30a3b4c 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/GeneratorConfig.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/config/GeneratorConfig.java @@ -1,11 +1,12 @@ package org.jboss.bacon.experimental.impl.config; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; - import javax.validation.Valid; import javax.validation.constraints.NotNull; +import lombok.Data; + +import com.fasterxml.jackson.annotation.JsonInclude; + @Data @JsonInclude(JsonInclude.Include.NON_EMPTY) public class GeneratorConfig { diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyExcluder.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyExcluder.java index 79fcedcab..b68317e94 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyExcluder.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyExcluder.java @@ -1,6 +1,10 @@ package org.jboss.bacon.experimental.impl.dependencies; +import java.io.IOException; +import java.net.URI; + import lombok.extern.slf4j.Slf4j; + import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.config.RequestConfig; @@ -10,9 +14,6 @@ import org.apache.http.util.EntityUtils; import org.jboss.pnc.bacon.config.AutobuildConfig; -import java.io.IOException; -import java.net.URI; - /** * Collects the dependencies to be excluded. */ diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResolver.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResolver.java index 8a6d1aff2..65fb931d8 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResolver.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResolver.java @@ -1,31 +1,5 @@ package org.jboss.bacon.experimental.impl.dependencies; -import io.quarkus.bom.decomposer.ReleaseId; -import io.quarkus.bom.decomposer.ReleaseOrigin; -import io.quarkus.bom.decomposer.ReleaseVersion; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.domino.CircularReleaseDependency; -import io.quarkus.domino.ProjectDependencyConfig; -import io.quarkus.domino.ProjectDependencyConfigMapper; -import io.quarkus.domino.ProjectDependencyResolver; -import io.quarkus.domino.ReleaseCollection; -import io.quarkus.domino.ReleaseRepo; -import io.quarkus.maven.dependency.ArtifactCoords; -import lombok.extern.slf4j.Slf4j; -import org.jboss.bacon.da.DaHelper; -import org.jboss.bacon.da.rest.endpoint.LookupApi; -import org.jboss.bacon.experimental.impl.config.DependencyResolutionConfig; -import org.jboss.da.lookup.model.MavenLookupRequest; -import org.jboss.da.lookup.model.MavenLookupResult; -import org.jboss.da.model.rest.GAV; -import org.jboss.pnc.bacon.common.exception.FatalException; -import org.jboss.pnc.bacon.config.AutobuildConfig; -import org.jboss.pnc.bacon.config.Config; -import org.jboss.pnc.common.version.SuffixedVersion; -import org.jboss.pnc.common.version.VersionParser; - import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; @@ -42,6 +16,34 @@ import java.util.Set; import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; + +import org.jboss.bacon.da.DaHelper; +import org.jboss.bacon.da.rest.endpoint.LookupApi; +import org.jboss.bacon.experimental.impl.config.DependencyResolutionConfig; +import org.jboss.da.lookup.model.MavenLookupRequest; +import org.jboss.da.lookup.model.MavenLookupResult; +import org.jboss.da.model.rest.GAV; +import org.jboss.pnc.bacon.common.exception.FatalException; +import org.jboss.pnc.bacon.config.AutobuildConfig; +import org.jboss.pnc.bacon.config.Config; +import org.jboss.pnc.common.version.SuffixedVersion; +import org.jboss.pnc.common.version.VersionParser; + +import io.quarkus.bom.decomposer.ReleaseId; +import io.quarkus.bom.decomposer.ReleaseOrigin; +import io.quarkus.bom.decomposer.ReleaseVersion; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.domino.CircularReleaseDependency; +import io.quarkus.domino.ProjectDependencyConfig; +import io.quarkus.domino.ProjectDependencyConfigMapper; +import io.quarkus.domino.ProjectDependencyResolver; +import io.quarkus.domino.ReleaseCollection; +import io.quarkus.domino.ReleaseRepo; +import io.quarkus.maven.dependency.ArtifactCoords; + @Slf4j public class DependencyResolver { diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResult.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResult.java index 1ea489adf..126e0c601 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResult.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResult.java @@ -1,10 +1,10 @@ package org.jboss.bacon.experimental.impl.dependencies; -import lombok.Data; - import java.util.HashSet; import java.util.Set; +import lombok.Data; + @Data public class DependencyResult { private Set topLevelProjects; diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/Project.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/Project.java index 39e3036bb..571fb2b63 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/Project.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/Project.java @@ -1,10 +1,11 @@ package org.jboss.bacon.experimental.impl.dependencies; +import java.util.Set; + import lombok.Data; import lombok.EqualsAndHashCode; -import org.jboss.da.model.rest.GAV; -import java.util.Set; +import org.jboss.da.model.rest.GAV; @Data @EqualsAndHashCode(exclude = { "dependencies", "depth", "cutDependency", "name", "conflictingName" }) diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/generator/BuildConfigGenerator.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/generator/BuildConfigGenerator.java index 8475ff154..59fa4c071 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/generator/BuildConfigGenerator.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/generator/BuildConfigGenerator.java @@ -1,6 +1,18 @@ package org.jboss.bacon.experimental.impl.generator; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.StringJoiner; +import java.util.TreeMap; +import java.util.stream.Collectors; + import lombok.extern.slf4j.Slf4j; + import org.jboss.bacon.experimental.impl.config.BuildConfigGeneratorConfig; import org.jboss.bacon.experimental.impl.dependencies.DependencyResult; import org.jboss.bacon.experimental.impl.dependencies.Project; @@ -17,17 +29,6 @@ import org.jboss.pnc.dto.BuildConfigurationRevision; import org.jboss.pnc.dto.Environment; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.StringJoiner; -import java.util.TreeMap; -import java.util.stream.Collectors; - @Slf4j public class BuildConfigGenerator { private final BuildConfigGeneratorConfig config; diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/generator/ProjectNameGenerator.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/generator/ProjectNameGenerator.java index 0c2f18d7c..d49fec911 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/generator/ProjectNameGenerator.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/generator/ProjectNameGenerator.java @@ -17,18 +17,19 @@ */ package org.jboss.bacon.experimental.impl.generator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import lombok.extern.slf4j.Slf4j; + import org.jboss.bacon.experimental.impl.dependencies.Project; import org.jboss.da.model.rest.GA; import org.jboss.da.model.rest.GAV; import org.jboss.pnc.common.version.SuffixedVersion; import org.jboss.pnc.common.version.VersionParser; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - @Slf4j public class ProjectNameGenerator { private final VersionParser versionParser = new VersionParser("redhat", "temporary-redhat"); diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/EnvironmentResolver.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/EnvironmentResolver.java index 4cd08a0fb..a13b5a44f 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/EnvironmentResolver.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/EnvironmentResolver.java @@ -1,6 +1,11 @@ package org.jboss.bacon.experimental.impl.projectfinder; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + import lombok.extern.slf4j.Slf4j; + import org.jboss.bacon.experimental.impl.config.BuildConfigGeneratorConfig; import org.jboss.pnc.bacon.common.exception.FatalException; import org.jboss.pnc.bacon.pnc.common.ClientCreator; @@ -9,10 +14,6 @@ import org.jboss.pnc.client.RemoteResourceException; import org.jboss.pnc.dto.Environment; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; - @Slf4j public class EnvironmentResolver { @@ -65,8 +66,8 @@ public Environment resolve(Environment env) { log.error( "Environment " + env.getName() + " #" + env.getId() + " is deprecated, but does not have a DEPRECATION_REPLACEMENT provided.");// TODO: replace - // with constant - // from 2.5 + // with constant + // from 2.5 return env; } Environment replacement = environments.get(replacementID); diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/FoundProject.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/FoundProject.java index 0d3196720..3e8cfa4d5 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/FoundProject.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/FoundProject.java @@ -1,12 +1,13 @@ package org.jboss.bacon.experimental.impl.projectfinder; +import java.util.Set; + import lombok.Data; + import org.jboss.da.model.rest.GAV; import org.jboss.pnc.dto.BuildConfiguration; import org.jboss.pnc.dto.BuildConfigurationRevision; -import java.util.Set; - @Data public class FoundProject { private Set gavs; diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/FoundProjects.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/FoundProjects.java index 7c146e3db..ab2db8c0d 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/FoundProjects.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/FoundProjects.java @@ -1,10 +1,10 @@ package org.jboss.bacon.experimental.impl.projectfinder; -import lombok.Data; - import java.util.HashSet; import java.util.Set; +import lombok.Data; + @Data public class FoundProjects { private Set foundProjects = new HashSet<>(); diff --git a/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/ProjectFinder.java b/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/ProjectFinder.java index 5ffecca11..f070ea094 100644 --- a/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/ProjectFinder.java +++ b/experimental/src/main/java/org/jboss/bacon/experimental/impl/projectfinder/ProjectFinder.java @@ -1,7 +1,18 @@ package org.jboss.bacon.experimental.impl.projectfinder; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; + import org.commonjava.atlas.maven.ident.ref.SimpleArtifactRef; import org.jboss.bacon.da.DaHelper; import org.jboss.bacon.da.rest.endpoint.LookupApi; @@ -29,16 +40,6 @@ import org.jboss.pnc.dto.BuildConfigurationRevisionRef; import org.jboss.pnc.restclient.util.ArtifactUtil; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; - @Slf4j public class ProjectFinder { diff --git a/experimental/src/test/java/org/jboss/bacon/experimental/impl/dependencies/DependencyExcluderTest.java b/experimental/src/test/java/org/jboss/bacon/experimental/impl/dependencies/DependencyExcluderTest.java index 811f58177..f08541aca 100644 --- a/experimental/src/test/java/org/jboss/bacon/experimental/impl/dependencies/DependencyExcluderTest.java +++ b/experimental/src/test/java/org/jboss/bacon/experimental/impl/dependencies/DependencyExcluderTest.java @@ -1,18 +1,19 @@ package org.jboss.bacon.experimental.impl.dependencies; -import com.github.tomakehurst.wiremock.WireMockServer; -import com.github.tomakehurst.wiremock.common.ConsoleNotifier; -import com.github.tomakehurst.wiremock.junit5.WireMockExtension; +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; +import static org.assertj.core.api.Assertions.assertThat; + +import java.io.*; +import java.net.URL; + import org.jboss.pnc.bacon.config.Config; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import java.io.*; -import java.net.URL; - -import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; -import static org.assertj.core.api.Assertions.assertThat; +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.common.ConsoleNotifier; +import com.github.tomakehurst.wiremock.junit5.WireMockExtension; public class DependencyExcluderTest { diff --git a/experimental/src/test/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResultTest.java b/experimental/src/test/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResultTest.java index 339a5ab75..657f3d92f 100644 --- a/experimental/src/test/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResultTest.java +++ b/experimental/src/test/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResultTest.java @@ -1,10 +1,10 @@ package org.jboss.bacon.experimental.impl.dependencies; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; import java.util.HashSet; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; public class DependencyResultTest { diff --git a/experimental/src/test/java/org/jboss/bacon/experimental/impl/dependencies/GACTVParserTest.java b/experimental/src/test/java/org/jboss/bacon/experimental/impl/dependencies/GACTVParserTest.java index 9a200cd85..b6205e172 100644 --- a/experimental/src/test/java/org/jboss/bacon/experimental/impl/dependencies/GACTVParserTest.java +++ b/experimental/src/test/java/org/jboss/bacon/experimental/impl/dependencies/GACTVParserTest.java @@ -1,10 +1,11 @@ package org.jboss.bacon.experimental.impl.dependencies; -import io.quarkus.maven.dependency.ArtifactCoords; +import static org.assertj.core.api.Assertions.assertThat; + import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; +import io.quarkus.maven.dependency.ArtifactCoords; public class GACTVParserTest { diff --git a/experimental/src/test/java/org/jboss/bacon/experimental/impl/generator/BuildConfigGeneratorTest.java b/experimental/src/test/java/org/jboss/bacon/experimental/impl/generator/BuildConfigGeneratorTest.java index 998fbcd0e..2cfdb8a8b 100644 --- a/experimental/src/test/java/org/jboss/bacon/experimental/impl/generator/BuildConfigGeneratorTest.java +++ b/experimental/src/test/java/org/jboss/bacon/experimental/impl/generator/BuildConfigGeneratorTest.java @@ -1,9 +1,9 @@ package org.jboss.bacon.experimental.impl.generator; -import org.junit.jupiter.api.Test; - import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; + public class BuildConfigGeneratorTest { @Test diff --git a/experimental/src/test/java/org/jboss/bacon/experimental/impl/generator/ProjectNameGeneratorTest.java b/experimental/src/test/java/org/jboss/bacon/experimental/impl/generator/ProjectNameGeneratorTest.java index 223886c17..5327c8bd8 100644 --- a/experimental/src/test/java/org/jboss/bacon/experimental/impl/generator/ProjectNameGeneratorTest.java +++ b/experimental/src/test/java/org/jboss/bacon/experimental/impl/generator/ProjectNameGeneratorTest.java @@ -17,14 +17,14 @@ */ package org.jboss.bacon.experimental.impl.generator; -import org.jboss.bacon.experimental.impl.dependencies.Project; -import org.jboss.da.model.rest.GAV; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Collections; import java.util.Set; -import static org.assertj.core.api.Assertions.assertThat; +import org.jboss.bacon.experimental.impl.dependencies.Project; +import org.jboss.da.model.rest.GAV; +import org.junit.jupiter.api.Test; public class ProjectNameGeneratorTest { diff --git a/experimental/src/test/java/org/jboss/bacon/experimental/impl/projectfinder/ProjectFinderTest.java b/experimental/src/test/java/org/jboss/bacon/experimental/impl/projectfinder/ProjectFinderTest.java index 5c7c0627b..86a57e78a 100644 --- a/experimental/src/test/java/org/jboss/bacon/experimental/impl/projectfinder/ProjectFinderTest.java +++ b/experimental/src/test/java/org/jboss/bacon/experimental/impl/projectfinder/ProjectFinderTest.java @@ -1,9 +1,16 @@ package org.jboss.bacon.experimental.impl.projectfinder; -import com.github.tomakehurst.wiremock.WireMockServer; -import com.github.tomakehurst.wiremock.common.ConsoleNotifier; -import com.github.tomakehurst.wiremock.junit5.WireMockExtension; +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; +import static org.assertj.core.api.Assertions.assertThat; + +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + import lombok.extern.slf4j.Slf4j; + import org.jboss.bacon.experimental.impl.config.BuildConfigGeneratorConfig; import org.jboss.bacon.experimental.impl.dependencies.DependencyResult; import org.jboss.bacon.experimental.impl.dependencies.Project; @@ -17,14 +24,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - -import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; -import static org.assertj.core.api.Assertions.assertThat; +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.common.ConsoleNotifier; +import com.github.tomakehurst.wiremock.junit5.WireMockExtension; @Slf4j public class ProjectFinderTest { diff --git a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/AbstractTest.java b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/AbstractTest.java index 01e160a91..be2433f50 100644 --- a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/AbstractTest.java +++ b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/AbstractTest.java @@ -5,20 +5,21 @@ */ package org.jboss.pnc.bacon.test; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.github.tomakehurst.wiremock.WireMockServer; -import com.github.tomakehurst.wiremock.common.ConsoleNotifier; +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Base64; +import java.util.Random; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Base64; -import java.util.Random; - -import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; -import static org.assertj.core.api.Assertions.assertThat; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.common.ConsoleNotifier; /** * diff --git a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/CLIExecutor.java b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/CLIExecutor.java index a2474ee9c..86d66561b 100644 --- a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/CLIExecutor.java +++ b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/CLIExecutor.java @@ -1,9 +1,5 @@ package org.jboss.pnc.bacon.test; -import org.jboss.pnc.bacon.common.Constant; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -18,6 +14,10 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import org.jboss.pnc.bacon.common.Constant; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * * @author jbrazdil diff --git a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/PNCWiremockHelper.java b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/PNCWiremockHelper.java index 4b08147e0..2cfa34c62 100644 --- a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/PNCWiremockHelper.java +++ b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/PNCWiremockHelper.java @@ -1,20 +1,5 @@ package org.jboss.pnc.bacon.test; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.github.tomakehurst.wiremock.client.MappingBuilder; -import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; -import com.github.tomakehurst.wiremock.client.ScenarioMappingBuilder; -import com.github.tomakehurst.wiremock.client.WireMock; -import org.jboss.pnc.dto.DTOEntity; -import org.jboss.pnc.dto.response.Page; - -import java.util.Objects; -import java.util.Optional; -import java.util.UUID; - import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.absent; import static com.github.tomakehurst.wiremock.client.WireMock.containing; @@ -28,6 +13,22 @@ import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED; import static org.jboss.pnc.bacon.test.PNCWiremockHelper.REST; +import java.util.Objects; +import java.util.Optional; +import java.util.UUID; + +import org.jboss.pnc.dto.DTOEntity; +import org.jboss.pnc.dto.response.Page; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.github.tomakehurst.wiremock.client.MappingBuilder; +import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; +import com.github.tomakehurst.wiremock.client.ScenarioMappingBuilder; +import com.github.tomakehurst.wiremock.client.WireMock; + /** * * @author jbrazdil diff --git a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/da/DAMavenLatestTest.java b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/da/DAMavenLatestTest.java index 02a8568d4..2bd273a0a 100644 --- a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/da/DAMavenLatestTest.java +++ b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/da/DAMavenLatestTest.java @@ -1,12 +1,12 @@ package org.jboss.pnc.bacon.test.da; +import static org.assertj.core.api.Assertions.assertThat; + import org.jboss.pnc.bacon.test.CLIExecutor; import org.jboss.pnc.bacon.test.ExecutionResult; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import static org.assertj.core.api.Assertions.assertThat; - @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class DAMavenLatestTest { diff --git a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pig/EmptyProjectBuildTest.java b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pig/EmptyProjectBuildTest.java index 8236cafe9..b3fa9522c 100644 --- a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pig/EmptyProjectBuildTest.java +++ b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pig/EmptyProjectBuildTest.java @@ -1,5 +1,14 @@ package org.jboss.pnc.bacon.test.pig; +import static java.lang.String.format; +import static org.assertj.core.api.Assertions.assertThat; + +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import org.jboss.pnc.bacon.pig.PigFacade; import org.jboss.pnc.bacon.pig.impl.config.GroupBuildInfo; import org.jboss.pnc.bacon.pig.impl.pnc.BuildConfigData; @@ -11,15 +20,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import static java.lang.String.format; -import static org.assertj.core.api.Assertions.assertThat; - public class EmptyProjectBuildTest extends PigFunctionalTest { @Test diff --git a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pig/PigFunctionalTest.java b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pig/PigFunctionalTest.java index 48b7f9931..9d6237fba 100644 --- a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pig/PigFunctionalTest.java +++ b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pig/PigFunctionalTest.java @@ -1,5 +1,8 @@ package org.jboss.pnc.bacon.test.pig; +import java.nio.file.Path; +import java.util.Collections; + import org.apache.commons.lang3.RandomStringUtils; import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.exception.FatalException; @@ -12,9 +15,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; -import java.nio.file.Path; -import java.util.Collections; - @Tag(TestType.REAL_SERVICE_ONLY) public abstract class PigFunctionalTest { static final String emptyNameBase1 = "michalszynkiewicz-et-%s"; diff --git a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pig/PigTest.java b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pig/PigTest.java index 6b9c6c1b3..182787806 100644 --- a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pig/PigTest.java +++ b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pig/PigTest.java @@ -1,5 +1,30 @@ package org.jboss.pnc.bacon.test.pig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.jboss.pnc.bacon.test.CLIExecutor.CONFIG_LOCATION; +import static org.jboss.pnc.bacon.test.Endpoints.BUILD_CONFIG; +import static org.jboss.pnc.bacon.test.Endpoints.BUILD_CONFIG_DEPENDENCIES; +import static org.jboss.pnc.bacon.test.Endpoints.ENVIRONMENT; +import static org.jboss.pnc.bacon.test.Endpoints.GROUP_CONFIG; +import static org.jboss.pnc.bacon.test.Endpoints.GROUP_CONFIG_BUILD_CONFIGS; +import static org.jboss.pnc.bacon.test.Endpoints.PRODUCT; +import static org.jboss.pnc.bacon.test.Endpoints.PRODUCT_MILESTONE; +import static org.jboss.pnc.bacon.test.Endpoints.PRODUCT_VERSION; +import static org.jboss.pnc.bacon.test.Endpoints.PRODUCT_VERSIONS; +import static org.jboss.pnc.bacon.test.Endpoints.PRODUCT_VERSION_MILESTONES; +import static org.jboss.pnc.bacon.test.Endpoints.PROJECT; +import static org.jboss.pnc.bacon.test.Endpoints.SCM_REPOSITORY; +import static org.jboss.pnc.bacon.test.Endpoints.SCM_REPOSITORY_CREATE; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.Instant; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.jboss.pnc.bacon.test.AbstractTest; import org.jboss.pnc.bacon.test.ExecutionResult; import org.jboss.pnc.bacon.test.TestType; @@ -20,31 +45,6 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestMethodOrder; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.time.Instant; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.jboss.pnc.bacon.test.CLIExecutor.CONFIG_LOCATION; -import static org.jboss.pnc.bacon.test.Endpoints.BUILD_CONFIG; -import static org.jboss.pnc.bacon.test.Endpoints.BUILD_CONFIG_DEPENDENCIES; -import static org.jboss.pnc.bacon.test.Endpoints.ENVIRONMENT; -import static org.jboss.pnc.bacon.test.Endpoints.GROUP_CONFIG; -import static org.jboss.pnc.bacon.test.Endpoints.GROUP_CONFIG_BUILD_CONFIGS; -import static org.jboss.pnc.bacon.test.Endpoints.PRODUCT; -import static org.jboss.pnc.bacon.test.Endpoints.PRODUCT_MILESTONE; -import static org.jboss.pnc.bacon.test.Endpoints.PRODUCT_VERSION; -import static org.jboss.pnc.bacon.test.Endpoints.PRODUCT_VERSIONS; -import static org.jboss.pnc.bacon.test.Endpoints.PRODUCT_VERSION_MILESTONES; -import static org.jboss.pnc.bacon.test.Endpoints.PROJECT; -import static org.jboss.pnc.bacon.test.Endpoints.SCM_REPOSITORY; -import static org.jboss.pnc.bacon.test.Endpoints.SCM_REPOSITORY_CREATE; - /** * * @author jbrazdil diff --git a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pnc/ProductTest.java b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pnc/ProductTest.java index 625063fb9..c59f1c5ec 100644 --- a/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pnc/ProductTest.java +++ b/integration-tests/src/test/java/org/jboss/pnc/bacon/test/pnc/ProductTest.java @@ -1,6 +1,12 @@ package org.jboss.pnc.bacon.test.pnc; -import com.fasterxml.jackson.core.JsonProcessingException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.jboss.pnc.bacon.test.Endpoints.PRODUCT; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Collections; + import org.jboss.pnc.bacon.test.AbstractTest; import org.jboss.pnc.bacon.test.ExecutionResult; import org.jboss.pnc.bacon.test.TestType; @@ -15,12 +21,7 @@ import org.junit.jupiter.api.TestInstance.Lifecycle; import org.junit.jupiter.api.TestMethodOrder; -import java.util.Collections; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.jboss.pnc.bacon.test.Endpoints.PRODUCT; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.fasterxml.jackson.core.JsonProcessingException; /** * diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/GavFinder.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/GavFinder.java index 800a8f51f..4342f06c0 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/GavFinder.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/GavFinder.java @@ -1,16 +1,16 @@ package org.jboss.pnc.bacon.licenses; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.project.MavenProject; -import org.jboss.pnc.bacon.licenses.maven.MavenProjectFactory; -import org.jboss.pnc.bacon.licenses.utils.Gav; - import java.nio.file.Path; import java.util.Collection; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.project.MavenProject; +import org.jboss.pnc.bacon.licenses.maven.MavenProjectFactory; +import org.jboss.pnc.bacon.licenses.utils.Gav; + public class GavFinder { private final MavenProjectFactory mavenProjectFactory; diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicenseSummaryFactory.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicenseSummaryFactory.java index a1211419e..c5e8f14e8 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicenseSummaryFactory.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicenseSummaryFactory.java @@ -16,6 +16,11 @@ package org.jboss.pnc.bacon.licenses; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + import org.apache.maven.artifact.Artifact; import org.jboss.pnc.bacon.licenses.sanitiser.LicenseSanitiser; import org.jboss.pnc.bacon.licenses.xml.DependencyElement; @@ -23,11 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collection; -import java.util.Comparator; -import java.util.List; -import java.util.stream.Collectors; - /** * Class responsible for retrieving licenses information based on a provided GAV. * diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicensesFileManager.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicensesFileManager.java index 4f94642cc..0f49af0f9 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicensesFileManager.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicensesFileManager.java @@ -16,23 +16,6 @@ package org.jboss.pnc.bacon.licenses; -import io.quarkus.qute.Qute; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.jboss.pnc.bacon.licenses.xml.DependencyElement; -import org.jboss.pnc.bacon.licenses.xml.LicenseElement; -import org.jboss.pnc.bacon.licenses.xml.LicenseSummary; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.xml.bind.JAXBException; - import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; @@ -49,6 +32,24 @@ import java.util.Optional; import java.util.stream.Collectors; +import javax.xml.bind.JAXBException; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.jboss.pnc.bacon.licenses.xml.DependencyElement; +import org.jboss.pnc.bacon.licenses.xml.LicenseElement; +import org.jboss.pnc.bacon.licenses.xml.LicenseSummary; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.quarkus.qute.Qute; + /** * Class responsible for persisting licenses information to XML and HTML files. * diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicensesGenerator.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicensesGenerator.java index 71dff7351..bbafcb345 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicensesGenerator.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicensesGenerator.java @@ -16,6 +16,12 @@ package org.jboss.pnc.bacon.licenses; +import java.nio.file.Paths; +import java.util.Collection; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.project.ProjectBuilder; @@ -37,12 +43,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.nio.file.Paths; -import java.util.Collection; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicensesGeneratorApplication.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicensesGeneratorApplication.java index 1d93f20ce..9a770faf2 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicensesGeneratorApplication.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/LicensesGeneratorApplication.java @@ -16,13 +16,13 @@ package org.jboss.pnc.bacon.licenses; -import org.jboss.pnc.bacon.licenses.properties.GeneratorProperties; -import org.jboss.pnc.bacon.licenses.properties.PropertyKeys; - import java.util.Arrays; import java.util.Objects; import java.util.Properties; +import org.jboss.pnc.bacon.licenses.properties.GeneratorProperties; +import org.jboss.pnc.bacon.licenses.properties.PropertyKeys; + /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/MavenEmbedderFactory.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/MavenEmbedderFactory.java index 3975557b4..504c916c9 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/MavenEmbedderFactory.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/MavenEmbedderFactory.java @@ -16,9 +16,10 @@ package org.jboss.pnc.bacon.licenses.maven; +import org.apache.maven.model.building.ModelBuildingRequest; + import hudson.maven.MavenEmbedderException; import hudson.maven.MavenRequest; -import org.apache.maven.model.building.ModelBuildingRequest; /** * @author Gytis Trikleris diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/MavenProjectFactory.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/MavenProjectFactory.java index 89b233362..c5bf296f0 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/MavenProjectFactory.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/MavenProjectFactory.java @@ -16,6 +16,12 @@ package org.jboss.pnc.bacon.licenses.maven; +import java.io.File; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + import org.apache.maven.artifact.Artifact; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; @@ -25,12 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/ProjectBuildingRequestFactory.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/ProjectBuildingRequestFactory.java index 012adc0b6..38fbbc693 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/ProjectBuildingRequestFactory.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/ProjectBuildingRequestFactory.java @@ -16,6 +16,9 @@ package org.jboss.pnc.bacon.licenses.maven; +import java.util.List; +import java.util.stream.Collectors; + import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.project.DefaultProjectBuildingRequest; @@ -23,9 +26,6 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.jboss.pnc.bacon.licenses.properties.GeneratorProperties; -import java.util.List; -import java.util.stream.Collectors; - /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/SnowdropMavenEmbedder.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/SnowdropMavenEmbedder.java index 765752f19..5d2df4570 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/SnowdropMavenEmbedder.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/maven/SnowdropMavenEmbedder.java @@ -16,13 +16,14 @@ package org.jboss.pnc.bacon.licenses.maven; -import hudson.maven.MavenEmbedder; -import hudson.maven.MavenEmbedderException; -import hudson.maven.MavenRequest; import org.apache.maven.DefaultMaven; import org.apache.maven.Maven; import org.eclipse.aether.RepositorySystemSession; +import hudson.maven.MavenEmbedder; +import hudson.maven.MavenEmbedderException; +import hudson.maven.MavenRequest; + /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/properties/GeneratorProperties.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/properties/GeneratorProperties.java index 6fb2214a5..616c358a3 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/properties/GeneratorProperties.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/properties/GeneratorProperties.java @@ -16,16 +16,16 @@ package org.jboss.pnc.bacon.licenses.properties; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.builder.fluent.Configurations; -import org.apache.commons.configuration2.ex.ConfigurationException; - import java.util.AbstractMap; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.builder.fluent.Configurations; +import org.apache.commons.configuration2.ex.ConfigurationException; + /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/AliasLicenseSanitiser.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/AliasLicenseSanitiser.java index 6ab93e4ef..d5a14973c 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/AliasLicenseSanitiser.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/AliasLicenseSanitiser.java @@ -16,13 +16,13 @@ package org.jboss.pnc.bacon.licenses.sanitiser; -import org.jboss.pnc.bacon.licenses.xml.DependencyElement; -import org.jboss.pnc.bacon.licenses.xml.LicenseElement; +import static org.jboss.pnc.bacon.licenses.utils.JsonUtils.loadJsonToSet; import java.util.Optional; import java.util.Set; -import static org.jboss.pnc.bacon.licenses.utils.JsonUtils.loadJsonToSet; +import org.jboss.pnc.bacon.licenses.xml.DependencyElement; +import org.jboss.pnc.bacon.licenses.xml.LicenseElement; /** * @author Gytis Trikleris diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/ExceptionLicenseSanitiser.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/ExceptionLicenseSanitiser.java index cc9cbd440..1197a85fc 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/ExceptionLicenseSanitiser.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/ExceptionLicenseSanitiser.java @@ -16,12 +16,12 @@ package org.jboss.pnc.bacon.licenses.sanitiser; +import java.util.Set; + import org.jboss.pnc.bacon.licenses.sanitiser.exceptions.LicenseException; import org.jboss.pnc.bacon.licenses.utils.JsonUtils; import org.jboss.pnc.bacon.licenses.xml.DependencyElement; -import java.util.Set; - /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/LicenseServiceSanitiser.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/LicenseServiceSanitiser.java index 70cf41765..130cc287e 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/LicenseServiceSanitiser.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/LicenseServiceSanitiser.java @@ -15,12 +15,12 @@ */ package org.jboss.pnc.bacon.licenses.sanitiser; +import java.util.Set; + import org.jboss.pnc.bacon.licenses.sanitiser.provider.ExternalLicenseProvider; import org.jboss.pnc.bacon.licenses.xml.DependencyElement; import org.jboss.pnc.bacon.licenses.xml.LicenseElement; -import java.util.Set; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 11/15/17 diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/MavenSanitiser.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/MavenSanitiser.java index ca3aee3d2..f5bfbb945 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/MavenSanitiser.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/MavenSanitiser.java @@ -15,6 +15,10 @@ */ package org.jboss.pnc.bacon.licenses.sanitiser; +import java.util.HashSet; +import java.util.Optional; +import java.util.Set; + import org.apache.maven.model.License; import org.apache.maven.project.MavenProject; import org.jboss.pnc.bacon.licenses.maven.MavenProjectFactory; @@ -23,10 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.HashSet; -import java.util.Optional; -import java.util.Set; - /** * A pass-through sanitiser. If the dependency element does not have a license, the sanitiser will try to get it from a * maven project. Then, the dependency element will be given to the next sanitiser. diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/RedHatLicense.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/RedHatLicense.java index a75392166..18ebcede8 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/RedHatLicense.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/RedHatLicense.java @@ -16,14 +16,14 @@ package org.jboss.pnc.bacon.licenses.sanitiser; -import org.jboss.pnc.bacon.licenses.xml.LicenseElement; +import java.util.HashSet; +import java.util.Set; +import java.util.stream.Collectors; import javax.json.JsonObject; import javax.json.JsonString; -import java.util.HashSet; -import java.util.Set; -import java.util.stream.Collectors; +import org.jboss.pnc.bacon.licenses.xml.LicenseElement; /** * @author Gytis Trikleris diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/LicenseException.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/LicenseException.java index fd78476db..874357681 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/LicenseException.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/LicenseException.java @@ -16,15 +16,15 @@ package org.jboss.pnc.bacon.licenses.sanitiser.exceptions; -import org.jboss.pnc.bacon.licenses.xml.DependencyElement; -import org.jboss.pnc.bacon.licenses.xml.LicenseElement; - -import javax.json.JsonObject; - import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; +import javax.json.JsonObject; + +import org.jboss.pnc.bacon.licenses.xml.DependencyElement; +import org.jboss.pnc.bacon.licenses.xml.LicenseElement; + public class LicenseException { private String groupId; private String artifactId; diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/RangeVersionMatcher.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/RangeVersionMatcher.java index 3d631b353..19f76abd9 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/RangeVersionMatcher.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/RangeVersionMatcher.java @@ -16,13 +16,13 @@ package org.jboss.pnc.bacon.licenses.sanitiser.exceptions; +import java.util.Objects; + import org.eclipse.aether.util.version.GenericVersionScheme; import org.eclipse.aether.version.InvalidVersionSpecificationException; import org.eclipse.aether.version.VersionConstraint; import org.eclipse.aether.version.VersionScheme; -import java.util.Objects; - class RangeVersionMatcher implements VersionMatcher { private final VersionScheme scheme; private final VersionConstraint constraint; diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/provider/ExternalLicenseDto.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/provider/ExternalLicenseDto.java index 462fb1f2a..c8710d9d5 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/provider/ExternalLicenseDto.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/provider/ExternalLicenseDto.java @@ -15,11 +15,12 @@ */ package org.jboss.pnc.bacon.licenses.sanitiser.provider; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; import org.codehaus.plexus.util.StringUtils; import org.jboss.pnc.bacon.licenses.xml.LicenseElement; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com */ diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/provider/ExternalLicenseProvider.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/provider/ExternalLicenseProvider.java index 6999e4a67..c7423fc35 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/provider/ExternalLicenseProvider.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/provider/ExternalLicenseProvider.java @@ -15,17 +15,6 @@ */ package org.jboss.pnc.bacon.licenses.sanitiser.provider; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.type.CollectionType; -import com.fasterxml.jackson.databind.type.TypeFactory; -import org.jboss.pnc.bacon.licenses.LicensesGeneratorException; -import org.jboss.pnc.bacon.licenses.xml.LicenseElement; -import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; - -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; - import java.io.IOException; import java.util.Collection; import java.util.Collections; @@ -34,6 +23,18 @@ import java.util.logging.Logger; import java.util.stream.Collectors; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.core.Response; + +import org.jboss.pnc.bacon.licenses.LicensesGeneratorException; +import org.jboss.pnc.bacon.licenses.xml.LicenseElement; +import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.type.CollectionType; +import com.fasterxml.jackson.databind.type.TypeFactory; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 10/20/17 diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/provider/ExternalLicensesDto.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/provider/ExternalLicensesDto.java index a9d508714..09ec5cef4 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/provider/ExternalLicensesDto.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/sanitiser/provider/ExternalLicensesDto.java @@ -15,10 +15,10 @@ */ package org.jboss.pnc.bacon.licenses.sanitiser.provider; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - import java.util.Set; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com */ diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/utils/JsonUtils.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/utils/JsonUtils.java index 4b2af1065..ace0e1a46 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/utils/JsonUtils.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/utils/JsonUtils.java @@ -15,10 +15,6 @@ */ package org.jboss.pnc.bacon.licenses.utils; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonValue; - import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; @@ -28,6 +24,10 @@ import java.util.function.Function; import java.util.stream.Collectors; +import javax.json.Json; +import javax.json.JsonObject; +import javax.json.JsonValue; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 9/14/17 diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/xml/DependencyElement.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/xml/DependencyElement.java index 9cee1c233..52c5f5fcb 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/xml/DependencyElement.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/xml/DependencyElement.java @@ -16,7 +16,11 @@ package org.jboss.pnc.bacon.licenses.xml; -import org.apache.maven.artifact.Artifact; +import java.util.Collections; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; import javax.json.JsonObject; import javax.xml.bind.annotation.XmlElement; @@ -25,11 +29,7 @@ import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; -import java.util.Collections; -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; +import org.apache.maven.artifact.Artifact; /** * @author Gytis Trikleris diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/xml/LicenseElement.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/xml/LicenseElement.java index a3c7668af..cffbe9046 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/xml/LicenseElement.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/xml/LicenseElement.java @@ -16,13 +16,13 @@ package org.jboss.pnc.bacon.licenses.xml; -import org.apache.commons.lang3.StringUtils; -import org.apache.maven.model.License; - import javax.json.JsonObject; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; +import org.apache.commons.lang3.StringUtils; +import org.apache.maven.model.License; + /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/xml/LicenseSummary.java b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/xml/LicenseSummary.java index d0b983216..01562a9de 100644 --- a/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/xml/LicenseSummary.java +++ b/licenses-generator/src/main/java/org/jboss/pnc/bacon/licenses/xml/LicenseSummary.java @@ -16,6 +16,10 @@ package org.jboss.pnc.bacon.licenses.xml; +import java.io.StringWriter; +import java.util.Collections; +import java.util.List; + import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; @@ -23,10 +27,6 @@ import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; -import java.io.StringWriter; -import java.util.Collections; -import java.util.List; - /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/ExternalLicensesTest.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/ExternalLicensesTest.java index e238b44d7..cfaa196aa 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/ExternalLicensesTest.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/ExternalLicensesTest.java @@ -1,5 +1,13 @@ package org.jboss.pnc.bacon.licenses; +import static java.util.Collections.singleton; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.Optional; +import java.util.Set; + import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.handler.DefaultArtifactHandler; @@ -15,14 +23,6 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import java.util.Optional; -import java.util.Set; - -import static java.util.Collections.singleton; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 11/15/17 diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/LicenseServiceMock.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/LicenseServiceMock.java index 19479882d..41f0ac648 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/LicenseServiceMock.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/LicenseServiceMock.java @@ -15,13 +15,13 @@ */ package org.jboss.pnc.bacon.licenses; -import io.undertow.Undertow; - import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; +import io.undertow.Undertow; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 10/23/17 diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/LicenseSummaryFactoryTest.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/LicenseSummaryFactoryTest.java index 3527dd6c1..8b600f990 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/LicenseSummaryFactoryTest.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/LicenseSummaryFactoryTest.java @@ -1,5 +1,15 @@ package org.jboss.pnc.bacon.licenses; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.Collection; +import java.util.Collections; +import java.util.Optional; + import org.apache.maven.artifact.Artifact; import org.apache.maven.model.License; import org.apache.maven.project.MavenProject; @@ -14,16 +24,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.util.Collection; -import java.util.Collections; -import java.util.Optional; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/maven/MavenProjectFactoryTest.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/maven/MavenProjectFactoryTest.java index 8b982bae4..128c0cb17 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/maven/MavenProjectFactoryTest.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/maven/MavenProjectFactoryTest.java @@ -1,5 +1,18 @@ package org.jboss.pnc.bacon.licenses.maven; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.io.File; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + import org.apache.maven.artifact.Artifact; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; @@ -11,19 +24,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.io.File; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Optional; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/properties/GeneratorPropertiesTest.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/properties/GeneratorPropertiesTest.java index 5af7c8fa3..877cd7475 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/properties/GeneratorPropertiesTest.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/properties/GeneratorPropertiesTest.java @@ -16,11 +16,11 @@ package org.jboss.pnc.bacon.licenses.properties; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; - /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/AliasLicenseSanitiserTest.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/AliasLicenseSanitiserTest.java index 6c467677d..c18b83df7 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/AliasLicenseSanitiserTest.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/AliasLicenseSanitiserTest.java @@ -1,11 +1,8 @@ package org.jboss.pnc.bacon.licenses.sanitiser; -import org.jboss.pnc.bacon.licenses.xml.DependencyElement; -import org.jboss.pnc.bacon.licenses.xml.LicenseElement; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; import java.util.Arrays; import java.util.Collection; @@ -14,9 +11,12 @@ import java.util.List; import java.util.Set; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import org.jboss.pnc.bacon.licenses.xml.DependencyElement; +import org.jboss.pnc.bacon.licenses.xml.LicenseElement; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; /** * @author Gytis Trikleris diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/ExceptionLicenseSanitiserTest.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/ExceptionLicenseSanitiserTest.java index 28c4b2714..904211d5e 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/ExceptionLicenseSanitiserTest.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/ExceptionLicenseSanitiserTest.java @@ -1,5 +1,13 @@ package org.jboss.pnc.bacon.licenses.sanitiser; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import java.util.Collection; +import java.util.Collections; + import org.jboss.pnc.bacon.licenses.xml.DependencyElement; import org.jboss.pnc.bacon.licenses.xml.LicenseElement; import org.junit.jupiter.api.BeforeEach; @@ -7,14 +15,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.util.Collection; -import java.util.Collections; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - /** * @author Gytis Trikleris */ diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/NoopLicenseSanitiserTest.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/NoopLicenseSanitiserTest.java index 5a4581c6e..5de68a179 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/NoopLicenseSanitiserTest.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/NoopLicenseSanitiserTest.java @@ -1,12 +1,12 @@ package org.jboss.pnc.bacon.licenses.sanitiser; -import org.jboss.pnc.bacon.licenses.xml.DependencyElement; -import org.jboss.pnc.bacon.licenses.xml.LicenseElement; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Collections; -import static org.assertj.core.api.Assertions.assertThat; +import org.jboss.pnc.bacon.licenses.xml.DependencyElement; +import org.jboss.pnc.bacon.licenses.xml.LicenseElement; +import org.junit.jupiter.api.Test; /** * @author Gytis Trikleris diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/RedHatLicenseTest.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/RedHatLicenseTest.java index 32047512f..64155e8d0 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/RedHatLicenseTest.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/RedHatLicenseTest.java @@ -1,14 +1,14 @@ package org.jboss.pnc.bacon.licenses.sanitiser; -import org.jboss.pnc.bacon.licenses.xml.LicenseElement; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Arrays; import javax.json.Json; import javax.json.JsonObject; -import java.util.Arrays; - -import static org.assertj.core.api.Assertions.assertThat; +import org.jboss.pnc.bacon.licenses.xml.LicenseElement; +import org.junit.jupiter.api.Test; public class RedHatLicenseTest { diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/ExactVersionMatcherTest.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/ExactVersionMatcherTest.java index 7a6ecbf1e..821e98007 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/ExactVersionMatcherTest.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/ExactVersionMatcherTest.java @@ -1,9 +1,9 @@ package org.jboss.pnc.bacon.licenses.sanitiser.exceptions; -import org.junit.jupiter.api.Test; - import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; + public class ExactVersionMatcherTest { private VersionMatcher matcher = new ExactVersionMatcher("1.0.0"); diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/RangeVersionMatcherTest.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/RangeVersionMatcherTest.java index 0e5982915..54f440de5 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/RangeVersionMatcherTest.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/RangeVersionMatcherTest.java @@ -1,9 +1,9 @@ package org.jboss.pnc.bacon.licenses.sanitiser.exceptions; -import org.junit.jupiter.api.Test; - import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; + public class RangeVersionMatcherTest { @Test public void singleVersion() throws Exception { diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/RegexpVersionMatcherTest.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/RegexpVersionMatcherTest.java index 64fe5a60a..0c271796f 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/RegexpVersionMatcherTest.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/sanitiser/exceptions/RegexpVersionMatcherTest.java @@ -1,9 +1,9 @@ package org.jboss.pnc.bacon.licenses.sanitiser.exceptions; -import org.junit.jupiter.api.Test; - import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; + public class RegexpVersionMatcherTest { private VersionMatcher matcher = new RegexpVersionMatcher("1.0.0(-redhat-\\d+)?"); diff --git a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/xml/LicenseSummaryTest.java b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/xml/LicenseSummaryTest.java index f32b5c08d..fb0ad8af4 100644 --- a/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/xml/LicenseSummaryTest.java +++ b/licenses-generator/src/test/java/org/jboss/pnc/bacon/licenses/xml/LicenseSummaryTest.java @@ -1,12 +1,12 @@ package org.jboss.pnc.bacon.licenses.xml; -import org.junit.jupiter.api.Test; - -import javax.xml.bind.JAXBException; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Collections; -import static org.assertj.core.api.Assertions.assertThat; +import javax.xml.bind.JAXBException; + +import org.junit.jupiter.api.Test; /** * @author Gytis Trikleris diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/Cachi2Lockfile.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/Cachi2Lockfile.java index 8c42e61b5..01c13a5b8 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/Cachi2Lockfile.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/Cachi2Lockfile.java @@ -1,12 +1,13 @@ package org.jboss.pnc.bacon.pig; -import org.jboss.pnc.bacon.pig.impl.addons.cachi2.Cachi2LockfileGenerator; -import picocli.CommandLine; - import java.io.File; import java.util.List; import java.util.concurrent.Callable; +import org.jboss.pnc.bacon.pig.impl.addons.cachi2.Cachi2LockfileGenerator; + +import picocli.CommandLine; + @CommandLine.Command( name = "cachi2lockfile", description = "Generates a Cachi2 lock file for a given Maven repository ZIP file.") diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/Pig.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/Pig.java index f6c38f8cb..d9d887fc8 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/Pig.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/Pig.java @@ -17,7 +17,19 @@ */ package org.jboss.pnc.bacon.pig; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collections; +import java.util.Map; +import java.util.Scanner; +import java.util.concurrent.Callable; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.JSONCommandHandler; import org.jboss.pnc.bacon.common.exception.FatalException; @@ -36,21 +48,11 @@ import org.jboss.pnc.bacon.pig.impl.utils.FileDownloadUtils; import org.jboss.pnc.bacon.pnc.common.ParameterChecker; import org.jboss.pnc.enums.RebuildMode; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.InputStream; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Collections; -import java.util.Map; -import java.util.Scanner; -import java.util.concurrent.Callable; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 12/13/18 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/PigExport.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/PigExport.java index 6e3eb348f..7614aad95 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/PigExport.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/PigExport.java @@ -1,5 +1,7 @@ package org.jboss.pnc.bacon.pig; +import java.util.Optional; + import org.jboss.pnc.bacon.common.cli.AbstractGetSpecificCommand; import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; import org.jboss.pnc.bacon.pig.impl.mapping.BuildConfigMapping; @@ -8,9 +10,8 @@ import org.jboss.pnc.client.ClientException; import org.jboss.pnc.dto.BuildConfiguration; import org.jboss.pnc.dto.BuildConfigurationRevision; -import picocli.CommandLine; -import java.util.Optional; +import picocli.CommandLine; @CommandLine.Command( name = "export", diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/PigFacade.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/PigFacade.java index 405f9c489..c76ec73dd 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/PigFacade.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/PigFacade.java @@ -17,6 +17,19 @@ */ package org.jboss.pnc.bacon.pig; +import java.io.File; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.time.Instant; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import javax.ws.rs.NotFoundException; + import org.jboss.pnc.bacon.common.exception.FatalException; import org.jboss.pnc.bacon.pig.impl.PigContext; import org.jboss.pnc.bacon.pig.impl.addons.AddOn; @@ -63,19 +76,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.NotFoundException; - -import java.io.File; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.time.Instant; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - /** * TODO: javadoc * diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/PigContext.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/PigContext.java index 6c5105ead..e9b03c0b2 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/PigContext.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/PigContext.java @@ -17,20 +17,9 @@ */ package org.jboss.pnc.bacon.pig.impl; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.jboss.pnc.bacon.pig.impl.documents.Deliverables; -import org.jboss.pnc.bacon.pig.impl.pnc.ImportResult; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.jboss.pnc.bacon.pig.impl.pnc.PncEntitiesImporter; -import org.jboss.pnc.bacon.pig.impl.repo.RepositoryData; -import org.jboss.pnc.bacon.pig.impl.utils.MilestoneNumberFinder; +import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.jboss.pnc.bacon.common.Constant.PIG_CONTEXT_DIR; +import static org.jboss.pnc.bacon.pig.impl.utils.HashUtils.hashDirectory; import java.io.File; import java.io.FileInputStream; @@ -44,9 +33,22 @@ import java.util.Collection; import java.util.Map; -import static org.apache.commons.lang.StringUtils.isEmpty; -import static org.jboss.pnc.bacon.common.Constant.PIG_CONTEXT_DIR; -import static org.jboss.pnc.bacon.pig.impl.utils.HashUtils.hashDirectory; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; + +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.jboss.pnc.bacon.pig.impl.documents.Deliverables; +import org.jboss.pnc.bacon.pig.impl.pnc.ImportResult; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.jboss.pnc.bacon.pig.impl.pnc.PncEntitiesImporter; +import org.jboss.pnc.bacon.pig.impl.repo.RepositoryData; +import org.jboss.pnc.bacon.pig.impl.utils.MilestoneNumberFinder; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; /** * TODO: consider saving the latest reached state to not repeat the steps already performed diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/AddOn.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/AddOn.java index b2e8d21ed..e818379a1 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/AddOn.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/AddOn.java @@ -17,11 +17,11 @@ */ package org.jboss.pnc.bacon.pig.impl.addons; +import java.util.Map; + import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import java.util.Map; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 12/11/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/AddOnFactory.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/AddOnFactory.java index 5552fb45b..be484ac03 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/AddOnFactory.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/AddOnFactory.java @@ -17,9 +17,13 @@ */ package org.jboss.pnc.bacon.pig.impl.addons; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.jboss.pnc.bacon.pig.impl.addons.cachi2.Cachi2LockfileAddon; import org.jboss.pnc.bacon.pig.impl.addons.camel.CamelRuntimeDependenciesToAlignTree; import org.jboss.pnc.bacon.pig.impl.addons.camel.RuntimeDependenciesToAlignTree; -import org.jboss.pnc.bacon.pig.impl.addons.cachi2.Cachi2LockfileAddon; import org.jboss.pnc.bacon.pig.impl.addons.microprofile.MicroProfileSmallRyeCommunityDepAnalyzer; import org.jboss.pnc.bacon.pig.impl.addons.quarkus.QuarkusCommunityDepAnalyzer; import org.jboss.pnc.bacon.pig.impl.addons.quarkus.QuarkusPostBuildAnalyzer; @@ -35,10 +39,6 @@ import org.jboss.pnc.bacon.pig.impl.documents.Deliverables; import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 12/11/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/ExtraDeliverableDownloader.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/ExtraDeliverableDownloader.java index cd1684b6d..d98315ecb 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/ExtraDeliverableDownloader.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/ExtraDeliverableDownloader.java @@ -17,16 +17,16 @@ */ package org.jboss.pnc.bacon.pig.impl.addons; -import org.jboss.pnc.bacon.pig.impl.PigContext; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.jboss.pnc.bacon.pig.impl.pnc.ArtifactWrapper; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; - import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import java.util.Map; +import org.jboss.pnc.bacon.pig.impl.PigContext; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.jboss.pnc.bacon.pig.impl.pnc.ArtifactWrapper; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 3/26/18 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/cachi2/Cachi2Lockfile.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/cachi2/Cachi2Lockfile.java index 1c0a75f25..5b3be3cba 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/cachi2/Cachi2Lockfile.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/cachi2/Cachi2Lockfile.java @@ -1,6 +1,6 @@ package org.jboss.pnc.bacon.pig.impl.addons.cachi2; -import com.fasterxml.jackson.annotation.JsonInclude; +import static org.jboss.pnc.bacon.pig.impl.addons.cachi2.YamlUtil.initYamlMapper; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -13,7 +13,7 @@ import java.util.Map; import java.util.TreeMap; -import static org.jboss.pnc.bacon.pig.impl.addons.cachi2.YamlUtil.initYamlMapper; +import com.fasterxml.jackson.annotation.JsonInclude; /** * Cachi2 lockfile diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/cachi2/Cachi2LockfileAddon.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/cachi2/Cachi2LockfileAddon.java index 03ea9fcc9..2b5031142 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/cachi2/Cachi2LockfileAddon.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/cachi2/Cachi2LockfileAddon.java @@ -1,14 +1,14 @@ package org.jboss.pnc.bacon.pig.impl.addons.cachi2; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Map; + import org.jboss.pnc.bacon.pig.impl.PigContext; import org.jboss.pnc.bacon.pig.impl.addons.AddOn; import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Map; - /** * An add-on that generates Cachi2 lock files. */ diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/cachi2/Cachi2LockfileGenerator.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/cachi2/Cachi2LockfileGenerator.java index 1eaf61259..0b38ba92b 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/cachi2/Cachi2LockfileGenerator.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/cachi2/Cachi2LockfileGenerator.java @@ -1,13 +1,5 @@ package org.jboss.pnc.bacon.pig.impl.addons.cachi2; -import io.quarkus.fs.util.ZipUtils; -import org.jboss.pnc.bacon.pig.impl.repo.visitor.ArtifactVisit; -import org.jboss.pnc.bacon.pig.impl.repo.visitor.VisitableArtifactRepository; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; -import org.jboss.pnc.bacon.pig.impl.utils.indy.Indy; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.FileSystem; @@ -26,6 +18,15 @@ import java.util.concurrent.Phaser; import java.util.concurrent.atomic.AtomicInteger; +import org.jboss.pnc.bacon.pig.impl.repo.visitor.ArtifactVisit; +import org.jboss.pnc.bacon.pig.impl.repo.visitor.VisitableArtifactRepository; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; +import org.jboss.pnc.bacon.pig.impl.utils.indy.Indy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.quarkus.fs.util.ZipUtils; + /** * Cachi2 lock file generator */ diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/camel/CamelRuntimeDependenciesToAlignTree.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/camel/CamelRuntimeDependenciesToAlignTree.java index 15051eb3e..f341d6d42 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/camel/CamelRuntimeDependenciesToAlignTree.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/camel/CamelRuntimeDependenciesToAlignTree.java @@ -14,12 +14,6 @@ */ package org.jboss.pnc.bacon.pig.impl.addons.camel; -import org.jboss.pnc.bacon.pig.impl.addons.AddOn; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -30,6 +24,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.jboss.pnc.bacon.pig.impl.addons.AddOn; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author Tom Cunningham, tcunning@redhat.com
* @author Paul Gallagher, pgallagh@redhat.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/camel/RuntimeDependenciesToAlignTree.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/camel/RuntimeDependenciesToAlignTree.java index f1d477807..31439b99a 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/camel/RuntimeDependenciesToAlignTree.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/camel/RuntimeDependenciesToAlignTree.java @@ -14,12 +14,6 @@ */ package org.jboss.pnc.bacon.pig.impl.addons.camel; -import org.jboss.pnc.bacon.pig.impl.addons.AddOn; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.FileNotFoundException; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; @@ -30,6 +24,12 @@ import java.util.Map; import java.util.stream.Collectors; +import org.jboss.pnc.bacon.pig.impl.addons.AddOn; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author Tom Cunningham, tcunning@redhat.com
* @author Paul Gallagher, pgallagh@redhat.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/camel/TreeParser.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/camel/TreeParser.java index 6366b5882..b7c502de1 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/camel/TreeParser.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/camel/TreeParser.java @@ -14,9 +14,6 @@ */ package org.jboss.pnc.bacon.pig.impl.addons.camel; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -27,6 +24,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author Tom Cunningham, tcunning@redhat.com
* Date: 2023-10-02 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/microprofile/BuildLogWithDependencyTrees.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/microprofile/BuildLogWithDependencyTrees.java index b7d1a2e22..b482eb935 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/microprofile/BuildLogWithDependencyTrees.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/microprofile/BuildLogWithDependencyTrees.java @@ -1,10 +1,5 @@ package org.jboss.pnc.bacon.pig.impl.addons.microprofile; -import com.google.common.collect.Sets; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -15,6 +10,12 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.collect.Sets; + public class BuildLogWithDependencyTrees { private static final Logger log = LoggerFactory.getLogger(BuildLogWithDependencyTrees.class); diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/microprofile/MicroProfileSmallRyeCommunityDepAnalyzer.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/microprofile/MicroProfileSmallRyeCommunityDepAnalyzer.java index c220dabdc..29614a628 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/microprofile/MicroProfileSmallRyeCommunityDepAnalyzer.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/microprofile/MicroProfileSmallRyeCommunityDepAnalyzer.java @@ -1,5 +1,12 @@ package org.jboss.pnc.bacon.pig.impl.addons.microprofile; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import org.jboss.pnc.bacon.pig.impl.addons.AddOn; import org.jboss.pnc.bacon.pig.impl.addons.runtime.CommunityDepAnalyzer; import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; @@ -8,13 +15,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - /** * Performs community dependency analysis on all builds (in "our" build group, that is). Assumes that each build * includes {@code mvn dependency:tree} in its build script. Community dependencies from modules whose names contain diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusCommunityDepAnalyzer.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusCommunityDepAnalyzer.java index edd3e592f..128fe4f87 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusCommunityDepAnalyzer.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusCommunityDepAnalyzer.java @@ -1,13 +1,24 @@ package org.jboss.pnc.bacon.pig.impl.addons.quarkus; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectReader; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import static org.jboss.pnc.bacon.pig.impl.utils.FileUtils.mkTempDir; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.TreeSet; +import java.util.stream.Collectors; + import org.apache.commons.io.FilenameUtils; import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; @@ -33,24 +44,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.TreeSet; -import java.util.stream.Collectors; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; -import static org.jboss.pnc.bacon.pig.impl.utils.FileUtils.mkTempDir; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusCommunityDependency.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusCommunityDependency.java index 3f978ef64..5c0c254cd 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusCommunityDependency.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusCommunityDependency.java @@ -1,12 +1,12 @@ package org.jboss.pnc.bacon.pig.impl.addons.quarkus; +import java.util.Collection; +import java.util.stream.Collectors; + import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.CommunityDependency; import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.CsvExportable; import org.jboss.pnc.bacon.pig.impl.utils.GAV; -import java.util.Collection; -import java.util.stream.Collectors; - public class QuarkusCommunityDependency implements CsvExportable { private final String usingExtensions; diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusExtension.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusExtension.java index 17f407475..0a6527567 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusExtension.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusExtension.java @@ -1,8 +1,9 @@ package org.jboss.pnc.bacon.pig.impl.addons.quarkus; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 19/08/2019 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusExtensions.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusExtensions.java index a655f20fe..6e413619d 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusExtensions.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusExtensions.java @@ -1,9 +1,9 @@ package org.jboss.pnc.bacon.pig.impl.addons.quarkus; -import lombok.Data; - import java.util.List; +import lombok.Data; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 1/23/20 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusPostBuildAnalyzer.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusPostBuildAnalyzer.java index 6ae91b345..c03719709 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusPostBuildAnalyzer.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusPostBuildAnalyzer.java @@ -1,5 +1,14 @@ package org.jboss.pnc.bacon.pig.impl.addons.quarkus; +import java.io.*; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.*; +import java.util.stream.Collectors; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.jboss.pnc.bacon.pig.impl.addons.AddOn; @@ -14,15 +23,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.*; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.*; -import java.util.stream.Collectors; - /** * @author Harsh Madhani Date: 06-August-2020 */ diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/VertxArtifactFinder.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/VertxArtifactFinder.java index 537c975e7..37e4570ce 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/VertxArtifactFinder.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/VertxArtifactFinder.java @@ -1,15 +1,6 @@ package org.jboss.pnc.bacon.pig.impl.addons.quarkus; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.jboss.pnc.bacon.pig.impl.PigContext; -import org.jboss.pnc.bacon.pig.impl.addons.AddOn; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.jboss.pnc.bacon.pig.impl.utils.FileUtils; -import org.jboss.pnc.bacon.pig.impl.utils.MavenRepositoryUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static org.jboss.pnc.bacon.pig.impl.utils.FileUtils.mkTempDir; import java.io.BufferedWriter; import java.io.File; @@ -23,7 +14,17 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.jboss.pnc.bacon.pig.impl.utils.FileUtils.mkTempDir; +import org.jboss.pnc.bacon.pig.impl.PigContext; +import org.jboss.pnc.bacon.pig.impl.addons.AddOn; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.jboss.pnc.bacon.pig.impl.utils.FileUtils; +import org.jboss.pnc.bacon.pig.impl.utils.MavenRepositoryUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; /** * @author Saumya Singh, singhsaumyas150@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/rhba/OfflineManifestGenerator.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/rhba/OfflineManifestGenerator.java index 740921ce7..1f09f799b 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/rhba/OfflineManifestGenerator.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/rhba/OfflineManifestGenerator.java @@ -1,17 +1,7 @@ package org.jboss.pnc.bacon.pig.impl.addons.rhba; -import org.jboss.pnc.bacon.common.exception.FatalException; -import org.jboss.pnc.bacon.pig.impl.addons.AddOn; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.jboss.pnc.bacon.pig.impl.config.RepoGenerationData; -import org.jboss.pnc.bacon.pig.impl.config.RepoGenerationStrategy; -import org.jboss.pnc.bacon.pig.impl.pnc.ArtifactWrapper; -import org.jboss.pnc.bacon.pig.impl.pnc.BuildInfoCollector; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; -import org.jboss.pnc.enums.RepositoryType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static org.jboss.pnc.bacon.pig.impl.config.RepoGenerationStrategy.BUILD_GROUP; +import static org.jboss.pnc.bacon.pig.impl.config.RepoGenerationStrategy.IGNORE; import java.io.FileNotFoundException; import java.io.PrintWriter; @@ -25,8 +15,18 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import static org.jboss.pnc.bacon.pig.impl.config.RepoGenerationStrategy.BUILD_GROUP; -import static org.jboss.pnc.bacon.pig.impl.config.RepoGenerationStrategy.IGNORE; +import org.jboss.pnc.bacon.common.exception.FatalException; +import org.jboss.pnc.bacon.pig.impl.addons.AddOn; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.jboss.pnc.bacon.pig.impl.config.RepoGenerationData; +import org.jboss.pnc.bacon.pig.impl.config.RepoGenerationStrategy; +import org.jboss.pnc.bacon.pig.impl.pnc.ArtifactWrapper; +import org.jboss.pnc.bacon.pig.impl.pnc.BuildInfoCollector; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; +import org.jboss.pnc.enums.RepositoryType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Generates the offline manifest text file, which contains all the dependencies, including third party, non-RH diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/runtime/CommunityDepAnalyzer.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/runtime/CommunityDepAnalyzer.java index 0ba6398af..6e063ef6b 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/runtime/CommunityDepAnalyzer.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/runtime/CommunityDepAnalyzer.java @@ -17,13 +17,6 @@ */ package org.jboss.pnc.bacon.pig.impl.addons.runtime; -import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.CommunityDependency; -import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.CsvExportable; -import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.DADao; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.File; import java.io.FileWriter; import java.util.Collection; @@ -31,6 +24,13 @@ import java.util.function.Function; import java.util.stream.Collectors; +import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.CommunityDependency; +import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.CsvExportable; +import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.DADao; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 6/1/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/runtime/RuntimeDependenciesAnalyzer.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/runtime/RuntimeDependenciesAnalyzer.java index 66fdbfd8d..06759dd14 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/runtime/RuntimeDependenciesAnalyzer.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/runtime/RuntimeDependenciesAnalyzer.java @@ -17,14 +17,6 @@ */ package org.jboss.pnc.bacon.pig.impl.addons.runtime; -import org.apache.commons.io.IOUtils; -import org.jboss.pnc.bacon.pig.impl.addons.AddOn; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.jboss.pnc.bacon.pig.impl.utils.FileUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.File; import java.io.FileInputStream; import java.io.InputStream; @@ -34,6 +26,14 @@ import java.util.Map; import java.util.stream.Collectors; +import org.apache.commons.io.IOUtils; +import org.jboss.pnc.bacon.pig.impl.addons.AddOn; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.jboss.pnc.bacon.pig.impl.utils.FileUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 12/11/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/runtime/ThorntailDepAnalyzer.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/runtime/ThorntailDepAnalyzer.java index 2793d2076..b202b500b 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/runtime/ThorntailDepAnalyzer.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/runtime/ThorntailDepAnalyzer.java @@ -1,13 +1,13 @@ package org.jboss.pnc.bacon.pig.impl.addons.runtime; -import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.CommunityDependency; -import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.CsvExportable; -import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.ThorntailCommunityDependency; - import java.util.List; import java.util.function.Function; import java.util.stream.Collectors; +import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.CommunityDependency; +import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.CsvExportable; +import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.ThorntailCommunityDependency; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 13/08/2019 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/PostBuildScanService.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/PostBuildScanService.java index b9febbdde..0f16895db 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/PostBuildScanService.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/PostBuildScanService.java @@ -1,7 +1,12 @@ package org.jboss.pnc.bacon.pig.impl.addons.scanservice; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.*; +import java.util.stream.Collectors; + +import javax.ws.rs.core.Response; + import org.jboss.pnc.bacon.config.Validate; import org.jboss.pnc.bacon.pig.impl.addons.AddOn; import org.jboss.pnc.bacon.pig.impl.addons.scanservice.pssaas.ScanHelper; @@ -10,12 +15,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.core.Response; - -import java.net.URI; -import java.net.URISyntaxException; -import java.util.*; -import java.util.stream.Collectors; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; public class PostBuildScanService extends AddOn implements Validate { private static final Logger log = LoggerFactory.getLogger(PostBuildScanService.class); diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/ScanServiceDTO.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/ScanServiceDTO.java index d2f844d99..b1d05c78b 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/ScanServiceDTO.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/ScanServiceDTO.java @@ -1,17 +1,6 @@ package org.jboss.pnc.bacon.pig.impl.addons.scanservice; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import lombok.Getter; -import lombok.Setter; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static java.lang.String.*; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -25,7 +14,20 @@ import java.util.Map; import java.util.stream.Collectors; -import static java.lang.String.*; +import lombok.Getter; +import lombok.Setter; + +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; /** * PSSC scanning container interface diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/AddAuthHeadersRequestFilter.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/AddAuthHeadersRequestFilter.java index 3eb440781..286f15b9c 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/AddAuthHeadersRequestFilter.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/AddAuthHeadersRequestFilter.java @@ -1,12 +1,12 @@ package org.jboss.pnc.bacon.pig.impl.addons.scanservice.pssaas; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; - import java.io.IOException; import java.util.Map; import java.util.TreeMap; +import javax.ws.rs.client.ClientRequestContext; +import javax.ws.rs.client.ClientRequestFilter; + public class AddAuthHeadersRequestFilter implements ClientRequestFilter { private Map headers = new TreeMap(); diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/RedirectAndLog.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/RedirectAndLog.java index 7781d0313..2987676b7 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/RedirectAndLog.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/RedirectAndLog.java @@ -1,19 +1,19 @@ package org.jboss.pnc.bacon.pig.impl.addons.scanservice.pssaas; -import org.apache.commons.io.IOUtils; -import org.jboss.pnc.bacon.pig.impl.addons.scanservice.PostBuildScanService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static org.apache.commons.io.IOUtils.toInputStream; + +import java.io.BufferedInputStream; +import java.io.IOException; import javax.ws.rs.client.ClientRequestContext; import javax.ws.rs.client.ClientResponseContext; import javax.ws.rs.client.ClientResponseFilter; import javax.ws.rs.client.Entity; -import java.io.BufferedInputStream; -import java.io.IOException; - -import static org.apache.commons.io.IOUtils.toInputStream; +import org.apache.commons.io.IOUtils; +import org.jboss.pnc.bacon.pig.impl.addons.scanservice.PostBuildScanService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RedirectAndLog implements ClientResponseFilter { private static final Logger log = LoggerFactory.getLogger(PostBuildScanService.class); diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/ScanHelper.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/ScanHelper.java index 8d3f38d7c..2727bc77b 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/ScanHelper.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/ScanHelper.java @@ -1,11 +1,11 @@ package org.jboss.pnc.bacon.pig.impl.addons.scanservice.pssaas; -import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; - import java.net.URI; import java.util.Map; import java.util.TreeMap; +import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; + public class ScanHelper { public ScanInterface client; diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/ScanInterface.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/ScanInterface.java index c5645bd12..3577c1a76 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/ScanInterface.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/pssaas/ScanInterface.java @@ -1,11 +1,11 @@ package org.jboss.pnc.bacon.pig.impl.addons.scanservice.pssaas; -import org.jboss.pnc.bacon.pig.impl.addons.scanservice.ScanServiceDTO; - import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.jboss.pnc.bacon.pig.impl.addons.scanservice.ScanServiceDTO; + public interface ScanInterface { @POST diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/spring/BomVerifierAddon.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/spring/BomVerifierAddon.java index 52658754c..4044700e1 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/spring/BomVerifierAddon.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/spring/BomVerifierAddon.java @@ -15,6 +15,15 @@ package org.jboss.pnc.bacon.pig.impl.addons.spring; +import static java.util.Collections.emptyList; +import static org.jboss.pnc.bacon.pig.impl.utils.XmlUtils.listNodes; + +import java.io.File; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.apache.commons.lang3.StringUtils; import org.jboss.pnc.bacon.pig.impl.addons.AddOn; import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; @@ -27,15 +36,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import java.io.File; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static java.util.Collections.emptyList; -import static org.jboss.pnc.bacon.pig.impl.utils.XmlUtils.listNodes; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 7/7/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/FindTransitiveDuplicateArtifactsInDepTree.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/FindTransitiveDuplicateArtifactsInDepTree.java index 1ef3110dc..53dd50d31 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/FindTransitiveDuplicateArtifactsInDepTree.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/FindTransitiveDuplicateArtifactsInDepTree.java @@ -15,14 +15,6 @@ package org.jboss.pnc.bacon.pig.impl.addons.vertx; -import org.jboss.pnc.bacon.pig.impl.addons.AddOn; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.jboss.pnc.bacon.pig.impl.documents.Deliverables; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.BufferedReader; import java.io.FileNotFoundException; import java.io.FileReader; @@ -36,6 +28,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.jboss.pnc.bacon.pig.impl.addons.AddOn; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.jboss.pnc.bacon.pig.impl.documents.Deliverables; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author Paul Gallagher, pgallagh@redhat.com
* Date: 2022-07-28 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/NotYetAlignedFromDependencyTree.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/NotYetAlignedFromDependencyTree.java index e8a15306d..7973e2332 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/NotYetAlignedFromDependencyTree.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/NotYetAlignedFromDependencyTree.java @@ -15,12 +15,6 @@ package org.jboss.pnc.bacon.pig.impl.addons.vertx; -import org.jboss.pnc.bacon.pig.impl.addons.AddOn; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.FileNotFoundException; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; @@ -29,6 +23,12 @@ import java.util.Map; import java.util.stream.Collectors; +import org.jboss.pnc.bacon.pig.impl.addons.AddOn; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author Paul Gallagher, pgallagh@redhat.com
* Date: 2018-11-20 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/SaveBuildLogsLocally.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/SaveBuildLogsLocally.java index ef4698710..b674a276b 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/SaveBuildLogsLocally.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/SaveBuildLogsLocally.java @@ -15,17 +15,17 @@ package org.jboss.pnc.bacon.pig.impl.addons.vertx; +import java.io.File; +import java.io.FileWriter; +import java.util.List; +import java.util.Map; + import org.jboss.pnc.bacon.pig.impl.addons.AddOn; import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.io.FileWriter; -import java.util.List; -import java.util.Map; - /** * @author Paul Gallagher, pgallagh@redhat.com
* Date: 2022-07-28 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/common/DeliverableManager.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/common/DeliverableManager.java index da3369d24..82e292e3b 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/common/DeliverableManager.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/common/DeliverableManager.java @@ -18,6 +18,11 @@ package org.jboss.pnc.bacon.pig.impl.common; +import java.io.File; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Map; + import org.jboss.pnc.bacon.pig.impl.config.GenerationData; import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; import org.jboss.pnc.bacon.pig.impl.documents.Deliverables; @@ -26,11 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.nio.file.Path; -import java.util.Arrays; -import java.util.Map; - /** * A superclass for deliverable generation. Out of the box it supports downloading of artifacts and repackaging them to * deliverables. A concrete implementation can add different methods of generating the deliverables. diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/AdditionalArtifactsFromBuild.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/AdditionalArtifactsFromBuild.java index 41dcfaf6d..6e832c8b2 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/AdditionalArtifactsFromBuild.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/AdditionalArtifactsFromBuild.java @@ -17,10 +17,10 @@ */ package org.jboss.pnc.bacon.pig.impl.config; -import lombok.Data; - import java.util.List; +import lombok.Data; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 2/5/18 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/BuildConfig.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/BuildConfig.java index cbcabe99f..0b1ba225c 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/BuildConfig.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/BuildConfig.java @@ -17,24 +17,9 @@ */ package org.jboss.pnc.bacon.pig.impl.config; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; -import org.apache.commons.lang3.StringUtils; -import org.jboss.pnc.bacon.common.exception.FatalException; -import org.jboss.pnc.bacon.pig.impl.pnc.GitRepoInspector; -import org.jboss.pnc.bacon.pnc.common.ClientCreator; -import org.jboss.pnc.client.EnvironmentClient; -import org.jboss.pnc.client.RemoteResourceException; -import org.jboss.pnc.dto.BuildConfiguration; -import org.jboss.pnc.dto.Environment; -import org.jboss.pnc.dto.SCMRepository; -import org.jboss.pnc.enums.BuildType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; +import static java.util.function.Function.identity; +import static java.util.stream.Collectors.toMap; +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; @@ -52,9 +37,26 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import static java.util.function.Function.identity; -import static java.util.stream.Collectors.toMap; -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; + +import lombok.Data; + +import org.apache.commons.lang3.StringUtils; +import org.jboss.pnc.bacon.common.exception.FatalException; +import org.jboss.pnc.bacon.pig.impl.pnc.GitRepoInspector; +import org.jboss.pnc.bacon.pnc.common.ClientCreator; +import org.jboss.pnc.client.EnvironmentClient; +import org.jboss.pnc.client.RemoteResourceException; +import org.jboss.pnc.dto.BuildConfiguration; +import org.jboss.pnc.dto.Environment; +import org.jboss.pnc.dto.SCMRepository; +import org.jboss.pnc.enums.BuildType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; /** * DTO representing the build-config field in build-config.yaml diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/Flow.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/Flow.java index abe800c6b..8b63534b2 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/Flow.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/Flow.java @@ -17,11 +17,13 @@ */ package org.jboss.pnc.bacon.pig.impl.config; -import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; + import org.jboss.pnc.bacon.pig.impl.sources.SourcesGenerationData; import org.jboss.pnc.bacon.pig.impl.validation.GenerationDataCheck; +import com.fasterxml.jackson.annotation.JsonInclude; + /** * * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/GroupBuildInfo.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/GroupBuildInfo.java index 3061a9a8c..5da7853d2 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/GroupBuildInfo.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/GroupBuildInfo.java @@ -17,13 +17,14 @@ */ package org.jboss.pnc.bacon.pig.impl.config; +import java.util.Map; + import lombok.AllArgsConstructor; import lombok.Data; + import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; import org.jboss.pnc.dto.GroupBuild; -import java.util.Map; - @Data @AllArgsConstructor public class GroupBuildInfo { diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/JavadocGenerationData.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/JavadocGenerationData.java index 4deeeb4b1..c600dae6d 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/JavadocGenerationData.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/JavadocGenerationData.java @@ -17,16 +17,18 @@ */ package org.jboss.pnc.bacon.pig.impl.config; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.TreeSet; +import lombok.Data; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.fasterxml.jackson.annotation.JsonInclude; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 5/25/18 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/LicenseGenerationData.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/LicenseGenerationData.java index d63c19b5c..99093a513 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/LicenseGenerationData.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/LicenseGenerationData.java @@ -17,9 +17,10 @@ */ package org.jboss.pnc.bacon.pig.impl.config; -import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; +import com.fasterxml.jackson.annotation.JsonInclude; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 5/25/18 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/Output.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/Output.java index 1a9107c97..cbc62e807 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/Output.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/Output.java @@ -17,10 +17,10 @@ */ package org.jboss.pnc.bacon.pig.impl.config; -import lombok.Data; - import javax.validation.constraints.NotBlank; +import lombok.Data; + /** * * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/PigConfiguration.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/PigConfiguration.java index 4ae239fe9..6af3a1d8f 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/PigConfiguration.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/PigConfiguration.java @@ -17,27 +17,8 @@ */ package org.jboss.pnc.bacon.pig.impl.config; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AccessLevel; -import lombok.Data; -import lombok.Getter; -import org.jboss.pnc.bacon.common.exception.FatalException; -import org.jboss.pnc.bacon.config.Validate; -import org.jboss.pnc.bacon.pig.impl.utils.AlignmentType; -import org.jboss.pnc.bacon.pig.impl.validation.ListBuildConfigCheck; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.yaml.snakeyaml.Yaml; - -import javax.validation.ConstraintViolation; -import javax.validation.Valid; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import static java.util.stream.Collectors.toList; +import static java.util.stream.Collectors.toMap; import java.io.ByteArrayInputStream; import java.io.File; @@ -57,8 +38,29 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static java.util.stream.Collectors.toList; -import static java.util.stream.Collectors.toMap; +import javax.validation.ConstraintViolation; +import javax.validation.Valid; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +import lombok.AccessLevel; +import lombok.Data; +import lombok.Getter; + +import org.jboss.pnc.bacon.common.exception.FatalException; +import org.jboss.pnc.bacon.config.Validate; +import org.jboss.pnc.bacon.pig.impl.utils.AlignmentType; +import org.jboss.pnc.bacon.pig.impl.validation.ListBuildConfigCheck; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.yaml.snakeyaml.Yaml; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/ProductConfig.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/ProductConfig.java index 3512388a0..d237637de 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/ProductConfig.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/ProductConfig.java @@ -17,10 +17,11 @@ */ package org.jboss.pnc.bacon.pig.impl.config; -import com.fasterxml.jackson.annotation.JsonInclude; +import javax.validation.constraints.NotBlank; + import lombok.Data; -import javax.validation.constraints.NotBlank; +import com.fasterxml.jackson.annotation.JsonInclude; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/RepoGenerationData.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/RepoGenerationData.java index 468fed789..57559ecbb 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/RepoGenerationData.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/config/RepoGenerationData.java @@ -17,11 +17,6 @@ */ package org.jboss.pnc.bacon.pig.impl.config; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AccessLevel; -import lombok.Data; -import lombok.Getter; - import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -29,6 +24,12 @@ import java.util.Map; import java.util.Set; +import lombok.AccessLevel; +import lombok.Data; +import lombok.Getter; + +import com.fasterxml.jackson.annotation.JsonInclude; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 1/17/18 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/DataRoot.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/DataRoot.java index fc2f27dba..def405265 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/DataRoot.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/DataRoot.java @@ -18,14 +18,15 @@ package org.jboss.pnc.bacon.pig.impl.documents; +import java.util.Collection; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; + import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import java.util.Collection; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 6/5/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/DocumentGenerator.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/DocumentGenerator.java index 973a5572a..2ea419e18 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/DocumentGenerator.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/DocumentGenerator.java @@ -17,6 +17,16 @@ */ package org.jboss.pnc.bacon.pig.impl.documents; +import java.io.File; +import java.io.IOException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + import org.jboss.pnc.bacon.config.Config; import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.SharedContentReportGenerator; @@ -28,16 +38,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.io.IOException; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 11/23/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/FileGenerator.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/FileGenerator.java index 9071ad771..e13f78fde 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/FileGenerator.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/FileGenerator.java @@ -17,11 +17,6 @@ */ package org.jboss.pnc.bacon.pig.impl.documents; -import freemarker.core.Environment; -import freemarker.template.Configuration; -import freemarker.template.DefaultObjectWrapper; -import freemarker.template.TemplateException; - import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -30,6 +25,11 @@ import java.util.Locale; import java.util.Optional; +import freemarker.core.Environment; +import freemarker.template.Configuration; +import freemarker.template.DefaultObjectWrapper; +import freemarker.template.TemplateException; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 6/5/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/BrewSearcher.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/BrewSearcher.java index ebf640c83..8b44656fd 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/BrewSearcher.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/BrewSearcher.java @@ -18,7 +18,12 @@ package org.jboss.pnc.bacon.pig.impl.documents.sharedcontent; -import com.redhat.red.build.koji.model.xmlrpc.KojiTagInfo; +import java.nio.file.Path; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + import org.jboss.pnc.bacon.pig.impl.utils.BuildFinderUtils; import org.jboss.pnc.bacon.pig.impl.utils.GAV; import org.jboss.pnc.build.finder.koji.KojiBuild; @@ -26,11 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.nio.file.Path; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; +import com.redhat.red.build.koji.model.xmlrpc.KojiTagInfo; /** * TODO: 1. move out methods that manipulated on SharedContentReportRow TODO: 2. move to a dedicated package diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/DASearcher.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/DASearcher.java index 377de6020..ebb6c90e9 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/DASearcher.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/DASearcher.java @@ -18,18 +18,19 @@ package org.jboss.pnc.bacon.pig.impl.documents.sharedcontent; -import com.google.common.collect.Multimap; -import com.google.common.collect.Multimaps; -import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.DADao; -import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.DAListArtifact; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; +import static org.apache.commons.collections4.CollectionUtils.isNotEmpty; +import static org.apache.commons.lang3.StringUtils.join; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static org.apache.commons.collections4.CollectionUtils.isNotEmpty; -import static org.apache.commons.lang3.StringUtils.join; +import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.DADao; +import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da.DAListArtifact; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; + +import com.google.common.collect.Multimap; +import com.google.common.collect.Multimaps; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/MRRCSearcher.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/MRRCSearcher.java index 8cb61ca86..ec687846d 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/MRRCSearcher.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/MRRCSearcher.java @@ -18,6 +18,8 @@ package org.jboss.pnc.bacon.pig.impl.documents.sharedcontent; +import java.io.IOException; + import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpHead; @@ -27,8 +29,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 6/19/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/SharedContentReportGenerator.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/SharedContentReportGenerator.java index 6669106ae..883f43556 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/SharedContentReportGenerator.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/SharedContentReportGenerator.java @@ -18,11 +18,6 @@ package org.jboss.pnc.bacon.pig.impl.documents.sharedcontent; -import org.jboss.pnc.bacon.pig.impl.repo.RepoDescriptor; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -33,6 +28,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.jboss.pnc.bacon.pig.impl.repo.RepoDescriptor; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 6/19/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/SharedContentReportRow.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/SharedContentReportRow.java index 00bf5ff6c..14a8ecfc6 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/SharedContentReportRow.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/SharedContentReportRow.java @@ -18,10 +18,7 @@ package org.jboss.pnc.bacon.pig.impl.documents.sharedcontent; -import lombok.Data; -import lombok.experimental.Delegate; -import org.apache.commons.lang3.StringUtils; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; +import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; import java.io.File; import java.nio.file.Path; @@ -29,7 +26,11 @@ import java.util.Objects; import java.util.stream.Collectors; -import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; +import lombok.Data; +import lombok.experimental.Delegate; + +import org.apache.commons.lang3.StringUtils; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/CommunityDependency.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/CommunityDependency.java index aeb402a22..f70ad24ca 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/CommunityDependency.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/CommunityDependency.java @@ -22,6 +22,7 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.Delegate; + import org.jboss.pnc.bacon.pig.impl.utils.GAV; /** diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/DADao.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/DADao.java index 8cebf5700..0b32d03e7 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/DADao.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/DADao.java @@ -17,6 +17,11 @@ */ package org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + import org.apache.commons.lang3.StringUtils; import org.jboss.bacon.da.DaHelper; import org.jboss.bacon.da.rest.endpoint.ListingsApi; @@ -29,11 +34,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 6/2/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/DAListArtifact.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/DAListArtifact.java index 2455b45d1..aaf0f0528 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/DAListArtifact.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/DAListArtifact.java @@ -20,6 +20,7 @@ import lombok.Getter; import lombok.experimental.Delegate; + import org.jboss.da.listings.model.rest.RestProductGAV; import org.jboss.pnc.bacon.pig.impl.utils.GAV; diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/ThorntailCommunityDependency.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/ThorntailCommunityDependency.java index 67f9a3415..66c0d6269 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/ThorntailCommunityDependency.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/ThorntailCommunityDependency.java @@ -1,11 +1,11 @@ package org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da; +import java.util.List; + import lombok.Getter; import lombok.Setter; import lombok.ToString; -import java.util.List; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 13/08/2019 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/javadoc/JavadocManager.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/javadoc/JavadocManager.java index aa2c459b5..84fac6e1a 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/javadoc/JavadocManager.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/javadoc/JavadocManager.java @@ -17,7 +17,27 @@ */ package org.jboss.pnc.bacon.pig.impl.javadoc; +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; + import lombok.Getter; + import org.apache.commons.io.filefilter.TrueFileFilter; import org.commonjava.maven.ext.cli.Cli; import org.eclipse.jgit.api.Git; @@ -40,25 +60,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; - -import java.io.File; -import java.io.IOException; -import java.io.PrintStream; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 12/5/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/license/LicenseGenerator.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/license/LicenseGenerator.java index 5536b438a..72c5900dc 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/license/LicenseGenerator.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/license/LicenseGenerator.java @@ -18,6 +18,16 @@ package org.jboss.pnc.bacon.pig.impl.license; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Collection; +import java.util.List; +import java.util.Properties; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.jboss.pnc.bacon.config.Config; import org.jboss.pnc.bacon.config.PigConfig; import org.jboss.pnc.bacon.licenses.LicensesGenerator; @@ -34,16 +44,6 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Node; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Collection; -import java.util.List; -import java.util.Properties; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 8/24/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/license/LicenseManager.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/license/LicenseManager.java index 4250bef69..421238db2 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/license/LicenseManager.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/license/LicenseManager.java @@ -17,7 +17,13 @@ */ package org.jboss.pnc.bacon.pig.impl.license; +import java.io.File; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Map; + import lombok.Getter; + import org.jboss.pnc.bacon.pig.impl.PigContext; import org.jboss.pnc.bacon.pig.impl.common.DeliverableManager; import org.jboss.pnc.bacon.pig.impl.config.GenerationData; @@ -31,11 +37,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Map; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 12/5/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/mapping/BuildConfigMapping.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/mapping/BuildConfigMapping.java index 83bda1a06..ee7e70101 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/mapping/BuildConfigMapping.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/mapping/BuildConfigMapping.java @@ -1,21 +1,22 @@ package org.jboss.pnc.bacon.pig.impl.mapping; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Optional; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; + import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; import org.jboss.pnc.dto.BuildConfiguration; import org.jboss.pnc.dto.BuildConfigurationRevision; import org.jboss.pnc.dto.Environment; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Optional; - public class BuildConfigMapping { public static BuildConfig toBuildConfig(BuildConfiguration buildConfiguration, GeneratorOptions options) { diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/nvr/NvrListGenerator.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/nvr/NvrListGenerator.java index 7facfb06a..63e205965 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/nvr/NvrListGenerator.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/nvr/NvrListGenerator.java @@ -17,13 +17,6 @@ */ package org.jboss.pnc.bacon.pig.impl.nvr; -import org.jboss.pnc.bacon.pig.impl.utils.BuildFinderUtils; -import org.jboss.pnc.build.finder.koji.KojiBuild; -import org.jboss.pnc.build.finder.report.NVRReport; -import org.jboss.pnc.build.finder.report.Report; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.File; import java.io.IOException; import java.nio.file.Path; @@ -31,6 +24,13 @@ import java.util.List; import java.util.Map; +import org.jboss.pnc.bacon.pig.impl.utils.BuildFinderUtils; +import org.jboss.pnc.build.finder.koji.KojiBuild; +import org.jboss.pnc.build.finder.report.NVRReport; +import org.jboss.pnc.build.finder.report.Report; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public final class NvrListGenerator { private static final Logger log = LoggerFactory.getLogger(NvrListGenerator.class); diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/out/PigRunOutput.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/out/PigRunOutput.java index e04eaff8c..2f8895481 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/out/PigRunOutput.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/out/PigRunOutput.java @@ -17,13 +17,14 @@ */ package org.jboss.pnc.bacon.pig.impl.out; +import java.util.Collection; + import lombok.Data; + import org.jboss.pnc.bacon.pig.impl.config.GroupBuildInfo; import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; import org.jboss.pnc.dto.GroupBuild; -import java.util.Collection; - @Data public class PigRunOutput { private String fullVersion; diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/ArtifactWrapper.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/ArtifactWrapper.java index 013e7568b..00cc4a91d 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/ArtifactWrapper.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/ArtifactWrapper.java @@ -18,19 +18,20 @@ package org.jboss.pnc.bacon.pig.impl.pnc; +import java.io.File; +import java.net.URI; +import java.nio.file.Path; + import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.pig.impl.utils.FileDownloadUtils; import org.jboss.pnc.bacon.pig.impl.utils.GAV; import org.jboss.pnc.dto.Artifact; import org.jboss.pnc.enums.RepositoryType; -import java.io.File; -import java.net.URI; -import java.nio.file.Path; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 6/13/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/BuildConfigData.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/BuildConfigData.java index 42b39215a..d7d6dffb0 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/BuildConfigData.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/BuildConfigData.java @@ -20,6 +20,7 @@ import lombok.Getter; import lombok.Setter; import lombok.experimental.Delegate; + import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; import org.jboss.pnc.dto.BuildConfiguration; diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/BuildInfoCollector.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/BuildInfoCollector.java index 7f71f6f1a..efe8110b6 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/BuildInfoCollector.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/BuildInfoCollector.java @@ -18,7 +18,20 @@ package org.jboss.pnc.bacon.pig.impl.pnc; +import static java.util.Optional.of; +import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.query; +import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.toList; + +import java.io.Closeable; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.pig.impl.config.GroupBuildInfo; import org.jboss.pnc.bacon.pnc.client.PncClientHelper; import org.jboss.pnc.client.BuildClient; @@ -37,18 +50,6 @@ import org.jboss.pnc.rest.api.parameters.BuildsFilterParameters; import org.jboss.pnc.rest.api.parameters.GroupBuildsFilterParameters; -import java.io.Closeable; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import static java.util.Optional.of; -import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.query; -import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.toList; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 6/3/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/GitRepoInspector.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/GitRepoInspector.java index c6165a7f2..404af421f 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/GitRepoInspector.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/GitRepoInspector.java @@ -17,6 +17,16 @@ */ package org.jboss.pnc.bacon.pig.impl.pnc; +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URI; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Optional; +import java.util.Set; + import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.ObjectId; @@ -30,16 +40,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URI; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Optional; -import java.util.Set; - /** * TODO: drop it once https://projects.engineering.redhat.com/browse/NCL-1322 is implemented * diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/ImportResult.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/ImportResult.java index 6f1b11a50..1ebff4ec9 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/ImportResult.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/ImportResult.java @@ -17,14 +17,15 @@ */ package org.jboss.pnc.bacon.pig.impl.pnc; +import java.util.List; + import lombok.AllArgsConstructor; import lombok.Data; + import org.jboss.pnc.dto.GroupConfigurationRef; import org.jboss.pnc.dto.ProductMilestoneRef; import org.jboss.pnc.dto.ProductVersionRef; -import java.util.List; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 12/4/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncBuild.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncBuild.java index 26c7b185d..90a779b42 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncBuild.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncBuild.java @@ -18,12 +18,25 @@ package org.jboss.pnc.bacon.pig.impl.pnc; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import static java.util.Arrays.asList; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import lombok.ToString; + import org.jboss.pnc.bacon.pnc.client.PncClientHelper; import org.jboss.pnc.bacon.pnc.common.UrlGenerator; import org.jboss.pnc.client.BuildClient; @@ -34,19 +47,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import static java.util.Arrays.asList; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncBuilder.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncBuilder.java index f4f8aac57..0f27baff2 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncBuilder.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncBuilder.java @@ -17,6 +17,13 @@ */ package org.jboss.pnc.bacon.pig.impl.pnc; +import static java.util.Optional.of; +import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.query; +import static org.jboss.pnc.bacon.pnc.client.PncClientHelper.getPncConfiguration; + +import java.io.Closeable; +import java.util.Collection; + import org.jboss.pnc.api.enums.AlignmentPreference; import org.jboss.pnc.bacon.common.exception.FatalException; import org.jboss.pnc.bacon.pig.impl.utils.SleepUtils; @@ -37,13 +44,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Closeable; -import java.util.Collection; - -import static java.util.Optional.of; -import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.query; -import static org.jboss.pnc.bacon.pnc.client.PncClientHelper.getPncConfiguration; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 11/14/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncConfigurator.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncConfigurator.java index 10eefaee8..885bb13f8 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncConfigurator.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncConfigurator.java @@ -17,6 +17,14 @@ */ package org.jboss.pnc.bacon.pig.impl.pnc; +import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.toStream; + +import java.io.Closeable; +import java.time.Instant; +import java.time.LocalDate; +import java.time.ZoneOffset; +import java.util.Optional; + import org.jboss.pnc.bacon.pnc.client.PncClientHelper; import org.jboss.pnc.client.ClientException; import org.jboss.pnc.client.ProductMilestoneClient; @@ -30,14 +38,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Closeable; -import java.time.Instant; -import java.time.LocalDate; -import java.time.ZoneOffset; -import java.util.Optional; - -import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.toStream; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 11/14/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncEntitiesImporter.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncEntitiesImporter.java index 97295e92d..696e44001 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncEntitiesImporter.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/pnc/PncEntitiesImporter.java @@ -17,6 +17,22 @@ */ package org.jboss.pnc.bacon.pig.impl.pnc; +import static java.util.Optional.empty; +import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.findByNameQuery; +import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.maybeSingle; +import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.query; +import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.toStream; + +import java.io.Closeable; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; + import org.jboss.pnc.bacon.pig.impl.PigContext; import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; @@ -54,22 +70,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Closeable; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; - -import static java.util.Optional.empty; -import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.findByNameQuery; -import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.maybeSingle; -import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.query; -import static org.jboss.pnc.bacon.pig.impl.utils.PncClientUtils.toStream; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 11/28/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ArtifactProgressTracker.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ArtifactProgressTracker.java index bb6dd77a2..4d0ad2b2f 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ArtifactProgressTracker.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ArtifactProgressTracker.java @@ -1,11 +1,12 @@ package org.jboss.pnc.bacon.pig.impl.repo; -import io.quarkus.maven.dependency.GAV; +import java.util.Formatter; +import java.util.concurrent.atomic.AtomicInteger; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Formatter; -import java.util.concurrent.atomic.AtomicInteger; +import io.quarkus.maven.dependency.GAV; /** * Artifact processing progress tracker diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ArtifactVersion.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ArtifactVersion.java index 7d6dc1643..0f3a21ccd 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ArtifactVersion.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ArtifactVersion.java @@ -1,12 +1,12 @@ package org.jboss.pnc.bacon.pig.impl.repo; +import java.util.Map; +import java.util.Optional; + import org.jboss.pnc.bacon.pig.impl.pnc.ArtifactWrapper; import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; import org.jboss.pnc.bacon.pig.impl.utils.GAV; -import java.util.Map; -import java.util.Optional; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com 2020-06-05 */ diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/BomRepoGenerationSummary.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/BomRepoGenerationSummary.java index 8be096e53..a14fdf3aa 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/BomRepoGenerationSummary.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/BomRepoGenerationSummary.java @@ -1,13 +1,14 @@ package org.jboss.pnc.bacon.pig.impl.repo; -import io.quarkus.maven.dependency.ArtifactCoords; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Collection; import java.util.List; import java.util.concurrent.ConcurrentLinkedQueue; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.quarkus.maven.dependency.ArtifactCoords; + /** * Maven repository generation summary for the BOM resolution strategy */ diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ExternalArtifactDownloader.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ExternalArtifactDownloader.java index ad921aad9..935e58db2 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ExternalArtifactDownloader.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ExternalArtifactDownloader.java @@ -17,16 +17,16 @@ */ package org.jboss.pnc.bacon.pig.impl.repo; +import java.io.File; +import java.net.URI; +import java.nio.file.Path; + import org.jboss.pnc.bacon.pig.impl.utils.FileDownloadUtils; import org.jboss.pnc.bacon.pig.impl.utils.GAV; import org.jboss.pnc.bacon.pig.impl.utils.indy.Indy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.net.URI; -import java.nio.file.Path; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 5/10/18 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ParentPomDownloader.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ParentPomDownloader.java index c4a2ac23f..f85a22799 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ParentPomDownloader.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ParentPomDownloader.java @@ -1,19 +1,5 @@ package org.jboss.pnc.bacon.pig.impl.repo; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.w3c.dom.Document; -import org.xml.sax.SAXException; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathExpression; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; - import java.io.File; import java.io.IOException; import java.io.UncheckedIOException; @@ -25,6 +11,20 @@ import java.util.Set; import java.util.stream.Stream; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathExpression; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; + +import org.jboss.pnc.bacon.pig.impl.utils.GAV; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.w3c.dom.Document; +import org.xml.sax.SAXException; + /** * @author Ken Finnigan */ diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepoBuilder.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepoBuilder.java index d5018d897..bdbc60a1b 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepoBuilder.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepoBuilder.java @@ -18,6 +18,17 @@ package org.jboss.pnc.bacon.pig.impl.repo; +import static org.apache.commons.lang3.StringUtils.isEmpty; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.jboss.pnc.bacon.common.ObjectHelper; @@ -35,17 +46,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import java.io.File; -import java.io.IOException; -import java.nio.file.Path; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import static org.apache.commons.lang3.StringUtils.isEmpty; - /** * TODO: replace with programmatic maven api to remove OSCommandExecutor? TODO: CON: would mean that users have to stick * to the same maven version diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepoDescriptor.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepoDescriptor.java index d7be9c566..a13646ef6 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepoDescriptor.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepoDescriptor.java @@ -17,8 +17,6 @@ */ package org.jboss.pnc.bacon.pig.impl.repo; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; - import java.io.File; import java.io.IOException; import java.io.UncheckedIOException; @@ -32,6 +30,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 11/14/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepoManager.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepoManager.java index 5dc6edca6..a39a739b7 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepoManager.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepoManager.java @@ -17,51 +17,6 @@ */ package org.jboss.pnc.bacon.pig.impl.repo; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; -import io.quarkus.bootstrap.util.IoUtils; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.domino.inspect.DependencyTreeError; -import io.quarkus.domino.inspect.DependencyTreeInspector; -import io.quarkus.domino.inspect.DependencyTreeVisitor; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import lombok.Getter; -import org.apache.maven.model.Model; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.Exclusion; -import org.eclipse.aether.resolution.DependencyRequest; -import org.eclipse.aether.resolution.DependencyResolutionException; -import org.eclipse.aether.util.artifact.JavaScopes; -import org.eclipse.aether.util.listener.ChainedRepositoryListener; -import org.jboss.pnc.bacon.common.ObjectHelper; -import org.jboss.pnc.bacon.common.exception.FatalException; -import org.jboss.pnc.bacon.pig.impl.PigContext; -import org.jboss.pnc.bacon.pig.impl.addons.cachi2.Cachi2LockfileGenerator; -import org.jboss.pnc.bacon.pig.impl.common.DeliverableManager; -import org.jboss.pnc.bacon.pig.impl.config.AdditionalArtifactsFromBuild; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.jboss.pnc.bacon.pig.impl.config.RepoGenerationData; -import org.jboss.pnc.bacon.pig.impl.config.RepoGenerationStrategy; -import org.jboss.pnc.bacon.pig.impl.documents.Deliverables; -import org.jboss.pnc.bacon.pig.impl.license.LicenseGenerator; -import org.jboss.pnc.bacon.pig.impl.pnc.ArtifactWrapper; -import org.jboss.pnc.bacon.pig.impl.pnc.BuildInfoCollector; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.jboss.pnc.bacon.pig.impl.utils.FileUtils; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; -import org.jboss.pnc.bacon.pig.impl.utils.GavSet; -import org.jboss.pnc.bacon.pig.impl.utils.ResourceUtils; -import org.jboss.pnc.bacon.pig.impl.utils.indy.Indy; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.BufferedReader; import java.io.Closeable; import java.io.File; @@ -98,6 +53,53 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import lombok.Getter; + +import org.apache.maven.model.Model; +import org.eclipse.aether.DefaultRepositorySystemSession; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; +import org.eclipse.aether.graph.Dependency; +import org.eclipse.aether.graph.DependencyNode; +import org.eclipse.aether.graph.Exclusion; +import org.eclipse.aether.resolution.DependencyRequest; +import org.eclipse.aether.resolution.DependencyResolutionException; +import org.eclipse.aether.util.artifact.JavaScopes; +import org.eclipse.aether.util.listener.ChainedRepositoryListener; +import org.jboss.pnc.bacon.common.ObjectHelper; +import org.jboss.pnc.bacon.common.exception.FatalException; +import org.jboss.pnc.bacon.pig.impl.PigContext; +import org.jboss.pnc.bacon.pig.impl.addons.cachi2.Cachi2LockfileGenerator; +import org.jboss.pnc.bacon.pig.impl.common.DeliverableManager; +import org.jboss.pnc.bacon.pig.impl.config.AdditionalArtifactsFromBuild; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.jboss.pnc.bacon.pig.impl.config.RepoGenerationData; +import org.jboss.pnc.bacon.pig.impl.config.RepoGenerationStrategy; +import org.jboss.pnc.bacon.pig.impl.documents.Deliverables; +import org.jboss.pnc.bacon.pig.impl.license.LicenseGenerator; +import org.jboss.pnc.bacon.pig.impl.pnc.ArtifactWrapper; +import org.jboss.pnc.bacon.pig.impl.pnc.BuildInfoCollector; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.jboss.pnc.bacon.pig.impl.utils.FileUtils; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; +import org.jboss.pnc.bacon.pig.impl.utils.GavSet; +import org.jboss.pnc.bacon.pig.impl.utils.ResourceUtils; +import org.jboss.pnc.bacon.pig.impl.utils.indy.Indy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; +import io.quarkus.bootstrap.util.IoUtils; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.domino.inspect.DependencyTreeError; +import io.quarkus.domino.inspect.DependencyTreeInspector; +import io.quarkus.domino.inspect.DependencyTreeVisitor; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 11/23/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepositoryData.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepositoryData.java index 980c28aaf..ab5307aa6 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepositoryData.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepositoryData.java @@ -17,13 +17,14 @@ */ package org.jboss.pnc.bacon.pig.impl.repo; -import lombok.Data; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; - import java.io.File; import java.nio.file.Path; import java.util.Collection; +import lombok.Data; + +import org.jboss.pnc.bacon.pig.impl.utils.GAV; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 8/29/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepositoryUtils.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepositoryUtils.java index 24e621881..f2d2aa187 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepositoryUtils.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/RepositoryUtils.java @@ -17,17 +17,7 @@ */ package org.jboss.pnc.bacon.pig.impl.repo; -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.io.FileUtils; -import org.apache.maven.artifact.repository.metadata.Metadata; -import org.apache.maven.artifact.repository.metadata.Versioning; -import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer; -import org.commonjava.maven.atlas.ident.ref.ProjectRef; -import org.commonjava.maven.atlas.ident.ref.ProjectVersionRef; -import org.commonjava.maven.atlas.ident.util.ArtifactPathInfo; -import org.commonjava.maven.atlas.ident.version.SingleVersion; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static java.util.Comparator.comparingInt; import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; @@ -58,7 +48,17 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static java.util.Comparator.comparingInt; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.io.FileUtils; +import org.apache.maven.artifact.repository.metadata.Metadata; +import org.apache.maven.artifact.repository.metadata.Versioning; +import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer; +import org.commonjava.maven.atlas.ident.ref.ProjectRef; +import org.commonjava.maven.atlas.ident.ref.ProjectVersionRef; +import org.commonjava.maven.atlas.ident.util.ArtifactPathInfo; +import org.commonjava.maven.atlas.ident.version.SingleVersion; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ResolvedArtifactCollector.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ResolvedArtifactCollector.java index 49a707500..02c1c17ed 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ResolvedArtifactCollector.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ResolvedArtifactCollector.java @@ -1,8 +1,12 @@ package org.jboss.pnc.bacon.pig.impl.repo; -import io.quarkus.domino.RhVersionPattern; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.GAV; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import org.eclipse.aether.AbstractRepositoryListener; import org.eclipse.aether.RepositoryEvent; import org.jboss.pnc.bacon.pig.impl.repo.visitor.ArtifactVisit; @@ -10,12 +14,9 @@ import org.jboss.pnc.bacon.pig.impl.repo.visitor.FileSystemArtifactVisit; import org.jboss.pnc.bacon.pig.impl.repo.visitor.VisitableArtifactRepository; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; +import io.quarkus.domino.RhVersionPattern; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.GAV; /** * Collects all the artifacts resolved by a Maven artifact resolver diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ResolvedGav.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ResolvedGav.java index 28d734ced..ebb9d1d7e 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ResolvedGav.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/ResolvedGav.java @@ -1,10 +1,5 @@ package org.jboss.pnc.bacon.pig.impl.repo; -import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.GAV; -import org.eclipse.aether.artifact.Artifact; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -14,6 +9,12 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; +import org.eclipse.aether.artifact.Artifact; + +import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.GAV; + /** * This class represent a set of resolved artifacts sharing the same GAV. */ diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/Sl4jMessageWriter.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/Sl4jMessageWriter.java index eed911496..c3f04089b 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/Sl4jMessageWriter.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/Sl4jMessageWriter.java @@ -1,8 +1,9 @@ package org.jboss.pnc.bacon.pig.impl.repo; -import io.quarkus.devtools.messagewriter.MessageWriter; import org.slf4j.Logger; +import io.quarkus.devtools.messagewriter.MessageWriter; + class Sl4jMessageWriter implements MessageWriter { private final Logger log; diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/visitor/ArtifactVisit.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/visitor/ArtifactVisit.java index 4833a2504..6c68f5863 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/visitor/ArtifactVisit.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/visitor/ArtifactVisit.java @@ -1,9 +1,9 @@ package org.jboss.pnc.bacon.pig.impl.repo.visitor; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; - import java.util.Map; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; + /** * Information about a visited artifact */ diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/visitor/FileSystemArtifactRepository.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/visitor/FileSystemArtifactRepository.java index 1e05dfdd9..e630e10f8 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/visitor/FileSystemArtifactRepository.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/visitor/FileSystemArtifactRepository.java @@ -1,8 +1,5 @@ package org.jboss.pnc.bacon.pig.impl.repo.visitor; -import org.jboss.pnc.bacon.pig.impl.repo.RepoDescriptor; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; - import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.FileVisitResult; @@ -15,6 +12,9 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; +import org.jboss.pnc.bacon.pig.impl.repo.RepoDescriptor; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; + class FileSystemArtifactRepository implements VisitableArtifactRepository { /** diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/visitor/FileSystemArtifactVisit.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/visitor/FileSystemArtifactVisit.java index ee4774e1d..4f8cda3af 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/visitor/FileSystemArtifactVisit.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/repo/visitor/FileSystemArtifactVisit.java @@ -1,7 +1,5 @@ package org.jboss.pnc.bacon.pig.impl.repo.visitor; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; - import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.Files; @@ -10,6 +8,8 @@ import java.util.Map; import java.util.stream.Stream; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; + public class FileSystemArtifactVisit implements ArtifactVisit { private static final String[] CHECKSUM_PREFIXES = { "sha", "md5" }; diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/script/ScriptGenerator.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/script/ScriptGenerator.java index e34ee90d5..2a9ccb7a8 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/script/ScriptGenerator.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/script/ScriptGenerator.java @@ -17,14 +17,6 @@ */ package org.jboss.pnc.bacon.pig.impl.script; -import lombok.AllArgsConstructor; -import lombok.Data; -import org.jboss.pnc.bacon.pig.impl.PigContext; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.jboss.pnc.bacon.pig.impl.documents.FileGenerator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -33,6 +25,15 @@ import java.util.Optional; import java.util.Set; +import lombok.AllArgsConstructor; +import lombok.Data; + +import org.jboss.pnc.bacon.pig.impl.PigContext; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.jboss.pnc.bacon.pig.impl.documents.FileGenerator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 1/4/18 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/sources/SourcesGenerationData.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/sources/SourcesGenerationData.java index b09d3b87f..9a6055fc0 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/sources/SourcesGenerationData.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/sources/SourcesGenerationData.java @@ -1,11 +1,12 @@ package org.jboss.pnc.bacon.pig.impl.sources; -import lombok.Data; -import org.jboss.pnc.bacon.pig.impl.config.GenerationData; - import java.util.ArrayList; import java.util.List; +import lombok.Data; + +import org.jboss.pnc.bacon.pig.impl.config.GenerationData; + @Data public class SourcesGenerationData extends GenerationData { diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/sources/SourcesGenerator.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/sources/SourcesGenerator.java index 532f50ab1..df7e0e86e 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/sources/SourcesGenerator.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/sources/SourcesGenerator.java @@ -1,8 +1,25 @@ package org.jboss.pnc.bacon.pig.impl.sources; -import com.google.common.collect.Maps; -import com.redhat.red.build.koji.model.xmlrpc.KojiArchiveInfo; -import com.redhat.red.build.koji.model.xmlrpc.KojiBuildInfo; +import static org.jboss.pnc.bacon.pig.impl.utils.GerritUtils.gerritSnapshotDownloadUrl; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import javax.ws.rs.core.Response; + import org.apache.commons.io.FilenameUtils; import org.jboss.pnc.bacon.pig.impl.PigContext; import org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.BrewSearcher; @@ -21,25 +38,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.core.Response; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.jboss.pnc.bacon.pig.impl.utils.GerritUtils.gerritSnapshotDownloadUrl; +import com.google.common.collect.Maps; +import com.redhat.red.build.koji.model.xmlrpc.KojiArchiveInfo; +import com.redhat.red.build.koji.model.xmlrpc.KojiBuildInfo; public class SourcesGenerator { private static final Logger log = LoggerFactory.getLogger(SourcesGenerator.class); diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/BuildFinderUtils.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/BuildFinderUtils.java index 39123345e..54c55dbee 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/BuildFinderUtils.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/BuildFinderUtils.java @@ -1,6 +1,21 @@ package org.jboss.pnc.bacon.pig.impl.utils; -import com.redhat.red.build.koji.KojiClientException; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.stream.Collectors; + import org.apache.commons.collections4.MultiValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; import org.jboss.pnc.bacon.config.Config; @@ -17,21 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.io.IOException; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.stream.Collectors; +import com.redhat.red.build.koji.KojiClientException; public final class BuildFinderUtils { private static final Logger log = LoggerFactory.getLogger(BuildFinderUtils.class); diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/CSVUtils.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/CSVUtils.java index 3841c8925..a3c4b0086 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/CSVUtils.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/CSVUtils.java @@ -1,8 +1,5 @@ package org.jboss.pnc.bacon.pig.impl.utils; -import org.apache.commons.csv.CSVFormat; -import org.apache.commons.csv.CSVParser; - import java.io.IOException; import java.io.Reader; import java.nio.charset.StandardCharsets; @@ -11,6 +8,9 @@ import java.util.Set; import java.util.stream.Collectors; +import org.apache.commons.csv.CSVFormat; +import org.apache.commons.csv.CSVParser; + /** * @author Harsh Madhani Date: 06-August-2020 */ diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/FileDownloadUtils.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/FileDownloadUtils.java index 4265141ca..e7b045de4 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/FileDownloadUtils.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/FileDownloadUtils.java @@ -17,6 +17,14 @@ */ package org.jboss.pnc.bacon.pig.impl.utils; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; + +import javax.ws.rs.NotFoundException; + import org.apache.commons.io.IOUtils; import org.apache.http.HttpException; import org.apache.http.client.config.RequestConfig; @@ -27,14 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.NotFoundException; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 4/16/18 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/FileUtils.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/FileUtils.java index c31c0ec7c..bf3f284fb 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/FileUtils.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/FileUtils.java @@ -18,6 +18,27 @@ package org.jboss.pnc.bacon.pig.impl.utils; +import static java.nio.file.Files.createTempDirectory; + +import java.io.*; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; +import java.nio.file.FileVisitOption; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; +import java.nio.file.attribute.FileTime; +import java.nio.file.attribute.PosixFilePermission; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Stream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; + import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveException; import org.apache.commons.compress.archivers.ArchiveInputStream; @@ -40,27 +61,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.*; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; -import java.nio.file.FileVisitOption; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.nio.file.attribute.FileTime; -import java.nio.file.attribute.PosixFilePermission; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Stream; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - -import static java.nio.file.Files.createTempDirectory; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 7/28/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/GAV.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/GAV.java index bb4d5b0e5..ba4747a51 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/GAV.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/GAV.java @@ -18,22 +18,24 @@ package org.jboss.pnc.bacon.pig.impl.utils; -import com.redhat.red.build.koji.model.xmlrpc.KojiArchiveInfo; +import static org.apache.commons.lang3.StringUtils.isBlank; + +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.Map; + import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; + import org.apache.commons.io.FilenameUtils; import org.jboss.da.listings.model.rest.RestArtifact; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Element; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; -import java.util.Map; - -import static org.apache.commons.lang3.StringUtils.isBlank; +import com.redhat.red.build.koji.model.xmlrpc.KojiArchiveInfo; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/HashUtils.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/HashUtils.java index 7990bfc1c..d0febc5d7 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/HashUtils.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/HashUtils.java @@ -1,8 +1,5 @@ package org.jboss.pnc.bacon.pig.impl.utils; -import org.apache.commons.codec.digest.DigestUtils; -import org.jboss.resteasy.util.Hex; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -10,6 +7,9 @@ import java.util.function.Predicate; import java.util.stream.Stream; +import org.apache.commons.codec.digest.DigestUtils; +import org.jboss.resteasy.util.Hex; + public class HashUtils { private HashUtils() { } diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/MavenRepositoryUtils.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/MavenRepositoryUtils.java index f5b6da849..4ba304a22 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/MavenRepositoryUtils.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/MavenRepositoryUtils.java @@ -1,5 +1,7 @@ package org.jboss.pnc.bacon.pig.impl.utils; +import static org.jboss.pnc.bacon.pig.impl.repo.RepoDescriptor.MAVEN_REPOSITORY; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -8,8 +10,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.jboss.pnc.bacon.pig.impl.repo.RepoDescriptor.MAVEN_REPOSITORY; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 13/08/2019 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/MilestoneNumberFinder.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/MilestoneNumberFinder.java index 74f42fe6d..b756216f5 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/MilestoneNumberFinder.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/MilestoneNumberFinder.java @@ -17,8 +17,6 @@ */ package org.jboss.pnc.bacon.pig.impl.utils; -import org.apache.commons.io.FileUtils; - import java.io.File; import java.io.IOException; import java.net.URL; @@ -27,6 +25,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.io.FileUtils; + /** * TODO: resurrect it * diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/OSCommandExecutor.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/OSCommandExecutor.java index 294f412d4..04bdf6c6b 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/OSCommandExecutor.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/OSCommandExecutor.java @@ -18,9 +18,8 @@ package org.jboss.pnc.bacon.pig.impl.utils; -import lombok.Getter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static java.util.Arrays.asList; +import static org.apache.commons.lang3.StringUtils.join; import java.io.BufferedReader; import java.io.File; @@ -37,8 +36,10 @@ import java.util.function.Consumer; import java.util.stream.Stream; -import static java.util.Arrays.asList; -import static org.apache.commons.lang3.StringUtils.join; +import lombok.Getter; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * todo: clean up + possibly move out to a separate lib TODO: remove !! diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/PncClientUtils.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/PncClientUtils.java index 3bf95a3b5..44ed23c60 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/PncClientUtils.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/PncClientUtils.java @@ -17,14 +17,14 @@ */ package org.jboss.pnc.bacon.pig.impl.utils; -import org.jboss.pnc.client.RemoteCollection; - import java.util.List; import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; +import org.jboss.pnc.client.RemoteCollection; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 28/06/2019 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/ResourceUtils.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/ResourceUtils.java index 616c4edc0..2c9662432 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/ResourceUtils.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/ResourceUtils.java @@ -18,10 +18,7 @@ package org.jboss.pnc.bacon.pig.impl.utils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static org.apache.commons.io.FileUtils.writeStringToFile; import java.io.File; import java.io.IOException; @@ -30,7 +27,10 @@ import java.util.Optional; import java.util.Properties; -import static org.apache.commons.io.FileUtils.writeStringToFile; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/SleepUtils.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/SleepUtils.java index d57b4d91e..164f7855e 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/SleepUtils.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/SleepUtils.java @@ -18,11 +18,11 @@ package org.jboss.pnc.bacon.pig.impl.utils; +import java.util.function.Supplier; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.function.Supplier; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 7/7/17 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/XmlUtils.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/XmlUtils.java index 646c040fc..e9a831e0f 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/XmlUtils.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/XmlUtils.java @@ -18,11 +18,16 @@ package org.jboss.pnc.bacon.pig.impl.utils; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -39,16 +44,11 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/pom/DependencyManagement.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/pom/DependencyManagement.java index 975a8da65..a2b7c0fb0 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/pom/DependencyManagement.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/pom/DependencyManagement.java @@ -1,11 +1,11 @@ package org.jboss.pnc.bacon.pig.impl.utils.pom; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; - import java.util.ArrayList; import java.util.List; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; + /** * @author Paul Gallagher, pgallagh@redhat
* Date: 12/10/2018 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/pom/Profile.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/pom/Profile.java index d6672baa7..cee0b052e 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/pom/Profile.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/pom/Profile.java @@ -1,11 +1,11 @@ package org.jboss.pnc.bacon.pig.impl.utils.pom; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; - import java.util.ArrayList; import java.util.List; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; + /** * @author Paul Gallagher, pgallagh@redhat
* Date: 12/10/2018 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/pom/Profiles.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/pom/Profiles.java index a9cd940e2..1e7fbfc0d 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/pom/Profiles.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/utils/pom/Profiles.java @@ -1,10 +1,10 @@ package org.jboss.pnc.bacon.pig.impl.utils.pom; -import javax.xml.bind.annotation.XmlElement; - import java.util.ArrayList; import java.util.List; +import javax.xml.bind.annotation.XmlElement; + /** * @author Paul Gallagher, pgallagh@redhat
* Date: 12/10/2018 diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/GenerationDataCheck.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/GenerationDataCheck.java index 0038124b5..06018183f 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/GenerationDataCheck.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/GenerationDataCheck.java @@ -1,17 +1,17 @@ package org.jboss.pnc.bacon.pig.impl.validation; -import javax.validation.Constraint; -import javax.validation.Payload; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.validation.Constraint; +import javax.validation.Payload; + /** * Validator annotation for GenerationData */ diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/GenerationDataValidator.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/GenerationDataValidator.java index ffbb31984..07320c921 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/GenerationDataValidator.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/GenerationDataValidator.java @@ -1,10 +1,10 @@ package org.jboss.pnc.bacon.pig.impl.validation; -import org.jboss.pnc.bacon.pig.impl.config.GenerationData; - import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; +import org.jboss.pnc.bacon.pig.impl.config.GenerationData; + /** * Validation implementation for GenerationDataCheck */ diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/ListBuildConfigCheck.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/ListBuildConfigCheck.java index ccbe911a4..591f7961d 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/ListBuildConfigCheck.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/ListBuildConfigCheck.java @@ -1,17 +1,17 @@ package org.jboss.pnc.bacon.pig.impl.validation; -import javax.validation.Constraint; -import javax.validation.Payload; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.validation.Constraint; +import javax.validation.Payload; + /** * Validator annotation for Build config */ diff --git a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/ListBuildConfigValidator.java b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/ListBuildConfigValidator.java index 80b7268c5..b18237280 100644 --- a/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/ListBuildConfigValidator.java +++ b/pig/src/main/java/org/jboss/pnc/bacon/pig/impl/validation/ListBuildConfigValidator.java @@ -1,8 +1,7 @@ package org.jboss.pnc.bacon.pig.impl.validation; -import lombok.extern.slf4j.Slf4j; -import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; -import org.jboss.pnc.enums.BuildType; +import java.util.ArrayList; +import java.util.List; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -10,8 +9,10 @@ import javax.validation.Validator; import javax.validation.ValidatorFactory; -import java.util.ArrayList; -import java.util.List; +import lombok.extern.slf4j.Slf4j; + +import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; +import org.jboss.pnc.enums.BuildType; /** * Validation implementation for BuildConfig diff --git a/pig/src/test/java/org/jboss/pnc/bacon/config/ConfigReaderTest.java b/pig/src/test/java/org/jboss/pnc/bacon/config/ConfigReaderTest.java index 6733438b2..645de195d 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/config/ConfigReaderTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/config/ConfigReaderTest.java @@ -17,20 +17,21 @@ */ package org.jboss.pnc.bacon.config; -import com.google.common.collect.ImmutableMap; -import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; -import org.jboss.pnc.bacon.pig.impl.config.JavadocGenerationStrategy; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.InputStream; import java.util.Collections; import java.util.Map; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; +import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; +import org.jboss.pnc.bacon.pig.impl.config.JavadocGenerationStrategy; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.junit.jupiter.api.Test; + +import com.google.common.collect.ImmutableMap; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/PigContextTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/PigContextTest.java index 2c0e9f4bc..154841a80 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/PigContextTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/PigContextTest.java @@ -1,11 +1,11 @@ package org.jboss.pnc.bacon.pig.impl; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; import java.nio.file.Path; import java.nio.file.Paths; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; class PigContextTest { diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/camel/TreeNodeTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/camel/TreeNodeTest.java index 1d9beb9ff..5a2363590 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/camel/TreeNodeTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/camel/TreeNodeTest.java @@ -1,9 +1,9 @@ package org.jboss.pnc.bacon.pig.impl.addons.camel; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + /** * Unit test for simple App. */ diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/camel/TreeParserTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/camel/TreeParserTest.java index 77558099b..822bf4222 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/camel/TreeParserTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/camel/TreeParserTest.java @@ -1,11 +1,11 @@ package org.jboss.pnc.bacon.pig.impl.addons.camel; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.util.ArrayList; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; /** * Unit test for simple App. diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusCommunityDepAnalyzerTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusCommunityDepAnalyzerTest.java index 5e36178df..8daca42a4 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusCommunityDepAnalyzerTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusCommunityDepAnalyzerTest.java @@ -1,5 +1,13 @@ package org.jboss.pnc.bacon.pig.impl.addons.quarkus; +import static java.util.Arrays.asList; + +import java.io.File; +import java.nio.file.Paths; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + import org.assertj.core.util.Files; import org.jboss.pnc.bacon.config.Config; import org.jboss.pnc.bacon.config.ConfigProfile; @@ -14,14 +22,6 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import java.io.File; -import java.nio.file.Paths; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import static java.util.Arrays.asList; - public class QuarkusCommunityDepAnalyzerTest { public static final String REPO_ZIP_PATH = null; diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusPostBuildAnalyzerTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusPostBuildAnalyzerTest.java index da26c04bc..a45c4681d 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusPostBuildAnalyzerTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/quarkus/QuarkusPostBuildAnalyzerTest.java @@ -1,10 +1,6 @@ package org.jboss.pnc.bacon.pig.impl.addons.quarkus; -import com.github.tomakehurst.wiremock.WireMockServer; -import org.apache.commons.io.FileUtils; -import org.jboss.pnc.bacon.common.exception.FatalException; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.junit.jupiter.api.Test; +import static com.github.tomakehurst.wiremock.client.WireMock.*; import java.io.File; import java.io.IOException; @@ -13,7 +9,12 @@ import java.util.List; import java.util.Map; -import static com.github.tomakehurst.wiremock.client.WireMock.*; +import org.apache.commons.io.FileUtils; +import org.jboss.pnc.bacon.common.exception.FatalException; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.junit.jupiter.api.Test; + +import com.github.tomakehurst.wiremock.WireMockServer; public class QuarkusPostBuildAnalyzerTest { WireMockServer wireMockServer = new WireMockServer(); diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/rhba/OfflineManifestGeneratorTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/rhba/OfflineManifestGeneratorTest.java index aaf825ed9..6a6d05c05 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/rhba/OfflineManifestGeneratorTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/rhba/OfflineManifestGeneratorTest.java @@ -1,17 +1,8 @@ package org.jboss.pnc.bacon.pig.impl.addons.rhba; -import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; -import org.jboss.pnc.bacon.pig.impl.pnc.ArtifactWrapper; -import org.jboss.pnc.bacon.pig.impl.pnc.BuildInfoCollector; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.jboss.pnc.bacon.pig.impl.utils.GAV; -import org.jboss.pnc.dto.Artifact; -import org.jboss.pnc.dto.TargetRepository; -import org.jboss.pnc.enums.RepositoryType; -import org.jeasy.random.EasyRandom; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; +import static org.jboss.pnc.bacon.pig.impl.config.RepoGenerationStrategy.BUILD_GROUP; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.nio.file.Files; @@ -26,9 +17,18 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.jboss.pnc.bacon.pig.impl.config.RepoGenerationStrategy.BUILD_GROUP; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.jboss.pnc.bacon.pig.impl.config.PigConfiguration; +import org.jboss.pnc.bacon.pig.impl.pnc.ArtifactWrapper; +import org.jboss.pnc.bacon.pig.impl.pnc.BuildInfoCollector; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.jboss.pnc.bacon.pig.impl.utils.GAV; +import org.jboss.pnc.dto.Artifact; +import org.jboss.pnc.dto.TargetRepository; +import org.jboss.pnc.enums.RepositoryType; +import org.jeasy.random.EasyRandom; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; public class OfflineManifestGeneratorTest { diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/MockScanServiceTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/MockScanServiceTest.java index d3c122b5c..dff0f2ded 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/MockScanServiceTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/MockScanServiceTest.java @@ -1,25 +1,26 @@ package org.jboss.pnc.bacon.pig.impl.addons.scanservice; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.tomakehurst.wiremock.WireMockServer; -import com.github.tomakehurst.wiremock.stubbing.StubMapping; -import com.github.tomakehurst.wiremock.verification.LoggedRequest; -import org.jboss.pnc.bacon.pig.impl.addons.scanservice.pssaas.ScanHelper; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.jeasy.random.EasyRandom; -import org.junit.jupiter.api.*; - -import javax.ws.rs.core.Response; +import static com.github.tomakehurst.wiremock.client.WireMock.*; +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.List; -import static com.github.tomakehurst.wiremock.client.WireMock.*; -import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; -import static org.junit.jupiter.api.Assertions.*; +import javax.ws.rs.core.Response; + +import org.jboss.pnc.bacon.pig.impl.addons.scanservice.pssaas.ScanHelper; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.jeasy.random.EasyRandom; +import org.junit.jupiter.api.*; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.stubbing.StubMapping; +import com.github.tomakehurst.wiremock.verification.LoggedRequest; @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class MockScanServiceTest { diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/ScanServiceDTOTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/ScanServiceDTOTest.java index 41ba29694..2fdb6c9a1 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/ScanServiceDTOTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/ScanServiceDTOTest.java @@ -1,17 +1,18 @@ package org.jboss.pnc.bacon.pig.impl.addons.scanservice; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; -import org.jeasy.random.EasyRandom; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.junit.jupiter.api.Assertions.*; +import org.jboss.pnc.bacon.pig.impl.pnc.PncBuild; +import org.jeasy.random.EasyRandom; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; public class ScanServiceDTOTest { diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/ValidationTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/ValidationTest.java index 7b2e5ad7c..ec04eef91 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/ValidationTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/scanservice/ValidationTest.java @@ -1,15 +1,15 @@ package org.jboss.pnc.bacon.pig.impl.addons.scanservice; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.*; + import org.jboss.pnc.bacon.config.Validate; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import java.util.*; - -import static org.junit.jupiter.api.Assertions.assertTrue; - class ValidationTest { PostBuildScanService scanService = new PostBuildScanService(null, null, null, null); diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/NotYetAlignedFromDependencyTreeTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/NotYetAlignedFromDependencyTreeTest.java index f84046570..c5ba613f5 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/NotYetAlignedFromDependencyTreeTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/addons/vertx/NotYetAlignedFromDependencyTreeTest.java @@ -1,9 +1,9 @@ package org.jboss.pnc.bacon.pig.impl.addons.vertx; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; + class NotYetAlignedFromDependencyTreeTest { @Test diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/config/PigConfigurationTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/config/PigConfigurationTest.java index 553360cc1..918e3170d 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/config/PigConfigurationTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/config/PigConfigurationTest.java @@ -1,11 +1,11 @@ package org.jboss.pnc.bacon.pig.impl.config; +import static org.junit.jupiter.api.Assertions.*; + import org.jeasy.random.EasyRandom; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - class PigConfigurationTest { private PigConfiguration generated; diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/config/RepoGenerationDataTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/config/RepoGenerationDataTest.java index 85da04d3e..a6c00add7 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/config/RepoGenerationDataTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/config/RepoGenerationDataTest.java @@ -1,10 +1,10 @@ package org.jboss.pnc.bacon.pig.impl.config; -import org.junit.jupiter.api.Test; - import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; + class RepoGenerationDataTest { @Test diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/DADaoTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/DADaoTest.java index 8e533ee44..46ffd044d 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/DADaoTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/documents/sharedcontent/da/DADaoTest.java @@ -17,17 +17,17 @@ */ package org.jboss.pnc.bacon.pig.impl.documents.sharedcontent.da; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.junit.jupiter.api.Assertions.fail; + +import java.io.IOException; + import org.apache.commons.lang.StringUtils; import org.jboss.pnc.bacon.config.Config; import org.jboss.pnc.bacon.testcommon.RemoteTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import java.io.IOException; - -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.junit.jupiter.api.Assertions.fail; - /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
* Date: 24/04/2019 diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/mapping/BuildConfigMappingTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/mapping/BuildConfigMappingTest.java index 4fea97c94..d6b802501 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/mapping/BuildConfigMappingTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/mapping/BuildConfigMappingTest.java @@ -1,18 +1,18 @@ package org.jboss.pnc.bacon.pig.impl.mapping; -import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; -import org.jboss.pnc.dto.BuildConfiguration; -import org.jboss.pnc.dto.BuildConfigurationRevision; -import org.jeasy.random.EasyRandom; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Optional; -import static org.junit.jupiter.api.Assertions.*; +import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; +import org.jboss.pnc.dto.BuildConfiguration; +import org.jboss.pnc.dto.BuildConfigurationRevision; +import org.jeasy.random.EasyRandom; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; class BuildConfigMappingTest { diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/nvr/NvrListGeneratorTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/nvr/NvrListGeneratorTest.java index 345fd9e9c..a03427e1a 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/nvr/NvrListGeneratorTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/nvr/NvrListGeneratorTest.java @@ -1,13 +1,6 @@ package org.jboss.pnc.bacon.pig.impl.nvr; -import org.apache.commons.io.FileUtils; -import org.jboss.pnc.bacon.pig.impl.utils.BuildFinderUtils; -import org.jboss.pnc.build.finder.core.BuildFinderObjectMapper; -import org.jboss.pnc.build.finder.koji.KojiBuild; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; -import org.mockito.MockedStatic; -import org.mockito.Mockito; +import static org.assertj.core.api.Assertions.assertThat; import java.io.File; import java.io.IOException; @@ -22,7 +15,14 @@ import java.util.List; import java.util.Map; -import static org.assertj.core.api.Assertions.assertThat; +import org.apache.commons.io.FileUtils; +import org.jboss.pnc.bacon.pig.impl.utils.BuildFinderUtils; +import org.jboss.pnc.build.finder.core.BuildFinderObjectMapper; +import org.jboss.pnc.build.finder.koji.KojiBuild; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.MockedStatic; +import org.mockito.Mockito; class NvrListGeneratorTest { @Test diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/pnc/PncBuilderTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/pnc/PncBuilderTest.java index 5893ce809..e5de53584 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/pnc/PncBuilderTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/pnc/PncBuilderTest.java @@ -1,5 +1,14 @@ package org.jboss.pnc.bacon.pig.impl.pnc; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + import org.jboss.pnc.client.GroupBuildClient; import org.jboss.pnc.client.GroupConfigurationClient; import org.jboss.pnc.client.RemoteCollection; @@ -11,15 +20,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - class PncBuilderTest { private GroupBuildClient groupBuildClient; diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/MultiStepBomBasedRepositoryTestBase.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/MultiStepBomBasedRepositoryTestBase.java index fab3cdeae..a61658fdd 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/MultiStepBomBasedRepositoryTestBase.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/MultiStepBomBasedRepositoryTestBase.java @@ -1,8 +1,29 @@ package org.jboss.pnc.bacon.pig.impl.repo; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.fs.util.ZipUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.doReturn; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.FileSystem; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.TreeSet; +import java.util.stream.Collectors; + import org.apache.maven.settings.Profile; import org.apache.maven.settings.Repository; import org.apache.maven.settings.RepositoryPolicy; @@ -32,29 +53,9 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.FileSystem; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.TreeSet; -import java.util.stream.Collectors; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.doReturn; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.fs.util.ZipUtils; public abstract class MultiStepBomBasedRepositoryTestBase { diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/RepositoryUtilsTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/RepositoryUtilsTest.java index 91bc8cfc4..5220c14a1 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/RepositoryUtilsTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/RepositoryUtilsTest.java @@ -1,6 +1,6 @@ package org.jboss.pnc.bacon.pig.impl.repo; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; import java.io.File; import java.io.IOException; @@ -8,7 +8,7 @@ import java.nio.file.Path; import java.nio.file.Paths; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; class RepositoryUtilsTest { diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/ResolveOnlyRepositoryTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/ResolveOnlyRepositoryTest.java index 3fb24abc1..f45499e14 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/ResolveOnlyRepositoryTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/ResolveOnlyRepositoryTest.java @@ -1,5 +1,25 @@ package org.jboss.pnc.bacon.pig.impl.repo; +import static org.mockito.Mockito.doReturn; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.TreeSet; +import java.util.stream.Collectors; + import org.assertj.core.api.Assertions; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; @@ -23,26 +43,6 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.TreeSet; -import java.util.stream.Collectors; - -import static org.mockito.Mockito.doReturn; - public class ResolveOnlyRepositoryTest { private static final String EXPECTED_ARTIFACT_LIST_TXT = "resolve-and-repackage-repo-artifact-list.txt"; diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/TestPlatformBuilder.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/TestPlatformBuilder.java index ebad3d377..259a27c11 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/TestPlatformBuilder.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/repo/TestPlatformBuilder.java @@ -1,16 +1,5 @@ package org.jboss.pnc.bacon.pig.impl.repo; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.GACTV; -import io.quarkus.maven.dependency.GAV; -import org.apache.maven.model.Dependency; -import org.apache.maven.model.DependencyManagement; -import org.apache.maven.model.Model; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; - import java.io.BufferedWriter; import java.nio.file.Files; import java.nio.file.Path; @@ -19,6 +8,18 @@ import java.util.List; import java.util.Map; +import org.apache.maven.model.Dependency; +import org.apache.maven.model.DependencyManagement; +import org.apache.maven.model.Model; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; + +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.GACTV; +import io.quarkus.maven.dependency.GAV; + public class TestPlatformBuilder { public static TestPlatformBuilder newInstance(Path workDir) { diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/BuildFinderUtilsTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/BuildFinderUtilsTest.java index d2beaf5ab..8c26aaf5e 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/BuildFinderUtilsTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/BuildFinderUtilsTest.java @@ -1,12 +1,12 @@ package org.jboss.pnc.bacon.pig.impl.utils; -import org.jboss.pnc.bacon.config.Config; -import org.jboss.pnc.build.finder.core.BuildConfig; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.jboss.pnc.bacon.config.Config; +import org.jboss.pnc.build.finder.core.BuildConfig; +import org.junit.jupiter.api.Test; class BuildFinderUtilsTest { @Test diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/GAVTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/GAVTest.java index f032b5835..892403f5c 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/GAVTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/GAVTest.java @@ -18,10 +18,10 @@ package org.jboss.pnc.bacon.pig.impl.utils; -import org.junit.jupiter.api.Test; - import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; + class GAVTest { @Test void shouldGetGavFromFileName() { diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/HashUtilsTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/HashUtilsTest.java index d27e39ee9..713bcff1e 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/HashUtilsTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/HashUtilsTest.java @@ -1,11 +1,11 @@ package org.jboss.pnc.bacon.pig.impl.utils; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; import java.nio.file.Path; import java.nio.file.Paths; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; class HashUtilsTest { static final Path testDirs = Paths.get("src", "test", "resources", "hash"); diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/indy/IndyTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/indy/IndyTest.java index c8deab38f..a14a8e543 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/indy/IndyTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/utils/indy/IndyTest.java @@ -1,13 +1,13 @@ package org.jboss.pnc.bacon.pig.impl.utils.indy; -import org.jboss.pnc.bacon.config.Config; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; import java.io.File; import java.io.IOException; -import static org.junit.jupiter.api.Assertions.*; +import org.jboss.pnc.bacon.config.Config; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; class IndyTest { diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/BuildConfigTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/BuildConfigTest.java index 9900af681..73a3f164d 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/BuildConfigTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/BuildConfigTest.java @@ -1,20 +1,20 @@ package org.jboss.pnc.bacon.pig.impl.validation; -import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; -import org.jboss.pnc.enums.BuildType; -import org.jeasy.random.EasyRandom; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.*; + +import java.util.Set; import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; -import java.util.Set; - -import static org.assertj.core.api.Assertions.*; +import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; +import org.jboss.pnc.enums.BuildType; +import org.jeasy.random.EasyRandom; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; class BuildConfigTest { diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/GenerationDataCheckTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/GenerationDataCheckTest.java index bf15c398f..07d888403 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/GenerationDataCheckTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/GenerationDataCheckTest.java @@ -1,5 +1,14 @@ package org.jboss.pnc.bacon.pig.impl.validation; +import static org.assertj.core.api.Assertions.*; + +import java.util.Set; + +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; + import org.jboss.pnc.bacon.pig.impl.config.GenerationData; import org.jboss.pnc.bacon.pig.impl.config.JavadocGenerationData; import org.jboss.pnc.bacon.pig.impl.config.JavadocGenerationStrategy; @@ -10,15 +19,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - -import java.util.Set; - -import static org.assertj.core.api.Assertions.*; - class GenerationDataCheckTest { static Validator validator; diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/ListBuildConfigCheckTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/ListBuildConfigCheckTest.java index 0ac473f9f..ba7005ef6 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/ListBuildConfigCheckTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/ListBuildConfigCheckTest.java @@ -1,22 +1,24 @@ package org.jboss.pnc.bacon.pig.impl.validation; -import com.google.common.collect.Lists; -import lombok.AllArgsConstructor; -import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; -import org.jboss.pnc.enums.BuildType; -import org.jeasy.random.EasyRandom; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.*; + +import java.util.List; +import java.util.Set; import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; -import java.util.List; -import java.util.Set; +import lombok.AllArgsConstructor; -import static org.assertj.core.api.Assertions.*; +import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; +import org.jboss.pnc.enums.BuildType; +import org.jeasy.random.EasyRandom; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import com.google.common.collect.Lists; class ListBuildConfigCheckTest { static Validator validator; diff --git a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/PigConfigurationValidationTest.java b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/PigConfigurationValidationTest.java index 0cf4ba09c..baa312923 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/PigConfigurationValidationTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/pig/impl/validation/PigConfigurationValidationTest.java @@ -1,6 +1,15 @@ package org.jboss.pnc.bacon.pig.impl.validation; -import com.google.common.collect.Lists; +import static org.assertj.core.api.Assertions.*; + +import java.util.Collections; +import java.util.Set; + +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; + import org.jboss.pnc.bacon.pig.impl.config.BuildConfig; import org.jboss.pnc.bacon.pig.impl.config.JavadocGenerationStrategy; import org.jboss.pnc.bacon.pig.impl.config.LicenseGenerationStrategy; @@ -12,15 +21,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - -import java.util.Collections; -import java.util.Set; - -import static org.assertj.core.api.Assertions.*; +import com.google.common.collect.Lists; class PigConfigurationValidationTest { diff --git a/pig/src/test/java/org/jboss/pnc/bacon/resources/ResourcesValidationTest.java b/pig/src/test/java/org/jboss/pnc/bacon/resources/ResourcesValidationTest.java index 152a69e89..bed2bd4a3 100644 --- a/pig/src/test/java/org/jboss/pnc/bacon/resources/ResourcesValidationTest.java +++ b/pig/src/test/java/org/jboss/pnc/bacon/resources/ResourcesValidationTest.java @@ -1,12 +1,6 @@ package org.jboss.pnc.bacon.resources; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.InputStream; @@ -14,7 +8,14 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; public class ResourcesValidationTest { diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/AdminCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/AdminCli.java index cca2e6914..cb2f508ed 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/AdminCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/AdminCli.java @@ -19,6 +19,7 @@ import org.jboss.pnc.bacon.pnc.admin.AnnouncementBannerCli; import org.jboss.pnc.bacon.pnc.admin.MaintenanceModeCli; + import picocli.CommandLine.Command; @Command( diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ArtifactCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ArtifactCli.java index 2d76ce9df..64550c913 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ArtifactCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ArtifactCli.java @@ -1,6 +1,12 @@ package org.jboss.pnc.bacon.pnc; +import java.util.Collection; +import java.util.Collections; +import java.util.Optional; +import java.util.concurrent.Callable; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.AbstractGetSpecificCommand; @@ -13,15 +19,11 @@ import org.jboss.pnc.client.RemoteResourceException; import org.jboss.pnc.dto.Artifact; import org.jboss.pnc.dto.Build; + import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Option; -import java.util.Collection; -import java.util.Collections; -import java.util.Optional; -import java.util.concurrent.Callable; - @Slf4j @Command( name = "artifact", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/BrewPushCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/BrewPushCli.java index 0177a3200..e4d3254ac 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/BrewPushCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/BrewPushCli.java @@ -17,6 +17,10 @@ */ package org.jboss.pnc.bacon.pnc; +import java.util.Collections; +import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; + import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.JSONCommandHandler; @@ -28,14 +32,11 @@ import org.jboss.pnc.dto.requests.GroupBuildPushRequest; import org.jboss.pnc.enums.BuildPushStatus; import org.jboss.pnc.restclient.AdvancedBuildClient; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; -import java.util.Collections; -import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; - @Command( name = "brew-push", description = "brew-push", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/BuildCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/BuildCli.java index d8d91acff..c1473364e 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/BuildCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/BuildCli.java @@ -17,7 +17,24 @@ */ package org.jboss.pnc.bacon.pnc; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collection; +import java.util.Optional; +import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; + +import javax.ws.rs.core.Response; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.api.enums.AlignmentPreference; import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.ObjectHelper; @@ -40,26 +57,11 @@ import org.jboss.pnc.rest.api.parameters.BuildParameters; import org.jboss.pnc.rest.api.parameters.BuildsFilterParameters; import org.jboss.pnc.restclient.AdvancedBuildConfigurationClient; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; -import javax.ws.rs.core.Response; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Collection; -import java.util.Optional; -import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; - @Command( name = "build", description = "build", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/BuildConfigCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/BuildConfigCli.java index 2f506a649..6a51d9cd6 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/BuildConfigCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/BuildConfigCli.java @@ -17,8 +17,15 @@ */ package org.jboss.pnc.bacon.pnc; -import com.fasterxml.jackson.core.JsonProcessingException; +import static org.apache.commons.lang.StringUtils.isNotEmpty; + +import java.util.Collection; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.Callable; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.AbstractBuildListCommand; @@ -40,16 +47,12 @@ import org.jboss.pnc.dto.requests.BuildConfigWithSCMRequest; import org.jboss.pnc.enums.BuildType; import org.jboss.pnc.rest.api.parameters.BuildsFilterParameters; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; -import java.util.Collection; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.Callable; - -import static org.apache.commons.lang.StringUtils.isNotEmpty; +import com.fasterxml.jackson.core.JsonProcessingException; @Command( name = "build-config", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/EnvironmentCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/EnvironmentCli.java index 2265e1f03..c1ea555e1 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/EnvironmentCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/EnvironmentCli.java @@ -17,6 +17,9 @@ */ package org.jboss.pnc.bacon.pnc; +import java.util.Collection; +import java.util.Optional; + import org.jboss.pnc.bacon.common.cli.AbstractGetSpecificCommand; import org.jboss.pnc.bacon.common.cli.AbstractListCommand; import org.jboss.pnc.bacon.pnc.common.ClientCreator; @@ -24,10 +27,8 @@ import org.jboss.pnc.client.EnvironmentClient; import org.jboss.pnc.client.RemoteResourceException; import org.jboss.pnc.dto.Environment; -import picocli.CommandLine.Command; -import java.util.Collection; -import java.util.Optional; +import picocli.CommandLine.Command; @Command( name = "environment", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/GroupBuildCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/GroupBuildCli.java index 1487e4102..b4babc749 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/GroupBuildCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/GroupBuildCli.java @@ -17,7 +17,13 @@ */ package org.jboss.pnc.bacon.pnc; +import java.util.Collection; +import java.util.Optional; +import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.api.enums.AlignmentPreference; import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.ObjectHelper; @@ -36,15 +42,11 @@ import org.jboss.pnc.rest.api.parameters.BuildsFilterParameters; import org.jboss.pnc.rest.api.parameters.GroupBuildParameters; import org.jboss.pnc.restclient.AdvancedGroupConfigurationClient; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; -import java.util.Collection; -import java.util.Optional; -import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; - @Command( name = "group-build", description = "Group builds", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/GroupConfigCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/GroupConfigCli.java index e9ec90048..f1d277aba 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/GroupConfigCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/GroupConfigCli.java @@ -17,7 +17,16 @@ */ package org.jboss.pnc.bacon.pnc; +import static java.util.Optional.of; +import static org.apache.commons.lang.StringUtils.isNotEmpty; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Optional; +import java.util.concurrent.Callable; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.AbstractGetSpecificCommand; @@ -34,18 +43,11 @@ import org.jboss.pnc.dto.GroupConfiguration; import org.jboss.pnc.dto.ProductVersionRef; import org.jboss.pnc.rest.api.parameters.GroupBuildsFilterParameters; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; -import java.util.Collection; -import java.util.HashMap; -import java.util.Optional; -import java.util.concurrent.Callable; - -import static java.util.Optional.of; -import static org.apache.commons.lang.StringUtils.isNotEmpty; - @Slf4j @Command( name = "group-config", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductCli.java index 5af5c1b89..6132f9224 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductCli.java @@ -17,6 +17,12 @@ */ package org.jboss.pnc.bacon.pnc; +import static org.apache.commons.lang.StringUtils.isNotEmpty; + +import java.util.Collection; +import java.util.Optional; +import java.util.concurrent.Callable; + import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.AbstractGetSpecificCommand; @@ -28,16 +34,11 @@ import org.jboss.pnc.client.RemoteResourceException; import org.jboss.pnc.dto.Product; import org.jboss.pnc.dto.ProductVersion; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; -import java.util.Collection; -import java.util.Optional; -import java.util.concurrent.Callable; - -import static org.apache.commons.lang.StringUtils.isNotEmpty; - @Command( name = "product", description = "Product", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductMilestoneCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductMilestoneCli.java index 612c40856..5dd52aeb1 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductMilestoneCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductMilestoneCli.java @@ -17,7 +17,19 @@ */ package org.jboss.pnc.bacon.pnc; +import static org.apache.commons.lang.StringUtils.isNotEmpty; +import static org.jboss.pnc.bacon.pnc.client.PncClientHelper.parseDateFormat; + +import java.net.URL; +import java.time.Instant; +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.Callable; +import java.util.stream.Collectors; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.AbstractBuildListCommand; @@ -40,21 +52,11 @@ import org.jboss.pnc.dto.ProductVersionRef; import org.jboss.pnc.dto.requests.DeliverablesAnalysisRequest; import org.jboss.pnc.rest.api.parameters.BuildsFilterParameters; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; -import java.net.URL; -import java.time.Instant; -import java.util.Collection; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.Callable; -import java.util.stream.Collectors; - -import static org.apache.commons.lang.StringUtils.isNotEmpty; -import static org.jboss.pnc.bacon.pnc.client.PncClientHelper.parseDateFormat; - @Slf4j @Command( name = "product-milestone", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductReleaseCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductReleaseCli.java index 28e90b92d..1dd288d91 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductReleaseCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductReleaseCli.java @@ -17,6 +17,10 @@ */ package org.jboss.pnc.bacon.pnc; +import static org.apache.commons.lang.StringUtils.isNotEmpty; + +import java.util.concurrent.Callable; + import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.AbstractGetSpecificCommand; @@ -30,14 +34,11 @@ import org.jboss.pnc.dto.ProductMilestone; import org.jboss.pnc.dto.ProductRelease; import org.jboss.pnc.enums.SupportLevel; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; -import java.util.concurrent.Callable; - -import static org.apache.commons.lang.StringUtils.isNotEmpty; - @Command( name = "product-release", description = "Product Release", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductVersionCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductVersionCli.java index ca16f7bf5..2355039d6 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductVersionCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProductVersionCli.java @@ -17,7 +17,14 @@ */ package org.jboss.pnc.bacon.pnc; +import static org.apache.commons.lang.StringUtils.isNotEmpty; + +import java.util.Collection; +import java.util.Optional; +import java.util.concurrent.Callable; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.AbstractGetSpecificCommand; @@ -34,16 +41,11 @@ import org.jboss.pnc.dto.ProductRef; import org.jboss.pnc.dto.ProductRelease; import org.jboss.pnc.dto.ProductVersion; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; -import java.util.Collection; -import java.util.Optional; -import java.util.concurrent.Callable; - -import static org.apache.commons.lang.StringUtils.isNotEmpty; - @Command( name = "product-version", description = "Product Version", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProjectCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProjectCli.java index f53451624..b69d404dc 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProjectCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ProjectCli.java @@ -17,6 +17,12 @@ */ package org.jboss.pnc.bacon.pnc; +import static org.apache.commons.lang.StringUtils.isNotEmpty; + +import java.util.Collection; +import java.util.Optional; +import java.util.concurrent.Callable; + import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.AbstractBuildListCommand; @@ -31,16 +37,11 @@ import org.jboss.pnc.dto.BuildConfiguration; import org.jboss.pnc.dto.Project; import org.jboss.pnc.rest.api.parameters.BuildsFilterParameters; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; -import java.util.Collection; -import java.util.Optional; -import java.util.concurrent.Callable; - -import static org.apache.commons.lang.StringUtils.isNotEmpty; - @Command( name = "project", description = "Project", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ScmRepositoryCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ScmRepositoryCli.java index 4c87106a8..869fe5180 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ScmRepositoryCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/ScmRepositoryCli.java @@ -17,7 +17,15 @@ */ package org.jboss.pnc.bacon.pnc; +import static org.apache.commons.lang.StringUtils.isNotEmpty; + +import java.util.Collection; +import java.util.Optional; +import java.util.concurrent.Callable; +import java.util.concurrent.CompletableFuture; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.AbstractGetSpecificCommand; @@ -34,17 +42,11 @@ import org.jboss.pnc.dto.requests.CreateAndSyncSCMRequest; import org.jboss.pnc.restclient.AdvancedSCMRepositoryClient; import org.jboss.pnc.restclient.AdvancedSCMRepositoryClient.SCMCreationResult; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; -import java.util.Collection; -import java.util.Optional; -import java.util.concurrent.Callable; -import java.util.concurrent.CompletableFuture; - -import static org.apache.commons.lang.StringUtils.isNotEmpty; - @Command( name = "scm-repository", description = "Scm repository", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/WhoAmICli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/WhoAmICli.java index 84da184dd..7e49fa257 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/WhoAmICli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/WhoAmICli.java @@ -17,13 +17,14 @@ */ package org.jboss.pnc.bacon.pnc; +import java.util.concurrent.Callable; + import org.jboss.pnc.bacon.common.ObjectHelper; import org.jboss.pnc.bacon.common.cli.JSONCommandHandler; import org.jboss.pnc.bacon.pnc.common.ClientCreator; import org.jboss.pnc.client.UserClient; -import picocli.CommandLine.Command; -import java.util.concurrent.Callable; +import picocli.CommandLine.Command; @Command(name = "whoami", description = "Returns identity of current user") public class WhoAmICli extends JSONCommandHandler implements Callable { diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/admin/AnnouncementBannerCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/admin/AnnouncementBannerCli.java index 628c957b2..b51b3894d 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/admin/AnnouncementBannerCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/admin/AnnouncementBannerCli.java @@ -17,13 +17,14 @@ */ package org.jboss.pnc.bacon.pnc.admin; +import java.util.concurrent.Callable; + import org.jboss.pnc.bacon.pnc.common.ClientCreator; import org.jboss.pnc.client.GenericSettingClient; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; -import java.util.concurrent.Callable; - @Command( name = "announcement-banner", description = "Announcement banner related tasks", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/admin/MaintenanceModeCli.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/admin/MaintenanceModeCli.java index d2378b8d4..fcb2472e2 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/admin/MaintenanceModeCli.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/admin/MaintenanceModeCli.java @@ -17,14 +17,15 @@ */ package org.jboss.pnc.bacon.pnc.admin; +import java.util.concurrent.Callable; + import org.jboss.pnc.bacon.common.Constant; import org.jboss.pnc.bacon.pnc.common.ClientCreator; import org.jboss.pnc.client.GenericSettingClient; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; -import java.util.concurrent.Callable; - @Command( name = "maintenance-mode", description = "Maintenance mode related tasks", diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/client/BifrostClient.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/client/BifrostClient.java index 787af65a7..e4b545771 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/client/BifrostClient.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/client/BifrostClient.java @@ -1,13 +1,5 @@ package org.jboss.pnc.bacon.pnc.client; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.impl.client.HttpClients; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -19,6 +11,14 @@ import java.util.List; import java.util.function.Consumer; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.impl.client.HttpClients; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author Matej Lazar */ diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/client/PncClientHelper.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/client/PncClientHelper.java index 41e40899b..e949a9fb7 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/client/PncClientHelper.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/client/PncClientHelper.java @@ -17,7 +17,16 @@ */ package org.jboss.pnc.bacon.pnc.client; +import java.net.URI; +import java.net.URISyntaxException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.Instant; +import java.util.Date; +import java.util.function.Supplier; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.auth.KeycloakClientImpl; import org.jboss.pnc.bacon.auth.model.Credential; import org.jboss.pnc.bacon.auth.spi.KeycloakClient; @@ -28,14 +37,6 @@ import org.jboss.pnc.client.GenericSettingClient; import org.jboss.pnc.client.RemoteResourceException; -import java.net.URI; -import java.net.URISyntaxException; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.Instant; -import java.util.Date; -import java.util.function.Supplier; - @Slf4j public class PncClientHelper { diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/common/ClientCreator.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/common/ClientCreator.java index 137b3a2ac..bc9b9c84a 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/common/ClientCreator.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/common/ClientCreator.java @@ -1,12 +1,13 @@ package org.jboss.pnc.bacon.pnc.common; +import java.util.function.Function; + import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.pnc.client.PncClientHelper; import org.jboss.pnc.client.ClientBase; import org.jboss.pnc.client.Configuration; -import java.util.function.Function; - /** * Helper class to create the PNC CLI client to use in the CLI objects. There are two variants, the unauthenticated one * and the authenticated one. diff --git a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/common/ParameterChecker.java b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/common/ParameterChecker.java index c56fd9fb7..41cccf74e 100644 --- a/pnc/src/main/java/org/jboss/pnc/bacon/pnc/common/ParameterChecker.java +++ b/pnc/src/main/java/org/jboss/pnc/bacon/pnc/common/ParameterChecker.java @@ -18,6 +18,7 @@ package org.jboss.pnc.bacon.pnc.common; import lombok.extern.slf4j.Slf4j; + import org.jboss.pnc.bacon.common.exception.FatalException; import org.jboss.pnc.enums.RebuildMode; diff --git a/pnc/src/test/java/org/jboss/pnc/bacon/pnc/ArtifactCliTest.java b/pnc/src/test/java/org/jboss/pnc/bacon/pnc/ArtifactCliTest.java index e0b1534a1..c911a6c9c 100644 --- a/pnc/src/test/java/org/jboss/pnc/bacon/pnc/ArtifactCliTest.java +++ b/pnc/src/test/java/org/jboss/pnc/bacon/pnc/ArtifactCliTest.java @@ -1,9 +1,9 @@ package org.jboss.pnc.bacon.pnc; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; + class ArtifactCliTest { @Test diff --git a/pnc/src/test/java/org/jboss/pnc/bacon/pnc/ProductReleaseCliTest.java b/pnc/src/test/java/org/jboss/pnc/bacon/pnc/ProductReleaseCliTest.java index 97066629b..e9d441d99 100644 --- a/pnc/src/test/java/org/jboss/pnc/bacon/pnc/ProductReleaseCliTest.java +++ b/pnc/src/test/java/org/jboss/pnc/bacon/pnc/ProductReleaseCliTest.java @@ -1,18 +1,18 @@ package org.jboss.pnc.bacon.pnc; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.spy; + +import java.io.File; +import java.io.IOException; + import org.apache.commons.lang.reflect.FieldUtils; import org.jboss.pnc.bacon.config.Config; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; import org.mockito.Mockito; -import java.io.File; -import java.io.IOException; - -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Mockito.spy; - class ProductReleaseCliTest { @Test void testCreateException() throws IOException, IllegalAccessException { diff --git a/pnc/src/test/java/org/jboss/pnc/bacon/pnc/ProductVersionCliTest.java b/pnc/src/test/java/org/jboss/pnc/bacon/pnc/ProductVersionCliTest.java index 30fb10cc7..57257a950 100644 --- a/pnc/src/test/java/org/jboss/pnc/bacon/pnc/ProductVersionCliTest.java +++ b/pnc/src/test/java/org/jboss/pnc/bacon/pnc/ProductVersionCliTest.java @@ -1,9 +1,9 @@ package org.jboss.pnc.bacon.pnc; -import org.junit.jupiter.api.Test; - import static org.assertj.core.api.Assertions.*; +import org.junit.jupiter.api.Test; + class ProductVersionCliTest { @Test diff --git a/pnc/src/test/java/org/jboss/pnc/bacon/pnc/common/ParameterCheckerTest.java b/pnc/src/test/java/org/jboss/pnc/bacon/pnc/common/ParameterCheckerTest.java index b8a5774cb..89c5e4343 100644 --- a/pnc/src/test/java/org/jboss/pnc/bacon/pnc/common/ParameterCheckerTest.java +++ b/pnc/src/test/java/org/jboss/pnc/bacon/pnc/common/ParameterCheckerTest.java @@ -1,10 +1,10 @@ package org.jboss.pnc.bacon.pnc.common; +import static org.junit.jupiter.api.Assertions.*; + import org.jboss.pnc.bacon.common.exception.FatalException; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - class ParameterCheckerTest { @Test void verifyRebuildOption() { diff --git a/pnc/src/test/java/org/jboss/pnc/bacon/pnc/common/UrlGeneratorTest.java b/pnc/src/test/java/org/jboss/pnc/bacon/pnc/common/UrlGeneratorTest.java index 8c9637ff3..b219f6a9a 100644 --- a/pnc/src/test/java/org/jboss/pnc/bacon/pnc/common/UrlGeneratorTest.java +++ b/pnc/src/test/java/org/jboss/pnc/bacon/pnc/common/UrlGeneratorTest.java @@ -17,14 +17,14 @@ */ package org.jboss.pnc.bacon.pnc.common; -import org.jboss.pnc.bacon.config.Config; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; import java.io.File; import java.io.IOException; -import static org.junit.jupiter.api.Assertions.*; +import org.jboss.pnc.bacon.config.Config; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * Stupid tests that check for accidental modifications in UrlGenerator diff --git a/pom.xml b/pom.xml index 0b8d360ec..3f8579623 100644 --- a/pom.xml +++ b/pom.xml @@ -932,12 +932,22 @@ + + java-import-order.txt + - eclipse-codeStyle.xml + java-formatter.xml UNIX + + + org.jboss.pnc + ide-config + 1.1.0 + + diff --git a/test-common/src/main/java/org/jboss/pnc/bacon/testcommon/RemoteTest.java b/test-common/src/main/java/org/jboss/pnc/bacon/testcommon/RemoteTest.java index c347e8c7a..dd5146b21 100644 --- a/test-common/src/main/java/org/jboss/pnc/bacon/testcommon/RemoteTest.java +++ b/test-common/src/main/java/org/jboss/pnc/bacon/testcommon/RemoteTest.java @@ -1,14 +1,14 @@ package org.jboss.pnc.bacon.testcommon; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; /** * @author Matej Lazar