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

major classes refactoring

Browse Source
This commit is contained in:
Athou
2013-04-11 20:49:08 +02:00
parent 54ebf7b9db
commit 5b5ad242e0
31 changed files with 380 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,14 +5,14 @@ import javax.inject.Inject;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebPage;
import com.commafeed.backend.dao.FeedCategoryService;
import com.commafeed.backend.dao.FeedEntryService;
import com.commafeed.backend.dao.FeedEntryStatusService;
import com.commafeed.backend.dao.FeedService;
import com.commafeed.backend.dao.FeedSubscriptionService;
import com.commafeed.backend.dao.UserRoleService;
import com.commafeed.backend.dao.UserService;
import com.commafeed.backend.dao.UserSettingsService;
import com.commafeed.backend.dao.FeedCategoryDAO;
import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.dao.FeedEntryDAO;
import com.commafeed.backend.dao.FeedEntryStatusDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO;
import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.dao.UserRoleDAO;
import com.commafeed.backend.dao.UserSettingsDAO;
import de.agilecoders.wicket.Bootstrap;
@@ -20,28 +20,28 @@ import de.agilecoders.wicket.Bootstrap;
public class BasePage extends WebPage {
@Inject
protected FeedService feedService;
protected FeedDAO feedDAO;
@Inject
protected FeedSubscriptionService feedSubscriptionService;
protected FeedSubscriptionDAO feedSubscriptionDAO;
@Inject
protected FeedCategoryService feedCategoryService;
protected FeedCategoryDAO feedCategoryDAO;
@Inject
protected FeedEntryService feedEntryService;
protected FeedEntryDAO feedEntryDAO;
@Inject
protected FeedEntryStatusService feedEntryStatusService;
protected FeedEntryStatusDAO feedEntryStatusDAO;
@Inject
protected UserService userService;
protected UserDAO userDAO;
@Inject
protected UserSettingsService userSettingsService;
protected UserSettingsDAO userSettingsDAO;
@Inject
protected UserRoleService userRoleService;
protected UserRoleDAO userRoleDAO;
@Override
public void renderHead(IHeaderResponse response) {

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

@@ -10,8 +10,8 @@ import org.apache.wicket.request.UrlRenderer;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.commafeed.backend.dao.ApplicationSettingsService;
import com.commafeed.backend.dao.UserService;
import com.commafeed.backend.dao.ApplicationSettingsDAO;
import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.feeds.OPMLImporter;
import com.commafeed.backend.model.ApplicationSettings;
import com.commafeed.frontend.utils.WicketUtils;
@@ -33,13 +33,13 @@ public class GoogleImportCallbackPage extends WebPage {
private static final String EXPORT_URL = "https://www.google.com/reader/subscriptions/export";
@Inject
ApplicationSettingsService applicationSettingsService;
ApplicationSettingsDAO applicationSettingsDAO;
@Inject
OPMLImporter importer;
@Inject
UserService userService;
UserDAO userDAO;
public static String getCallbackUrl() {
RequestCycle cycle = RequestCycle.get();
@@ -65,7 +65,7 @@ public class GoogleImportCallbackPage extends WebPage {
} else if (code == null) {
throw new DisplayException("Missing authorization code");
} else {
ApplicationSettings settings = applicationSettingsService.get();
ApplicationSettings settings = applicationSettingsDAO.get();
String redirectUri = getCallbackUrl();
String clientId = settings.getGoogleClientId();
String clientSecret = settings.getGoogleClientSecret();
@@ -90,7 +90,7 @@ public class GoogleImportCallbackPage extends WebPage {
httpRequest, accessToken);
String opml = httpRequest.execute().parseAsString();
String state = responseUrl.getState();
importer.importOpml(userService.findById(Long.valueOf(state)),
importer.importOpml(userDAO.findById(Long.valueOf(state)),
opml);
} catch (Exception e) {
throw new DisplayException(e);

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

@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.flow.RedirectToUrlException;
import org.jboss.logging.Logger;
import com.commafeed.backend.dao.ApplicationSettingsService;
import com.commafeed.backend.dao.ApplicationSettingsDAO;
import com.commafeed.backend.model.ApplicationSettings;
import com.commafeed.frontend.CommaFeedSession;
@@ -23,11 +23,11 @@ public class GoogleImportRedirectPage extends WebPage {
private static final String AUTH_URL = "https://accounts.google.com/o/oauth2/auth";
@Inject
ApplicationSettingsService applicationSettingsService;
ApplicationSettingsDAO applicationSettingsDAO;
public GoogleImportRedirectPage() {
ApplicationSettings settings = applicationSettingsService.get();
ApplicationSettings settings = applicationSettingsDAO.get();
String clientId = settings.getGoogleClientId();

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

@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.commafeed.backend.dao.UserSettingsService;
import com.commafeed.backend.dao.UserSettingsDAO;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.model.UserSettings;
import com.commafeed.frontend.CommaFeedSession;
@@ -34,7 +34,7 @@ import de.agilecoders.wicket.markup.html.bootstrap.extensions.icon.OpenWebIconsC
public class HomePage extends BasePage {
@Inject
UserSettingsService settingsService;
UserSettingsDAO userSettingsDAO;
@Override
public void renderHead(IHeaderResponse response) {
@@ -67,7 +67,7 @@ public class HomePage extends BasePage {
new UserCustomCssReference() {
@Override
protected String getCss() {
UserSettings settings = settingsService
UserSettings settings = userSettingsDAO
.findByUser(CommaFeedSession.get().getUser());
return settings == null ? null : settings
.getCustomCss();

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

@@ -4,7 +4,7 @@ import javax.inject.Inject;
import org.apache.wicket.markup.head.IHeaderResponse;
import com.commafeed.backend.dao.ApplicationSettingsService;
import com.commafeed.backend.dao.ApplicationSettingsDAO;
import com.commafeed.frontend.pages.components.LoginPanel;
import com.commafeed.frontend.pages.components.RegisterPanel;
import com.commafeed.frontend.utils.WicketUtils;
@@ -13,7 +13,7 @@ import com.commafeed.frontend.utils.WicketUtils;
public class WelcomePage extends BasePage {
@Inject
ApplicationSettingsService applicationSettingsService;
ApplicationSettingsDAO applicationSettingsDAO;
public WelcomePage() {
add(new LoginPanel("login"));
@@ -21,7 +21,7 @@ public class WelcomePage extends BasePage {
@Override
protected void onConfigure() {
super.onConfigure();
setVisibilityAllowed(applicationSettingsService.get()
setVisibilityAllowed(applicationSettingsDAO.get()
.isAllowRegistrations());
}
});

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

@@ -20,10 +20,11 @@ import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
import org.apache.wicket.validation.validator.StringValidator;
import com.commafeed.backend.dao.ApplicationSettingsService;
import com.commafeed.backend.dao.UserService;
import com.commafeed.backend.dao.ApplicationSettingsDAO;
import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.services.UserService;
import com.commafeed.frontend.CommaFeedSession;
import com.commafeed.frontend.model.RegistrationRequest;
import com.commafeed.frontend.pages.GoogleImportRedirectPage;
@@ -32,11 +33,14 @@ import com.commafeed.frontend.utils.ModelFactory.MF;
@SuppressWarnings("serial")
public class RegisterPanel extends Panel {
@Inject
UserDAO userDAO;
@Inject
UserService userService;
@Inject
ApplicationSettingsService applicationSettingsService;
ApplicationSettingsDAO applicationSettingsDAO;
public RegisterPanel(String markupId) {
super(markupId);
@@ -47,7 +51,7 @@ public class RegisterPanel extends Panel {
"form", model) {
@Override
protected void onSubmit() {
if (applicationSettingsService.get().isAllowRegistrations()) {
if (applicationSettingsDAO.get().isAllowRegistrations()) {
RegistrationRequest req = getModelObject();
userService.register(req.getName(), req.getPassword(),
Arrays.asList(Role.USER));
@@ -79,7 +83,7 @@ public class RegisterPanel extends Panel {
public void validate(
IValidatable<String> validatable) {
String name = validatable.getValue();
User user = userService.findByName(name);
User user = userDAO.findByName(name);
if (user != null) {
validatable.error(new ValidationError(
"Name is already taken."));