Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions samples/bloggy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>3.1.4</version>
<version>3.5.6</version>
</dependency>
<dependency>
<groupId>com.codeforces</groupId>
<artifactId>commons</artifactId>
<version>3.0-SNAPSHOT</version>
</dependency>
</dependencies>

<build>
<finalName>bloggy</finalName>
<resources>
Expand Down Expand Up @@ -95,7 +95,7 @@
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<version>1.5.0</version>
<version>2.0.1</version>
<executions>
<execution>
<id>default</id>
Expand All @@ -117,15 +117,14 @@
<printEqualFiles>false</printEqualFiles>
<preferLocal>true</preferLocal>

<!-- Version 1.1.1+ -->
<includeBootClasspath>false</includeBootClasspath>
<bootClasspathProperty>sun.boot.class.path</bootClasspathProperty>
<!-- Version 1.1.1+ -->


<!-- Version 1.2.0+ -->
<includePomProjects>false</includePomProjects>
<!-- Version 1.2.0+ -->

<useDefaultResourceIgnoreList>true</useDefaultResourceIgnoreList>
<ignoredClassPatterns>
<ignoredClassPattern>org\.apache\.commons\.logging\..*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</plugin>
</plugins>
Expand Down
21 changes: 10 additions & 11 deletions samples/bloggy/src/main/java/bloggy/ApplicationModule.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
package bloggy;

import com.codeforces.commons.io.http.HttpMethod;
import com.codeforces.commons.text.StringUtil;
import com.google.inject.Binder;
import com.google.inject.Module;
import com.google.inject.matcher.AbstractMatcher;
import org.aopalliance.intercept.MethodInterceptor;
import org.nocturne.link.Links;
import org.nocturne.main.ApplicationContext;
import org.nocturne.main.Component;
import bloggy.captions.dao.CaptionDao;
import bloggy.captions.dao.impl.CaptionDaoImpl;
import bloggy.dao.DateDao;
Expand All @@ -19,6 +10,14 @@
import bloggy.dao.impl.UserDaoImpl;
import bloggy.web.annotation.PostOnly;
import bloggy.web.page.IndexPage;
import com.codeforces.commons.io.http.HttpMethod;
import com.codeforces.commons.text.StringUtil;
import com.google.inject.Binder;
import com.google.inject.Module;
import com.google.inject.matcher.AbstractMatcher;
import org.nocturne.link.Links;
import org.nocturne.main.ApplicationContext;
import org.nocturne.main.Component;

import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
Expand All @@ -34,12 +33,12 @@ public void configure(Binder binder) {
binder.bind(UserDao.class).to(UserDaoImpl.class);
binder.bind(PostDao.class).to(PostDaoImpl.class);

binder.bindInterceptor(new AbstractMatcher<Class<?>>() {
binder.bindInterceptor(new AbstractMatcher<>() {
@Override
public boolean matches(Class<?> aClass) {
return Component.class.isAssignableFrom(aClass);
}
}, new AbstractMatcher<Method>() {
}, new AbstractMatcher<>() {
@Override
public boolean matches(Method method) {
return method.getAnnotation(PostOnly.class) != null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
*/
package bloggy;

import bloggy.web.page.WebPage;
import com.codeforces.commons.exception.ExceptionUtil;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import org.apache.log4j.Logger;
import org.nocturne.listener.PageRequestListener;
import org.nocturne.main.Page;
import bloggy.web.page.WebPage;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
Expand Down Expand Up @@ -50,7 +50,8 @@ public void afterProcessPage(Page page, Throwable t) {
addRequestParameters(page, paramsDump);
addRequestAttributes(page, paramsDump);

t.printStackTrace();
t.printStackTrace(System.out);
t.printStackTrace(System.err);
}

if (t != null && page instanceof WebPage) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package bloggy;

import bloggy.web.page.*;
import org.nocturne.link.Links;
import org.nocturne.main.LinkedRequestRouter;
import bloggy.web.page.*;

/**
* @author Mike Mirzayanov
Expand Down
4 changes: 1 addition & 3 deletions samples/bloggy/src/main/java/bloggy/NginxFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ public void init(FilterConfig filterConfig) {

@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException {
if (request instanceof HttpServletRequest) {
HttpServletRequest httpRequest = (HttpServletRequest) request;

if (request instanceof HttpServletRequest httpRequest) {
String ip = httpRequest.getHeader(X_REAL_IP);
String host = httpRequest.getHeader(X_FORWARDED_FOR);

Expand Down
2 changes: 1 addition & 1 deletion samples/bloggy/src/main/java/bloggy/PreprocessFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
*/
package bloggy;

import org.jacuzzi.core.Jacuzzi;
import bloggy.database.ApplicationDataSource;
import org.jacuzzi.core.Jacuzzi;

import javax.servlet.*;
import java.io.IOException;
Expand Down
8 changes: 3 additions & 5 deletions samples/bloggy/src/main/java/bloggy/StaticFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.codeforces.commons.properties.PropertiesUtil;
import com.codeforces.commons.text.StringUtil;
import org.nocturne.main.ApplicationContext;

import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -38,10 +37,9 @@ public void init(FilterConfig filterConfig) {

@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
if (ENABLED && request instanceof HttpServletRequest && response instanceof HttpServletResponse) {
HttpServletRequest httpServletRequest = (HttpServletRequest) request;
HttpServletResponse httpServletResponse = (HttpServletResponse) response;

if (ENABLED
&& request instanceof HttpServletRequest httpServletRequest
&& response instanceof HttpServletResponse httpServletResponse) {
String requestURI = httpServletRequest.getRequestURI();
if (isResourceRequestUri(requestURI)) {
File file = new File(STATIC_SRC_PATH, requestURI);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
*/
package bloggy.captions;

import bloggy.captions.dao.CaptionDao;
import bloggy.captions.model.Caption;
import com.google.common.base.Strings;
import com.google.inject.Inject;
import org.nocturne.caption.Captions;
import org.nocturne.main.ApplicationContext;
import bloggy.captions.dao.CaptionDao;
import bloggy.captions.model.Caption;

import java.text.MessageFormat;
import java.util.Locale;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

import bloggy.captions.model.Caption;

import java.util.List;

public interface CaptionDao {
String shaHex(String s);
Caption find(String shortcutSha1, String locale);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
*/
package bloggy.captions.dao.impl;

import bloggy.captions.TemplateEngineConfigurations;
import bloggy.captions.dao.CaptionDao;
import bloggy.captions.model.Caption;
import bloggy.dao.impl.ApplicationDaoImpl;
import com.codeforces.commons.text.StringUtil;
import com.google.inject.Singleton;
import freemarker.cache.SoftCacheStorage;
import freemarker.template.Configuration;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.log4j.Logger;
import org.nocturne.main.ApplicationContext;
import bloggy.captions.TemplateEngineConfigurations;
import bloggy.captions.dao.CaptionDao;
import bloggy.captions.model.Caption;
import bloggy.dao.impl.ApplicationDaoImpl;

import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package bloggy.dao.impl;

import org.jacuzzi.core.GenericDaoImpl;
import bloggy.database.ApplicationDataSource;
import bloggy.model.Entity;
import org.jacuzzi.core.GenericDaoImpl;

import java.util.Date;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package bloggy.dao.impl;

import com.google.inject.Singleton;
import bloggy.dao.PostDao;
import bloggy.model.Post;
import bloggy.model.User;
import com.google.inject.Singleton;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package bloggy.dao.impl;

import com.google.inject.Singleton;
import bloggy.dao.UserDao;
import bloggy.model.User;
import com.google.inject.Singleton;

@Singleton
public class UserDaoImpl extends ApplicationDaoImpl<User> implements UserDao {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
*/
package bloggy.database;

import org.apache.log4j.Logger;
import bloggy.exception.ApplicationException;
import org.apache.log4j.Logger;
import org.mariadb.jdbc.MariaDbDataSource;

import javax.annotation.Nonnull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package bloggy.exception;

@SuppressWarnings("unused")
public class ApplicationException extends RuntimeException {
public ApplicationException(String message) {
super(message);
Expand Down
2 changes: 2 additions & 0 deletions samples/bloggy/src/main/java/bloggy/model/Entity.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public void setId(long id) {
this.id = id;
}

@SuppressWarnings("unused")
public Date getUpdateTime() {
return updateTime;
}
Expand All @@ -29,6 +30,7 @@ public void setUpdateTime(Date updateTime) {
this.updateTime = TimeUtil.toDate(updateTime);
}

@SuppressWarnings("unused")
public Date getCreationTime() {
return creationTime;
}
Expand Down
1 change: 1 addition & 0 deletions samples/bloggy/src/main/java/bloggy/model/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public String getLogin() {
return login;
}

@SuppressWarnings("unused")
public void setLogin(String login) {
this.login = login;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package bloggy.web.frame;

import com.google.inject.Inject;
import bloggy.dao.UserDao;
import bloggy.model.Post;
import bloggy.model.User;
import com.google.inject.Inject;

public class PostViewFrame extends ApplicationFrame {
@Inject
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package bloggy.web.frame;

import com.google.inject.Inject;
import bloggy.dao.PostDao;
import bloggy.model.Post;
import bloggy.model.User;
import com.google.inject.Inject;

import java.util.List;
import java.util.stream.Collectors;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package bloggy.web.page;

import bloggy.dao.DateDao;
import bloggy.model.User;
import com.google.inject.Inject;
import org.nocturne.main.ApplicationContext;
import org.nocturne.main.Page;
import bloggy.dao.DateDao;
import bloggy.model.User;

public abstract class ApplicationPage extends Page {
private static final String USER_SESSION_KEY = "user";
Expand Down
4 changes: 2 additions & 2 deletions samples/bloggy/src/main/java/bloggy/web/page/EnterPage.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package bloggy.web.page;

import bloggy.dao.UserDao;
import bloggy.web.annotation.PostOnly;
import com.google.inject.Inject;
import org.nocturne.annotation.Action;
import org.nocturne.annotation.Parameter;
Expand All @@ -8,8 +10,6 @@
import org.nocturne.validation.RequiredValidator;
import org.nocturne.validation.ValidationException;
import org.nocturne.validation.Validator;
import bloggy.dao.UserDao;
import bloggy.web.annotation.PostOnly;

@Link("enter")
public class EnterPage extends WebPage {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package bloggy.web.page;

import bloggy.web.frame.PostsViewFrame;
import com.google.inject.Inject;
import org.nocturne.link.Link;
import bloggy.web.frame.PostsViewFrame;

@Link(";index")
public class IndexPage extends WebPage {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package bloggy.web.page;

import bloggy.web.annotation.PostOnly;
import org.nocturne.annotation.Action;
import org.nocturne.link.Link;
import bloggy.web.annotation.PostOnly;

@Link("logout")
public class LogoutDataPage extends DataPage {
Expand Down
5 changes: 2 additions & 3 deletions samples/bloggy/src/main/java/bloggy/web/page/MyPostsPage.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package bloggy.web.page;

import com.google.inject.Inject;
import org.nocturne.link.Link;
import bloggy.dao.PostDao;
import bloggy.model.User;
import bloggy.web.frame.PostsViewFrame;
import com.google.inject.Inject;
import org.nocturne.link.Link;

@Link("my")
public class MyPostsPage extends WebPage {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package bloggy.web.page;

import com.google.inject.Inject;
import org.nocturne.annotation.Parameter;
import org.nocturne.link.Link;
import bloggy.dao.PostDao;
import bloggy.model.Post;
import bloggy.web.frame.PostViewFrame;
import com.google.inject.Inject;
import org.nocturne.annotation.Parameter;
import org.nocturne.link.Link;

@Link("post/{postId}")
public class PostViewPage extends WebPage {
Expand Down
Loading