Skip to content

Commit

Permalink
Add Spotless on test-backend
Browse files Browse the repository at this point in the history
  • Loading branch information
PabloLec committed May 11, 2024
1 parent b50a88d commit 642d846
Show file tree
Hide file tree
Showing 43 changed files with 230 additions and 214 deletions.
32 changes: 32 additions & 0 deletions test-backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<properties>
<java.version>21</java.version>
<springdoc-openapi-starter-webmvc-ui.version>2.5.0</springdoc-openapi-starter-webmvc-ui.version>
<spotless.version>2.43.0</spotless.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -97,6 +98,37 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>${spotless.version}</version>
<executions>
<execution>
<goals>
<goal>apply</goal>
</goals>
<phase>compile</phase>
</execution>
</executions>
<configuration>
<java>
<includes>
<include>src/main/java/**/*.java</include>
<include>src/test/java/**/*.java</include>
</includes>
<importOrder />
<removeUnusedImports />
<toggleOffOn/>
<trimTrailingWhitespace/>
<endWithNewline/>
<indent>
<tabs>true</tabs>
<spacesPerTab>4</spacesPerTab>
</indent>
<palantirJavaFormat/>
</java>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ public void addCorsMappings(CorsRegistry registry) {
}
};
}

}
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package dev.pablolec.backend.configuration;

import com.querydsl.core.types.dsl.EntityPathBase;
import dev.pablolec.backend.db.model.*;
import dev.pablolec.querybuilder.CriteriaQueryBuilder;
import dev.pablolec.querybuilder.EntityPathResolver;
import jakarta.persistence.EntityManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import dev.pablolec.backend.db.model.*;

import java.util.HashMap;
import java.util.Map;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@Configuration
public class QueryBuilderConfiguration {
Expand All @@ -21,7 +20,8 @@ public EntityPathResolver queryDslClassMapper(Map<String, EntityPathBase<?>> ent
}

@Bean
public CriteriaQueryBuilder dynamicQueryService(EntityManager entityManager, EntityPathResolver entityPathResolver) {
public CriteriaQueryBuilder dynamicQueryService(
EntityManager entityManager, EntityPathResolver entityPathResolver) {
return new CriteriaQueryBuilder(entityManager, entityPathResolver);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
import dev.pablolec.backend.service.MockDataService;
import dev.pablolec.querybuilder.CriteriaQueryBuilder;
import dev.pablolec.querybuilder.model.SearchCriterion;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@RequestMapping("/api/v1/library")
@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package dev.pablolec.backend.db.model;

import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.*;
import lombok.*;

Expand Down Expand Up @@ -30,4 +29,4 @@ public class Address {
private String state;
private String country;
private String postalCode;
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package dev.pablolec.backend.db.model;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonManagedReference;
import jakarta.persistence.*;
import lombok.*;

import java.time.LocalDate;
import java.util.Set;
import lombok.*;

@Getter
@Setter
Expand All @@ -19,6 +17,7 @@ public class Author {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer authorId;

private String name;
private String bio;
private String nationality;
Expand All @@ -29,4 +28,4 @@ public class Author {
@OneToMany(mappedBy = "author", fetch = FetchType.EAGER)
@JsonManagedReference
private Set<Book> books;
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package dev.pablolec.backend.db.model;

import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonManagedReference;
import jakarta.persistence.*;
import lombok.*;

import java.time.LocalDateTime;
import java.util.Set;
import lombok.*;

@Entity
@AllArgsConstructor
Expand All @@ -20,6 +18,7 @@ public class Book {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer bookId;

private String title;
private String isbn;
private Integer publishYear;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ public class BookPublisher {
@JoinColumn(name = "publisher_id", insertable = false, updatable = false)
@JsonBackReference
private Publisher publisher;
}
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package dev.pablolec.backend.db.model;

import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.io.Serializable;

@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class BookPublisherId implements Serializable {
private Integer bookId;
private Integer publisherId;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ public class BookTag {
@JoinColumn(name = "tag_id", insertable = false, updatable = false)
@JsonBackReference
private Tag tag;
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package dev.pablolec.backend.db.model;

import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.io.Serializable;

@Getter
@Setter
@AllArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

import com.fasterxml.jackson.annotation.JsonBackReference;
import jakarta.persistence.*;
import lombok.*;

import java.time.LocalDate;
import lombok.*;

@Getter
@Setter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ public class EventParticipant {
@JoinColumn(name = "user_id", insertable = false, updatable = false)
@JsonBackReference
private User user;
}
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package dev.pablolec.backend.db.model;

import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.io.Serializable;

@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class EventParticipantId implements Serializable {
private Integer eventId;
private Integer userId;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

import com.fasterxml.jackson.annotation.JsonManagedReference;
import jakarta.persistence.*;
import lombok.*;

import java.time.LocalDate;
import java.util.Set;
import lombok.*;

@Getter
@Setter
Expand All @@ -18,6 +17,7 @@ public class Library {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer libraryId;

private String name;
private String location;
private String openingHours;
Expand All @@ -36,12 +36,10 @@ public class Library {
private Set<Membership> memberships;

@OneToMany(mappedBy = "library")

@JsonManagedReference
private Set<LibraryEvent> events;

@OneToMany(mappedBy = "library")

@JsonManagedReference
private Set<LibraryStaff> staff;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonManagedReference;
import jakarta.persistence.*;
import lombok.*;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Set;
import lombok.*;

@Getter
@Setter
Expand Down Expand Up @@ -35,4 +34,4 @@ public class LibraryEvent {
@OneToMany(mappedBy = "event")
@JsonManagedReference
private Set<EventParticipant> participants;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

import com.fasterxml.jackson.annotation.JsonBackReference;
import jakarta.persistence.*;
import lombok.*;

import java.time.LocalDate;
import lombok.*;

@Getter
@Setter
Expand All @@ -31,4 +30,4 @@ public class Membership {
private LocalDate joinDate;
private LocalDate expirationDate;
private String membershipStatus;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

import com.fasterxml.jackson.annotation.JsonManagedReference;
import jakarta.persistence.*;
import lombok.*;

import java.util.Set;
import lombok.*;

@Getter
@Setter
Expand All @@ -17,10 +16,11 @@ public class Publisher {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer publisherId;

private String name;
private String website;

@OneToMany(mappedBy = "publisher")
@JsonManagedReference
private Set<BookPublisher> publishedBooks;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

import com.fasterxml.jackson.annotation.JsonBackReference;
import jakarta.persistence.*;
import lombok.*;

import java.math.BigDecimal;
import java.time.LocalDate;
import lombok.*;

@Getter
@Setter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

import com.fasterxml.jackson.annotation.JsonManagedReference;
import jakarta.persistence.*;
import lombok.*;

import java.util.Set;
import lombok.*;

@Getter
@Setter
Expand All @@ -17,6 +16,7 @@ public class Tag {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer tagId;

private String name;
private String description;

Expand Down
Loading

0 comments on commit 642d846

Please sign in to comment.