Fix "serviceMame" Domain column not present in business logic

qa/common/src/main/java/org/eclipse/kapua/qa/common/TestDomain.java

@@ -30,6 +30,7 @@ public class TestDomain extends AbstractKapuaEntity implements Domain, org.eclip
     private static final long serialVersionUID = 3782336558657796495L;
 
     private String name = "test";
+    private String serviceName = "test";
     private Set<Actions> actions = new HashSet<>(Lists.newArrayList(Actions.read, Actions.delete, Actions.write));
     private boolean groupable;
 
@@ -44,11 +45,22 @@ public void setName(String name) {
         this.name = name;
     }
 
+    @Override
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
     @Override
     public String getName() {
         return name;
     }
 
+    @Override
+    public String getServiceName() {
+        return serviceName;
+    }
+
+
     @Override
     public void setActions(Set<Actions> actions) {
         this.actions = actions;

qa/common/src/main/java/org/eclipse/kapua/qa/common/cucumber/CucDomain.java

@@ -20,9 +20,19 @@
 public class CucDomain {
 
     private String name;
+    private String serviceName;
     private String actions;
     private Set<Actions> actionSet;
 
+    public CucDomain(String name, String serviceName, String actions) {
+        this.name = name;
+        this.serviceName = serviceName;
+        if (this.serviceName == null) {
+            this.serviceName= "test";
+        }
+        this.actions = actions;
+    }
+
     public void doParse() {
         if (this.actions != null) {
             String[] tmpList = this.actions.split(",");
@@ -58,6 +68,18 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
+    public void setActionSet(Set<Actions> actionSet) {
+        this.actionSet = actionSet;
+    }
+
     public String getActions() {
         return this.actions;
     }

service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/domain/Domain.java

@@ -58,6 +58,8 @@ default String getType() {
      */
     void setName(String name);
 
+    void setServiceName(String serviceName);
+
     /**
      * Gets the {@link Domain} name.
      *
@@ -67,6 +69,8 @@ default String getType() {
     @XmlElement(name = "name")
     String getName();
 
+    String getServiceName();
+
     /**
      * Sets the set of {@link Actions} available in this {@link Domain}.<br>
      * It up to the implementation class to make a clone of the set or use the given set.

service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/domain/DomainCreator.java

@@ -34,6 +34,8 @@ public interface DomainCreator extends KapuaEntityCreator<Domain> { // org.eclip
 
     String getName();
 
+    String getServiceName();
+
     Set<Actions> getActions();
 
     boolean getGroupable();
@@ -46,6 +48,8 @@ public interface DomainCreator extends KapuaEntityCreator<Domain> { // org.eclip
      */
     void setName(String name);
 
+    void setServiceName(String serviceName);
+
     /**
      * Sets the set of {@link Actions} available in the {@link Domain}.<br>
      * It up to the implementation class to make a clone of the set or use the given set.

service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainCreatorImpl.java

@@ -30,6 +30,8 @@ public class DomainCreatorImpl extends AbstractKapuaEntityCreator<Domain> implem
     private static final long serialVersionUID = -4676187845961673421L;
 
     private String name;
+
+    private String serviceName;
     private Set<Actions> actions;
     private boolean groupable;
 
@@ -50,11 +52,20 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
     @Override
     public String getName() {
         return name;
     }
 
+    @Override
+    public String getServiceName() {
+        return serviceName;
+    }
+
     @Override
     public Set<Actions> getActions() {
         return actions;

service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainImpl.java

@@ -44,6 +44,10 @@ public class DomainImpl extends AbstractKapuaEntity implements Domain {
     @Column(name = "name", nullable = false, updatable = false)
     private String name;
 
+    @Basic
+    @Column(name = "serviceName", nullable = false, updatable = false)
+    private String serviceName;
+
     @ElementCollection
     @CollectionTable(name = "athz_domain_actions", joinColumns = @JoinColumn(name = "domain_id", referencedColumnName = "id"))
     @Column(name = "action", nullable = false)
@@ -92,11 +96,21 @@ public void setName(String name) {
         this.name = name;
     }
 
+    @Override
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
     @Override
     public String getName() {
         return name;
     }
 
+    @Override
+    public String getServiceName() {
+        return this.serviceName;
+    }
+
     @Override
     public Set<Actions> getActions() {
         return actions;

service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainRegistryServiceImpl.java

@@ -59,10 +59,14 @@ public Domain create(DomainCreator domainCreator)
         ArgumentValidator.notNull(domainCreator, "domainCreator");
         ArgumentValidator.notEmptyOrNull(domainCreator.getName(), "domainCreator.name");
         ArgumentValidator.notNull(domainCreator.getActions(), "domainCreator.actions");
-
-        //
+        ArgumentValidator.notEmptyOrNull(domainCreator.getServiceName(), "domainCreator.serviceName");
         // Check Access
         authorizationService.checkPermission(permissionFactory.newPermission(AuthorizationDomains.DOMAIN_DOMAIN, Actions.write, null));
+        Domain domain = new DomainImpl();
+
+        domain.setName(domainCreator.getName());
+        domain.setServiceName(domainCreator.getServiceName());
+        domain.setGroupable(domainCreator.getGroupable());
 
         return entityManagerSession.doTransactedAction(em -> DomainDAO.create(em, domainCreator));
     }

service/security/test-steps/src/main/java/org/eclipse/kapua/service/authorization/steps/AuthorizationServiceSteps.java

@@ -765,6 +765,7 @@ public void createAListOfDomains(List<CucDomain> domains)
             if (tmpDom.getActionSet() != null) {
                 domainCreator.setActions(tmpDom.getActionSet());
             }
+            domainCreator.setServiceName(tmpDom.getServiceName());
             stepData.put(DOMAIN_CREATOR, domainCreator);
 
             try {
@@ -909,6 +910,7 @@ public void checkDomainComparison()
 
         KapuaSecurityUtils.doPrivileged(() -> {
             DomainCreator tmpCreator = domainFactory.newCreator("name_1");
+            tmpCreator.setServiceName("test");
             HashSet<Actions> tmpAct = new HashSet<>();
             tmpAct.add(Actions.read);
             tmpAct.add(Actions.write);