Refactor HivePrivilegeInfo

Extracted-From: prestodb/presto#10904
trinodb · Jan 29, 2019 · de9890c · de9890c
1 parent c603474
commit de9890c
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/HivePrivilegeInfo.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/HivePrivilegeInfo.java
@@ -34,13 +34,14 @@
 import static io.prestosql.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege.SELECT;
 import static io.prestosql.plugin.hive.metastore.HivePrivilegeInfo.HivePrivilege.UPDATE;
 import static java.util.Locale.ENGLISH;
+import static java.util.Objects.requireNonNull;
 
 @Immutable
 public class HivePrivilegeInfo
 {
     public enum HivePrivilege
     {
-        SELECT, INSERT, UPDATE, DELETE, OWNERSHIP;
+        SELECT, INSERT, UPDATE, DELETE, OWNERSHIP
     }
 
     private final HivePrivilege hivePrivilege;
@@ -51,7 +52,7 @@ public HivePrivilegeInfo(
             @JsonProperty("hivePrivilege") HivePrivilege hivePrivilege,
             @JsonProperty("grantOption") boolean grantOption)
     {
-        this.hivePrivilege = hivePrivilege;
+        this.hivePrivilege = requireNonNull(hivePrivilege, "hivePrivilege is null");
         this.grantOption = grantOption;
     }
 
@@ -67,20 +68,15 @@ public boolean isGrantOption()
         return grantOption;
     }
 
-    public HivePrivilegeInfo withGrantOption(boolean grantOption)
-    {
-        return new HivePrivilegeInfo(hivePrivilege, grantOption);
-    }
-
     public static Set<HivePrivilegeInfo> parsePrivilege(PrivilegeGrantInfo userGrant)
     {
         boolean withGrantOption = userGrant.isGrantOption();
         String name = userGrant.getPrivilege().toUpperCase(ENGLISH);
         switch (name) {
             case "ALL":
-                return Arrays.asList(HivePrivilege.values()).stream()
+                return ImmutableSet.copyOf(Arrays.stream(HivePrivilege.values())
                         .map(hivePrivilege -> new HivePrivilegeInfo(hivePrivilege, withGrantOption))
-                        .collect(Collectors.toSet());
+                        .collect(Collectors.toSet()));
             case "SELECT":
                 return ImmutableSet.of(new HivePrivilegeInfo(SELECT, withGrantOption));
             case "INSERT":
@@ -91,8 +87,9 @@ public static Set<HivePrivilegeInfo> parsePrivilege(PrivilegeGrantInfo userGrant
                 return ImmutableSet.of(new HivePrivilegeInfo(DELETE, withGrantOption));
             case "OWNERSHIP":
                 return ImmutableSet.of(new HivePrivilegeInfo(OWNERSHIP, withGrantOption));
+            default:
+                throw new IllegalArgumentException("Unsupported privilege name: " + name);
         }
-        return ImmutableSet.of();
     }
 
     public static HivePrivilege toHivePrivilege(Privilege privilege)
@@ -120,7 +117,7 @@ public boolean isContainedIn(HivePrivilegeInfo hivePrivilegeInfo)
 
     public Set<PrivilegeInfo> toPrivilegeInfo()
     {
-        switch (getHivePrivilege()) {
+        switch (hivePrivilege) {
             case SELECT:
                 return ImmutableSet.of(new PrivilegeInfo(Privilege.SELECT, isGrantOption()));
             case INSERT:
@@ -130,11 +127,12 @@ public Set<PrivilegeInfo> toPrivilegeInfo()
             case UPDATE:
                 return ImmutableSet.of(new PrivilegeInfo(Privilege.UPDATE, isGrantOption()));
             case OWNERSHIP:
-                return Arrays.asList(Privilege.values()).stream()
+                return ImmutableSet.copyOf(Arrays.stream(Privilege.values())
                         .map(privilege -> new PrivilegeInfo(privilege, Boolean.TRUE))
-                        .collect(Collectors.toSet());
+                        .collect(Collectors.toSet()));
+            default:
+                throw new IllegalArgumentException("Unsupported hivePrivilege: " + hivePrivilege);
         }
-        return null;
     }
 
     @Override