Skip to content

Commit

Permalink
remove app directory
Browse files Browse the repository at this point in the history
Signed-off-by: Kirill Mokevnin <mokevnin@gmail.com>
  • Loading branch information
mokevnin committed Jul 15, 2023
1 parent 03bb02d commit 7d3bf1d
Show file tree
Hide file tree
Showing 36 changed files with 137 additions and 62 deletions.
43 changes: 43 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="bin/main" path="src/main/java">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/main" path="src/main/resources">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/test" path="src/test/java">
<attributes>
<attribute name="gradle_scope" value="test"/>
<attribute name="gradle_used_by_scope" value="test"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/test" path="src/test/resources">
<attributes>
<attribute name="gradle_scope" value="test"/>
<attribute name="gradle_used_by_scope" value="test"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-19/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="src" path="bin/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/test" path="bin/generated-test-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin/default"/>
</classpath>
3 changes: 3 additions & 0 deletions .factorypath
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<factorypath>
<factorypathentry kind="EXTJAR" id="/Users/kirillmokevnin/.gradle/caches/modules-2/files-2.1/io.ebean/querybean-generator/13.15.0/9825aded4302de5c38675b02565a1e747da787b2/querybean-generator-13.15.0.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
43 changes: 39 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,42 @@
# Ignore Gradle project-specific cache directory
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/

# Ignore Gradle build output directory
build
### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/

*.db
### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/

### VS Code ###
.vscode/

### Mac OS ###
.DS_Store
34 changes: 34 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>java-javalin-blog</name>
<comment>Project java-javalin-blog created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
<filteredResources>
<filter>
<id>1689459694176</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
setup:
make -C app setup
gradle wrapper --gradle-version 7.4

clean:
make -C app clean
./gradlew clean

build:
make -C app build
./gradlew clean build

start:
make -C app start
APP_ENV=development ./gradlew run

install:
make -C app install
./gradlew install

start-dist:
make -C app start-dist
APP_ENV=production ./build/install/java-javalin-blog/bin/java-javalin-blog

generate-migrations:
make -C app generate-migrations
./gradlew generateMigrations

lint:
make -C app lint
./gradlew checkstyleMain checkstyleTest

test:
make -C app test
./gradlew test

report:
make -C app report
./gradlew jacocoTestReport

check-updates:
make -C app check-updates
./gradlew dependencyUpdates

image-build:
docker build -t hexletcomponents/java-javalin-blog:latest .
Expand Down
File renamed without changes.
40 changes: 0 additions & 40 deletions app/Makefile

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package io.hexlet.blog.controllers;

import io.javalin.http.Handler;
import io.javalin.http.NotFoundResponse;
import io.ebean.PagedList;
import java.util.List;
import java.util.stream.IntStream;
import java.util.stream.Collectors;
import java.util.stream.IntStream;

import io.hexlet.blog.domain.query.QArticle;
import io.ebean.PagedList;
import io.hexlet.blog.domain.Article;
import io.hexlet.blog.domain.query.QArticle;
import io.javalin.http.Handler;
import io.javalin.http.NotFoundResponse;

public final class ArticleController {

Expand Down Expand Up @@ -80,7 +80,7 @@ public final class ArticleController {
throw new NotFoundResponse();
}

ctx.attribute("article", article);
ctx.render("articles/show.html");
ctx.attribute("article", article);
ctx.render("articles/show.html");
};
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 7d3bf1d

Please sign in to comment.