Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply formatter

Browse Source
This commit is contained in:
Athou
2013-07-25 09:17:33 +02:00
parent 02f1090fe7
commit 8845c54d0c
82 changed files with 626 additions and 1116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/commafeed/frontend/pages/BasePage.java
View File

@@ -79,15 +79,12 @@ public abstract class BasePage extends WebPage {
if (user != null) {
UserSettings settings = userSettingsDAO.findByUser(user);
if (settings != null) {
lang = settings.getLanguage() == null ? "en" : settings
.getLanguage();
theme = settings.getTheme() == null ? "default" : settings
.getTheme();
lang = settings.getLanguage() == null ? "en" : settings.getLanguage();
theme = settings.getTheme() == null ? "default" : settings.getTheme();
}
}
add(new TransparentWebMarkupContainer("html").setMarkupId(
"theme-" + theme).add(new AttributeModifier("lang", lang)));
add(new TransparentWebMarkupContainer("html").setMarkupId("theme-" + theme).add(new AttributeModifier("lang", lang)));
settings = applicationSettingsService.get();
add(new HeaderResponseContainer("footer-container", "footer-container"));
@@ -107,8 +104,7 @@ public abstract class BasePage extends WebPage {
if (getApplication().getConfigurationType() == RuntimeConfigurationType.DEPLOYMENT) {
long startupTime = startupBean.getStartupTime();
String suffix = "?" + startupTime;
response.render(JavaScriptHeaderItem.forUrl("static/all.js"
+ suffix));
response.render(JavaScriptHeaderItem.forUrl("static/all.js" + suffix));
response.render(CssHeaderItem.forUrl("static/all.css" + suffix));
} else {
response.render(JavaScriptHeaderItem.forUrl("wro/lib.js"));

3
src/main/java/com/commafeed/frontend/pages/DemoLoginPage.java
View File

@@ -16,8 +16,7 @@ public class DemoLoginPage extends WebPage {
UserService userService;
public DemoLoginPage() {
CommaFeedSession.get().authenticate(StartupBean.USERNAME_DEMO,
StartupBean.USERNAME_DEMO);
CommaFeedSession.get().authenticate(StartupBean.USERNAME_DEMO, StartupBean.USERNAME_DEMO);
setResponsePage(getApplication().getHomePage());
}
}

16
src/main/java/com/commafeed/frontend/pages/GoogleImportCallbackPage.java
View File

@@ -55,8 +55,7 @@ public class GoogleImportCallbackPage extends WebPage {
if (request.getQueryString() != null) {
urlBuffer.append('?').append(request.getQueryString());
}
AuthorizationCodeResponseUrl responseUrl = new AuthorizationCodeResponseUrl(
urlBuffer.toString());
AuthorizationCodeResponseUrl responseUrl = new AuthorizationCodeResponseUrl(urlBuffer.toString());
String code = responseUrl.getCode();
if (responseUrl.getError() != null) {
@@ -73,8 +72,8 @@ public class GoogleImportCallbackPage extends WebPage {
HttpTransport httpTransport = new NetHttpTransport();
JacksonFactory jsonFactory = new JacksonFactory();
AuthorizationCodeTokenRequest tokenRequest = new AuthorizationCodeTokenRequest(
httpTransport, jsonFactory, new GenericUrl(TOKEN_URL), code);
AuthorizationCodeTokenRequest tokenRequest = new AuthorizationCodeTokenRequest(httpTransport, jsonFactory, new GenericUrl(
TOKEN_URL), code);
tokenRequest.setRedirectUri(redirectUri);
tokenRequest.put("client_id", clientId);
tokenRequest.put("client_secret", clientSecret);
@@ -87,16 +86,13 @@ public class GoogleImportCallbackPage extends WebPage {
TokenResponse tokenResponse = tokenRequest.execute();
String accessToken = tokenResponse.getAccessToken();
HttpRequest httpRequest = httpTransport.createRequestFactory()
.buildGetRequest(new GenericUrl(EXPORT_URL));
BearerToken.authorizationHeaderAccessMethod().intercept(
httpRequest, accessToken);
HttpRequest httpRequest = httpTransport.createRequestFactory().buildGetRequest(new GenericUrl(EXPORT_URL));
BearerToken.authorizationHeaderAccessMethod().intercept(httpRequest, accessToken);
String opml = httpRequest.execute().parseAsString();
User user = CommaFeedSession.get().getUser();
if (user != null) {
if (StartupBean.USERNAME_DEMO.equals(user.getName())) {
throw new DisplayException(
"Import is disabled for the demo account");
throw new DisplayException("Import is disabled for the demo account");
}
importer.importOpml(CommaFeedSession.get().getUser(), opml);
}

3
src/main/java/com/commafeed/frontend/pages/GoogleImportRedirectPage.java
View File

@@ -15,8 +15,7 @@ import com.commafeed.backend.services.ApplicationSettingsService;
@SuppressWarnings("serial")
public class GoogleImportRedirectPage extends WebPage {
private static Logger log = Logger
.getLogger(GoogleImportRedirectPage.class);
private static Logger log = Logger.getLogger(GoogleImportRedirectPage.class);
private static final String SCOPE = "https://www.google.com/reader/subscriptions/export email profile";
private static final String AUTH_URL = "https://accounts.google.com/o/oauth2/auth";

18
src/main/java/com/commafeed/frontend/pages/HomePage.java
View File

@@ -18,16 +18,12 @@ public class HomePage extends BasePage {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(CssHeaderItem.forReference(
new UserCustomCssReference() {
@Override
protected String getCss() {
UserSettings settings = userSettingsDAO
.findByUser(CommaFeedSession.get().getUser());
return settings == null ? null : settings
.getCustomCss();
}
}, new PageParameters().add("_t", System.currentTimeMillis()),
null));
response.render(CssHeaderItem.forReference(new UserCustomCssReference() {
@Override
protected String getCss() {
UserSettings settings = userSettingsDAO.findByUser(CommaFeedSession.get().getUser());
return settings == null ? null : settings.getCustomCss();
}
}, new PageParameters().add("_t", System.currentTimeMillis()), null));
}
}

18
src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
View File

@@ -52,21 +52,15 @@ public class NextUnreadRedirectPage extends WebPage {
}
List<FeedEntryStatus> statuses = null;
if (StringUtils.isBlank(categoryId)
|| CategoryREST.ALL.equals(categoryId)) {
if (StringUtils.isBlank(categoryId) || CategoryREST.ALL.equals(categoryId)) {
List<FeedSubscription> subs = feedSubscriptionDAO.findAll(user);
statuses = feedEntryStatusDAO.findBySubscriptions(subs, true, null,
null, 0, 1, order, true);
statuses = feedEntryStatusDAO.findBySubscriptions(subs, true, null, null, 0, 1, order, true);
} else {
FeedCategory category = feedCategoryDAO.findById(user,
Long.valueOf(categoryId));
FeedCategory category = feedCategoryDAO.findById(user, Long.valueOf(categoryId));
if (category != null) {
List<FeedCategory> children = feedCategoryDAO
.findAllChildrenCategories(user, category);
List<FeedSubscription> subscriptions = feedSubscriptionDAO
.findByCategories(user, children);
statuses = feedEntryStatusDAO.findBySubscriptions(
subscriptions, true, null, null, 0, 1, order, true);
List<FeedCategory> children = feedCategoryDAO.findAllChildrenCategories(user, category);
List<FeedSubscription> subscriptions = feedSubscriptionDAO.findByCategories(user, children);
statuses = feedEntryStatusDAO.findBySubscriptions(subscriptions, true, null, null, 0, 1, order, true);
}
}

15
src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.java
View File

@@ -40,12 +40,10 @@ public class PasswordRecoveryCallbackPage extends BasePage {
if (user == null) {
throw new DisplayException("email not found");
}
if (user.getRecoverPasswordToken() == null
|| !user.getRecoverPasswordToken().equals(token)) {
if (user.getRecoverPasswordToken() == null || !user.getRecoverPasswordToken().equals(token)) {
throw new DisplayException("invalid token");
}
if (user.getRecoverPasswordTokenDate().before(
DateUtils.addDays(new Date(), -2))) {
if (user.getRecoverPasswordTokenDate().before(DateUtils.addDays(new Date(), -2))) {
throw new DisplayException("token expired");
}
@@ -57,8 +55,7 @@ public class PasswordRecoveryCallbackPage extends BasePage {
protected void onSubmit() {
String passwd = password.getObject();
if (StringUtils.equals(passwd, confirm.getObject())) {
byte[] password = encryptionService.getEncryptedPassword(
passwd, user.getSalt());
byte[] password = encryptionService.getEncryptedPassword(passwd, user.getSalt());
user.setPassword(password);
user.setApiKey(userService.generateApiKey(user));
user.setRecoverPasswordToken(null);
@@ -71,10 +68,8 @@ public class PasswordRecoveryCallbackPage extends BasePage {
}
};
add(form);
form.add(new PasswordTextField("password", password).setResetPassword(
true).add(StringValidator.minimumLength(6)));
form.add(new PasswordTextField("confirm", confirm).setResetPassword(
true).add(StringValidator.minimumLength(6)));
form.add(new PasswordTextField("password", password).setResetPassword(true).add(StringValidator.minimumLength(6)));
form.add(new PasswordTextField("confirm", confirm).setResetPassword(true).add(StringValidator.minimumLength(6)));
form.add(new BookmarkablePageLink<Void>("cancel", HomePage.class));

21
src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java
View File

@@ -21,8 +21,7 @@ import com.commafeed.frontend.pages.components.BootstrapFeedbackPanel;
@SuppressWarnings("serial")
public class PasswordRecoveryPage extends BasePage {
private static Logger log = LoggerFactory
.getLogger(PasswordRecoveryPage.class);
private static Logger log = LoggerFactory.getLogger(PasswordRecoveryPage.class);
public PasswordRecoveryPage() {
@@ -37,12 +36,10 @@ public class PasswordRecoveryPage extends BasePage {
error("Email not found.");
} else {
try {
user.setRecoverPasswordToken(DigestUtils.sha1Hex(UUID
.randomUUID().toString()));
user.setRecoverPasswordToken(DigestUtils.sha1Hex(UUID.randomUUID().toString()));
user.setRecoverPasswordTokenDate(new Date());
userDAO.saveOrUpdate(user);
mailService.sendMail(user, "Password recovery",
buildEmailContent(user));
mailService.sendMail(user, "Password recovery", buildEmailContent(user));
info("Email sent.");
} catch (Exception e) {
log.error(e.getMessage(), e);
@@ -67,9 +64,7 @@ public class PasswordRecoveryPage extends BasePage {
private String buildEmailContent(User user) throws Exception {
String publicUrl = FeedUtils
.removeTrailingSlash(applicationSettingsService.get()
.getPublicUrl());
String publicUrl = FeedUtils.removeTrailingSlash(applicationSettingsService.get().getPublicUrl());
publicUrl += "/recover2";
return String
@@ -78,11 +73,7 @@ public class PasswordRecoveryPage extends BasePage {
}
private String callbackUrl(User user, String publicUrl) throws Exception {
return new URIBuilder(publicUrl)
.addParameter(PasswordRecoveryCallbackPage.PARAM_EMAIL,
user.getEmail())
.addParameter(PasswordRecoveryCallbackPage.PARAM_TOKEN,
user.getRecoverPasswordToken()).build().toURL()
.toString();
return new URIBuilder(publicUrl).addParameter(PasswordRecoveryCallbackPage.PARAM_EMAIL, user.getEmail())
.addParameter(PasswordRecoveryCallbackPage.PARAM_TOKEN, user.getRecoverPasswordToken()).build().toURL().toString();
}
}

3
src/main/java/com/commafeed/frontend/pages/TestRssPage.java
View File

@@ -53,8 +53,7 @@ public class TestRssPage extends WebPage {
} catch (InterruptedException e) {
// do nothing
}
getRequestCycle().scheduleRequestHandlerAfterCurrent(
new TextRequestHandler("text/xml", "UTF-8", writer.toString()));
getRequestCycle().scheduleRequestHandlerAfterCurrent(new TextRequestHandler("text/xml", "UTF-8", writer.toString()));
}
}

6
src/main/java/com/commafeed/frontend/pages/WelcomePage.java
View File

@@ -15,16 +15,14 @@ public class WelcomePage extends BasePage {
ApplicationSettingsService applicationSettingsService;
public WelcomePage() {
add(new BookmarkablePageLink<Void>("logo-link", getApplication()
.getHomePage()));
add(new BookmarkablePageLink<Void>("logo-link", getApplication().getHomePage()));
add(new BookmarkablePageLink<Void>("demo-login", DemoLoginPage.class));
add(new LoginPanel("login"));
add(new RegisterPanel("register") {
@Override
protected void onConfigure() {
super.onConfigure();
setVisibilityAllowed(applicationSettingsService.get()
.isAllowRegistrations());
setVisibilityAllowed(applicationSettingsService.get().isAllowRegistrations());
}
});
}

6
src/main/java/com/commafeed/frontend/pages/components/LoginPanel.java
View File

@@ -19,11 +19,9 @@ public class LoginPanel extends SignInPanel {
public LoginPanel(String id) {
super(id);
replace(new BootstrapFeedbackPanel("feedback",
new ContainerFeedbackMessageFilter(this)));
replace(new BootstrapFeedbackPanel("feedback", new ContainerFeedbackMessageFilter(this)));
Form<?> form = (Form<?>) get("signInForm");
form.add(new BookmarkablePageLink<Void>("recover",
PasswordRecoveryPage.class){
form.add(new BookmarkablePageLink<Void>("recover", PasswordRecoveryPage.class) {
@Override
protected void onConfigure() {
super.onConfigure();

69
src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java
View File

@@ -45,62 +45,51 @@ public class RegisterPanel extends Panel {
IModel<RegistrationRequest> model = Model.of(new RegistrationRequest());
Form<RegistrationRequest> form = new StatelessForm<RegistrationRequest>(
"form", model) {
Form<RegistrationRequest> form = new StatelessForm<RegistrationRequest>("form", model) {
@Override
protected void onSubmit() {
if (applicationSettingsService.get().isAllowRegistrations()) {
RegistrationRequest req = getModelObject();
userService.register(req.getName(), req.getPassword(),
req.getEmail(), Arrays.asList(Role.USER));
userService.register(req.getName(), req.getPassword(), req.getEmail(), Arrays.asList(Role.USER));
IAuthenticationStrategy strategy = getApplication()
.getSecuritySettings().getAuthenticationStrategy();
IAuthenticationStrategy strategy = getApplication().getSecuritySettings().getAuthenticationStrategy();
strategy.save(req.getName(), req.getPassword());
CommaFeedSession.get().signIn(req.getName(),
req.getPassword());
CommaFeedSession.get().signIn(req.getName(), req.getPassword());
}
setResponsePage(getApplication().getHomePage());
}
};
add(form);
add(new BootstrapFeedbackPanel("feedback",
new ContainerFeedbackMessageFilter(form)));
add(new BootstrapFeedbackPanel("feedback", new ContainerFeedbackMessageFilter(form)));
RegistrationRequest p = MF.p(RegistrationRequest.class);
form.add(new RequiredTextField<String>("name", MF.m(model, p.getName()))
.add(StringValidator.lengthBetween(3, 32)).add(
new IValidator<String>() {
@Override
public void validate(
IValidatable<String> validatable) {
String name = validatable.getValue();
User user = userDAO.findByName(name);
if (user != null) {
validatable.error(new ValidationError(
"Name is already taken."));
}
}
}));
form.add(new PasswordTextField("password", MF.m(model, p.getPassword()))
.setResetPassword(false).add(StringValidator.minimumLength(6)));
form.add(new RequiredTextField<String>("email", MF.m(model,
p.getEmail())) {
form.add(new RequiredTextField<String>("name", MF.m(model, p.getName())).add(StringValidator.lengthBetween(3, 32)).add(
new IValidator<String>() {
@Override
public void validate(IValidatable<String> validatable) {
String name = validatable.getValue();
User user = userDAO.findByName(name);
if (user != null) {
validatable.error(new ValidationError("Name is already taken."));
}
}
}));
form.add(new PasswordTextField("password", MF.m(model, p.getPassword())).setResetPassword(false).add(
StringValidator.minimumLength(6)));
form.add(new RequiredTextField<String>("email", MF.m(model, p.getEmail())) {
@Override
protected String getInputType() {
return "email";
}
}.add(RfcCompliantEmailAddressValidator.getInstance()).add(
new IValidator<String>() {
@Override
public void validate(IValidatable<String> validatable) {
String email = validatable.getValue();
User user = userDAO.findByEmail(email);
if (user != null) {
validatable.error(new ValidationError(
"Email is already taken."));
}
}
}));
}.add(RfcCompliantEmailAddressValidator.getInstance()).add(new IValidator<String>() {
@Override
public void validate(IValidatable<String> validatable) {
String email = validatable.getValue();
User user = userDAO.findByEmail(email);
if (user != null) {
validatable.error(new ValidationError("Email is already taken."));
}
}
}));
}
}