Skip to content
Snippets Groups Projects
Commit f4e033b6 authored by Arnaud LABOUREL's avatar Arnaud LABOUREL
Browse files

Changed name of module to include client and correcting a small bug

parent a6a61ec7
No related branches found
No related tags found
No related merge requests found
Pipeline #44819 passed
Showing
with 38 additions and 38 deletions
...@@ -12,8 +12,8 @@ repositories { ...@@ -12,8 +12,8 @@ repositories {
} }
application { application {
mainModule.set("fr.univ_amu.m1info") mainModule.set("fr.univ_amu.m1info.client")
mainClass.set("fr.univ_amu.m1info.viewer.CalendarApp") mainClass.set("fr.univ_amu.m1info.client.viewer.CalendarApp")
} }
javafx { javafx {
......
package fr.univ_amu.m1info.model; package fr.univ_amu.m1info.client.model;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Collection; import java.util.Collection;
......
package fr.univ_amu.m1info.model; package fr.univ_amu.m1info.client.model;
import fr.univ_amu.m1info.service.dao.CalendarServiceDAO; import fr.univ_amu.m1info.client.service.dao.CalendarServiceDAO;
import fr.univ_amu.m1info.service.dao.exceptions.ConnexionException; import fr.univ_amu.m1info.client.service.dao.exceptions.ConnexionException;
import fr.univ_amu.m1info.service.dao.exceptions.UnknownElementException; import fr.univ_amu.m1info.client.service.dao.exceptions.UnknownElementException;
import fr.univ_amu.m1info.service.dao.exceptions.WrongVersionException; import fr.univ_amu.m1info.client.service.dao.exceptions.WrongVersionException;
import fr.univ_amu.m1info.service.dto.SlotDTO; import fr.univ_amu.m1info.client.service.dto.SlotDTO;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Collection; import java.util.Collection;
......
package fr.univ_amu.m1info.model; package fr.univ_amu.m1info.client.model;
import java.time.Duration; import java.time.Duration;
import java.time.LocalDateTime; import java.time.LocalDateTime;
......
package fr.univ_amu.m1info.model; package fr.univ_amu.m1info.client.model;
import fr.univ_amu.m1info.service.dto.SlotDTO; import fr.univ_amu.m1info.client.service.dto.SlotDTO;
import fr.univ_amu.m1info.service.dto.DateTimeInterval; import fr.univ_amu.m1info.client.service.dto.DateTimeInterval;
import java.time.Duration; import java.time.Duration;
......
package fr.univ_amu.m1info.model; package fr.univ_amu.m1info.client.model;
import java.time.Duration; import java.time.Duration;
import java.time.LocalDateTime; import java.time.LocalDateTime;
......
package fr.univ_amu.m1info.model; package fr.univ_amu.m1info.client.model;
import fr.univ_amu.m1info.service.dto.SlotDTO; import fr.univ_amu.m1info.client.service.dto.SlotDTO;
public interface SlotDTOConverter { public interface SlotDTOConverter {
Slot fromDTO(SlotDTO slotDTO); Slot fromDTO(SlotDTO slotDTO);
......
package fr.univ_amu.m1info.service.dao; package fr.univ_amu.m1info.client.service.dao;
import fr.univ_amu.m1info.service.dao.exceptions.ConnexionException; import fr.univ_amu.m1info.client.service.dao.exceptions.ConnexionException;
import fr.univ_amu.m1info.service.dao.exceptions.UnknownElementException; import fr.univ_amu.m1info.client.service.dao.exceptions.UnknownElementException;
import fr.univ_amu.m1info.service.dao.exceptions.WrongVersionException; import fr.univ_amu.m1info.client.service.dao.exceptions.WrongVersionException;
import fr.univ_amu.m1info.service.dto.SlotDTO; import fr.univ_amu.m1info.client.service.dto.SlotDTO;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Collection; import java.util.Collection;
......
package fr.univ_amu.m1info.service.dao; package fr.univ_amu.m1info.client.service.dao;
import fr.univ_amu.m1info.service.dao.exceptions.UnknownElementException; import fr.univ_amu.m1info.client.service.dao.exceptions.UnknownElementException;
import fr.univ_amu.m1info.service.dao.exceptions.WrongVersionException; import fr.univ_amu.m1info.client.service.dao.exceptions.WrongVersionException;
import fr.univ_amu.m1info.service.dto.CalendarDTO; import fr.univ_amu.m1info.client.service.dto.CalendarDTO;
import fr.univ_amu.m1info.service.dto.SlotDTO; import fr.univ_amu.m1info.client.service.dto.SlotDTO;
import fr.univ_amu.m1info.service.dao.json.JsonBodyHandler; import fr.univ_amu.m1info.client.service.dao.json.JsonBodyHandler;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
......
package fr.univ_amu.m1info.service.dao.exceptions; package fr.univ_amu.m1info.client.service.dao.exceptions;
import java.io.IOException; import java.io.IOException;
......
package fr.univ_amu.m1info.service.dao.exceptions; package fr.univ_amu.m1info.client.service.dao.exceptions;
/** /**
* Exception that can occur during an update / delete / get * Exception that can occur during an update / delete / get
......
package fr.univ_amu.m1info.service.dao.exceptions; package fr.univ_amu.m1info.client.service.dao.exceptions;
/** /**
* Concurrency issue on the version number * Concurrency issue on the version number
......
package fr.univ_amu.m1info.service.dao.json; package fr.univ_amu.m1info.client.service.dao.json;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
......
package fr.univ_amu.m1info.service.dto; package fr.univ_amu.m1info.client.service.dto;
import java.util.List; import java.util.List;
......
package fr.univ_amu.m1info.service.dto; package fr.univ_amu.m1info.client.service.dto;
import java.time.LocalDateTime; import java.time.LocalDateTime;
......
package fr.univ_amu.m1info.service.dto; package fr.univ_amu.m1info.client.service.dto;
public record SlotDTO(int id, String description, DateTimeInterval timeInterval, int version) { public record SlotDTO(int id, String description, DateTimeInterval timeInterval, int version) {
} }
package fr.univ_amu.m1info.util; package fr.univ_amu.m1info.client.util;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
......
package fr.univ_amu.m1info.util; package fr.univ_amu.m1info.client.util;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
......
package fr.univ_amu.m1info.util; package fr.univ_amu.m1info.client.util;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Iterator; import java.util.Iterator;
......
package fr.univ_amu.m1info.util; package fr.univ_amu.m1info.client.util;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment