Commit f6356629 authored by Erik Moravec's avatar Erik Moravec Committed by Ján Dovjak
Browse files

refactor: fixed TeamDtos classes names

parent 994fba83

api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameDto.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -18,16 +18,16 @@ public class GameDto { 
    @NotNull

    @NotNull

    @Getter

    @Getter

    @Setter

    @Setter

    private TeamDTO homeTeam;

    private TeamDto homeTeam;





    @NotNull

    @NotNull

    @Getter

    @Getter

    @Setter

    @Setter

    private TeamDTO awayTeam;

    private TeamDto awayTeam;





    @Getter

    @Getter

    @Setter

    @Setter

    private TeamDTO winner;

    private TeamDto winner;





    @PositiveOrZero

    @PositiveOrZero

    @Getter

    @Getter

api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/TeamCreateDTO.java→api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/TeamCreateDto.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ import lombok.Setter; 
import javax.validation.constraints.NotBlank;

import javax.validation.constraints.NotBlank;

import java.util.Objects;

import java.util.Objects;





public class TeamCreateDTO {

public class TeamCreateDto {

    @NotBlank

    @NotBlank

    @Setter

    @Setter

    @Getter

    @Getter
@@ -16,7 +16,7 @@ public class TeamCreateDTO { 
    public boolean equals(Object o) {

    public boolean equals(Object o) {

        if (this == o) return true;

        if (this == o) return true;

        if (o == null || getClass() != o.getClass()) return false;

        if (o == null || getClass() != o.getClass()) return false;

        TeamDTO teamDTO = (TeamDTO) o;

        TeamDto teamDTO = (TeamDto) o;

        return getName().equals(teamDTO.getName());

        return getName().equals(teamDTO.getName());

    }

    }

api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/TeamDTO.java→api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/TeamDto.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank; 
import javax.validation.constraints.NotNull;

import javax.validation.constraints.NotNull;

import java.util.Objects;

import java.util.Objects;





public final class TeamDTO {

public final class TeamDto {

    @NotNull

    @NotNull

    @Getter

    @Getter

    @Setter

    @Setter
@@ -22,7 +22,7 @@ public final class TeamDTO { 
    public boolean equals(Object o) {

    public boolean equals(Object o) {

        if (this == o) return true;

        if (this == o) return true;

        if (o == null || getClass() != o.getClass()) return false;

        if (o == null || getClass() != o.getClass()) return false;

        TeamDTO teamDTO = (TeamDTO) o;

        TeamDto teamDTO = (TeamDto) o;

        return getId().equals(teamDTO.getId()) &&

        return getId().equals(teamDTO.getId()) &&

                getName().equals(teamDTO.getName());

                getName().equals(teamDTO.getName());

    }

    }

api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacade.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ package cz.muni.fi.pa165.icehockeymanager.facades; 
import cz.muni.fi.pa165.icehockeymanager.dto.GameCreateDto;

import cz.muni.fi.pa165.icehockeymanager.dto.GameCreateDto;

import cz.muni.fi.pa165.icehockeymanager.dto.GameUpdateScoreDto;

import cz.muni.fi.pa165.icehockeymanager.dto.GameUpdateScoreDto;

import cz.muni.fi.pa165.icehockeymanager.dto.GameWinnerDto;

import cz.muni.fi.pa165.icehockeymanager.dto.GameWinnerDto;

import cz.muni.fi.pa165.icehockeymanager.dto.TeamCreateDTO;

import cz.muni.fi.pa165.icehockeymanager.dto.TeamCreateDto;





/**

/**

 * Facade with functionality for the league manager,

 * Facade with functionality for the league manager,
@@ -40,5 +40,5 @@ public interface LeagueManagerFacade { 
     * Add new team to the league.

     * Add new team to the league.

     * @param teamCreateDTO DTO of the new team to be created.

     * @param teamCreateDTO DTO of the new team to be created.

     */

     */

    void createNewTeam(TeamCreateDTO teamCreateDTO);

    void createNewTeam(TeamCreateDto teamCreateDTO);

}
 
}

api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacade.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ package cz.muni.fi.pa165.icehockeymanager.facades; 




import cz.muni.fi.pa165.icehockeymanager.dto.GameDto;

import cz.muni.fi.pa165.icehockeymanager.dto.GameDto;

import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDto;

import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDto;

import cz.muni.fi.pa165.icehockeymanager.dto.TeamDTO;

import cz.muni.fi.pa165.icehockeymanager.dto.TeamDto;

import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;

import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;





import java.util.Collection;

import java.util.Collection;
@@ -52,5 +52,5 @@ public interface UserFacade { 
     *

     *

     * @return Collection of teams

     * @return Collection of teams

     */

     */

    Collection<TeamDTO> getTeamsInLeague();

    Collection<TeamDto> getTeamsInLeague();

}
 
}