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

chore(java): bump to java 21 #5

Merged
merged 2 commits into from
Jun 21, 2024
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
25 changes: 25 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true

[*]

# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

# Change these settings to your own preference
indent_style = space
indent_size = 2

[*.java]
ij_java_class_count_to_use_import_on_demand = 999
ij_java_names_count_to_use_import_on_demand = 999
ij_java_packages_to_use_import_on_demand = 9999

[*.md]
trim_trailing_whitespace = false
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: '17'
java-version: '21'
distribution: 'corretto'
cache: maven
- name: Build with Maven
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Pour être performant, nous avons besoin d'informatiser nos processus.
## Story mapping

Après un travail acharné avec la team Product Owner. Nous avons pu construire la story map suivante:
![img](./docs/user-story-map.png)
![img](/docs/user-story-map.png)


En découle des User stories que nous avons priorisées au courant des 2 sprints précédents.
Expand Down Expand Up @@ -50,15 +50,15 @@ La facturation a été isolée sur un microservice dédié et ne fera donc pas l
Les périmètres fonctionnels "Gestion des fermiers" et "Import des matières premières" sont rassemblés au sein du même dépôt de code qui permet de déployer un microservice exposant des API REST.

L'architecture technique choisie pour ce microservice est [l'architecture hexagonale](https://blog.ippon.fr/2021/02/17/spring-boot-hexagone/) :
![img](./docs/technical-architecture.png)
![img](/docs/technical-architecture.png)

Concernant la stack technique, voici la liste des langages et frameworks utilisés :
* Java 17
* Springboot 2.7.6
* Java 21
* Springboot 3.3.1


Il a aussi été choisi de faire du "Contrat First" pour la gestion des contrats d'API.
Le dossier [api-contracts](./api-contracts) contient les contrats au format OpenAPI.
Le dossier [api-contracts](/api-contracts) contient les contrats au format OpenAPI.

### Lancer l'application en local

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<name>mill-api</name>
<description>Mill API</description>
<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<springdoc.version>2.5.0</springdoc.version>
</properties>
<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fr/ippon/mill/Application.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
@SpringBootApplication
public class Application {

public static void main(String[] args) {
SpringApplication.run(Application.class, args);
}
public static void main(String[] args) {
SpringApplication.run(Application.class, args);
}

}
21 changes: 11 additions & 10 deletions src/main/java/fr/ippon/mill/error/domain/Assert.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@

public final class Assert {

private Assert(){}
private Assert() {
}

public static void assertNotNull(String fieldName, Object field){
if(Objects.isNull(field)){
throw new AssertionException(String.format("Field \"%s\" is required (value provided: null",fieldName));
}
public static void assertNotNull(String fieldName, Object field) {
if (Objects.isNull(field)) {
throw new AssertionException(String.format("Field \"%s\" is required (value provided: null", fieldName));
}
}

public static void assertNotBlank(String fieldName, String field) {
assertNotNull(fieldName,field);
if(StringUtils.isBlank(field)){
throw new AssertionException(String.format("Field \"%s\" cannot be blank (value provided: \"%s\")",fieldName,field));
}
public static void assertNotBlank(String fieldName, String field) {
assertNotNull(fieldName, field);
if (StringUtils.isBlank(field)) {
throw new AssertionException(String.format("Field \"%s\" cannot be blank (value provided: \"%s\")", fieldName, field));
}
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package fr.ippon.mill.error.domain;

public class AssertionException extends RuntimeException{
public class AssertionException extends RuntimeException {

public AssertionException(String message){
super(message);
}
public AssertionException(String message) {
super(message);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
@Service
public class SpringFarmerService extends FarmerService {

public SpringFarmerService(FarmerRepository farmerRepository) {
super(farmerRepository);
}
public SpringFarmerService(FarmerRepository farmerRepository) {
super(farmerRepository);
}

@Transactional
@Override
public String register(Farmer farmer) throws FarmerAlreadyExistsException {
return super.register(farmer);
}
@Transactional
@Override
public String register(Farmer farmer) throws FarmerAlreadyExistsException {
return super.register(farmer);
}
}
92 changes: 46 additions & 46 deletions src/main/java/fr/ippon/mill/farmer/domain/Farmer.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +6,50 @@

public class Farmer {

private UUID reference;
private final String firstName;
private final String lastName;
private final String email;
private final String phoneNumber;

public static Farmer create(String firstName, String lastName, String email, String phoneNumber) {
return new Farmer(UUID.randomUUID(), firstName, lastName, email, phoneNumber);
}

public Farmer(UUID reference, String firstName, String lastName, String email, String phoneNumber) {
Assert.assertNotNull("reference",reference);
Assert.assertNotBlank("firstName",firstName);
Assert.assertNotBlank("lastName",lastName);
Assert.assertNotBlank("email",email);
Assert.assertNotBlank("phoneNumber",phoneNumber);
this.reference = reference;
this.firstName = firstName;
this.lastName = lastName;
this.email = email;
this.phoneNumber = phoneNumber;
}

public UUID getReference() {
return reference;
}

public void setReference(UUID reference) {
this.reference = reference;
}

public String getFirstName() {
return firstName;
}

public String getLastName() {
return lastName;
}

public String getEmail() {
return email;
}

public String getPhoneNumber() {
return phoneNumber;
}
private UUID reference;
private final String firstName;
private final String lastName;
private final String email;
private final String phoneNumber;

public static Farmer create(String firstName, String lastName, String email, String phoneNumber) {
return new Farmer(UUID.randomUUID(), firstName, lastName, email, phoneNumber);
}

public Farmer(UUID reference, String firstName, String lastName, String email, String phoneNumber) {
Assert.assertNotNull("reference", reference);
Assert.assertNotBlank("firstName", firstName);
Assert.assertNotBlank("lastName", lastName);
Assert.assertNotBlank("email", email);
Assert.assertNotBlank("phoneNumber", phoneNumber);
this.reference = reference;
this.firstName = firstName;
this.lastName = lastName;
this.email = email;
this.phoneNumber = phoneNumber;
}

public UUID getReference() {
return reference;
}

public void setReference(UUID reference) {
this.reference = reference;
}

public String getFirstName() {
return firstName;
}

public String getLastName() {
return lastName;
}

public String getEmail() {
return email;
}

public String getPhoneNumber() {
return phoneNumber;
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package fr.ippon.mill.farmer.domain;

public class FarmerAlreadyExistsException extends Exception{
public class FarmerAlreadyExistsException extends Exception {

public FarmerAlreadyExistsException(String email){
super(String.format("Farmer with email \"%s\" already exists",email));
}
public FarmerAlreadyExistsException(String email) {
super(String.format("Farmer with email \"%s\" already exists", email));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import java.util.UUID;

public interface FarmerRepository {
Optional<Farmer> findByReference(UUID reference);
void save(Farmer farmer);
boolean exists(String email);
Optional<Farmer> findByReference(UUID reference);

void save(Farmer farmer);

boolean exists(String email);
}
22 changes: 11 additions & 11 deletions src/main/java/fr/ippon/mill/farmer/domain/FarmerService.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

public abstract class FarmerService {

private final FarmerRepository farmerRepository;
private final FarmerRepository farmerRepository;

protected FarmerService(FarmerRepository farmerRepository) {
this.farmerRepository = farmerRepository;
}
protected FarmerService(FarmerRepository farmerRepository) {
this.farmerRepository = farmerRepository;
}

public String register(Farmer farmer) throws FarmerAlreadyExistsException {
public String register(Farmer farmer) throws FarmerAlreadyExistsException {

boolean alreadyExists = farmerRepository.exists(farmer.getEmail());
if (alreadyExists) {
throw new FarmerAlreadyExistsException(farmer.getEmail());
}
this.farmerRepository.save(farmer);
return farmer.getReference().toString();
boolean alreadyExists = farmerRepository.exists(farmer.getEmail());
if (alreadyExists) {
throw new FarmerAlreadyExistsException(farmer.getEmail());
}
this.farmerRepository.save(farmer);
return farmer.getReference().toString();
}
}
Loading
Loading