From 5d020f68e364330b7e6f76b1aeaf50c18be99330 Mon Sep 17 00:00:00 2001
From: Sascha Herzinger <sascha.herzinger@uni.lu>
Date: Tue, 25 Jun 2019 08:56:55 +0200
Subject: [PATCH] privlegeType -> type

---
 .../model/security/ObjectPrivilege.java       |  8 ++++----
 .../mapviewer/model/security/Privilege.java   | 20 +++++++++----------
 .../mapviewer/api/users/UserRestImpl.java     |  8 ++++----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/model/src/main/java/lcsb/mapviewer/model/security/ObjectPrivilege.java b/model/src/main/java/lcsb/mapviewer/model/security/ObjectPrivilege.java
index 83ebc50abc..d2822e2fc4 100644
--- a/model/src/main/java/lcsb/mapviewer/model/security/ObjectPrivilege.java
+++ b/model/src/main/java/lcsb/mapviewer/model/security/ObjectPrivilege.java
@@ -32,7 +32,7 @@ public class ObjectPrivilege extends Privilege implements Serializable {
 
   @Override
   public String toString() {
-    return getPrivilegeType().name() + ":" + objectId.toString();
+    return getType().name() + ":" + objectId.toString();
   }
 
   @Override
@@ -44,16 +44,16 @@ public class ObjectPrivilege extends Privilege implements Serializable {
       return false;
     }
     ObjectPrivilege privilege = (ObjectPrivilege) obj;
-    return privilege.getPrivilegeType() == getPrivilegeType()
+    return privilege.getType() == getType()
         && Objects.equals(privilege.getObjectId(), objectId);
   }
 
   @Override
   public int hashCode() {
-    if (objectId == null || getPrivilegeType() == null) {
+    if (objectId == null || getType() == null) {
       return 0;
     }
-    return Objects.hash(objectId, getPrivilegeType());
+    return Objects.hash(objectId, getType());
   }
 
   public Integer getObjectId() {
diff --git a/model/src/main/java/lcsb/mapviewer/model/security/Privilege.java b/model/src/main/java/lcsb/mapviewer/model/security/Privilege.java
index 78e3612adf..fd61e31a18 100644
--- a/model/src/main/java/lcsb/mapviewer/model/security/Privilege.java
+++ b/model/src/main/java/lcsb/mapviewer/model/security/Privilege.java
@@ -17,18 +17,18 @@ public class Privilege implements Serializable {
   private int id;
 
   @Enumerated(EnumType.STRING)
-  private PrivilegeType privilegeType;
+  private PrivilegeType type;
 
   public Privilege() {
   }
 
-  public Privilege(PrivilegeType privilegeType) {
-    this.privilegeType = privilegeType;
+  public Privilege(PrivilegeType type) {
+    this.type = type;
   }
 
   @Override
   public String toString() {
-    return privilegeType.name();
+    return type.name();
   }
 
   @Override
@@ -40,12 +40,12 @@ public class Privilege implements Serializable {
       return false;
     }
     Privilege privilege = ((Privilege) obj);
-    return privilege.getPrivilegeType() == privilegeType;
+    return privilege.getType() == type;
   }
 
   @Override
   public int hashCode() {
-    return privilegeType.hashCode();
+    return type.hashCode();
   }
 
   public int getId() {
@@ -56,12 +56,12 @@ public class Privilege implements Serializable {
     this.id = id;
   }
 
-  public PrivilegeType getPrivilegeType() {
-    return privilegeType;
+  public PrivilegeType getType() {
+    return type;
   }
 
-  public void setPrivilegeType(PrivilegeType privilegeType) {
-    this.privilegeType = privilegeType;
+  public void setType(PrivilegeType type) {
+    this.type = type;
   }
 
 }
diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/users/UserRestImpl.java b/rest-api/src/main/java/lcsb/mapviewer/api/users/UserRestImpl.java
index d5fe3d6b03..a4fcabfb0d 100644
--- a/rest-api/src/main/java/lcsb/mapviewer/api/users/UserRestImpl.java
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/users/UserRestImpl.java
@@ -513,9 +513,9 @@ public class UserRestImpl extends BaseRestImpl {
     privileges.addAll(user.getPrivileges());
     for (Privilege privilege : privileges) {
       if (privilege instanceof ObjectPrivilege) {
-        if (Project.class.equals(privilege.getPrivilegeType().getPrivilegeObjectType())
+        if (Project.class.equals(privilege.getType().getPrivilegeObjectType())
             && ((ObjectPrivilege) privilege).getObjectId() == null) {
-          definedDefaultProjectPrivilegeTypes.add(privilege.getPrivilegeType());
+          definedDefaultProjectPrivilegeTypes.add(privilege.getType());
         }
         result.add(prepareObjectPrivilege((ObjectPrivilege) privilege));
       } else {
@@ -552,7 +552,7 @@ public class UserRestImpl extends BaseRestImpl {
 
   private Map<String, Object> prepareObjectPrivilege(ObjectPrivilege privilege) {
     Map<String, Object> result = new TreeMap<>();
-    result.put("privilegeType", privilege.getPrivilegeType());
+    result.put("privilegeType", privilege.getType());
     result.put("objectId", privilege.getObjectId());
     return result;
   }
@@ -560,7 +560,7 @@ public class UserRestImpl extends BaseRestImpl {
   private Map<String, Object> preparePrivilege(Privilege privilege) {
     Map<String, Object> result = new TreeMap<>();
     if (privilege.getClass().equals(Privilege.class)) {
-      result.put("privilegeType", privilege.getPrivilegeType());
+      result.put("privilegeType", privilege.getType());
       return result;
     } else {
       throw new InvalidArgumentException("Don't know how to handle class: " + privilege.getClass());
-- 
GitLab