Skip to content

Rename tables #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Sep 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/dataSources.local.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@
value = {"rowCreatedAt", "rowUpdatedAt"},
allowGetters = true
)
//@ToString
@Getter
@Setter
//@EqualsAndHashCode(callSuper=false)
public class AuditModel extends Object implements Serializable {

private static final long serialVersionUID = 4399373914714726911L;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;
import org.woehlke.java.simpleworklist.domain.search.SearchService;
import org.woehlke.java.simpleworklist.domain.db.search.service.SearchService;


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextStartedEvent;
import org.springframework.stereotype.Component;
import org.woehlke.java.simpleworklist.domain.search.SearchService;
import org.woehlke.java.simpleworklist.domain.db.search.service.SearchService;

import org.springframework.beans.factory.annotation.Autowired;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.woehlke.java.simpleworklist.domain.user.access.ApplicationUserDetailsService;
import org.woehlke.java.simpleworklist.domain.security.access.ApplicationUserDetailsService;


@Configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,33 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.SessionAttributes;
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
import org.woehlke.java.simpleworklist.domain.breadcrumb.BreadcrumbService;
import org.woehlke.java.simpleworklist.domain.db.data.Project;
import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectService;
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.BreadcrumbService;
import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
import org.woehlke.java.simpleworklist.domain.context.Context;
import org.woehlke.java.simpleworklist.domain.project.Project;
import org.woehlke.java.simpleworklist.domain.task.Task;
import org.woehlke.java.simpleworklist.domain.task.TaskService;
import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
import org.woehlke.java.simpleworklist.domain.task.TaskTime;
import org.woehlke.java.simpleworklist.domain.context.ContextService;
import org.woehlke.java.simpleworklist.domain.project.ProjectService;
import org.woehlke.java.simpleworklist.domain.chat.ChatMessageService;
import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService;
import org.woehlke.java.simpleworklist.domain.db.data.Context;
import org.woehlke.java.simpleworklist.domain.db.data.Task;
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
import org.woehlke.java.simpleworklist.domain.db.data.context.ContextService;
import org.woehlke.java.simpleworklist.domain.db.user.chat.ChatMessageService;
import org.woehlke.java.simpleworklist.domain.db.user.account.UserAccountService;

import org.springframework.beans.factory.annotation.Autowired;
import org.woehlke.java.simpleworklist.domain.user.access.UserAuthorizationService;
import org.woehlke.java.simpleworklist.domain.user.login.UserAccountLoginSuccessService;
import org.woehlke.java.simpleworklist.domain.security.access.UserAuthorizationService;
import org.woehlke.java.simpleworklist.domain.security.login.LoginSuccessService;

import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;

import static java.util.Locale.GERMAN;
import static org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState.*;
import static org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState.*;

/**
* Created by tw on 14.02.16.
Expand All @@ -57,7 +57,7 @@ public abstract class AbstractController {
protected ChatMessageService chatMessageService;

@Autowired
protected UserAccountLoginSuccessService userAccountLoginSuccessService;
protected LoginSuccessService loginSuccessService;

@Autowired
protected ContextService contextService;
Expand Down Expand Up @@ -150,7 +150,7 @@ public final boolean refreshMessagePage(){
}

protected UserAccount getUser() {
return this.userAccountLoginSuccessService.retrieveCurrentUser();
return this.loginSuccessService.retrieveCurrentUser();
}

protected Context getContext(@NotNull final UserSessionBean userSession){
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.woehlke.java.simpleworklist.domain;
package org.woehlke.java.simpleworklist.domain.db;

import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
Expand All @@ -7,9 +7,10 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.woehlke.java.simpleworklist.domain.context.Context;
import org.woehlke.java.simpleworklist.domain.context.ContextService;
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
import org.woehlke.java.simpleworklist.domain.AbstractController;
import org.woehlke.java.simpleworklist.domain.db.data.Context;
import org.woehlke.java.simpleworklist.domain.db.data.context.ContextService;
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;

import org.springframework.beans.factory.annotation.Autowired;

Expand Down
Loading