Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add import order + new ide-config setup #249

Merged
merged 1 commit into from
Jan 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
302 changes: 0 additions & 302 deletions eclipse-codeStyle.xml

This file was deleted.

12 changes: 11 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,21 @@
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.44.2</version>
<dependencies>
<dependency>
<groupId>org.jboss.pnc</groupId>
<artifactId>ide-config</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
<configuration>
<java>
<removeUnusedImports />
<importOrder>
<order>java,javax,jakarta,org,com</order>
</importOrder>
<eclipse>
<file>eclipse-codeStyle.xml</file>
<file>java-formatter.xml</file>
</eclipse>
<lineEndings>UNIX</lineEndings>
</java>
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/org/jboss/pnc/api/bifrost/dto/Line.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,17 @@

package org.jboss.pnc.api.bifrost.dto;

import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import org.jboss.pnc.api.bifrost.enums.Format;
import java.text.MessageFormat;
import java.util.Map;

import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;
import java.text.MessageFormat;
import java.util.Map;

import org.jboss.pnc.api.bifrost.enums.Format;

import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

/**
* @author <a href="mailto:[email protected]">Matej Lazar</a>
Expand Down
17 changes: 9 additions & 8 deletions src/main/java/org/jboss/pnc/api/bifrost/rest/Bifrost.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@

package org.jboss.pnc.api.bifrost.rest;

import org.jboss.pnc.api.bifrost.enums.Direction;
import org.jboss.pnc.api.bifrost.dto.Line;
import org.jboss.pnc.api.bifrost.dto.MetaData;
import org.jboss.pnc.api.bifrost.enums.Format;
import org.jboss.pnc.api.dto.ComponentVersion;
import java.io.IOException;
import java.util.List;

import javax.validation.constraints.Min;
import javax.ws.rs.Consumes;
Expand All @@ -33,8 +30,12 @@
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.io.IOException;
import java.util.List;

import org.jboss.pnc.api.bifrost.dto.Line;
import org.jboss.pnc.api.bifrost.dto.MetaData;
import org.jboss.pnc.api.bifrost.enums.Direction;
import org.jboss.pnc.api.bifrost.enums.Format;
import org.jboss.pnc.api.dto.ComponentVersion;

/**
* @author <a href="mailto:[email protected]">Matej Lazar</a>
Expand All @@ -57,7 +58,7 @@ Response getAllLines(
@QueryParam("batchDelay") @Min(200) Integer batchDelay,
@QueryParam("follow") boolean follow,
@QueryParam("timeoutProbeString") String timeoutProbeString); // if string is defined the server is sending
// given string as a connection probe. The
// given string as a connection probe. The

@GET
@Path("/")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@

package org.jboss.pnc.api.builddriver.dto;

import org.jboss.pnc.api.enums.ResultStatus;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import lombok.Builder;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import lombok.extern.jackson.Jacksonized;
import org.jboss.pnc.api.enums.ResultStatus;

/**
* @author <a href="mailto:[email protected]">Matej Lazar</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@

package org.jboss.pnc.api.builddriver.dto;

import org.jboss.pnc.api.dto.HeartbeatConfig;
import org.jboss.pnc.api.dto.Request;

import lombok.Builder;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import lombok.extern.jackson.Jacksonized;
import org.jboss.pnc.api.dto.HeartbeatConfig;
import org.jboss.pnc.api.dto.Request;

/**
* @author <a href="mailto:[email protected]">Matej Lazar</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@

package org.jboss.pnc.api.builddriver.dto;

import org.jboss.pnc.api.dto.Request;

import lombok.Builder;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import lombok.extern.jackson.Jacksonized;
import org.jboss.pnc.api.dto.Request;

/**
* @author <a href="mailto:[email protected]">Matej Lazar</a>
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/org/jboss/pnc/api/causeway/dto/push/Build.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
*/
package org.jboss.pnc.api.causeway.dto.push;

import java.util.Date;
import java.util.Set;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;

import lombok.Data;
import lombok.NonNull;

import java.util.Date;
import java.util.Set;

/**
*
* @author Honza Brázdil &lt;[email protected]&gt;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@
*/
package org.jboss.pnc.api.causeway.dto.push;

import javax.validation.Valid;

import org.jboss.pnc.api.dto.HeartbeatConfig;
import org.jboss.pnc.api.dto.Request;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import lombok.Builder;
import lombok.NonNull;
import lombok.Value;
import lombok.extern.jackson.Jacksonized;
import org.jboss.pnc.api.dto.HeartbeatConfig;
import org.jboss.pnc.api.dto.Request;

import javax.validation.Valid;

@Value
@JsonIgnoreProperties(ignoreUnknown = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;

import lombok.Data;
import lombok.NonNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,19 @@
*/
package org.jboss.pnc.api.causeway.dto.push;

import java.util.Date;
import java.util.Objects;
import java.util.Set;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonTypeName;

import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import lombok.extern.jackson.Jacksonized;

import java.util.Date;
import java.util.Objects;
import java.util.Set;

/**
*
* @author Honza Brázdil &lt;[email protected]&gt;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@
*/
package org.jboss.pnc.api.causeway.dto.push;

import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonTypeName;

import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import lombok.extern.jackson.Jacksonized;

import java.util.Objects;

/**
*
* @author Honza Brázdil &lt;[email protected]&gt;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package org.jboss.pnc.api.causeway.dto.push;

import java.util.Date;
import java.util.Objects;
import java.util.Set;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonTypeName;

import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import lombok.extern.jackson.Jacksonized;

import java.util.Date;
import java.util.Objects;
import java.util.Set;

/**
* @author <a href="mailto:[email protected]">Matej Lazar</a>
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package org.jboss.pnc.api.causeway.dto.push;

import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonTypeName;

import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import lombok.extern.jackson.Jacksonized;

import java.util.Objects;

/**
* @author <a href="mailto:[email protected]">Matej Lazar</a>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
*/
package org.jboss.pnc.api.causeway.dto.push;

import org.jboss.pnc.api.enums.ResultStatus;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import lombok.Builder;
import lombok.Data;
import lombok.extern.jackson.Jacksonized;
import org.jboss.pnc.api.enums.ResultStatus;

@Data
@Builder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

import java.util.Objects;

import javax.validation.Valid;

import org.jboss.pnc.api.dto.Request;

import com.fasterxml.jackson.annotation.JsonCreator;
Expand All @@ -26,8 +28,6 @@
import lombok.Data;
import lombok.NonNull;

import javax.validation.Valid;

/**
*
* @author Honza Brázdil &lt;[email protected]&gt;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/jboss/pnc/api/causeway/rest/Causeway.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
*/
package org.jboss.pnc.api.causeway.rest;

import org.jboss.pnc.api.causeway.dto.push.BuildPushRequest;
import org.jboss.pnc.api.causeway.dto.untag.UntagRequest;
import org.jboss.pnc.api.dto.ComponentVersion;

import javax.validation.Valid;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.core.MediaType;

import org.jboss.pnc.api.causeway.dto.push.BuildPushRequest;
import org.jboss.pnc.api.causeway.dto.untag.UntagRequest;
import org.jboss.pnc.api.dto.ComponentVersion;

@Consumes(MediaType.APPLICATION_JSON)
@Path("/")
public interface Causeway {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
import java.io.Serializable;
import java.util.List;

import javax.validation.Valid;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.extern.jackson.Jacksonized;

import javax.validation.Valid;

/**
* An object container for the results of the analysis
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package org.jboss.pnc.api.deliverablesanalyzer.dto;

import java.util.List;

import org.jboss.pnc.api.dto.Request;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import lombok.Builder;
import lombok.Data;
import lombok.NonNull;
import lombok.extern.jackson.Jacksonized;
import org.jboss.pnc.api.dto.Request;

import java.util.List;

@Data
@Jacksonized
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
import java.io.Serializable;
import java.util.List;

import org.jboss.pnc.api.dto.HeartbeatConfig;
import org.jboss.pnc.api.dto.Request;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.ToString;
import lombok.extern.jackson.Jacksonized;

import org.jboss.pnc.api.dto.HeartbeatConfig;
import org.jboss.pnc.api.dto.Request;

@ToString
@Getter
@AllArgsConstructor
Expand Down
Loading