Skip to content

Commit

Permalink
More consistent naming.
Browse files Browse the repository at this point in the history
  • Loading branch information
nmihajlovski committed Jul 8, 2016
1 parent b6ab29f commit feb1342
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 41 deletions.
Expand Up @@ -83,35 +83,35 @@ 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) {
this.errorHandler = errorHandler;
}

public ViewRenderer viewRenderer() {
return U.or(viewRenderer, My.getViewRenderer());
return U.or(viewRenderer, My.viewRenderer());
}

public void viewRenderer(ViewRenderer viewRenderer) {
this.viewRenderer = viewRenderer;
}

public JsonResponseRenderer jsonResponseRenderer() {
return U.or(jsonResponseRenderer, My.getJsonResponseRenderer());
return U.or(jsonResponseRenderer, My.jsonResponseRenderer());
}

public void jsonResponseRenderer(JsonResponseRenderer jsonResponseRenderer) {
this.jsonResponseRenderer = jsonResponseRenderer;
}

public BeanParameterFactory beanParameterFactory() {
return U.or(beanParameterFactory, My.getBeanParameterFactory());
return U.or(beanParameterFactory, My.beanParameterFactory());
}

public void beanParameterFactory(BeanParameterFactory beanParameterFactory) {
Expand All @@ -127,31 +127,31 @@ 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) {
this.loginProvider = loginProvider;
}

public RolesProvider rolesProvider() {
return U.or(rolesProvider, My.getRolesProvider());
return U.or(rolesProvider, My.rolesProvider());
}

public void rolesProvider(RolesProvider rolesProvider) {
this.rolesProvider = rolesProvider;
}

public PageRenderer pageRenderer() {
return U.or(pageRenderer, My.getPageRenderer());
return U.or(pageRenderer, My.pageRenderer());
}

public void pageRenderer(PageRenderer pageRenderer) {
this.pageRenderer = pageRenderer;
}

public BeanValidator validator() {
return U.or(validator, My.getValidator());
return U.or(validator, My.validator());
}

public ObjectMapper jackson() {
Expand Down
42 changes: 19 additions & 23 deletions rapidoid-http-fast/src/main/java/org/rapidoid/setup/Defaults.java
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions rapidoid-http-fast/src/main/java/org/rapidoid/setup/My.java
Expand Up @@ -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;
}

Expand Down

0 comments on commit feb1342

Please sign in to comment.