Skip to content

Commit

Permalink
submit java-web-ru/flash
Browse files Browse the repository at this point in the history
  • Loading branch information
@hexlet-cli
hexlet-cli committed Feb 14, 2024
1 parent 4a7b4ea commit 3569cc4
Show file tree
Hide file tree
Showing 10 changed files with 259 additions and 259 deletions.
2 changes: 1 addition & 1 deletion .current.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"assignment":"java-web-ru/session"}
{"assignment":"java-web-ru/flash"}
Empty file modified java-web-ru/flash/gradlew
100644 → 100755
View file
Empty file.
184 changes: 92 additions & 92 deletions java-web-ru/flash/gradlew.bat
View file
Original file line number Diff line number Diff line change
@@ -1,92 +1,92 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
2 changes: 1 addition & 1 deletion java-web-ru/flash/settings.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rootProject.name = "flash"
rootProject.name = "flash"
112 changes: 56 additions & 56 deletions java-web-ru/flash/src/main/java/exercise/controller/PostsController.java
View file
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
package exercise.controller;

import java.util.Collections;
import exercise.dto.posts.PostsPage;
import exercise.dto.posts.PostPage;
import exercise.model.Post;
import exercise.repository.PostRepository;
import exercise.dto.posts.BuildPostPage;
import exercise.util.NamedRoutes;
import io.javalin.http.Context;
import io.javalin.validation.ValidationException;
import io.javalin.http.NotFoundResponse;

public class PostsController {

public static void build(Context ctx) {
var page = new BuildPostPage();
ctx.render("posts/build.jte", Collections.singletonMap("page", page));
}

// BEGIN
public static void index(Context ctx) {
var page = new PostsPage(PostRepository.getEntities());
page.setFlashMessage(ctx.consumeSessionAttribute("flash"));
ctx.render("posts/index.jte", Collections.singletonMap("page", page));
}

public static void create(Context ctx) {
try {
var name = ctx.formParamAsClass("name", String.class)
.check(value -> value.length() >= 2, "Слишком короткое имя")
.get();
var body = ctx.formParamAsClass("body", String.class)
.get();
ctx.sessionAttribute("flash", "Пост был успешно создан!");
PostRepository.save(new Post(name, body));
ctx.redirect(NamedRoutes.postsPath());
} catch (ValidationException e) {
var name = ctx.pathParam("name");
var body = ctx.pathParam("body");
var page = new BuildPostPage(name, body, e.getErrors());
ctx.sessionAttribute("flash", "Неверный ввод данных");
ctx.render("posts/build.jte", Collections.singletonMap("page", page));
}
}
// END

public static void show(Context ctx) {
var id = ctx.pathParamAsClass("id", Long.class).get();
var post = PostRepository.find(id)
.orElseThrow(() -> new NotFoundResponse("Post not found"));

var page = new PostPage(post);
ctx.render("posts/show.jte", Collections.singletonMap("page", page));
}
}
package exercise.controller;

import java.util.Collections;
import exercise.dto.posts.PostsPage;
import exercise.dto.posts.PostPage;
import exercise.model.Post;
import exercise.repository.PostRepository;
import exercise.dto.posts.BuildPostPage;
import exercise.util.NamedRoutes;
import io.javalin.http.Context;
import io.javalin.validation.ValidationException;
import io.javalin.http.NotFoundResponse;

public class PostsController {

public static void build(Context ctx) {
var page = new BuildPostPage();
ctx.render("posts/build.jte", Collections.singletonMap("page", page));
}

// BEGIN
public static void index(Context ctx) {
var page = new PostsPage(PostRepository.getEntities());
page.setFlashMessage(ctx.consumeSessionAttribute("flash"));
ctx.render("posts/index.jte", Collections.singletonMap("page", page));
}

public static void create(Context ctx) {
try {
var name = ctx.formParamAsClass("name", String.class)
.check(value -> value.length() >= 2, "Слишком короткое имя")
.get();
var body = ctx.formParamAsClass("body", String.class)
.get();
ctx.sessionAttribute("flash", "Пост был успешно создан!");
PostRepository.save(new Post(name, body));
ctx.redirect(NamedRoutes.postsPath());
} catch (ValidationException e) {
var name = ctx.pathParam("name");
var body = ctx.pathParam("body");
var page = new BuildPostPage(name, body, e.getErrors());
ctx.sessionAttribute("flash", "Неверный ввод данных");
ctx.render("posts/build.jte", Collections.singletonMap("page", page));
}
}
// END

public static void show(Context ctx) {
var id = ctx.pathParamAsClass("id", Long.class).get();
var post = PostRepository.find(id)
.orElseThrow(() -> new NotFoundResponse("Post not found"));

var page = new PostPage(post);
ctx.render("posts/show.jte", Collections.singletonMap("page", page));
}
}
28 changes: 14 additions & 14 deletions java-web-ru/flash/src/main/java/exercise/dto/BasePage.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package exercise.dto;

import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

// BEGIN
@NoArgsConstructor
@Getter
@Setter
public class BasePage {
private String flashMessage;
}
// END
package exercise.dto;

import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

// BEGIN
@NoArgsConstructor
@Getter
@Setter
public class BasePage {
private String flashMessage;
}
// END
30 changes: 15 additions & 15 deletions java-web-ru/flash/src/main/java/exercise/dto/posts/PostsPage.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package exercise.dto.posts;

import java.util.List;
import exercise.model.Post;
import lombok.AllArgsConstructor;
import lombok.Getter;
import exercise.dto.BasePage;

// BEGIN
@AllArgsConstructor
@Getter
public class PostsPage extends BasePage {
private List<Post> posts;
}
// END
package exercise.dto.posts;

import java.util.List;
import exercise.model.Post;
import lombok.AllArgsConstructor;
import lombok.Getter;
import exercise.dto.BasePage;

// BEGIN
@AllArgsConstructor
@Getter
public class PostsPage extends BasePage {
private List<Post> posts;
}
// END
Loading

0 comments on commit 3569cc4

Please sign in to comment.