Skip to content

Commit

Permalink
Renamed PageRenderer to MasterPage.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nmihajlovski
nmihajlovski committed Aug 29, 2016
1 parent 34df0d9 commit da9af70
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 27 deletions.
4 changes: 2 additions & 2 deletions rapidoid-commons/src/main/resources/rapidoid-classes.txt
View file
Expand Up @@ -294,7 +294,7 @@ org.rapidoid.http.customize.defaults.DefaultErrorHandler
org.rapidoid.http.customize.defaults.DefaultJsonRequestBodyParser
org.rapidoid.http.customize.defaults.DefaultJsonResponseRenderer
org.rapidoid.http.customize.defaults.DefaultLoginProvider
org.rapidoid.http.customize.defaults.DefaultPageRenderer
org.rapidoid.http.customize.defaults.DefaultMasterPage
org.rapidoid.http.customize.defaults.DefaultRolesProvider
org.rapidoid.http.customize.defaults.Defaults
org.rapidoid.http.customize.defaults.DefaultSessionManager
Expand All @@ -306,7 +306,7 @@ org.rapidoid.http.customize.ErrorHandler
org.rapidoid.http.customize.JsonRequestBodyParser
org.rapidoid.http.customize.JsonResponseRenderer
org.rapidoid.http.customize.LoginProvider
org.rapidoid.http.customize.PageRenderer
org.rapidoid.http.customize.MasterPage
org.rapidoid.http.customize.RolesProvider
org.rapidoid.http.customize.SessionManager
org.rapidoid.http.customize.StaticFilesSecurity
Expand Down
12 changes: 6 additions & 6 deletions rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/Customization.java
View file
Expand Up @@ -52,7 +52,7 @@ public class Customization extends RapidoidThing {

private volatile ViewRenderer viewRenderer;

private volatile PageRenderer pageRenderer;
private volatile MasterPage masterPage;

private volatile JsonResponseRenderer jsonResponseRenderer;

Expand Down Expand Up @@ -92,7 +92,7 @@ public synchronized void reset() {
templatesPath = null;
errorHandler = null;
viewRenderer = null;
pageRenderer = null;
masterPage = null;
jsonResponseRenderer = null;
beanParameterFactory = null;
loginProvider = null;
Expand Down Expand Up @@ -171,12 +171,12 @@ public Customization viewRenderer(ViewRenderer viewRenderer) {
return this;
}

public PageRenderer pageRenderer() {
return pageRenderer != null || defaults == null ? pageRenderer : defaults.pageRenderer();
public MasterPage masterPage() {
return masterPage != null || defaults == null ? masterPage : defaults.masterPage();
}

public Customization pageRenderer(PageRenderer pageRenderer) {
this.pageRenderer = pageRenderer;
public Customization masterPage(MasterPage masterPage) {
this.masterPage = masterPage;
return this;
}

Expand Down
4 changes: 2 additions & 2 deletions ...rapidoid/http/customize/PageRenderer.java → ...g/rapidoid/http/customize/MasterPage.java
View file
Expand Up @@ -26,8 +26,8 @@
import org.rapidoid.http.Resp;

@Authors("Nikolche Mihajlovski")
@Since("5.1.0")
public interface PageRenderer {
@Since("5.2.0")
public interface MasterPage {

Object renderPage(Req req, Resp resp, String content) throws Exception;

Expand Down
13 changes: 8 additions & 5 deletions ...stomize/defaults/DefaultPageRenderer.java → ...customize/defaults/DefaultMasterPage.java
View file
Expand Up @@ -6,7 +6,7 @@
import org.rapidoid.gui.GUI;
import org.rapidoid.http.Req;
import org.rapidoid.http.Resp;
import org.rapidoid.http.customize.PageRenderer;
import org.rapidoid.http.customize.MasterPage;
import org.rapidoid.u.U;
import org.rapidoid.web.Screen;

Expand All @@ -33,10 +33,12 @@
*/

@Authors("Nikolche Mihajlovski")
@Since("5.1.0")
public class DefaultPageRenderer extends RapidoidThing implements PageRenderer {
@Since("5.2.0")
public class DefaultMasterPage extends RapidoidThing implements MasterPage {

private static final Pattern FULL_PAGE_PATTERN = Pattern.compile("(?s)^(?:\\s*(<!--(?:.*?)-->)*?)*?<(!DOCTYPE\\s+html|html)>");
private static final String FULL_PAGE_REGEX = "(?s)^(?:\\s*(<!--(?:.*?)-->)*?)*?<(!DOCTYPE\\s+html|html)>";

private static final Pattern FULL_PAGE_PATTERN = Pattern.compile(FULL_PAGE_REGEX);

@Override
public Object renderPage(Req req, Resp resp, String content) throws Exception {
Expand All @@ -51,7 +53,8 @@ public Object renderPage(Req req, Resp resp, String content) throws Exception {
}

private boolean isFullPage(Req req, String content) {
return (req.attr("_embedded", false) && content.startsWith("<!--EMBEDDED-->")) || FULL_PAGE_PATTERN.matcher(content).find();
return (req.attr("_embedded", false) && content.startsWith("<!--EMBEDDED-->"))
|| FULL_PAGE_PATTERN.matcher(content).find();
}

}
6 changes: 3 additions & 3 deletions rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/defaults/Defaults.java
View file
Expand Up @@ -49,7 +49,7 @@ public class Defaults extends RapidoidThing {

private static final RolesProvider rolesProvider = new DefaultRolesProvider();

private static final PageRenderer pageRenderer = new DefaultPageRenderer();
private static final MasterPage masterPage = new DefaultMasterPage();

private static final ViewRenderer viewRenderer = new DefaultViewRenderer();

Expand Down Expand Up @@ -93,8 +93,8 @@ public static RolesProvider rolesProvider() {
return rolesProvider;
}

public static PageRenderer pageRenderer() {
return pageRenderer;
public static MasterPage masterPage() {
return masterPage;
}

public static ViewRenderer viewRenderer() {
Expand Down
8 changes: 4 additions & 4 deletions rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/ResponseRenderer.java
View file
Expand Up @@ -29,7 +29,7 @@
import org.rapidoid.http.MediaType;
import org.rapidoid.http.Resp;
import org.rapidoid.http.customize.Customization;
import org.rapidoid.http.customize.PageRenderer;
import org.rapidoid.http.customize.MasterPage;
import org.rapidoid.http.customize.ViewRenderer;
import org.rapidoid.u.U;
import org.rapidoid.util.Msc;
Expand Down Expand Up @@ -108,11 +108,11 @@ public static String renderView(ReqImpl req, Resp resp, Object result) {

public static byte[] renderPage(ReqImpl req, Resp resp, String content) {

PageRenderer pageRenderer = Customization.of(req).pageRenderer();
U.must(pageRenderer != null, "A page renderer wasn't configured!");
MasterPage masterPage = Customization.of(req).masterPage();
U.must(masterPage != null, "A page renderer wasn't configured!");

try {
Object response = U.or(pageRenderer.renderPage(req, resp, content), "");
Object response = U.or(masterPage.renderPage(req, resp, content), "");
return HttpUtils.responseToBytes(req, response, MediaType.HTML_UTF_8, null);

} catch (Exception e) {
Expand Down
10 changes: 5 additions & 5 deletions rapidoid-http-fast/src/main/java/org/rapidoid/setup/My.java
View file
Expand Up @@ -44,7 +44,7 @@ public static void reset() {
GLOBAL.staticFilesPath(Defaults.staticFilesPath());
GLOBAL.errorHandler(Defaults.errorHandler());
GLOBAL.viewRenderer(Defaults.viewRenderer());
GLOBAL.pageRenderer(Defaults.pageRenderer());
GLOBAL.masterPage(Defaults.masterPage());
GLOBAL.jsonResponseRenderer(Defaults.jsonResponseRenderer());
GLOBAL.jsonRequestBodyParser(Defaults.jsonRequestBodyParser());
GLOBAL.beanParameterFactory(Defaults.beanParameterFactory());
Expand Down Expand Up @@ -113,8 +113,8 @@ public static void rolesProvider(RolesProvider rolesProvider) {
GLOBAL.rolesProvider(rolesProvider);
}

public static void pageRenderer(PageRenderer pageRenderer) {
GLOBAL.pageRenderer(pageRenderer);
public static void masterPage(MasterPage masterPage) {
GLOBAL.masterPage(masterPage);
}

public static void viewRenderer(ViewRenderer viewRenderer) {
Expand Down Expand Up @@ -149,8 +149,8 @@ public static RolesProvider rolesProvider() {
return GLOBAL.rolesProvider();
}

public static PageRenderer pageRenderer() {
return GLOBAL.pageRenderer();
public static MasterPage masterPage() {
return GLOBAL.masterPage();
}

public static ViewRenderer viewRenderer() {
Expand Down

0 comments on commit da9af70

Please sign in to comment.