jomu/shared
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 7 Activity

fixed injection issue when using WF14

Browse Source
This commit is contained in:
Joern Muehlencord
2018-11-19 13:45:22 +01:00
parent 4d69e8e70a
commit 1e3d2986c5
5 changed files with 420 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account-ui/pom.xml
View File

@ -40,7 +40,7 @@
<dependency> <dependency>
<groupId>org.omnifaces</groupId> <groupId>org.omnifaces</groupId>
<artifactId>omnifaces</artifactId> <artifactId>omnifaces</artifactId>
<version>2.7</version> <version>3.2</version>
</dependency> </dependency>
<!-- Apache Shiro, Security API --> <!-- Apache Shiro, Security API -->
<dependency> <dependency>

2
account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationRoleNameValidator.java
View File

@ -28,7 +28,7 @@ public class UniqueApplicationRoleNameValidator implements Validator, Serializab
@AccountPU @AccountPU
EntityManager em; EntityManager em;
@EJB @Inject
ApplicationRoleControl applicationRoleControl; ApplicationRoleControl applicationRoleControl;
@Override @Override

4
account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationValidator.java
View File

@ -3,13 +3,13 @@ package de.muehlencord.shared.account.web.presentation;
import de.muehlencord.shared.account.business.application.boundary.ApplicationService; import de.muehlencord.shared.account.business.application.boundary.ApplicationService;
import de.muehlencord.shared.account.business.application.entity.ApplicationEntity; import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
import java.io.Serializable; import java.io.Serializable;
import javax.ejb.EJB;
import javax.faces.application.FacesMessage; import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent; import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.faces.validator.FacesValidator; import javax.faces.validator.FacesValidator;
import javax.faces.validator.Validator; import javax.faces.validator.Validator;
import javax.faces.validator.ValidatorException; import javax.faces.validator.ValidatorException;
import javax.inject.Inject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -23,7 +23,7 @@ public class UniqueApplicationValidator implements Validator, Serializable {
private static final long serialVersionUID = 2526409681909574670L; private static final long serialVersionUID = 2526409681909574670L;
private static final Logger LOGGER = LoggerFactory.getLogger(UniqueApplicationValidator.class); private static final Logger LOGGER = LoggerFactory.getLogger(UniqueApplicationValidator.class);
@EJB @Inject
ApplicationService applicationService; ApplicationService applicationService;
@Override @Override

3
account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniquePermissionNameValidator.java
View File

@ -5,7 +5,6 @@ import de.muehlencord.shared.account.business.application.control.ApplicationPer
import de.muehlencord.shared.account.business.application.entity.ApplicationEntity; import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
import de.muehlencord.shared.account.util.AccountPU; import de.muehlencord.shared.account.util.AccountPU;
import java.io.Serializable; import java.io.Serializable;
import javax.ejb.EJB;
import javax.faces.application.FacesMessage; import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent; import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
@ -31,7 +30,7 @@ public class UniquePermissionNameValidator implements Validator, Serializable {
@AccountPU @AccountPU
EntityManager em; EntityManager em;
@EJB @Inject
ApplicationPermissionControl applicationPermissionControl; ApplicationPermissionControl applicationPermissionControl;
@Override @Override

1
account/src/main/java/de/muehlencord/shared/account/business/application/control/ApplicationRoleControl.java
View File

@ -74,6 +74,7 @@ public class ApplicationRoleControl implements Serializable {
em.merge(role); em.merge(role);
} }
@Transactional
public void delete(ApplicationRoleEntity role) throws AccountException { public void delete(ApplicationRoleEntity role) throws AccountException {
ApplicationRoleEntity existingRole = attach(role); ApplicationRoleEntity existingRole = attach(role);
em.remove(existingRole); em.remove(existingRole);