Skip to content
Snippets Groups Projects
Commit 8fcbbbfe authored by Tomas Madeja's avatar Tomas Madeja
Browse files

refactor: idea auto reformat

parent 2b0b7e1f
No related branches found
No related tags found
No related merge requests found
Showing
with 109 additions and 87 deletions
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>iceHockeyManager</artifactId> <artifactId>iceHockeyManager</artifactId>
......
...@@ -8,7 +8,8 @@ import javax.validation.constraints.PositiveOrZero; ...@@ -8,7 +8,8 @@ import javax.validation.constraints.PositiveOrZero;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.Objects; import java.util.Objects;
@Getter @Setter @Getter
@Setter
public class GameCreateDto { public class GameCreateDto {
@NotNull @NotNull
private Long homeTeamId; private Long homeTeamId;
......
...@@ -8,7 +8,8 @@ import javax.validation.constraints.PositiveOrZero; ...@@ -8,7 +8,8 @@ import javax.validation.constraints.PositiveOrZero;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.Objects; import java.util.Objects;
@Getter @Setter @Getter
@Setter
public class GameDto { public class GameDto {
@NotNull @NotNull
......
...@@ -6,7 +6,8 @@ import lombok.Setter; ...@@ -6,7 +6,8 @@ import lombok.Setter;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.PositiveOrZero; import javax.validation.constraints.PositiveOrZero;
@Getter @Setter @Getter
@Setter
public class GameUpdateScoreDto { public class GameUpdateScoreDto {
@NotNull @NotNull
......
...@@ -5,7 +5,8 @@ import lombok.Setter; ...@@ -5,7 +5,8 @@ import lombok.Setter;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@Getter @Setter @Getter
@Setter
public class GameWinnerDto { public class GameWinnerDto {
@NotNull @NotNull
private Long id; private Long id;
......
...@@ -6,7 +6,8 @@ import lombok.Setter; ...@@ -6,7 +6,8 @@ import lombok.Setter;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.Objects; import java.util.Objects;
@Getter @Setter @Getter
@Setter
public final class PlayerCreateDto { public final class PlayerCreateDto {
@NotBlank @NotBlank
......
...@@ -7,7 +7,8 @@ import javax.validation.constraints.NotBlank; ...@@ -7,7 +7,8 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Objects; import java.util.Objects;
@Getter @Setter @Getter
@Setter
public final class PlayerDto { public final class PlayerDto {
@NotNull @NotNull
......
...@@ -5,7 +5,8 @@ import lombok.Setter; ...@@ -5,7 +5,8 @@ import lombok.Setter;
import java.util.Objects; import java.util.Objects;
@Getter @Setter @Getter
@Setter
public final class PlayerTransferDto { public final class PlayerTransferDto {
private long playerId; private long playerId;
......
...@@ -6,7 +6,8 @@ import lombok.Setter; ...@@ -6,7 +6,8 @@ import lombok.Setter;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.Objects; import java.util.Objects;
@Getter @Setter @Getter
@Setter
public class TeamCreateDto { public class TeamCreateDto {
@NotBlank @NotBlank
......
...@@ -7,7 +7,8 @@ import javax.validation.constraints.NotBlank; ...@@ -7,7 +7,8 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Objects; import java.util.Objects;
@Getter @Setter @Getter
@Setter
public final class TeamDto { public final class TeamDto {
@NotNull @NotNull
private Long id; private Long id;
......
...@@ -5,7 +5,8 @@ import lombok.Setter; ...@@ -5,7 +5,8 @@ import lombok.Setter;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@Getter @Setter @Getter
@Setter
public class UserAuthRequestDto { public class UserAuthRequestDto {
@NotBlank @NotBlank
......
...@@ -8,7 +8,8 @@ import javax.validation.constraints.NotBlank; ...@@ -8,7 +8,8 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Objects; import java.util.Objects;
@Getter @Setter @Getter
@Setter
public final class UserDto { public final class UserDto {
@NotNull @NotNull
......
package cz.muni.fi.pa165.icehockeymanager.exceptions; package cz.muni.fi.pa165.icehockeymanager.exceptions;
public class UnknownGameException extends RuntimeException{ public class UnknownGameException extends RuntimeException {
public UnknownGameException() { public UnknownGameException() {
} }
......
...@@ -20,24 +20,28 @@ public interface LeagueManagerFacade { ...@@ -20,24 +20,28 @@ public interface LeagueManagerFacade {
/** /**
* Removes game from the schedule. * Removes game from the schedule.
*
* @param gameId ID of the game to be removed. * @param gameId ID of the game to be removed.
*/ */
void dropGame(long gameId); void dropGame(long gameId);
/** /**
* Updates the game score and also the winner if one is determined by the new score. * Updates the game score and also the winner if one is determined by the new score.
*
* @param game DTO for updating game * @param game DTO for updating game
*/ */
void updateGameScore(GameUpdateScoreDto game); void updateGameScore(GameUpdateScoreDto game);
/** /**
* Sets the winner of a game. * Sets the winner of a game.
*
* @param game DTO for setting game winner * @param game DTO for setting game winner
*/ */
void setGameWinner(GameWinnerDto game); void setGameWinner(GameWinnerDto game);
/** /**
* 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);
......
...@@ -40,7 +40,7 @@ public interface TeamManagerFacade { ...@@ -40,7 +40,7 @@ public interface TeamManagerFacade {
* *
* @param playerId Identifier of player * @param playerId Identifier of player
* @throws UnknownPlayerException If playerId does not match any player * @throws UnknownPlayerException If playerId does not match any player
* @throws UnknownTeamException If teamId does not match any team * @throws UnknownTeamException If teamId does not match any team
*/ */
void firePlayer(long playerId); void firePlayer(long playerId);
} }
...@@ -13,6 +13,7 @@ import java.util.Optional; ...@@ -13,6 +13,7 @@ import java.util.Optional;
public interface UserAuthFacade { public interface UserAuthFacade {
/** /**
* Authenticate user * Authenticate user
*
* @param username username * @param username username
* @param password plaintext password * @param password plaintext password
* @return true if the password is correct, else false * @return true if the password is correct, else false
...@@ -21,26 +22,27 @@ public interface UserAuthFacade { ...@@ -21,26 +22,27 @@ public interface UserAuthFacade {
/** /**
* Create new League Manager account * Create new League Manager account
*
* @param username username * @param username username
* @param password plaintext password * @param password plaintext password
* @return User if exists * @return User if exists
*
* @throws UsernameTakenException if username is already taken by another user * @throws UsernameTakenException if username is already taken by another user
*/ */
UserDto createLeagueManager(String username, String password); UserDto createLeagueManager(String username, String password);
/** /**
* Create new Team Manager account * Create new Team Manager account
*
* @param username username * @param username username
* @param password plaintext password * @param password plaintext password
* @return User if exists * @return User if exists
*
* @throws UsernameTakenException if username is already taken by another user * @throws UsernameTakenException if username is already taken by another user
*/ */
UserDto createTeamManager(String username, String password, int teamId); UserDto createTeamManager(String username, String password, int teamId);
/** /**
* Find team associated with the manager * Find team associated with the manager
*
* @param username username * @param username username
* @return associated team * @return associated team
*/ */
...@@ -48,6 +50,7 @@ public interface UserAuthFacade { ...@@ -48,6 +50,7 @@ public interface UserAuthFacade {
/** /**
* Find user by username * Find user by username
*
* @param username username * @param username username
* @return empty optional if user was not found * @return empty optional if user was not found
*/ */
......
import { NgModule } from '@angular/core'; import {NgModule} from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import {RouterModule, Routes} from '@angular/router';
import { AllGamesComponent } from './components/all-games/all-games.component'; import {AllGamesComponent} from './components/all-games/all-games.component';
import { AllplayersComponent } from './components/allplayers/allplayers.component'; import {AllplayersComponent} from './components/allplayers/allplayers.component';
import { CreateGameFormComponent } from './components/create-game-form/create-game-form.component'; import {CreateGameFormComponent} from './components/create-game-form/create-game-form.component';
import { CreateTeamFormComponent } from './components/create-team-form/create-team-form.component'; import {CreateTeamFormComponent} from './components/create-team-form/create-team-form.component';
import { TeamManagementDashboardComponent } from './components/team-management-dashboard/team-management-dashboard.component'; import {TeamManagementDashboardComponent} from './components/team-management-dashboard/team-management-dashboard.component';
import { TeamPlayersComponent } from './components/team-players/team-players.component'; import {TeamPlayersComponent} from './components/team-players/team-players.component';
import { TeamsComponent } from './components/teams/teams.component'; import {TeamsComponent} from './components/teams/teams.component';
const routes: Routes = [ const routes: Routes = [
...@@ -23,4 +23,5 @@ const routes: Routes = [ ...@@ -23,4 +23,5 @@ const routes: Routes = [
imports: [RouterModule.forRoot(routes)], imports: [RouterModule.forRoot(routes)],
exports: [RouterModule] exports: [RouterModule]
}) })
export class AppRoutingModule { } export class AppRoutingModule {
}
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous"> <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" rel="stylesheet">
<nav class="navbar navbar-expand-lg navbar-light bg-light"> <nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container-fluid"> <div class="container-fluid">
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<a class="navbar-brand" href="#">{{title}}</a> <a class="navbar-brand" href="#">{{title}}</a>
<ul class="navbar-nav me-auto mb-2 mb-lg-0"> <ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" routerLink="/teams" routerLinkActive="active">Teams</a> <a class="nav-link" routerLink="/teams" routerLinkActive="active">Teams</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" routerLink="/players" routerLinkActive="active">Players</a> <a class="nav-link" routerLink="/players" routerLinkActive="active">Players</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" routerLink="/games" routerLinkActive="active">Games</a> <a class="nav-link" routerLink="/games" routerLinkActive="active">Games</a>
</li> </li>
</ul> </ul>
<div class="d-flex"> <div class="d-flex">
<mat-action-row> <mat-action-row>
<button mat-button color="primary" [disabled]="isAuthenticated" (click)="handleLogInClick()">Log in</button> <button (click)="handleLogInClick()" [disabled]="isAuthenticated" color="primary" mat-button>Log in</button>
<button mat-button color="primary" [disabled]="!isAuthenticated" (click)="handleLogOutClick()">Log out</button> <button (click)="handleLogOutClick()" [disabled]="!isAuthenticated" color="primary" mat-button>Log out
</mat-action-row> </button>
</div> </mat-action-row>
</div> </div>
</div> </div>
</div>
</nav> </nav>
<router-outlet></router-outlet> <router-outlet></router-outlet>
\ No newline at end of file
import { Component } from '@angular/core'; import {Component} from '@angular/core';
import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; import {MatDialog, MatDialogConfig} from '@angular/material/dialog';
import { LogInDialogComponent } from './components/log-in-dialog/log-in-dialog.component'; import {LogInDialogComponent} from './components/log-in-dialog/log-in-dialog.component';
import { AuthServiceService } from './services/auth-service.service'; import {AuthServiceService} from './services/auth-service.service';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
...@@ -16,7 +16,8 @@ export class AppComponent { ...@@ -16,7 +16,8 @@ export class AppComponent {
constructor( constructor(
private dialog: MatDialog, private dialog: MatDialog,
private authService: AuthServiceService private authService: AuthServiceService
) { } ) {
}
ngOnInit(): void { ngOnInit(): void {
this.refreshAuth(); this.refreshAuth();
...@@ -29,8 +30,7 @@ export class AppComponent { ...@@ -29,8 +30,7 @@ export class AppComponent {
handleLogInClick() { handleLogInClick() {
const dialogConfig = new MatDialogConfig(); const dialogConfig = new MatDialogConfig();
dialogConfig.data = { dialogConfig.data = {};
};
const dialogRef = this.dialog.open(LogInDialogComponent, dialogConfig); const dialogRef = this.dialog.open(LogInDialogComponent, dialogConfig);
dialogRef.afterClosed().subscribe(data => this.onLogInClose(data)); dialogRef.afterClosed().subscribe(data => this.onLogInClose(data));
} }
...@@ -43,7 +43,7 @@ export class AppComponent { ...@@ -43,7 +43,7 @@ export class AppComponent {
handleLogOutClick() { handleLogOutClick() {
this.authService.logOut() this.authService.logOut()
.subscribe( (success: boolean) => { .subscribe((success: boolean) => {
if (success) { if (success) {
this.refreshAuth(); this.refreshAuth();
} }
......
import { NgModule } from '@angular/core'; import {NgModule} from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import {BrowserModule} from '@angular/platform-browser';
import { FormsModule } from '@angular/forms'; import {FormsModule} from '@angular/forms';
import { MatTableModule } from '@angular/material/table'; import {MatTableModule} from '@angular/material/table';
import { MatExpansionModule } from '@angular/material/expansion'; import {MatExpansionModule} from '@angular/material/expansion';
import { MatDialogModule } from '@angular/material/dialog'; import {MatDialogModule} from '@angular/material/dialog';
import { HttpClientModule } from '@angular/common/http'; import {HttpClientModule} from '@angular/common/http';
import { AppRoutingModule } from './app-routing.module'; import {AppRoutingModule} from './app-routing.module';
import { AppComponent } from './app.component'; import {AppComponent} from './app.component';
import { GamesComponent } from './components/games/games.component'; import {GamesComponent} from './components/games/games.component';
import { TeamsComponent } from './components/teams/teams.component'; import {TeamsComponent} from './components/teams/teams.component';
import { PlayersComponent } from './components/players/players.component'; import {PlayersComponent} from './components/players/players.component';
import { AllplayersComponent } from './components/allplayers/allplayers.component'; import {AllplayersComponent} from './components/allplayers/allplayers.component';
import { TeamPlayersComponent } from './components/team-players/team-players.component'; import {TeamPlayersComponent} from './components/team-players/team-players.component';
import { AllGamesComponent } from './components/all-games/all-games.component'; import {AllGamesComponent} from './components/all-games/all-games.component';
import { DeleteGameButtonComponent } from './components/delete-game-button/delete-game-button.component'; import {DeleteGameButtonComponent} from './components/delete-game-button/delete-game-button.component';
import { CreateGameFormComponent } from './components/create-game-form/create-game-form.component'; import {CreateGameFormComponent} from './components/create-game-form/create-game-form.component';
import { UpdateGameScoreFormComponent } from './components/update-game-score-form/update-game-score-form.component'; import {UpdateGameScoreFormComponent} from './components/update-game-score-form/update-game-score-form.component';
import { CreateTeamFormComponent } from './components/create-team-form/create-team-form.component'; import {CreateTeamFormComponent} from './components/create-team-form/create-team-form.component';
import { RecruitNewPlayerFormComponent } from './components/recruit-new-player-form/recruit-new-player-form.component'; import {RecruitNewPlayerFormComponent} from './components/recruit-new-player-form/recruit-new-player-form.component';
import { RecruitVeteranPlayerFormComponent } from './components/recruit-veteran-player-form/recruit-veteran-player-form.component'; import {RecruitVeteranPlayerFormComponent} from './components/recruit-veteran-player-form/recruit-veteran-player-form.component';
import { UpdateGameWinnerFormComponent } from './components/update-game-winner-form/update-game-winner-form.component'; import {UpdateGameWinnerFormComponent} from './components/update-game-winner-form/update-game-winner-form.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import { TeamManagementDashboardComponent } from './components/team-management-dashboard/team-management-dashboard.component'; import {TeamManagementDashboardComponent} from './components/team-management-dashboard/team-management-dashboard.component';
import { HireNewPlayerDialogComponent } from './components/hire-new-player-dialog/hire-new-player-dialog.component'; import {HireNewPlayerDialogComponent} from './components/hire-new-player-dialog/hire-new-player-dialog.component';
import { HireVeteranPlayerDialogComponent } from './components/hire-veteran-player-dialog/hire-veteran-player-dialog.component'; import {HireVeteranPlayerDialogComponent} from './components/hire-veteran-player-dialog/hire-veteran-player-dialog.component';
import { LogInFormComponent } from './components/log-in-form/log-in-form.component'; import {LogInFormComponent} from './components/log-in-form/log-in-form.component';
import { LogInDialogComponent } from './components/log-in-dialog/log-in-dialog.component'; import {LogInDialogComponent} from './components/log-in-dialog/log-in-dialog.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -63,4 +63,5 @@ import { LogInDialogComponent } from './components/log-in-dialog/log-in-dialog.c ...@@ -63,4 +63,5 @@ import { LogInDialogComponent } from './components/log-in-dialog/log-in-dialog.c
providers: [], providers: [],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })
export class AppModule { } export class AppModule {
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment