Refactorings

atlanhq · Feb 14, 2024 · e5121f5 · e5121f5
1 parent 1ae5fd5
commit e5121f5
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 332 deletions.
diff --git a/auth-common/src/main/java/org/apache/atlas/plugin/model/NewAccessResourceImpl.java b/auth-common/src/main/java/org/apache/atlas/plugin/model/NewAccessResourceImpl.java
diff --git a/auth-common/src/main/java/org/apache/atlas/plugin/model/RangerPolicy.java b/auth-common/src/main/java/org/apache/atlas/plugin/model/RangerPolicy.java
@@ -85,8 +85,6 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
     private String                            zoneName;
     private Boolean                           isDenyAllElse;
     private Map<String, String> 			  attributes;
-    private String 			                  policyFilterCriteria;
-    private String 			                  policyResourceCategory;
 
     public RangerPolicy() {
         this(null, null, null, null, null, null, null, null, null, null, null);
@@ -140,8 +138,6 @@ public RangerPolicy(String service, String name, String policyType, Integer poli
         setZoneName(zoneName);
         setConditions(conditions);
         setIsDenyAllElse(isDenyAllElse);
-        setPolicyFilterCriteria(null);
-        setPolicyResourceCategory(null);
 
     }
 
@@ -172,8 +168,6 @@ public void updateFrom(RangerPolicy other) {
         setPolicyLabels(other.getPolicyLabels());
         setZoneName(other.getZoneName());
         setIsDenyAllElse(other.getIsDenyAllElse());
-        setPolicyFilterCriteria(other.getPolicyFilterCriteria());
-        setPolicyResourceCategory(other.getPolicyResourceCategory());
     }
 
     public Map<String, String> getAttributes() {
@@ -540,22 +534,6 @@ public void setIsDenyAllElse(Boolean isDenyAllElse) {
         this.isDenyAllElse = isDenyAllElse == null ? Boolean.FALSE : isDenyAllElse;
     }
 
-    public String getPolicyFilterCriteria() {
-        return policyFilterCriteria;
-    }
-
-    public void setPolicyFilterCriteria(String policyFilterCriteria) {
-        this.policyFilterCriteria = policyFilterCriteria;
-    }
-
-    public String getPolicyResourceCategory() {
-        return policyResourceCategory;
-    }
-
-    public void setPolicyResourceCategory(String policyResourceCategory) {
-        this.policyResourceCategory = policyResourceCategory;
-    }
-
     @Override
     public String toString( ) {
         StringBuilder sb = new StringBuilder();
@@ -689,10 +667,6 @@ public StringBuilder toString(StringBuilder sb) {
         }
         sb.append(", zoneName=").append(zoneName);
 
-        sb.append(", policyFilterCriteria=").append(policyFilterCriteria);
-
-        sb.append(", policyResourceCategory=").append(policyResourceCategory);
-
         sb.append(", isDenyAllElse={").append(isDenyAllElse).append("} ");
 
         sb.append("}");

diff --git a/repository/src/main/java/org/apache/atlas/authorizer/authorizers/AuthorizerCommon.java b/repository/src/main/java/org/apache/atlas/authorizer/authorizers/AuthorizerCommon.java
@@ -1,12 +1,7 @@
 package org.apache.atlas.authorizer.authorizers;
 
-import org.apache.atlas.exception.AtlasBaseException;
-import org.apache.atlas.model.instance.AtlasEntity;
-import org.apache.atlas.model.instance.AtlasEntityHeader;
 import org.apache.atlas.repository.graphdb.AtlasGraph;
-import org.apache.atlas.repository.graphdb.AtlasVertex;
 import org.apache.atlas.repository.store.graph.v2.EntityGraphRetriever;
-import org.apache.atlas.type.AtlasEntityType;
 import org.apache.atlas.type.AtlasTypeRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,12 +10,9 @@
 import org.springframework.stereotype.Component;
 
 import javax.inject.Inject;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 @Component
 public class AuthorizerCommon {
@@ -55,18 +47,4 @@ public static Map<String, Object> getMap(String key, Object value) {
         map.put(key, value);
         return map;
     }
-
-    public static AtlasEntityType getEntityTypeByName(String typeName) {
-        return typeRegistry.getEntityTypeByName(typeName);
-    }
-
-    public static AtlasEntity toAtlasEntityHeaderWithClassifications(String guid) throws AtlasBaseException {
-        //return new AtlasEntity(entityRetriever.toAtlasEntityHeaderWithClassifications(guid));
-        return new AtlasEntity(entityRetriever.toAtlasEntity(guid));
-    }
-
-    public static AtlasEntity toAtlasEntityHeaderWithClassifications(AtlasVertex vertex) throws AtlasBaseException {
-        //return new AtlasEntity(entityRetriever.toAtlasEntityHeaderWithClassifications(vertex));
-        return new AtlasEntity(entityRetriever.toAtlasEntity(vertex));
-    }
 }