Commit 81e98ebc by Tuomas Riihimäki

Remove superadmin setter and change it to immutable in jpa

1 parent 96d412c4
...@@ -5,7 +5,6 @@ import javax.ejb.LocalBean; ...@@ -5,7 +5,6 @@ import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import fi.codecrew.moya.facade.UserFacade; import fi.codecrew.moya.facade.UserFacade;
import fi.codecrew.moya.beans.BootstrapBeanLocal;
import fi.codecrew.moya.model.User; import fi.codecrew.moya.model.User;
@Stateless @Stateless
...@@ -23,7 +22,7 @@ public class BootstrapBean implements BootstrapBeanLocal { ...@@ -23,7 +22,7 @@ public class BootstrapBean implements BootstrapBeanLocal {
if (adminUser == null) { if (adminUser == null) {
adminUser = new User(); adminUser = new User();
adminUser.setLogin("admin"); adminUser.setLogin("admin");
adminUser.setSuperadmin(true); // adminUser.setSuperadmin(true);
adminUser.resetPassword("admin"); adminUser.resetPassword("admin");
userFacade.create(adminUser); userFacade.create(adminUser);
} }
......
...@@ -21,8 +21,6 @@ import fi.codecrew.moya.facade.CompoFacade; ...@@ -21,8 +21,6 @@ import fi.codecrew.moya.facade.CompoFacade;
import fi.codecrew.moya.facade.EventMapFacade; import fi.codecrew.moya.facade.EventMapFacade;
import fi.codecrew.moya.facade.PlaceFacade; import fi.codecrew.moya.facade.PlaceFacade;
import fi.codecrew.moya.facade.UserFacade; import fi.codecrew.moya.facade.UserFacade;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.TestDataBeanLocal;
import fi.codecrew.moya.model.Bill; import fi.codecrew.moya.model.Bill;
import fi.codecrew.moya.model.Compo; import fi.codecrew.moya.model.Compo;
import fi.codecrew.moya.model.CompoEntry; import fi.codecrew.moya.model.CompoEntry;
...@@ -143,7 +141,7 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -143,7 +141,7 @@ public class TestDataBean implements TestDataBeanLocal {
u.setTown("Adminila"); u.setTown("Adminila");
u.setPostalTown("Adminila "); u.setPostalTown("Adminila ");
u.setZip("6666"); u.setZip("6666");
u.setSuperadmin(true); // u.setSuperadmin(true);
userFacade.create(u); userFacade.create(u);
return u; return u;
......
...@@ -105,9 +105,6 @@ public class EventUser extends GenericEntity { ...@@ -105,9 +105,6 @@ public class EventUser extends GenericEntity {
@Column(name = "createtime", nullable = false, updatable = false) @Column(name = "createtime", nullable = false, updatable = false)
private Date eventuserCreated; private Date eventuserCreated;
public EventUser getCreator() { public EventUser getCreator() {
return creator; return creator;
} }
...@@ -393,10 +390,6 @@ public class EventUser extends GenericEntity { ...@@ -393,10 +390,6 @@ public class EventUser extends GenericEntity {
return user.checkPassword(plainPassword); return user.checkPassword(plainPassword);
} }
public void setSuperadmin(boolean superadmin) {
user.setSuperadmin(superadmin);
}
public boolean isSuperadmin() { public boolean isSuperadmin() {
return user.isSuperadmin(); return user.isSuperadmin();
} }
...@@ -446,5 +439,4 @@ public class EventUser extends GenericEntity { ...@@ -446,5 +439,4 @@ public class EventUser extends GenericEntity {
} }
} }
...@@ -92,8 +92,6 @@ public interface IUser { ...@@ -92,8 +92,6 @@ public interface IUser {
public abstract boolean checkPassword(String plainPassword); public abstract boolean checkPassword(String plainPassword);
public abstract void setSuperadmin(boolean superadmin);
public abstract boolean isSuperadmin(); public abstract boolean isSuperadmin();
public abstract void setPostalTown(String postalTown); public abstract void setPostalTown(String postalTown);
......
...@@ -103,7 +103,7 @@ public class User extends GenericEntity implements IUser { ...@@ -103,7 +103,7 @@ public class User extends GenericEntity implements IUser {
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Calendar confirmTime; private Calendar confirmTime;
@Column(name = "superadmin") @Column(name = "superadmin", updatable = false)
private boolean superadmin = false; private boolean superadmin = false;
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL) @OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
...@@ -310,11 +310,6 @@ public class User extends GenericEntity implements IUser { ...@@ -310,11 +310,6 @@ public class User extends GenericEntity implements IUser {
} }
@Override @Override
public void setSuperadmin(boolean superadmin) {
this.superadmin = superadmin;
}
@Override
public boolean isSuperadmin() { public boolean isSuperadmin() {
return superadmin; return superadmin;
} }
...@@ -360,9 +355,8 @@ public class User extends GenericEntity implements IUser { ...@@ -360,9 +355,8 @@ public class User extends GenericEntity implements IUser {
return isAnon; return isAnon;
} }
public List<LicenseCode> getLicenseCodes() { public List<LicenseCode> getLicenseCodes() {
if(licenseCodes == null) if (licenseCodes == null)
licenseCodes = new ArrayList<LicenseCode>(); licenseCodes = new ArrayList<LicenseCode>();
return licenseCodes; return licenseCodes;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!