From feb134227093a91ec7f60f8991d0f32d6eb6233c Mon Sep 17 00:00:00 2001 From: nmihajlovski Date: Thu, 7 Jul 2016 23:28:33 -0700 Subject: [PATCH] More consistent naming. --- .../http/customize/Customization.java | 18 ++++---- .../java/org/rapidoid/setup/Defaults.java | 42 +++++++++---------- .../src/main/java/org/rapidoid/setup/My.java | 18 ++++---- 3 files changed, 37 insertions(+), 41 deletions(-) diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/Customization.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/Customization.java index a681c66c97..728b9a4151 100644 --- a/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/Customization.java +++ b/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/Customization.java @@ -83,11 +83,11 @@ public void staticFilesPath(String... staticFilesPath) { } public String[] staticFilesPath() { - return U.or(staticFilesPath, My.getStaticFilesPath()); + return U.or(staticFilesPath, My.staticFilesPath()); } public ErrorHandler errorHandler() { - return U.or(errorHandler, My.getErrorHandler()); + return U.or(errorHandler, My.errorHandler()); } public void errorHandler(ErrorHandler errorHandler) { @@ -95,7 +95,7 @@ public void errorHandler(ErrorHandler errorHandler) { } public ViewRenderer viewRenderer() { - return U.or(viewRenderer, My.getViewRenderer()); + return U.or(viewRenderer, My.viewRenderer()); } public void viewRenderer(ViewRenderer viewRenderer) { @@ -103,7 +103,7 @@ public void viewRenderer(ViewRenderer viewRenderer) { } public JsonResponseRenderer jsonResponseRenderer() { - return U.or(jsonResponseRenderer, My.getJsonResponseRenderer()); + return U.or(jsonResponseRenderer, My.jsonResponseRenderer()); } public void jsonResponseRenderer(JsonResponseRenderer jsonResponseRenderer) { @@ -111,7 +111,7 @@ public void jsonResponseRenderer(JsonResponseRenderer jsonResponseRenderer) { } public BeanParameterFactory beanParameterFactory() { - return U.or(beanParameterFactory, My.getBeanParameterFactory()); + return U.or(beanParameterFactory, My.beanParameterFactory()); } public void beanParameterFactory(BeanParameterFactory beanParameterFactory) { @@ -127,7 +127,7 @@ public void jackson(ObjectMapper jackson) { } public LoginProvider loginProvider() { - return U.or(loginProvider, My.getLoginProvider()); + return U.or(loginProvider, My.loginProvider()); } public void loginProvider(LoginProvider loginProvider) { @@ -135,7 +135,7 @@ public void loginProvider(LoginProvider loginProvider) { } public RolesProvider rolesProvider() { - return U.or(rolesProvider, My.getRolesProvider()); + return U.or(rolesProvider, My.rolesProvider()); } public void rolesProvider(RolesProvider rolesProvider) { @@ -143,7 +143,7 @@ public void rolesProvider(RolesProvider rolesProvider) { } public PageRenderer pageRenderer() { - return U.or(pageRenderer, My.getPageRenderer()); + return U.or(pageRenderer, My.pageRenderer()); } public void pageRenderer(PageRenderer pageRenderer) { @@ -151,7 +151,7 @@ public void pageRenderer(PageRenderer pageRenderer) { } public BeanValidator validator() { - return U.or(validator, My.getValidator()); + return U.or(validator, My.validator()); } public ObjectMapper jackson() { diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/setup/Defaults.java b/rapidoid-http-fast/src/main/java/org/rapidoid/setup/Defaults.java index 4ce78159a8..c2262e657e 100644 --- a/rapidoid-http-fast/src/main/java/org/rapidoid/setup/Defaults.java +++ b/rapidoid-http-fast/src/main/java/org/rapidoid/setup/Defaults.java @@ -31,29 +31,25 @@ @Since("5.1.7") public class Defaults extends RapidoidThing { - private static final String[] staticFilesPath; - private static final ErrorHandler errorHandler; - private static final JsonResponseRenderer jsonResponseRenderer; - private static final BeanParameterFactory beanParameterFactory; - private static final BeanValidator validator; - private static final LoginProvider loginProvider; - private static final RolesProvider rolesProvider; - private static final PageRenderer pageRenderer; - private static final ViewRenderer viewRenderer; - private static final ObjectMapper jackson; - - static { - staticFilesPath = new String[]{"static", "public", "default/static", "default/public"}; - errorHandler = new DefaultErrorHandler(); - viewRenderer = new DefaultViewRenderer(); - pageRenderer = new DefaultPageRenderer(); - jsonResponseRenderer = new DefaultJsonResponseRenderer(); - beanParameterFactory = new DefaultBeanParameterFactory(); - loginProvider = new DefaultLoginProvider(); - rolesProvider = new DefaultRolesProvider(); - validator = new DefaultBeanValidator(); - jackson = JSON.newMapper(); - } + private static final String[] staticFilesPath = {"static", "public", "default/static", "default/public"}; + + private static final ErrorHandler errorHandler = new DefaultErrorHandler(); + + private static final JsonResponseRenderer jsonResponseRenderer = new DefaultJsonResponseRenderer(); + + private static final BeanParameterFactory beanParameterFactory = new DefaultBeanParameterFactory(); + + private static final BeanValidator validator = new DefaultBeanValidator(); + + private static final LoginProvider loginProvider = new DefaultLoginProvider(); + + private static final RolesProvider rolesProvider = new DefaultRolesProvider(); + + private static final PageRenderer pageRenderer = new DefaultPageRenderer(); + + private static final ViewRenderer viewRenderer = new DefaultViewRenderer(); + + private static final ObjectMapper jackson = JSON.newMapper(); public static String[] staticFilesPath() { return staticFilesPath; diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/setup/My.java b/rapidoid-http-fast/src/main/java/org/rapidoid/setup/My.java index 53be0e1f30..0c83883a5f 100644 --- a/rapidoid-http-fast/src/main/java/org/rapidoid/setup/My.java +++ b/rapidoid-http-fast/src/main/java/org/rapidoid/setup/My.java @@ -98,39 +98,39 @@ public static void jackson(ObjectMapper jackson) { My.jackson = jackson; } - public static String[] getStaticFilesPath() { + public static String[] staticFilesPath() { return staticFilesPath; } - public static ErrorHandler getErrorHandler() { + public static ErrorHandler errorHandler() { return errorHandler; } - public static JsonResponseRenderer getJsonResponseRenderer() { + public static JsonResponseRenderer jsonResponseRenderer() { return jsonResponseRenderer; } - public static BeanParameterFactory getBeanParameterFactory() { + public static BeanParameterFactory beanParameterFactory() { return beanParameterFactory; } - public static BeanValidator getValidator() { + public static BeanValidator validator() { return validator; } - public static LoginProvider getLoginProvider() { + public static LoginProvider loginProvider() { return loginProvider; } - public static RolesProvider getRolesProvider() { + public static RolesProvider rolesProvider() { return rolesProvider; } - public static PageRenderer getPageRenderer() { + public static PageRenderer pageRenderer() { return pageRenderer; } - public static ViewRenderer getViewRenderer() { + public static ViewRenderer viewRenderer() { return viewRenderer; }