You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2016/09/28 09:32:54 UTC
[01/19] incubator-ranger git commit: HBaseClient refactor
Repository: incubator-ranger
Updated Branches:
refs/heads/master f2c3040a0 -> eb21ea6af
HBaseClient refactor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/5359e376
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/5359e376
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/5359e376
Branch: refs/heads/master
Commit: 5359e376b9c56ca62174722b47ad68cd77b13b73
Parents: f2c3040
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Sep 28 10:18:11 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Sep 28 10:18:11 2016 +0100
----------------------------------------------------------------------
.../services/hbase/client/HBaseClient.java | 322 +++++++++----------
1 file changed, 159 insertions(+), 163 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/5359e376/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java
index 0e980b9..1c9a57e 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java
@@ -17,7 +17,7 @@
* under the License.
*/
- package org.apache.ranger.services.hbase.client;
+package org.apache.ranger.services.hbase.client;
import java.io.IOException;
import java.security.PrivilegedAction;
@@ -42,52 +42,49 @@ import com.google.protobuf.ServiceException;
public class HBaseClient extends BaseClient {
- private static final Log LOG = LogFactory.getLog(HBaseClient.class) ;
+ private static final Log LOG = LogFactory.getLog(HBaseClient.class);
private static Subject subj = null;
- private Configuration conf;
-
- private static List<String> rangerInternalPropertyKeys = Arrays.asList("username",
- "password", "keytabfile");
+ private Configuration conf;
public HBaseClient(String serivceName,Map<String,String> connectionProp) {
- super(serivceName, addDefaultHBaseProp(connectionProp)) ;
- conf = HBaseConfiguration.create() ;
+ super(serivceName, addDefaultHBaseProp(connectionProp));
+ conf = HBaseConfiguration.create();
- Set<String> rangerInternalPropertyKeys = getConfigHolder().getRangerInternalPropertyKeys();
- for (Map.Entry<String, String> entry: connectionProperties.entrySet()) {
- String key = entry.getKey();
- String value = entry.getValue();
- if (!rangerInternalPropertyKeys.contains(key)) {
- conf.set(key, value);
- }
- }
+ Set<String> rangerInternalPropertyKeys = getConfigHolder().getRangerInternalPropertyKeys();
+ for (Map.Entry<String, String> entry: connectionProperties.entrySet()) {
+ String key = entry.getKey();
+ String value = entry.getValue();
+ if (!rangerInternalPropertyKeys.contains(key)) {
+ conf.set(key, value);
+ }
+ }
}
-
+
//TODO: temporary solution - to be added to the UI for HBase
private static Map<String,String> addDefaultHBaseProp(Map<String,String> connectionProp) {
if (connectionProp != null) {
- String param = "zookeeper.znode.parent" ;
- String unsecuredPath = "/hbase-unsecure" ;
- String authParam = "hadoop.security.authorization" ;
-
- String ret = connectionProp.get(param) ;
+ String param = "zookeeper.znode.parent";
+ String unsecuredPath = "/hbase-unsecure";
+ String authParam = "hadoop.security.authorization";
+
+ String ret = connectionProp.get(param);
LOG.info("HBase connection has [" + param + "] with value [" + ret + "]");
if (ret == null) {
- ret = connectionProp.get(authParam) ;
+ ret = connectionProp.get(authParam);
LOG.info("HBase connection has [" + authParam + "] with value [" + ret + "]");
if (ret != null && ret.trim().equalsIgnoreCase("false")) {
LOG.info("HBase connection is resetting [" + param + "] with value [" + unsecuredPath + "]");
- connectionProp.put(param, unsecuredPath) ;
+ connectionProp.put(param, unsecuredPath);
}
}
}
return connectionProp;
}
-
+
public static HashMap<String, Object> connectionTest (String dataSource,
Map<String, String> configs) throws Exception {
@@ -97,8 +94,7 @@ public class HBaseClient extends BaseClient {
+ "resource names. Check ranger_admin.log for more info.";
boolean connectivityStatus = false;
- HBaseClient connectionObj = new HBaseClient(dataSource,
- configs);
+ HBaseClient connectionObj = new HBaseClient(dataSource, configs);
if (connectionObj != null) {
try {
connectivityStatus = connectionObj.getHBaseStatus();
@@ -107,7 +103,7 @@ public class HBaseClient extends BaseClient {
throw e;
}
}
-
+
if (connectivityStatus) {
String successMsg = "ConnectionTest Successful";
generateResponseDataMap(connectivityStatus, successMsg, successMsg,
@@ -119,7 +115,7 @@ public class HBaseClient extends BaseClient {
}
return responseData;
}
-
+
public boolean getHBaseStatus() throws HadoopException{
boolean hbaseStatus = false;
subj = getLoginSubject();
@@ -134,13 +130,13 @@ public class HBaseClient extends BaseClient {
public Boolean run() {
Boolean hbaseStatus1 = false;
try {
- LOG.info("getHBaseStatus: creating default Hbase configuration");
+ LOG.info("getHBaseStatus: creating default Hbase configuration");
LOG.info("getHBaseStatus: setting config values from client");
setClientConfigValues(conf);
- LOG.info("getHBaseStatus: checking HbaseAvailability with the new config");
+ LOG.info("getHBaseStatus: checking HbaseAvailability with the new config");
HBaseAdmin.checkHBaseAvailable(conf);
- LOG.info("getHBaseStatus: no exception: HbaseAvailability true");
+ LOG.info("getHBaseStatus: no exception: HbaseAvailability true");
hbaseStatus1 = true;
} catch (ZooKeeperConnectionException zce) {
String msgDesc = "getHBaseStatus: Unable to connect to `ZooKeeper` "
@@ -148,10 +144,10 @@ public class HBaseClient extends BaseClient {
HadoopException hdpException = new HadoopException(msgDesc, zce);
hdpException.generateResponseDataMap(false, getMessage(zce),
msgDesc + errMsg, null, null);
-
- LOG.error(msgDesc + zce) ;
+
+ LOG.error(msgDesc + zce);
throw hdpException;
-
+
} catch (MasterNotRunningException mnre) {
String msgDesc = "getHBaseStatus: Looks like `Master` is not running, "
+ "so couldn't check that running HBase is available or not, "
@@ -161,7 +157,7 @@ public class HBaseClient extends BaseClient {
hdpException.generateResponseDataMap(false,
getMessage(mnre), msgDesc + errMsg,
null, null);
- LOG.error(msgDesc + mnre) ;
+ LOG.error(msgDesc + mnre);
throw hdpException;
} catch (ServiceException se) {
@@ -172,17 +168,17 @@ public class HBaseClient extends BaseClient {
msgDesc + errMsg, null, null);
LOG.error(msgDesc + se);
throw hdpException;
-
+
} catch(IOException io) {
String msgDesc = "getHBaseStatus: Unable to check availability of"
+ " Hbase environment [" + getConfigHolder().getDatasourceName() + "].";
HadoopException hdpException = new HadoopException(msgDesc, io);
hdpException.generateResponseDataMap(false, getMessage(io),
msgDesc + errMsg, null, null);
- LOG.error(msgDesc + io) ;
+ LOG.error(msgDesc + io);
throw hdpException;
-
- } catch (Throwable e) {
+
+ } catch (Throwable e) {
String msgDesc = "getHBaseStatus: Unable to check availability of"
+ " Hbase environment [" + getConfigHolder().getDatasourceName() + "].";
LOG.error(msgDesc + e);
@@ -194,25 +190,27 @@ public class HBaseClient extends BaseClient {
}
return hbaseStatus1;
}
- }) ;
+ });
} catch (SecurityException se) {
String msgDesc = "getHBaseStatus: Unable to connect to HBase Server instance ";
HadoopException hdpException = new HadoopException(msgDesc, se);
hdpException.generateResponseDataMap(false, getMessage(se),
msgDesc + errMsg, null, null);
- LOG.error(msgDesc + se) ;
+ LOG.error(msgDesc + se);
throw hdpException;
}
} else {
LOG.error("getHBaseStatus: secure login not done, subject is null");
}
-
+
return hbaseStatus;
}
-
+
private void setClientConfigValues(Configuration conf) {
- if (this.connectionProperties == null) return;
- Iterator<Entry<String, String>> i = this.connectionProperties.entrySet().iterator();
+ if (this.connectionProperties == null) {
+ return;
+ }
+ Iterator<Entry<String, String>> i = this.connectionProperties.entrySet().iterator();
while (i.hasNext()) {
Entry<String, String> e = i.next();
String v = conf.get(e.getKey());
@@ -227,112 +225,111 @@ public class HBaseClient extends BaseClient {
LOG.debug("==> HbaseClient.getTableList() tableNameMatching " + tableNameMatching + " ExisitingTableList " + existingTableList);
}
- List<String> ret = null ;
+ List<String> ret = null;
final String errMsg = " You can still save the repository and start creating "
+ "policies, but you would not be able to use autocomplete for "
+ "resource names. Check ranger_admin.log for more info.";
-
+
subj = getLoginSubject();
-
+
if (subj != null) {
- ret = Subject.doAs(subj, new PrivilegedAction<List<String>>() {
-
- @Override
- public List<String> run() {
-
- List<String> tableList = new ArrayList<String>() ;
- HBaseAdmin admin = null ;
- try {
- LOG.info("getTableList: setting config values from client");
- setClientConfigValues(conf);
- LOG.info("getTableList: checking HbaseAvailability with the new config");
- HBaseAdmin.checkHBaseAvailable(conf);
- LOG.info("getTableList: no exception: HbaseAvailability true");
- admin = new HBaseAdmin(conf) ;
- HTableDescriptor [] htds = admin.listTables(tableNameMatching);
- if (htds != null) {
- for (HTableDescriptor htd : admin.listTables(tableNameMatching)) {
- String tableName = htd.getNameAsString();
- if (existingTableList != null && existingTableList.contains(tableName)) {
- continue;
- } else {
- tableList.add(htd.getNameAsString());
- }
- }
- } else {
- LOG.error("getTableList: null HTableDescription received from HBaseAdmin.listTables");
- }
- } catch (ZooKeeperConnectionException zce) {
- String msgDesc = "getTableList: Unable to connect to `ZooKeeper` "
- + "using given config parameters.";
- HadoopException hdpException = new HadoopException(msgDesc, zce);
- hdpException.generateResponseDataMap(false, getMessage(zce),
- msgDesc + errMsg, null, null);
- LOG.error(msgDesc + zce) ;
- throw hdpException;
-
- } catch (MasterNotRunningException mnre) {
- String msgDesc = "getTableList: Looks like `Master` is not running, "
- + "so couldn't check that running HBase is available or not, "
- + "Please try again later.";
- HadoopException hdpException = new HadoopException(
- msgDesc, mnre);
- hdpException.generateResponseDataMap(false,
- getMessage(mnre), msgDesc + errMsg,
- null, null);
- LOG.error(msgDesc + mnre) ;
- throw hdpException;
+ ret = Subject.doAs(subj, new PrivilegedAction<List<String>>() {
- } catch(IOException io) {
- String msgDesc = "getTableList: Unable to get HBase table List for [repository:"
- + getConfigHolder().getDatasourceName() + ",table-match:"
- + tableNameMatching + "].";
- HadoopException hdpException = new HadoopException(msgDesc, io);
- hdpException.generateResponseDataMap(false, getMessage(io),
- msgDesc + errMsg, null, null);
- LOG.error(msgDesc + io) ;
- throw hdpException;
- } catch (Throwable e) {
- String msgDesc = "getTableList : Unable to get HBase table List for [repository:"
- + getConfigHolder().getDatasourceName() + ",table-match:"
- + tableNameMatching + "].";
- LOG.error(msgDesc + e);
- HadoopException hdpException = new HadoopException(msgDesc, e);
- hdpException.generateResponseDataMap(false, getMessage(e),
- msgDesc + errMsg, null, null);
- throw hdpException;
- }
- finally {
- if (admin != null) {
- try {
- admin.close() ;
- } catch (IOException e) {
- LOG.error("Unable to close HBase connection [" + getConfigHolder().getDatasourceName() + "]", e);
+ @Override
+ public List<String> run() {
+
+ List<String> tableList = new ArrayList<String>();
+ HBaseAdmin admin = null;
+ try {
+ LOG.info("getTableList: setting config values from client");
+ setClientConfigValues(conf);
+ LOG.info("getTableList: checking HbaseAvailability with the new config");
+ HBaseAdmin.checkHBaseAvailable(conf);
+ LOG.info("getTableList: no exception: HbaseAvailability true");
+ admin = new HBaseAdmin(conf);
+ HTableDescriptor [] htds = admin.listTables(tableNameMatching);
+ if (htds != null) {
+ for (HTableDescriptor htd : admin.listTables(tableNameMatching)) {
+ String tableName = htd.getNameAsString();
+ if (existingTableList != null && existingTableList.contains(tableName)) {
+ continue;
+ } else {
+ tableList.add(htd.getNameAsString());
}
}
+ } else {
+ LOG.error("getTableList: null HTableDescription received from HBaseAdmin.listTables");
+ }
+ } catch (ZooKeeperConnectionException zce) {
+ String msgDesc = "getTableList: Unable to connect to `ZooKeeper` "
+ + "using given config parameters.";
+ HadoopException hdpException = new HadoopException(msgDesc, zce);
+ hdpException.generateResponseDataMap(false, getMessage(zce),
+ msgDesc + errMsg, null, null);
+ LOG.error(msgDesc + zce);
+ throw hdpException;
+
+ } catch (MasterNotRunningException mnre) {
+ String msgDesc = "getTableList: Looks like `Master` is not running, "
+ + "so couldn't check that running HBase is available or not, "
+ + "Please try again later.";
+ HadoopException hdpException = new HadoopException(
+ msgDesc, mnre);
+ hdpException.generateResponseDataMap(false,
+ getMessage(mnre), msgDesc + errMsg,
+ null, null);
+ LOG.error(msgDesc + mnre);
+ throw hdpException;
+
+ } catch(IOException io) {
+ String msgDesc = "getTableList: Unable to get HBase table List for [repository:"
+ + getConfigHolder().getDatasourceName() + ",table-match:"
+ + tableNameMatching + "].";
+ HadoopException hdpException = new HadoopException(msgDesc, io);
+ hdpException.generateResponseDataMap(false, getMessage(io),
+ msgDesc + errMsg, null, null);
+ LOG.error(msgDesc + io);
+ throw hdpException;
+ } catch (Throwable e) {
+ String msgDesc = "getTableList : Unable to get HBase table List for [repository:"
+ + getConfigHolder().getDatasourceName() + ",table-match:"
+ + tableNameMatching + "].";
+ LOG.error(msgDesc + e);
+ HadoopException hdpException = new HadoopException(msgDesc, e);
+ hdpException.generateResponseDataMap(false, getMessage(e),
+ msgDesc + errMsg, null, null);
+ throw hdpException;
+ } finally {
+ if (admin != null) {
+ try {
+ admin.close();
+ } catch (IOException e) {
+ LOG.error("Unable to close HBase connection [" + getConfigHolder().getDatasourceName() + "]", e);
+ }
}
- return tableList ;
}
-
- }) ;
+ return tableList;
+ }
+
+ });
}
if (LOG.isDebugEnabled()) {
LOG.debug("<== HbaseClient.getTableList() " + ret);
}
- return ret ;
+ return ret;
}
-
-
+
+
public List<String> getColumnFamilyList(final String columnFamilyMatching, final List<String> tableList,final List<String> existingColumnFamilies) {
if (LOG.isDebugEnabled()) {
LOG.debug("==> HbaseClient.getColumnFamilyList() columnFamilyMatching " + columnFamilyMatching + " ExisitingTableList " + tableList + "existingColumnFamilies " + existingColumnFamilies);
}
- List<String> ret = null ;
+ List<String> ret = null;
final String errMsg = " You can still save the repository and start creating "
+ "policies, but you would not be able to use autocomplete for "
+ "resource names. Check ranger_admin.log for more info.";
-
+
subj = getLoginSubject();
if (subj != null) {
try {
@@ -341,43 +338,43 @@ public class HBaseClient extends BaseClient {
String tblName = null;
@Override
public List<String> run() {
- List<String> colfList = new ArrayList<String>() ;
- HBaseAdmin admin = null ;
+ List<String> colfList = new ArrayList<String>();
+ HBaseAdmin admin = null;
try {
LOG.info("getColumnFamilyList: setting config values from client");
setClientConfigValues(conf);
- LOG.info("getColumnFamilyList: checking HbaseAvailability with the new config");
+ LOG.info("getColumnFamilyList: checking HbaseAvailability with the new config");
HBaseAdmin.checkHBaseAvailable(conf);
- LOG.info("getColumnFamilyList: no exception: HbaseAvailability true");
- admin = new HBaseAdmin(conf) ;
+ LOG.info("getColumnFamilyList: no exception: HbaseAvailability true");
+ admin = new HBaseAdmin(conf);
if (tableList != null) {
for (String tableName: tableList) {
tblName = tableName;
- HTableDescriptor htd = admin.getTableDescriptor(tblName.getBytes()) ;
+ HTableDescriptor htd = admin.getTableDescriptor(tblName.getBytes());
if (htd != null) {
for (HColumnDescriptor hcd : htd.getColumnFamilies()) {
- String colf = hcd.getNameAsString() ;
+ String colf = hcd.getNameAsString();
if (colf.matches(columnFamilyMatching)) {
- if (existingColumnFamilies != null && existingColumnFamilies.contains(colf)) {
+ if (existingColumnFamilies != null && existingColumnFamilies.contains(colf)) {
continue;
} else {
colfList.add(colf);
}
-
+
}
}
}
}
}
- } catch (ZooKeeperConnectionException zce) {
+ } catch (ZooKeeperConnectionException zce) {
String msgDesc = "getColumnFamilyList: Unable to connect to `ZooKeeper` "
+ "using given config parameters.";
HadoopException hdpException = new HadoopException(msgDesc, zce);
hdpException.generateResponseDataMap(false, getMessage(zce),
msgDesc + errMsg, null, null);
- LOG.error(msgDesc + zce) ;
+ LOG.error(msgDesc + zce);
throw hdpException;
-
+
} catch (MasterNotRunningException mnre) {
String msgDesc = "getColumnFamilyList: Looks like `Master` is not running, "
+ "so couldn't check that running HBase is available or not, "
@@ -387,29 +384,29 @@ public class HBaseClient extends BaseClient {
hdpException.generateResponseDataMap(false,
getMessage(mnre), msgDesc + errMsg,
null, null);
- LOG.error(msgDesc + mnre) ;
+ LOG.error(msgDesc + mnre);
throw hdpException;
- } catch(IOException io) {
+ } catch(IOException io) {
String msgDesc = "getColumnFamilyList: Unable to get HBase ColumnFamilyList for "
+ "[repository:" +getConfigHolder().getDatasourceName() + ",table:" + tblName
+ ", table-match:" + columnFamilyMatching + "] ";
HadoopException hdpException = new HadoopException(msgDesc, io);
hdpException.generateResponseDataMap(false, getMessage(io),
msgDesc + errMsg, null, null);
- LOG.error(msgDesc + io) ;
+ LOG.error(msgDesc + io);
throw hdpException;
} catch (SecurityException se) {
- String msgDesc = "getColumnFamilyList: Unable to get HBase ColumnFamilyList for "
- + "[repository:" +getConfigHolder().getDatasourceName() + ",table:" + tblName
- + ", table-match:" + columnFamilyMatching + "] ";
- HadoopException hdpException = new HadoopException(msgDesc, se);
- hdpException.generateResponseDataMap(false, getMessage(se),
- msgDesc + errMsg, null, null);
- LOG.error(msgDesc + se) ;
- throw hdpException;
-
- } catch (Throwable e) {
+ String msgDesc = "getColumnFamilyList: Unable to get HBase ColumnFamilyList for "
+ + "[repository:" +getConfigHolder().getDatasourceName() + ",table:" + tblName
+ + ", table-match:" + columnFamilyMatching + "] ";
+ HadoopException hdpException = new HadoopException(msgDesc, se);
+ hdpException.generateResponseDataMap(false, getMessage(se),
+ msgDesc + errMsg, null, null);
+ LOG.error(msgDesc + se);
+ throw hdpException;
+
+ } catch (Throwable e) {
String msgDesc = "getColumnFamilyList: Unable to get HBase ColumnFamilyList for "
+ "[repository:" +getConfigHolder().getDatasourceName() + ",table:" + tblName
+ ", table-match:" + columnFamilyMatching + "] ";
@@ -417,35 +414,34 @@ public class HBaseClient extends BaseClient {
HadoopException hdpException = new HadoopException(msgDesc, e);
hdpException.generateResponseDataMap(false, getMessage(e),
msgDesc + errMsg, null, null);
- LOG.error(msgDesc + e) ;
+ LOG.error(msgDesc + e);
throw hdpException;
- }
- finally {
+ } finally {
if (admin != null) {
try {
- admin.close() ;
+ admin.close();
} catch (IOException e) {
LOG.error("Unable to close HBase connection [" + getConfigHolder().getDatasourceName() + "]", e);
}
}
}
- return colfList ;
+ return colfList;
}
-
- }) ;
+
+ });
} catch (SecurityException se) {
String msgDesc = "getColumnFamilyList: Unable to connect to HBase Server instance ";
HadoopException hdpException = new HadoopException(msgDesc, se);
hdpException.generateResponseDataMap(false, getMessage(se),
msgDesc + errMsg, null, null);
- LOG.error(msgDesc + se) ;
+ LOG.error(msgDesc + se);
throw hdpException;
}
}
if (LOG.isDebugEnabled()) {
LOG.debug("<== HbaseClient.getColumnFamilyList() " + ret);
}
- return ret ;
+ return ret;
}
}
[09/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/json/model/KMSSchedulerResponse.java
----------------------------------------------------------------------
diff --git a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/json/model/KMSSchedulerResponse.java b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/json/model/KMSSchedulerResponse.java
index 29cc63d..e228c92 100644
--- a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/json/model/KMSSchedulerResponse.java
+++ b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/json/model/KMSSchedulerResponse.java
@@ -40,7 +40,7 @@ public class KMSSchedulerResponse implements java.io.Serializable {
private KMSScheduler scheduler = null;
public KMSScheduler getScheduler() { return scheduler; }
-
+
public List<String> getQueueNames() {
List<String> ret = new ArrayList<String>();
@@ -50,7 +50,7 @@ public class KMSSchedulerResponse implements java.io.Serializable {
return ret;
}
-
+
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/DerbyTestUtils.java
----------------------------------------------------------------------
diff --git a/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/DerbyTestUtils.java b/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/DerbyTestUtils.java
index 6899da6..67ed802 100644
--- a/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/DerbyTestUtils.java
+++ b/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/DerbyTestUtils.java
@@ -24,26 +24,26 @@ import java.sql.Statement;
import java.util.Properties;
public final class DerbyTestUtils {
-
+
public static void startDerby() throws Exception {
// Start Apache Derby
Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
-
+
Properties props = new Properties();
Connection conn = DriverManager.getConnection("jdbc:derby:memory:derbyDB;create=true", props);
-
+
Statement statement = conn.createStatement();
statement.execute("CREATE SCHEMA KMSADMIN");
-
+
statement.execute("SET SCHEMA KMSADMIN");
-
+
// Create masterkey table
statement.execute("CREATE SEQUENCE RANGER_MASTERKEY_SEQ START WITH 1 INCREMENT BY 1");
String tableCreationString = "CREATE TABLE ranger_masterkey (id VARCHAR(20) NOT NULL PRIMARY KEY, create_time DATE,"
+ "update_time DATE, added_by_id VARCHAR(20), upd_by_id VARCHAR(20),"
+ "cipher VARCHAR(255), bitlength VARCHAR(11), masterkey VARCHAR(2048))";
statement.execute(tableCreationString);
-
+
// Create keys table
statement.execute("CREATE SEQUENCE RANGER_KEYSTORE_SEQ START WITH 1 INCREMENT BY 1");
statement.execute("CREATE TABLE ranger_keystore(id VARCHAR(20) NOT NULL PRIMARY KEY, create_time DATE,"
@@ -54,7 +54,7 @@ public final class DerbyTestUtils {
conn.close();
}
-
+
public static void stopDerby() throws Exception {
try {
DriverManager.getConnection("jdbc:derby:memory:derbyDB;drop=true");
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerAdminClientImpl.java
----------------------------------------------------------------------
diff --git a/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerAdminClientImpl.java b/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerAdminClientImpl.java
index ebc1991..e889447 100644
--- a/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerAdminClientImpl.java
+++ b/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerAdminClientImpl.java
@@ -64,21 +64,21 @@ public class RangerAdminClientImpl implements RangerAdminClient {
}
public void grantAccess(GrantRevokeRequest request) throws Exception {
-
+
}
public void revokeAccess(GrantRevokeRequest request) throws Exception {
-
+
}
public ServiceTags getServiceTagsIfUpdated(long lastKnownVersion) throws Exception {
return null;
-
+
}
public List<String> getTagTypes(String tagTypePattern) throws Exception {
return null;
}
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizerTest.java
----------------------------------------------------------------------
diff --git a/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizerTest.java b/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizerTest.java
index 7fef432..3cff953 100644
--- a/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizerTest.java
+++ b/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizerTest.java
@@ -41,13 +41,13 @@ import org.junit.Test;
/**
* Policies available from admin via:
- *
+ *
* http://localhost:6080/service/plugins/policies/download/KMSTest
- *
+ *
* The user "bob" can do anything. The group "IT" can only call the "get" methods
*/
public class RangerKmsAuthorizerTest {
-
+
private static KMSWebApp kmsWebapp;
private static final boolean UNRESTRICTED_POLICIES_INSTALLED;
static {
@@ -69,14 +69,14 @@ public class RangerKmsAuthorizerTest {
}
UNRESTRICTED_POLICIES_INSTALLED = ok;
}
-
+
@BeforeClass
public static void startServers() throws Exception {
if (!UNRESTRICTED_POLICIES_INSTALLED) {
return;
}
DerbyTestUtils.startDerby();
-
+
Path configDir = Paths.get("src/test/resources/kms");
System.setProperty(KMSConfiguration.KMS_CONFIG_DIR, configDir.toFile().getAbsolutePath());
@@ -89,12 +89,12 @@ public class RangerKmsAuthorizerTest {
kmsWebapp = new KMSWebApp();
kmsWebapp.contextInitialized(servletContextEvent);
}
-
+
@AfterClass
public static void stopServers() throws Exception {
DerbyTestUtils.stopDerby();
}
-
+
@Test
public void testCreateKeys() throws Throwable {
if (!UNRESTRICTED_POLICIES_INSTALLED) {
@@ -110,7 +110,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// "eve" should not have permission to create
final UserGroupInformation ugi2 = UserGroupInformation.createRemoteUser("eve");
ugi2.doAs(new PrivilegedExceptionAction<Void>() {
@@ -125,7 +125,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// the IT group should not have permission to create
final UserGroupInformation ugi3 = UserGroupInformation.createUserForTesting("alice", new String[]{"IT"});
ugi3.doAs(new PrivilegedExceptionAction<Void>() {
@@ -141,7 +141,7 @@ public class RangerKmsAuthorizerTest {
}
});
}
-
+
@Test
public void testDeleteKeys() throws Throwable {
if (!UNRESTRICTED_POLICIES_INSTALLED) {
@@ -157,7 +157,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// "eve" should not have permission to delete
final UserGroupInformation ugi2 = UserGroupInformation.createRemoteUser("eve");
ugi2.doAs(new PrivilegedExceptionAction<Void>() {
@@ -172,7 +172,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// the IT group should not have permission to delete
final UserGroupInformation ugi3 = UserGroupInformation.createUserForTesting("alice", new String[]{"IT"});
ugi3.doAs(new PrivilegedExceptionAction<Void>() {
@@ -187,9 +187,9 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
}
-
+
@Test
public void testRollover() throws Throwable {
if (!UNRESTRICTED_POLICIES_INSTALLED) {
@@ -205,7 +205,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// "eve" should not have permission to rollover
final UserGroupInformation ugi2 = UserGroupInformation.createRemoteUser("eve");
ugi2.doAs(new PrivilegedExceptionAction<Void>() {
@@ -220,7 +220,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// the IT group should not have permission to rollover
final UserGroupInformation ugi3 = UserGroupInformation.createUserForTesting("alice", new String[]{"IT"});
ugi3.doAs(new PrivilegedExceptionAction<Void>() {
@@ -235,9 +235,9 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
}
-
+
@Test
public void testGetKeys() throws Throwable {
if (!UNRESTRICTED_POLICIES_INSTALLED) {
@@ -253,7 +253,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// "eve" should not have permission to get keys
final UserGroupInformation ugi2 = UserGroupInformation.createRemoteUser("eve");
ugi2.doAs(new PrivilegedExceptionAction<Void>() {
@@ -268,7 +268,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// the IT group should have permission to get keys
final UserGroupInformation ugi3 = UserGroupInformation.createUserForTesting("alice", new String[]{"IT"});
ugi3.doAs(new PrivilegedExceptionAction<Void>() {
@@ -279,7 +279,7 @@ public class RangerKmsAuthorizerTest {
}
});
}
-
+
@Test
public void testGetMetadata() throws Throwable {
if (!UNRESTRICTED_POLICIES_INSTALLED) {
@@ -295,7 +295,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// "eve" should not have permission to get the metadata
final UserGroupInformation ugi2 = UserGroupInformation.createRemoteUser("eve");
ugi2.doAs(new PrivilegedExceptionAction<Void>() {
@@ -310,7 +310,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// the IT group should have permission to get the metadata
final UserGroupInformation ugi3 = UserGroupInformation.createUserForTesting("alice", new String[]{"IT"});
ugi3.doAs(new PrivilegedExceptionAction<Void>() {
@@ -320,9 +320,9 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
}
-
+
@Test
public void testGenerateEEK() throws Throwable {
if (!UNRESTRICTED_POLICIES_INSTALLED) {
@@ -338,7 +338,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// "eve" should not have permission to generate EEK
final UserGroupInformation ugi2 = UserGroupInformation.createRemoteUser("eve");
ugi2.doAs(new PrivilegedExceptionAction<Void>() {
@@ -353,7 +353,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// the IT group should not have permission to generate EEK
final UserGroupInformation ugi3 = UserGroupInformation.createUserForTesting("alice", new String[]{"IT"});
ugi3.doAs(new PrivilegedExceptionAction<Void>() {
@@ -368,9 +368,9 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
}
-
+
@Test
public void testDecryptEEK() throws Throwable {
if (!UNRESTRICTED_POLICIES_INSTALLED) {
@@ -386,7 +386,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// "eve" should not have permission to decrypt EEK
final UserGroupInformation ugi2 = UserGroupInformation.createRemoteUser("eve");
ugi2.doAs(new PrivilegedExceptionAction<Void>() {
@@ -401,7 +401,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
// the IT group should not have permission to decrypt EEK
final UserGroupInformation ugi3 = UserGroupInformation.createUserForTesting("alice", new String[]{"IT"});
ugi3.doAs(new PrivilegedExceptionAction<Void>() {
@@ -416,7 +416,7 @@ public class RangerKmsAuthorizerTest {
return null;
}
});
-
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
----------------------------------------------------------------------
diff --git a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
index 9390ba1..6160438 100644
--- a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
+++ b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -74,7 +74,7 @@ public class RangerSolrAuthorizer implements AuthorizationPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.solr.security.SolrAuthorizationPlugin#init(java.util.Map)
*/
@Override
@@ -136,7 +136,7 @@ public class RangerSolrAuthorizer implements AuthorizationPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see java.io.Closeable#close()
*/
@Override
@@ -151,7 +151,7 @@ public class RangerSolrAuthorizer implements AuthorizationPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.solr.security.SolrAuthorizationPlugin#authorize(org.apache
* .solr.security.SolrRequestContext)
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-solr/src/main/java/org/apache/ranger/services/solr/RangerServiceSolr.java
----------------------------------------------------------------------
diff --git a/plugin-solr/src/main/java/org/apache/ranger/services/solr/RangerServiceSolr.java b/plugin-solr/src/main/java/org/apache/ranger/services/solr/RangerServiceSolr.java
index 5262494..8fa51ea 100644
--- a/plugin-solr/src/main/java/org/apache/ranger/services/solr/RangerServiceSolr.java
+++ b/plugin-solr/src/main/java/org/apache/ranger/services/solr/RangerServiceSolr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java
----------------------------------------------------------------------
diff --git a/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java b/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java
index 6576551..58e539e 100644
--- a/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java
+++ b/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrConnectionMgr.java
----------------------------------------------------------------------
diff --git a/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrConnectionMgr.java b/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrConnectionMgr.java
index aece32f..2465aaf 100644
--- a/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrConnectionMgr.java
+++ b/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrConnectionMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
----------------------------------------------------------------------
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java b/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
index 14c8d26..a44cbe3 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java
----------------------------------------------------------------------
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java
index 64b033f..414bd87 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -67,10 +67,10 @@ public class YarnClient extends BaseClient {
if (this.yarnQUrl == null || this.yarnQUrl.isEmpty()) {
LOG.error("No value found for configuration 'yarn.url'. YARN resource lookup will fail");
- }
+ }
if (this.userName == null || this.userName.isEmpty()) {
LOG.error("No value found for configuration 'usename'. YARN resource lookup will fail");
- }
+ }
if (this.password == null || this.password.isEmpty()) {
LOG.error("No value found for configuration 'password'. YARN resource lookup will fail");
}
@@ -188,7 +188,7 @@ public class YarnClient extends BaseClient {
}
if (client != null) {
- client.destroy();
+ client.destroy();
}
}
return lret ;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnConnectionMgr.java
----------------------------------------------------------------------
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnConnectionMgr.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnConnectionMgr.java
index 58f5146..99cafd2 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnConnectionMgr.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnConnectionMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java
----------------------------------------------------------------------
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java
index 733fe3d..cc408ba 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -60,7 +60,7 @@ public class YarnResourceMgr {
if ( resourceMap != null && !resourceMap.isEmpty() &&
resourceMap.get(YARNQUEUE) != null ) {
yarnQueueName = userInput;
- yarnQueueList = resourceMap.get(YARNQUEUE);
+ yarnQueueList = resourceMap.get(YARNQUEUE);
} else {
yarnQueueName = userInput;
}
@@ -83,5 +83,5 @@ public class YarnResourceMgr {
}
return topologyList;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/json/model/YarnSchedulerResponse.java
----------------------------------------------------------------------
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/json/model/YarnSchedulerResponse.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/json/model/YarnSchedulerResponse.java
index 5906003..bc39c16 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/json/model/YarnSchedulerResponse.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/json/model/YarnSchedulerResponse.java
@@ -42,7 +42,7 @@ public class YarnSchedulerResponse implements java.io.Serializable {
private YarnScheduler scheduler = null;
public YarnScheduler getScheduler() { return scheduler; }
-
+
public List<String> getQueueNames() {
List<String> ret = new ArrayList<String>();
@@ -52,7 +52,7 @@ public class YarnSchedulerResponse implements java.io.Serializable {
return ret;
}
-
+
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-atlas-plugin-shim/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java
----------------------------------------------------------------------
diff --git a/ranger-atlas-plugin-shim/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java b/ranger-atlas-plugin-shim/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java
index d8bdefd..407d258 100644
--- a/ranger-atlas-plugin-shim/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java
+++ b/ranger-atlas-plugin-shim/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,7 +31,7 @@ public class RangerAtlasAuthorizer implements AtlasAuthorizer {
private static final Logger LOG = LoggerFactory.getLogger(RangerAtlasAuthorizer.class);
private static boolean isDebugEnabled = LOG.isDebugEnabled();
private static volatile RangerBasePlugin atlasPlugin = null;
-
+
private static final String RANGER_PLUGIN_TYPE = "atlas";
private static final String[] RANGER_PLUGIN_LIB_DIR = new String[] {"lib/ranger-atlas-plugin"};
private static final String RANGER_ATLAS_AUTHORIZER_IMPL_CLASSNAME = "org.apache.ranger.authorization.atlas.authorizer.RangerAtlasAuthorizer";
@@ -77,8 +77,8 @@ public class RangerAtlasAuthorizer implements AtlasAuthorizer {
public void init() {
if (isDebugEnabled) {
LOG.debug("gautam init <===");
- }
-
+ }
+
try {
activatePluginClassLoader();
@@ -86,20 +86,20 @@ public class RangerAtlasAuthorizer implements AtlasAuthorizer {
} finally {
deactivatePluginClassLoader();
}
-
+
if (isDebugEnabled) {
LOG.debug("gautam init ===> " );
}
}
-
+
@Override
public boolean isAccessAllowed(AtlasAccessRequest request) throws AtlasAuthorizationException {
boolean isAccessAllowed = false;
if (isDebugEnabled) {
LOG.debug("isAccessAllowed <===");
- }
-
+ }
+
try {
activatePluginClassLoader();
@@ -107,7 +107,7 @@ public class RangerAtlasAuthorizer implements AtlasAuthorizer {
} finally {
deactivatePluginClassLoader();
}
-
+
if (isDebugEnabled) {
LOG.debug("isAccessAllowed ===> Returning value :: " + isAccessAllowed);
}
@@ -127,7 +127,7 @@ public class RangerAtlasAuthorizer implements AtlasAuthorizer {
}
}
-
+
private void activatePluginClassLoader() {
if(rangerPluginClassLoader != null) {
rangerPluginClassLoader.activate();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerSampleSimpleMatcher.java
----------------------------------------------------------------------
diff --git a/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerSampleSimpleMatcher.java b/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerSampleSimpleMatcher.java
index 50ecb69..83ef70e 100644
--- a/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerSampleSimpleMatcher.java
+++ b/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerSampleSimpleMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/contextenricher/RangerSampleCountryProvider.java
----------------------------------------------------------------------
diff --git a/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/contextenricher/RangerSampleCountryProvider.java b/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/contextenricher/RangerSampleCountryProvider.java
index 198dc5f..e0823e4 100644
--- a/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/contextenricher/RangerSampleCountryProvider.java
+++ b/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/contextenricher/RangerSampleCountryProvider.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/contextenricher/RangerSampleProjectProvider.java
----------------------------------------------------------------------
diff --git a/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/contextenricher/RangerSampleProjectProvider.java b/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/contextenricher/RangerSampleProjectProvider.java
index d3de690..df6da7c 100644
--- a/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/contextenricher/RangerSampleProjectProvider.java
+++ b/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/contextenricher/RangerSampleProjectProvider.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-examples/conditions-enrichers/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSampleSimpleMatcherTest.java
----------------------------------------------------------------------
diff --git a/ranger-examples/conditions-enrichers/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSampleSimpleMatcherTest.java b/ranger-examples/conditions-enrichers/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSampleSimpleMatcherTest.java
index 3e683ba..22e298d 100644
--- a/ranger-examples/conditions-enrichers/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSampleSimpleMatcherTest.java
+++ b/ranger-examples/conditions-enrichers/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSampleSimpleMatcherTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -74,7 +74,7 @@ public class RangerSampleSimpleMatcherTest {
matcher.init();
Assert.assertTrue(matcher.isMatched(request));
- // so should a policy item condition with initialized with null list of values
+ // so should a policy item condition with initialized with null list of values
Mockito.when(policyItemCondition.getValues()).thenReturn(null);
matcher.setConditionDef(conditionDef);
matcher.setPolicyItemCondition(policyItemCondition);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-hbase-plugin-shim/src/main/java/com/xasecure/authorization/hbase/XaSecureAuthorizationCoprocessor.java
----------------------------------------------------------------------
diff --git a/ranger-hbase-plugin-shim/src/main/java/com/xasecure/authorization/hbase/XaSecureAuthorizationCoprocessor.java b/ranger-hbase-plugin-shim/src/main/java/com/xasecure/authorization/hbase/XaSecureAuthorizationCoprocessor.java
index bc01e51..1afe0ba 100644
--- a/ranger-hbase-plugin-shim/src/main/java/com/xasecure/authorization/hbase/XaSecureAuthorizationCoprocessor.java
+++ b/ranger-hbase-plugin-shim/src/main/java/com/xasecure/authorization/hbase/XaSecureAuthorizationCoprocessor.java
@@ -23,9 +23,9 @@ import org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.AccessCont
import org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor;
/**
* This class exists only to provide for seamless upgrade/downgrade capabilities. Coprocessor name is in hbase config files in /etc/.../conf which
- * is not only out of bounds for any upgrade script but also must be of a form to allow for downgrad! Thus when class names were changed XaSecure* -> Ranger*
+ * is not only out of bounds for any upgrade script but also must be of a form to allow for downgrad! Thus when class names were changed XaSecure* -> Ranger*
* this shell class serves to allow for seamles upgrade as well as downgrade.
- *
+ *
* This class is final because if one needs to customize coprocessor it is expected that RangerAuthorizationCoprocessor would be modified/extended as that is
* the "real" coprocessor! This class, hence, should NEVER be more than an EMPTY shell!
*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-hbase-plugin-shim/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
----------------------------------------------------------------------
diff --git a/ranger-hbase-plugin-shim/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java b/ranger-hbase-plugin-shim/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
index 2e404a7..eef355f 100644
--- a/ranger-hbase-plugin-shim/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
+++ b/ranger-hbase-plugin-shim/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
@@ -315,7 +315,7 @@ public class RangerAuthorizationCoprocessor implements MasterObserver, RegionObs
activatePluginClassLoader();
implMasterObserver.preBalance(c);
} finally {
- deactivatePluginClassLoader();
+ deactivatePluginClassLoader();
}
if(LOG.isDebugEnabled()) {
@@ -1270,7 +1270,7 @@ public class RangerAuthorizationCoprocessor implements MasterObserver, RegionObs
try {
activatePluginClassLoader();
- implAccessControlService.grant(controller, request, done);
+ implAccessControlService.grant(controller, request, done);
} finally {
deactivatePluginClassLoader();
}
@@ -2163,7 +2163,7 @@ public class RangerAuthorizationCoprocessor implements MasterObserver, RegionObs
}
@Override
- public boolean preCheckAndPutAfterRowLock(ObserverContext<RegionCoprocessorEnvironment> c, byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp,
+ public boolean preCheckAndPutAfterRowLock(ObserverContext<RegionCoprocessorEnvironment> c, byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp,
ByteArrayComparable comparator, Put put, boolean result) throws IOException {
final boolean ret;
@@ -2485,7 +2485,7 @@ public class RangerAuthorizationCoprocessor implements MasterObserver, RegionObs
}
@Override
- public Reader preStoreFileReaderOpen(ObserverContext<RegionCoprocessorEnvironment> ctx, FileSystem fs, Path p, FSDataInputStreamWrapper in, long size,
+ public Reader preStoreFileReaderOpen(ObserverContext<RegionCoprocessorEnvironment> ctx, FileSystem fs, Path p, FSDataInputStreamWrapper in, long size,
CacheConfig cacheConf, Reference r, Reader reader) throws IOException {
final Reader ret;
@@ -2554,7 +2554,7 @@ public class RangerAuthorizationCoprocessor implements MasterObserver, RegionObs
@Override
public DeleteTracker postInstantiateDeleteTracker( ObserverContext<RegionCoprocessorEnvironment> ctx, DeleteTracker delTracker) throws IOException {
- final DeleteTracker ret;
+ final DeleteTracker ret;
if(LOG.isDebugEnabled()) {
LOG.debug("==> RangerAuthorizationCoprocessor.postInstantiateDeleteTracker()");
@@ -3775,7 +3775,7 @@ public class RangerAuthorizationCoprocessor implements MasterObserver, RegionObs
}
-
+
// TODO : need override annotations for all of the following methods
public void preMoveServers(final ObserverContext<MasterCoprocessorEnvironment> ctx, Set<HostAndPort> servers, String targetGroup) throws IOException {}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-hbase-plugin-shim/src/main/test/org/apache/hadoop/hbase/security/access/RangerAccessControlListsTest.java
----------------------------------------------------------------------
diff --git a/ranger-hbase-plugin-shim/src/main/test/org/apache/hadoop/hbase/security/access/RangerAccessControlListsTest.java b/ranger-hbase-plugin-shim/src/main/test/org/apache/hadoop/hbase/security/access/RangerAccessControlListsTest.java
index aa66d08..b56f32d 100644
--- a/ranger-hbase-plugin-shim/src/main/test/org/apache/hadoop/hbase/security/access/RangerAccessControlListsTest.java
+++ b/ranger-hbase-plugin-shim/src/main/test/org/apache/hadoop/hbase/security/access/RangerAccessControlListsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-hdfs-plugin-shim/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
----------------------------------------------------------------------
diff --git a/ranger-hdfs-plugin-shim/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java b/ranger-hdfs-plugin-shim/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
index a19d072..e70285f 100644
--- a/ranger-hdfs-plugin-shim/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
+++ b/ranger-hdfs-plugin-shim/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-hive-plugin-shim/src/main/java/com/xasecure/authorization/hive/authorizer/XaSecureHiveAuthorizerFactory.java
----------------------------------------------------------------------
diff --git a/ranger-hive-plugin-shim/src/main/java/com/xasecure/authorization/hive/authorizer/XaSecureHiveAuthorizerFactory.java b/ranger-hive-plugin-shim/src/main/java/com/xasecure/authorization/hive/authorizer/XaSecureHiveAuthorizerFactory.java
index 592b667..2eade8a 100644
--- a/ranger-hive-plugin-shim/src/main/java/com/xasecure/authorization/hive/authorizer/XaSecureHiveAuthorizerFactory.java
+++ b/ranger-hive-plugin-shim/src/main/java/com/xasecure/authorization/hive/authorizer/XaSecureHiveAuthorizerFactory.java
@@ -22,9 +22,9 @@ import org.apache.ranger.authorization.hive.authorizer.RangerHiveAuthorizerFacto
/**
* This class exists only to provide for seamless upgrade/downgrade capabilities. Coprocessor name is in hbase config files in /etc/.../conf which
- * is not only out of bounds for any upgrade script but also must be of a form to allow for downgrad! Thus when class names were changed XaSecure* -> Ranger*
+ * is not only out of bounds for any upgrade script but also must be of a form to allow for downgrad! Thus when class names were changed XaSecure* -> Ranger*
* this shell class serves to allow for seamles upgrade as well as downgrade.
- *
+ *
* This class is final because if one needs to customize coprocessor it is expected that RangerAuthorizationCoprocessor would be modified/extended as that is
* the "real" coprocessor! This class, hence, should NEVER be more than an EMPTY shell!
*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-hive-plugin-shim/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerFactory.java
----------------------------------------------------------------------
diff --git a/ranger-hive-plugin-shim/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerFactory.java b/ranger-hive-plugin-shim/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerFactory.java
index 14ddd42..f809fbb 100644
--- a/ranger-hive-plugin-shim/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerFactory.java
+++ b/ranger-hive-plugin-shim/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -70,7 +70,7 @@ public class RangerHiveAuthorizerFactory implements HiveAuthorizerFactory {
activatePluginClassLoader();
- rangerHiveAuthorizerFactoryImpl = cls.newInstance();
+ rangerHiveAuthorizerFactoryImpl = cls.newInstance();
} catch (Exception e) {
// check what need to be done
@@ -98,7 +98,7 @@ public class RangerHiveAuthorizerFactory implements HiveAuthorizerFactory {
}
try {
- activatePluginClassLoader();
+ activatePluginClassLoader();
ret = rangerHiveAuthorizerFactoryImpl.createHiveAuthorizer(metastoreClientFactory, conf, hiveAuthenticator, sessionContext);
} finally {
deactivatePluginClassLoader();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-kafka-plugin-shim/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java
----------------------------------------------------------------------
diff --git a/ranger-kafka-plugin-shim/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java b/ranger-kafka-plugin-shim/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java
index c88e99f..e0aad96 100644
--- a/ranger-kafka-plugin-shim/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java
+++ b/ranger-kafka-plugin-shim/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-kms-plugin-shim/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java
----------------------------------------------------------------------
diff --git a/ranger-kms-plugin-shim/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java b/ranger-kms-plugin-shim/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java
index 3b123bb..33f39f7 100644
--- a/ranger-kms-plugin-shim/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java
+++ b/ranger-kms-plugin-shim/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-knox-plugin-shim/src/main/java/org/apache/ranger/authorization/knox/deploy/RangerPDPKnoxDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/ranger-knox-plugin-shim/src/main/java/org/apache/ranger/authorization/knox/deploy/RangerPDPKnoxDeploymentContributor.java b/ranger-knox-plugin-shim/src/main/java/org/apache/ranger/authorization/knox/deploy/RangerPDPKnoxDeploymentContributor.java
index 843e6fd..89f8ed2 100644
--- a/ranger-knox-plugin-shim/src/main/java/org/apache/ranger/authorization/knox/deploy/RangerPDPKnoxDeploymentContributor.java
+++ b/ranger-knox-plugin-shim/src/main/java/org/apache/ranger/authorization/knox/deploy/RangerPDPKnoxDeploymentContributor.java
@@ -49,7 +49,7 @@ public class RangerPDPKnoxDeploymentContributor extends ProviderDeploymentContri
}
@Override
- public void contributeFilter( DeploymentContext context, Provider provider, Service service,
+ public void contributeFilter( DeploymentContext context, Provider provider, Service service,
ResourceDescriptor resource, List<FilterParamDescriptor> params ) {
if (params == null) {
params = new ArrayList<FilterParamDescriptor>();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java
----------------------------------------------------------------------
diff --git a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java b/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java
index 6e6166c..bdff40d 100644
--- a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java
+++ b/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -158,7 +158,7 @@ public class RangerPluginClassLoader extends URLClassLoader {
return ret;
}
-
+
@Override
public Enumeration<URL> findResources(String name) throws IOException {
Enumeration<URL> ret = null;
@@ -167,7 +167,7 @@ public class RangerPluginClassLoader extends URLClassLoader {
LOG.debug("==> RangerPluginClassLoader.findResources(" + name + ") ");
}
- ret = new MergeEnumeration(findResourcesUsingChildClassLoader(name),findResourcesUsingComponentClassLoader(name));
+ ret = new MergeEnumeration(findResourcesUsingChildClassLoader(name),findResourcesUsingComponentClassLoader(name));
if(LOG.isDebugEnabled()) {
LOG.debug("<== RangerPluginClassLoader.findResources(" + name + ") ");
@@ -175,15 +175,15 @@ public class RangerPluginClassLoader extends URLClassLoader {
return ret;
}
-
+
public Enumeration<URL> findResourcesUsingChildClassLoader(String name) {
Enumeration<URL> ret = null;
try {
if(LOG.isDebugEnabled()) {
- LOG.debug("RangerPluginClassLoader.findResourcesUsingChildClassLoader(" + name + "): calling childClassLoader.findResources()");
- }
+ LOG.debug("RangerPluginClassLoader.findResourcesUsingChildClassLoader(" + name + "): calling childClassLoader.findResources()");
+ }
ret = super.findResources(name);
@@ -261,7 +261,7 @@ public class RangerPluginClassLoader extends URLClassLoader {
return componentClassLoader;
//return componentClassLoader.get();
}
-
+
static class MyClassLoader extends ClassLoader {
public MyClassLoader(ClassLoader realClassLoader) {
super(realClassLoader);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoaderUtil.java
----------------------------------------------------------------------
diff --git a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoaderUtil.java b/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoaderUtil.java
index fb33dcb..bd0a653 100644
--- a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoaderUtil.java
+++ b/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoaderUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -130,21 +130,21 @@ public class RangerPluginClassLoaderUtil {
private String getPluginImplLibPath(String serviceType, Class<?> pluginClass) throws Exception {
String ret = null;
-
+
if(LOG.isDebugEnabled()) {
LOG.debug("==> RangerPluginClassLoaderUtil.getPluginImplLibPath for Class (" + pluginClass.getName() + ")");
}
-
+
URI uri = pluginClass.getProtectionDomain().getCodeSource().getLocation().toURI();
-
+
Path path = Paths.get(URI.create(uri.toString()));
ret = path.getParent().toString() + File.separatorChar + rangerPluginLibDir.replaceAll("%", serviceType);
-
+
if(LOG.isDebugEnabled()) {
LOG.debug("<== RangerPluginClassLoaderUtil.getPluginImplLibPath for Class (" + pluginClass.getName() + " PATH :" + ret + ")");
}
-
+
return ret;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestChildFistClassLoader.java
----------------------------------------------------------------------
diff --git a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestChildFistClassLoader.java b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestChildFistClassLoader.java
index 4c791c7..7f48c91 100644
--- a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestChildFistClassLoader.java
+++ b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestChildFistClassLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -35,7 +35,7 @@ public class TestChildFistClassLoader {
URL[] urls = null;
try {
file = new File(".." + File.separatorChar + "TestPluginImpl.class");
- URL url = file.toPath().toUri().toURL();
+ URL url = file.toPath().toUri().toURL();
urls = new URL[] {url};
} catch (Exception e) {
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestPluginImpl.java
----------------------------------------------------------------------
diff --git a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestPluginImpl.java b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestPluginImpl.java
index cbb3c67..4647f8f 100644
--- a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestPluginImpl.java
+++ b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestPluginImpl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestPrint.java
----------------------------------------------------------------------
diff --git a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestPrint.java b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestPrint.java
index 8626ec4..a280cb8 100644
--- a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestPrint.java
+++ b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestPrint.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPlugin.java
----------------------------------------------------------------------
diff --git a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPlugin.java b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPlugin.java
index 15cb76e..b9524da 100644
--- a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPlugin.java
+++ b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPlugin.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPrintParent.java
----------------------------------------------------------------------
diff --git a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPrintParent.java b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPrintParent.java
index 9524dfa..adec7ce 100644
--- a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPrintParent.java
+++ b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPrintParent.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-solr-plugin-shim/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
----------------------------------------------------------------------
diff --git a/ranger-solr-plugin-shim/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java b/ranger-solr-plugin-shim/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
index a50a231..4cfa7e1 100644
--- a/ranger-solr-plugin-shim/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
+++ b/ranger-solr-plugin-shim/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-storm-plugin-shim/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
----------------------------------------------------------------------
diff --git a/ranger-storm-plugin-shim/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java b/ranger-storm-plugin-shim/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
index c7fb35f..d6ef345 100644
--- a/ranger-storm-plugin-shim/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
+++ b/ranger-storm-plugin-shim/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPluginPerfTester.java
----------------------------------------------------------------------
diff --git a/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPluginPerfTester.java b/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPluginPerfTester.java
index 803d737..6a9bfb2 100644
--- a/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPluginPerfTester.java
+++ b/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPluginPerfTester.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-util/src/main/java/org/apache/ranger/common/RangerVersionInfo.java
----------------------------------------------------------------------
diff --git a/ranger-util/src/main/java/org/apache/ranger/common/RangerVersionInfo.java b/ranger-util/src/main/java/org/apache/ranger/common/RangerVersionInfo.java
index 2cd9d3c..e4f9c0f 100644
--- a/ranger-util/src/main/java/org/apache/ranger/common/RangerVersionInfo.java
+++ b/ranger-util/src/main/java/org/apache/ranger/common/RangerVersionInfo.java
@@ -39,7 +39,7 @@ public class RangerVersionInfo {
/**
* Get the meta-data for the Ranger package.
- *
+ *
* @return
*/
static Package getPackage() {
@@ -48,7 +48,7 @@ public class RangerVersionInfo {
/**
* Get the Ranger version.
- *
+ *
* @return the Ranger version string, eg. "0.6.3-dev"
*/
public static String getVersion() {
@@ -57,7 +57,7 @@ public class RangerVersionInfo {
/**
* Get the Ranger short version, with major/minor/change version numbers.
- *
+ *
* @return short version string, eg. "0.6.3"
*/
public static String getShortVersion() {
@@ -66,7 +66,7 @@ public class RangerVersionInfo {
/**
* Get the subversion revision number for the root directory
- *
+ *
* @return the revision number, eg. "451451"
*/
public static String getRevision() {
@@ -75,7 +75,7 @@ public class RangerVersionInfo {
/**
* Get the branch on which this originated.
- *
+ *
* @return The branch name, e.g. "trunk" or "branches/branch-0.20"
*/
public static String getBranch() {
@@ -84,7 +84,7 @@ public class RangerVersionInfo {
/**
* The date that Ranger was compiled.
- *
+ *
* @return the compilation date in unix date format
*/
public static String getDate() {
@@ -93,7 +93,7 @@ public class RangerVersionInfo {
/**
* The user that compiled Ranger.
- *
+ *
* @return the username of the user
*/
public static String getUser() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ranger-yarn-plugin-shim/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
----------------------------------------------------------------------
diff --git a/ranger-yarn-plugin-shim/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java b/ranger-yarn-plugin-shim/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
index 289d1c0..2184329 100644
--- a/ranger-yarn-plugin-shim/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
+++ b/ranger-yarn-plugin-shim/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java b/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java
index efb835f..b10ac1b 100644
--- a/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java
+++ b/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
index 5ecae8d..c41b6a5 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -699,7 +699,7 @@ public class AssetMgr extends AssetMgrBase {
Long count=xTrxLogService
.searchXTrxLogsCount(searchCriteria);
vXTrxLogList.setTotalCount(count);
-
+
List<VXTrxLog> newList = validateXXTrxLogList(vXTrxLogList.getVXTrxLogs());
vXTrxLogList.setVXTrxLogs(newList);
return vXTrxLogList;
@@ -811,7 +811,7 @@ public class AssetMgr extends AssetMgrBase {
}
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.biz.AssetMgrBase#searchXPolicyExportAudits(org.apache.ranger.
* common.SearchCriteria)
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/AssetMgrBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgrBase.java b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgrBase.java
index d9d61ed..840bb38 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgrBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgrBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/BaseMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/BaseMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/BaseMgr.java
index 174a56c..0f5206a 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/BaseMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/BaseMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
index d565ebf..98bb4f7 100755
--- a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
@@ -83,10 +83,10 @@ public class KmsKeyMgr {
private static final String KMS_ROLL_KEY_URI = "v1/key/${alias}"; //POST
private static final String KMS_DELETE_KEY_URI = "v1/key/${alias}"; //DELETE
private static final String KMS_KEY_METADATA_URI = "v1/key/${alias}/_metadata"; //GET
- private static final String KMS_URL_CONFIG = "provider";
+ private static final String KMS_URL_CONFIG = "provider";
private static final String KMS_PASSWORD = "password";
private static final String KMS_USERNAME = "username";
- private static Map<String, String> providerList = new HashMap<String, String>();
+ private static Map<String, String> providerList = new HashMap<String, String>();
private static int nextProvider = 0;
static final String NAME_RULES = "hadoop.security.auth_to_local";
static final String RANGER_AUTH_TYPE = "hadoop.security.authentication";
@@ -94,7 +94,7 @@ public class KmsKeyMgr {
private static final String ADMIN_USER_PRINCIPAL = "ranger.admin.kerberos.principal";
private static final String ADMIN_USER_KEYTAB = "ranger.admin.kerberos.keytab";
static final String HOST_NAME = "ranger.service.host";
-
+
@Autowired
ServiceDBStore svcStore;
@@ -124,7 +124,7 @@ public class KmsKeyMgr {
isKerberos = checkKerberos();
} catch (Exception e1) {
logger.error("checkKerberos(" + repoName + ") failed", e1);
- }
+ }
if(providers!=null){
for (int i = 0; i < providers.length; i++) {
Client c = getClient();
@@ -228,7 +228,7 @@ public class KmsKeyMgr {
isKerberos = checkKerberos();
} catch (Exception e1) {
logger.error("checkKerberos(" + provider + ") failed", e1);
- }
+ }
if(providers!=null){
for (int i = 0; i < providers.length; i++) {
Client c = getClient();
@@ -282,7 +282,7 @@ public class KmsKeyMgr {
isKerberos = checkKerberos();
} catch (Exception e1) {
logger.error("checkKerberos(" + provider + ") failed", e1);
- }
+ }
if(providers!=null){
for (int i = 0; i < providers.length; i++) {
Client c = getClient();
@@ -334,7 +334,7 @@ public class KmsKeyMgr {
isKerberos = checkKerberos();
} catch (Exception e1) {
logger.error("checkKerberos(" + provider + ") failed", e1);
- }
+ }
if(providers!=null){
for (int i = 0; i < providers.length; i++) {
Client c = getClient();
@@ -387,7 +387,7 @@ public class KmsKeyMgr {
isKerberos = checkKerberos();
} catch (Exception e1) {
logger.error("checkKerberos(" + provider + ") failed", e1);
- }
+ }
if(providers!=null){
for (int i = 0; i < providers.length; i++) {
Client c = getClient();
@@ -595,7 +595,7 @@ public class KmsKeyMgr {
}
private synchronized Client getClient() {
- Client ret = null;
+ Client ret = null;
ClientConfig cc = new DefaultClientConfig();
cc.getProperties().put(ClientConfig.PROPERTY_FOLLOW_REDIRECTS, true);
ret = Client.create(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
index 32ffef9..6d14c66 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -387,7 +387,7 @@ public class RangerBizUtil {
/**
* return response object if users is having permission on given resource
- *
+ *
* @param vXResource
* @param permission
* @return
@@ -525,7 +525,7 @@ public class RangerBizUtil {
/**
* return true id current logged in session is owned by admin
- *
+ *
* @return
*/
public boolean isAdmin() {
@@ -544,7 +544,7 @@ public class RangerBizUtil {
/**
* return username of currently logged in user
- *
+ *
* @return
*/
public String getCurrentUserLoginId() {
@@ -561,7 +561,7 @@ public class RangerBizUtil {
/**
* returns current user's userID from active user sessions
- *
+ *
* @return
*/
public Long getXUserId() {
@@ -593,7 +593,7 @@ public class RangerBizUtil {
/**
* returns true if user is having required permission on given Hdfs resource
- *
+ *
* @param resourceName
* @param xResourceList
* @param xUserId
@@ -642,7 +642,7 @@ public class RangerBizUtil {
/**
* returns true if user is having required permission on given Hbase
* resource
- *
+ *
* @param resourceName
* @param xResourceList
* @param vXResponse
@@ -731,7 +731,7 @@ public class RangerBizUtil {
/**
* returns true if user is having required permission on given Hive resource
- *
+ *
* @param resourceName
* @param xResourceList
* @param xUserId
@@ -847,7 +847,7 @@ public class RangerBizUtil {
/**
* returns true if user is having required permission on given Hbase
* resource
- *
+ *
* @param resourceName
* @param xResourceList
* @param xUserId
@@ -855,7 +855,7 @@ public class RangerBizUtil {
* @return
*/
private boolean matchKnoxPolicy(String resourceName,
- List<XXResource> xResourceList,
+ List<XXResource> xResourceList,
Long xUserId, int permission) {
String[] splittedResources = stringUtil.split(resourceName,
@@ -934,7 +934,7 @@ public class RangerBizUtil {
/**
* returns true if user is having required permission on given STORM
* resource
- *
+ *
* @param resourceName
* @param xResourceList
* @param xUserId
@@ -1011,7 +1011,7 @@ public class RangerBizUtil {
/**
* returns path without meta characters
- *
+ *
* @param path
* @return
*/
@@ -1033,7 +1033,7 @@ public class RangerBizUtil {
/**
* returns random String of given length range
- *
+ *
* @param minLen
* @param maxLen
* @return
@@ -1050,7 +1050,7 @@ public class RangerBizUtil {
/**
* return random integer number for given range
- *
+ *
* @param min
* @param max
* @return
@@ -1071,7 +1071,7 @@ public class RangerBizUtil {
/**
* returns true if given userID is having specified permission on specified
* resource
- *
+ *
* @param xUserId
* @param permission
* @param resourceId
@@ -1115,7 +1115,7 @@ public class RangerBizUtil {
/**
* returns true is given group id is in given group list
- *
+ *
* @param groupId
* @param xGroupList
* @return
@@ -1132,7 +1132,7 @@ public class RangerBizUtil {
/**
* returns true if given path matches in same level or sub directories with
* given wild card pattern
- *
+ *
* @param pathToCheck
* @param wildcardPath
* @return
@@ -1160,12 +1160,12 @@ public class RangerBizUtil {
/**
* return List<Integer>
- *
+ *
* List of all possible parent return type for some specific resourceType
- *
+ *
* @param resourceType
* , assetType
- *
+ *
*/
public List<Integer> getResorceTypeParentHirearchy(int resourceType,
int assetType) {
@@ -1199,7 +1199,7 @@ public class RangerBizUtil {
/**
* return true if both path matches exactly, wild card matching is not
* checked
- *
+ *
* @param path1
* @param path2
* @return
@@ -1218,7 +1218,7 @@ public class RangerBizUtil {
/**
* return true if both path matches at same level path, this function does
* not match sub directories
- *
+ *
* @param pathToCheck
* @param wildcardPath
* @return
@@ -1253,7 +1253,7 @@ public class RangerBizUtil {
/**
* returns true if first and second path are same
- *
+ *
* @param pathToCheckFragment
* @param wildCardPathFragment
* @return
@@ -1302,7 +1302,7 @@ public class RangerBizUtil {
/**
* This method returns true if first parameter value is equal to others
* argument value passed
- *
+ *
* @param checkValue
* @param otherValues
* @return
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java b/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
index 3ba33d4..5258a74 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/RangerTagDBRetriever.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/RangerTagDBRetriever.java b/security-admin/src/main/java/org/apache/ranger/biz/RangerTagDBRetriever.java
index 256db42..0949092 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/RangerTagDBRetriever.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/RangerTagDBRetriever.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index 8a0e4b7..d709869 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -191,7 +191,7 @@ public class ServiceDBStore extends AbstractServiceStore {
@Autowired
RangerServiceDefService serviceDefService;
-
+
@Autowired
RangerDaoManager daoMgr;
@@ -222,16 +222,16 @@ public class ServiceDBStore extends AbstractServiceStore {
@Autowired
@Qualifier(value = "transactionManager")
PlatformTransactionManager txManager;
-
+
@Autowired
RangerBizUtil bizUtil;
-
+
@Autowired
RangerPolicyWithAssignedIdService assignedIdPolicyService;
-
+
@Autowired
RangerServiceWithAssignedIdService svcServiceWithAssignedId;
-
+
@Autowired
RangerServiceDefWithAssignedIdService svcDefServiceWithAssignedId;
@@ -2619,7 +2619,7 @@ public class ServiceDBStore extends AbstractServiceStore {
lookupUser = krbName.getShortName();
} catch (IOException e) {
throw restErrorUtil.createRESTException("Please provide proper value of lookup user principal : "+ lookupPrincipal, MessageEnums.INVALID_INPUT_DATA);
- }
+ }
if(LOG.isDebugEnabled()){
LOG.debug("Checking for Lookup User : "+lookupUser);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
index 65d41fb..f512049 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -83,7 +83,7 @@ public class ServiceMgr {
RangerService service = svcDBStore.getServiceByName(serviceName);
- String authType = PropertiesUtil.getProperty(AUTHENTICATION_TYPE);
+ String authType = PropertiesUtil.getProperty(AUTHENTICATION_TYPE);
String lookupPrincipal = SecureClientLogin.getPrincipal(PropertiesUtil.getProperty(LOOKUP_PRINCIPAL), PropertiesUtil.getProperty(HOST_NAME));
String lookupKeytab = PropertiesUtil.getProperty(LOOKUP_KEYTAB);
String nameRules = PropertiesUtil.getProperty(NAME_RULES);
@@ -136,7 +136,7 @@ public class ServiceMgr {
public VXResponse validateConfig(RangerService service, ServiceStore svcStore) throws Exception {
VXResponse ret = new VXResponse();
- String authType = PropertiesUtil.getProperty(AUTHENTICATION_TYPE);
+ String authType = PropertiesUtil.getProperty(AUTHENTICATION_TYPE);
String lookupPrincipal = SecureClientLogin.getPrincipal(PropertiesUtil.getProperty(LOOKUP_PRINCIPAL), PropertiesUtil.getProperty(HOST_NAME));
String lookupKeytab = PropertiesUtil.getProperty(LOOKUP_KEYTAB);
String nameRules = PropertiesUtil.getProperty(NAME_RULES);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java
index 4c77d01..ec744ea 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -404,7 +404,7 @@ public class SessionMgr {
public VXAuthSession getAuthSessionBySessionId(String authSessionId) {
if(stringUtil.isEmpty(authSessionId)){
- throw restErrorUtil.createRESTException("Please provide the auth session id.",
+ throw restErrorUtil.createRESTException("Please provide the auth session id.",
MessageEnums.INVALID_INPUT_DATA);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java
index 7fe0654..5fbc259 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[05/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
index b1a2159..886caa0 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -524,13 +524,13 @@ public class AssetREST {
String epoch = request.getParameter("epoch");
X509Certificate[] certchain = (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate");
- String ipAddress = request.getHeader("X-FORWARDED-FOR");
+ String ipAddress = request.getHeader("X-FORWARDED-FOR");
boolean isSecure = request.isSecure();
String policyCount = request.getParameter("policyCount");
String agentId = request.getParameter("agentId");
Long lastKnowPolicyVersion = Long.valueOf(-1);
- if (ipAddress == null) {
+ if (ipAddress == null) {
ipAddress = request.getRemoteAddr();
}
@@ -571,20 +571,20 @@ public class AssetREST {
SearchCriteria searchCriteria = searchUtil.extractCommonCriterias(
request, xPolicyExportAudits.sortFields);
- searchUtil.extractString(request, searchCriteria, "agentId",
- "The XA agent id pulling the policies.",
+ searchUtil.extractString(request, searchCriteria, "agentId",
+ "The XA agent id pulling the policies.",
StringUtil.VALIDATION_TEXT);
- searchUtil.extractString(request, searchCriteria, "clientIP",
+ searchUtil.extractString(request, searchCriteria, "clientIP",
"The XA agent ip pulling the policies.",
StringUtil.VALIDATION_TEXT);
- searchUtil.extractString(request, searchCriteria, "repositoryName",
+ searchUtil.extractString(request, searchCriteria, "repositoryName",
"Repository name for which export was done.",
StringUtil.VALIDATION_TEXT);
- searchUtil.extractInt(request, searchCriteria, "httpRetCode",
+ searchUtil.extractInt(request, searchCriteria, "httpRetCode",
"HTTP response code for exported policy.");
- searchUtil.extractDate(request, searchCriteria, "startDate",
+ searchUtil.extractDate(request, searchCriteria, "startDate",
"Start date for search", null);
- searchUtil.extractDate(request, searchCriteria, "endDate",
+ searchUtil.extractDate(request, searchCriteria, "endDate",
"End date for search", null);
return assetMgr.searchXPolicyExportAudits(searchCriteria);
}
@@ -598,13 +598,13 @@ public class AssetREST {
SearchCriteria searchCriteria = searchUtil.extractCommonCriterias(
request, xTrxLogService.sortFields);
searchUtil.extractInt(request, searchCriteria, "objectClassType", "Class type for report.");
- searchUtil.extractString(request, searchCriteria, "attributeName",
+ searchUtil.extractString(request, searchCriteria, "attributeName",
"Attribute Name", StringUtil.VALIDATION_TEXT);
- searchUtil.extractString(request, searchCriteria, "action",
+ searchUtil.extractString(request, searchCriteria, "action",
"CRUD Action Type", StringUtil.VALIDATION_TEXT);
- searchUtil.extractString(request, searchCriteria, "sessionId",
+ searchUtil.extractString(request, searchCriteria, "sessionId",
"Session Id", StringUtil.VALIDATION_TEXT);
- searchUtil.extractString(request, searchCriteria, "owner",
+ searchUtil.extractString(request, searchCriteria, "owner",
"Owner", StringUtil.VALIDATION_TEXT);
searchUtil.extractDate(request, searchCriteria, "startDate", "Trasaction date since", "MM/dd/yyyy");
searchUtil.extractDate(request, searchCriteria, "endDate", "Trasaction date till", "MM/dd/yyyy");
@@ -615,7 +615,7 @@ public class AssetREST {
@Path("/report/{transactionId}")
@Produces({ "application/xml", "application/json" })
@PreAuthorize("@rangerPreAuthSecurityHandler.isAPIAccessible(\"" + RangerAPIList.GET_TRANSACTION_REPORT + "\")")
- public VXTrxLogList getTransactionReport(@Context HttpServletRequest request,
+ public VXTrxLogList getTransactionReport(@Context HttpServletRequest request,
@PathParam("transactionId") String transactionId){
return assetMgr.getTransactionReport(transactionId);
}
@@ -662,7 +662,7 @@ public class AssetREST {
searchUtil.extractString(request, searchCriteria, "tags", "tags", null);
boolean isKeyAdmin = msBizUtil.isKeyAdmin();
- XXServiceDef xxServiceDef = daoManager.getXXServiceDef().findByName(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_KMS_NAME);
+ XXServiceDef xxServiceDef = daoManager.getXXServiceDef().findByName(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_KMS_NAME);
if(isKeyAdmin && xxServiceDef != null){
searchCriteria.getParamList().put("repoType", xxServiceDef.getId());
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java b/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java
index 1f465d5..c515085 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
index 26e2906..19fea65 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -160,7 +160,7 @@ public class ServiceREST {
GUIDUtil guidUtil;
@Autowired
- RangerValidatorFactory validatorFactory;
+ RangerValidatorFactory validatorFactory;
@Autowired
RangerDaoManager daoManager;
@@ -1844,11 +1844,11 @@ public class ServiceREST {
throw restErrorUtil.createRESTException(httpCode, logMsg, logError);
}
}
-
+
if(LOG.isDebugEnabled()) {
LOG.debug("<== ServiceREST.getServicePoliciesIfUpdated(" + serviceName + ", " + lastKnownVersion + "): count=" + ((ret == null || ret.getPolicies() == null) ? 0 : ret.getPolicies().size()));
}
-
+
return ret;
}
@@ -1943,7 +1943,7 @@ public class ServiceREST {
try {
String ipAddress = request.getHeader("X-FORWARDED-FOR");
- if (ipAddress == null) {
+ if (ipAddress == null) {
ipAddress = request.getRemoteAddr();
}
@@ -2316,7 +2316,7 @@ public class ServiceREST {
}
private HashMap<String, Object> getCSRFPropertiesMap() {
- HashMap<String, Object> map = new HashMap<String, Object>();
+ HashMap<String, Object> map = new HashMap<String, Object>();
map.put(isCSRF_ENABLED, PropertiesUtil.getBooleanProperty(isCSRF_ENABLED, true));
map.put(CUSTOM_HEADER_PARAM, PropertiesUtil.getProperty(CUSTOM_HEADER_PARAM, RangerCSRFPreventionFilter.HEADER_DEFAULT));
map.put(BROWSER_USER_AGENT_PARAM, PropertiesUtil.getProperty(BROWSER_USER_AGENT_PARAM, RangerCSRFPreventionFilter.BROWSER_USER_AGENTS_DEFAULT));
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java b/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java
index 8aef9a8..b76c308 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java
@@ -1006,7 +1006,7 @@ public class TagREST {
if(LOG.isDebugEnabled()) {
LOG.debug("==> TagREST.getTagResourceMap(" + tagGuid + ", " + resourceGuid + ")");
}
-
+
RangerTagResourceMap ret = null;
try {
@@ -1125,7 +1125,7 @@ public class TagREST {
return ret;
}
-
+
@GET
@Path(TagRESTConstants.TAGS_SECURE_DOWNLOAD + "{serviceName}")
@Produces({ "application/json", "application/xml" })
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java b/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java
index 3fad7b4..b2979f5 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -94,7 +94,7 @@ public class UserREST {
/**
* Implements the traditional search functionalities for UserProfile
- *
+ *
* @param request
* @return
*/
@@ -144,7 +144,7 @@ public class UserREST {
/**
* Return the VUserProfile for the given userId
- *
+ *
* @param userId
* @return
*/
@@ -237,7 +237,7 @@ public class UserREST {
/**
* Deactivate the user
- *
+ *
* @param userId
* @return
*/
@@ -258,7 +258,7 @@ public class UserREST {
/**
* This method returns the VUserProfile for the current session
- *
+ *
* @param request
* @return
*/
@@ -287,7 +287,7 @@ public class UserREST {
return null;
}
- /**
+ /**
* @param userId
* @param changePassword
* @return
@@ -313,8 +313,8 @@ public class UserREST {
return ret;
}
- /**
- *
+ /**
+ *
* @param userId
* @param changeEmail
* @return
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java
index cbe486b..5b0991a 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java
index b07bf9c..c7a81f9 100755
--- a/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java
@@ -71,7 +71,7 @@ public class XKeyREST {
/**
* Implements the traditional search functionalities for Keys
- *
+ *
* @param request
* @return
*/
@@ -90,7 +90,7 @@ public class XKeyREST {
}
/**
- * Implements the Rollover key functionality
+ * Implements the Rollover key functionality
* @param vXKey
* @return
*/
@@ -165,7 +165,7 @@ public class XKeyREST {
}
/**
- *
+ *
* @param name
* @param provider
* @return
@@ -201,7 +201,7 @@ public class XKeyREST {
message = obj.getString("message");
} catch (JSONException e1) {
message = e1.getMessage();
- }
+ }
}
if(!(message==null) && !(message.isEmpty()) && message.contains("Connection refused")){
message = "Connection refused : Please check the KMS provider URL and whether the Ranger KMS is running";
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
index 226d3c7..646ade6 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -218,7 +218,7 @@ public class XUserREST {
/**
* Implements the traditional search functionalities for XGroups
- *
+ *
* @param request
* @return
*/
@@ -277,7 +277,7 @@ public class XUserREST {
@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
public VXUserGroupInfo createXUserGroupFromMap(VXUserGroupInfo vXUserGroupInfo) {
return xUserMgr.createXUserGroupFromMap(vXUserGroupInfo);
- }
+ }
@POST
@Path("/secure/users")
@@ -329,7 +329,7 @@ public class XUserREST {
/**
* Implements the traditional search functionalities for XUsers
- *
+ *
* @param request
* @return
*/
@@ -400,7 +400,7 @@ public class XUserREST {
/**
* Implements the traditional search functionalities for XGroupUsers
- *
+ *
* @param request
* @return
*/
@@ -460,7 +460,7 @@ public class XUserREST {
/**
* Implements the traditional search functionalities for XGroupGroups
- *
+ *
* @param request
* @return
*/
@@ -545,7 +545,7 @@ public class XUserREST {
/**
* Implements the traditional search functionalities for XPermMaps
- *
+ *
* @param request
* @return
*/
@@ -629,7 +629,7 @@ public class XUserREST {
/**
* Implements the traditional search functionalities for XAuditMaps
- *
+ *
* @param request
* @return
*/
@@ -715,7 +715,7 @@ public class XUserREST {
@Path("/{userId}/groups")
@Produces({ "application/xml", "application/json" })
@PreAuthorize("@rangerPreAuthSecurityHandler.isAPIAccessible(\"" + RangerAPIList.GET_X_USER_GROUPS + "\")")
- public VXGroupList getXUserGroups(@Context HttpServletRequest request,
+ public VXGroupList getXUserGroups(@Context HttpServletRequest request,
@PathParam("userId") Long id){
return xUserMgr.getXUserGroups(id);
}
@@ -724,7 +724,7 @@ public class XUserREST {
@Path("/{groupId}/users")
@Produces({ "application/xml", "application/json" })
@PreAuthorize("@rangerPreAuthSecurityHandler.isAPIAccessible(\"" + RangerAPIList.GET_X_GROUP_USERS + "\")")
- public VXUserList getXGroupUsers(@Context HttpServletRequest request,
+ public VXUserList getXGroupUsers(@Context HttpServletRequest request,
@PathParam("groupId") Long id){
return xUserMgr.getXGroupUsers(id);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/context/RangerAPIList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/context/RangerAPIList.java b/security-admin/src/main/java/org/apache/ranger/security/context/RangerAPIList.java
index ab16535..6466712 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/context/RangerAPIList.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/context/RangerAPIList.java
@@ -17,7 +17,7 @@
package org.apache.ranger.security.context;
/**
- * This class holds list of APIs available in the system.
+ * This class holds list of APIs available in the system.
* This Class needs to be updated when writing new API in any of the REST.
*/
public class RangerAPIList {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/context/RangerAPIMapping.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/context/RangerAPIMapping.java b/security-admin/src/main/java/org/apache/ranger/security/context/RangerAPIMapping.java
index f8966f5..28b0a37 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/context/RangerAPIMapping.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/context/RangerAPIMapping.java
@@ -528,7 +528,7 @@ public class RangerAPIMapping {
/**
* @param apiName
* @return
- *
+ *
* @Note: apiName being passed to this function should strictly follow this format: {ClassName}.{apiMethodName} and also API should be listed into
* RangerAPIList and should be mapped properly with UI tabs in the current class.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/context/RangerContextHolder.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/context/RangerContextHolder.java b/security-admin/src/main/java/org/apache/ranger/security/context/RangerContextHolder.java
index a0969af..9884163 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/context/RangerContextHolder.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/context/RangerContextHolder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/context/RangerPreAuthSecurityHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/context/RangerPreAuthSecurityHandler.java b/security-admin/src/main/java/org/apache/ranger/security/context/RangerPreAuthSecurityHandler.java
index f925988..97f573a 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/context/RangerPreAuthSecurityHandler.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/context/RangerPreAuthSecurityHandler.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/context/RangerSecurityContext.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/context/RangerSecurityContext.java b/security-admin/src/main/java/org/apache/ranger/security/context/RangerSecurityContext.java
index b654c32..4f42521 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/context/RangerSecurityContext.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/context/RangerSecurityContext.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/handler/Permission.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/handler/Permission.java b/security-admin/src/main/java/org/apache/ranger/security/handler/Permission.java
index 1d6342b..effa739 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/handler/Permission.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/handler/Permission.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java
index 00541cb..d5cab44 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java
@@ -611,7 +611,7 @@ public class RangerAuthenticationProvider implements AuthenticationProvider {
}
return grantedAuths;
}
-
+
public Authentication getAuthenticationWithGrantedAuthority(Authentication authentication){
UsernamePasswordAuthenticationToken result=null;
if(authentication!=null && authentication.isAuthenticated()){
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java
index f9fea3f..62bf951 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/listener/RangerHttpSessionListener.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/listener/RangerHttpSessionListener.java b/security-admin/src/main/java/org/apache/ranger/security/listener/RangerHttpSessionListener.java
index 259a7e7..e0069b6 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/listener/RangerHttpSessionListener.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/listener/RangerHttpSessionListener.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java b/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java
index 29a35cf..ba5ebfa 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/standalone/StandaloneSecurityHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/standalone/StandaloneSecurityHandler.java b/security-admin/src/main/java/org/apache/ranger/security/standalone/StandaloneSecurityHandler.java
index ee275d3..f62f43d 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/standalone/StandaloneSecurityHandler.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/standalone/StandaloneSecurityHandler.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/authentication/CustomLogoutSuccessHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/CustomLogoutSuccessHandler.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/CustomLogoutSuccessHandler.java
index 237fb50..0fb9b12 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/CustomLogoutSuccessHandler.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/CustomLogoutSuccessHandler.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java
index 5c0738c..f2f5a62 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -37,7 +37,7 @@ import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.authentication.ExceptionMappingAuthenticationFailureHandler;
/**
- *
+ *
*
*/
public class RangerAuthFailureHandler extends
@@ -45,7 +45,7 @@ ExceptionMappingAuthenticationFailureHandler {
static Logger logger = Logger.getLogger(RangerAuthFailureHandler.class);
String ajaxLoginfailurePage = null;
-
+
@Autowired
JSONUtil jsonUtil;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java
index 8e41a39..0364b4c 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,7 +41,7 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti
import org.springframework.security.web.authentication.WebAuthenticationDetails;
/**
- *
+ *
*
*/
public class RangerAuthSuccessHandler extends
@@ -49,10 +49,10 @@ SavedRequestAwareAuthenticationSuccessHandler {
static Logger logger = Logger.getLogger(RangerAuthSuccessHandler.class);
String ajaxLoginSuccessPage = null;
-
+
@Autowired
SessionMgr sessionMgr;
-
+
@Autowired
JSONUtil jsonUtil;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java
index e3b5be3..a646d32 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -40,7 +40,7 @@ import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
/**
- *
+ *
*
*/
public class RangerAuthenticationEntryPoint extends
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerSessionFixationProtectionStrategy.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerSessionFixationProtectionStrategy.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerSessionFixationProtectionStrategy.java
index 4c73b52..1db2465 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerSessionFixationProtectionStrategy.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerSessionFixationProtectionStrategy.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java
index a2252fe..90b34d0 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -37,7 +37,7 @@ import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationFilter;
/**
- *
+ *
*
*/
@SuppressWarnings("deprecation")
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerCSRFPreventionFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerCSRFPreventionFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerCSRFPreventionFilter.java
index 88e4b5a..556e2dc 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerCSRFPreventionFilter.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerCSRFPreventionFilter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -70,7 +70,7 @@ public class RangerCSRFPreventionFilter implements Filter {
if (customHeader != null) {
headerName = customHeader;
}
-
+
String customMethodsToIgnore = PropertiesUtil.getProperty(CUSTOM_METHODS_TO_IGNORE_PARAM, METHODS_TO_IGNORE_DEFAULT);
if (customMethodsToIgnore != null) {
parseMethodsToIgnore(customMethodsToIgnore);
@@ -115,7 +115,7 @@ public class RangerCSRFPreventionFilter implements Filter {
}
return false;
}
-
+
public interface HttpInteraction {
/**
* Returns the value of a header.
@@ -157,7 +157,7 @@ public class RangerCSRFPreventionFilter implements Filter {
*/
void sendError(int code, String message) throws IOException;
}
-
+
public void handleHttpInteraction(HttpInteraction httpInteraction)
throws IOException, ServletException {
if (!isBrowser(httpInteraction.getHeader(HEADER_USER_AGENT))
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKRBAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKRBAuthenticationFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKRBAuthenticationFilter.java
index d28608c..f0b5890 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKRBAuthenticationFilter.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKRBAuthenticationFilter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -264,7 +264,7 @@ public class RangerKRBAuthenticationFilter extends RangerKrbFilter {
}
}
}
- if((existingAuth == null || !existingAuth.isAuthenticated()) && (!StringUtils.isEmpty(userName))){
+ if((existingAuth == null || !existingAuth.isAuthenticated()) && (!StringUtils.isEmpty(userName))){
//--------------------------- To Create Ranger Session --------------------------------------
String rangerLdapDefaultRole = PropertiesUtil.getProperty("ranger.ldap.default.role", "ROLE_USER");
//if we get the userName from the token then log into ranger using the same user
@@ -294,7 +294,7 @@ public class RangerKRBAuthenticationFilter extends RangerKrbFilter {
private boolean isSpnegoEnable(String authType){
String principal = PropertiesUtil.getProperty(PRINCIPAL);
- String keytabPath = PropertiesUtil.getProperty(KEYTAB);
+ String keytabPath = PropertiesUtil.getProperty(KEYTAB);
return ((!StringUtils.isEmpty(authType)) && authType.equalsIgnoreCase(KERBEROS_TYPE) && SecureClientLogin.isKerberosCredentialExists(principal, keytabPath));
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java
index 04e14be..e9401f1 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java
@@ -106,7 +106,7 @@ public class RangerKrbFilter implements Filter {
"signer.secret.provider.object";
private static final String BROWSER_USER_AGENT_PARAM = "ranger.krb.browser-useragents-regex";
-
+
private Set<Pattern> browserUserAgents;
private Properties config;
@@ -135,9 +135,9 @@ public class RangerKrbFilter implements Filter {
String authHandlerClassName;
if (authHandlerName == null) {
throw new ServletException("Authentication type must be specified: " +
- PseudoAuthenticationHandler.TYPE + "|" +
+ PseudoAuthenticationHandler.TYPE + "|" +
KerberosAuthenticationHandler.TYPE + "|<class>");
- }
+ }
if(StringUtils.equalsIgnoreCase(authHandlerName, PseudoAuthenticationHandler.TYPE)){
authHandlerClassName = PseudoAuthenticationHandler.class.getName();
}else if(StringUtils.equalsIgnoreCase(authHandlerName, KerberosAuthenticationHandler.TYPE)){
@@ -589,7 +589,7 @@ public class RangerKrbFilter implements Filter {
sb.append("; HttpOnly");
resp.addHeader("Set-Cookie", sb.toString());
}
-
+
void parseBrowserUserAgents(String userAgents) {
String[] agentsArray = userAgents.split(",");
browserUserAgents = new HashSet<Pattern>();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java
index 4783608..2095567 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java
@@ -109,7 +109,7 @@ public class RangerSSOAuthenticationFilter implements Filter {
* doFilter of RangerSSOAuthenticationFilter is the first in the filter list so in this it check for the request
* if the request is from browser, doesn't contain local login and sso is enabled then it process the request against knox sso
* else if it's ssoenable and the request is with local login string then it show's the appropriate msg
- * else if ssoenable is false then it contiunes with further filters as it was before sso
+ * else if ssoenable is false then it contiunes with further filters as it was before sso
*/
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)throws IOException, ServletException {
@@ -139,7 +139,7 @@ public class RangerSSOAuthenticationFilter implements Filter {
}
}
- //If sso is enable and request is not for local login and is from browser then it will go inside and try for knox sso authentication
+ //If sso is enable and request is not for local login and is from browser then it will go inside and try for knox sso authentication
if (ssoEnabled && !httpRequest.getRequestURI().contains(LOCAL_LOGIN_URL) && isWebUserAgent(userAgent)) {
//if jwt properties are loaded and is current not authenticated then it will go for sso authentication
//Note : Need to remove !isAuthenticated() after knoxsso solve the bug from cross-origin script
@@ -175,7 +175,7 @@ public class RangerSSOAuthenticationFilter implements Filter {
filterChain.doFilter(servletRequest,httpServletResponse);
}
- // if the token is not valid then redirect to knox sso
+ // if the token is not valid then redirect to knox sso
else {
String ssourl = constructLoginURL(httpRequest);
if(LOG.isDebugEnabled())
@@ -186,7 +186,7 @@ public class RangerSSOAuthenticationFilter implements Filter {
LOG.warn("Unable to parse the JWT token", e);
}
}
- // if the jwt token is not available then redirect it to knox sso
+ // if the jwt token is not available then redirect it to knox sso
else {
String ssourl = constructLoginURL(httpRequest);
if(LOG.isDebugEnabled())
@@ -194,7 +194,7 @@ public class RangerSSOAuthenticationFilter implements Filter {
httpServletResponse.sendRedirect(ssourl);
}
}
- //if property is not loaded or is already authenticated then proceed further with next filter
+ //if property is not loaded or is already authenticated then proceed further with next filter
else {
filterChain.doFilter(servletRequest, servletResponse);
}
@@ -275,7 +275,7 @@ public class RangerSSOAuthenticationFilter implements Filter {
/**
* Do not try to validate JWT if user already authenticated via other
* provider
- *
+ *
* @return true, if JWT validation required
*/
private boolean isAuthenticated() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerUsernamePasswordAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerUsernamePasswordAuthenticationFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerUsernamePasswordAuthenticationFilter.java
index b3fcbf2..4e7dba7 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerUsernamePasswordAuthenticationFilter.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerUsernamePasswordAuthenticationFilter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/filter/SSOAuthentication.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/SSOAuthentication.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/SSOAuthentication.java
index 6fcadb7..61f19f4 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/SSOAuthentication.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/SSOAuthentication.java
@@ -70,5 +70,5 @@ public class SSOAuthentication implements Authentication {
@Override
public Object getPrincipal() {
return null;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/security/web/filter/SSOAuthenticationProperties.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/SSOAuthenticationProperties.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/SSOAuthenticationProperties.java
index 8719b26..7706d9b 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/SSOAuthenticationProperties.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/SSOAuthenticationProperties.java
@@ -27,7 +27,7 @@ public class SSOAuthenticationProperties {
private RSAPublicKey publicKey = null;
private String cookieName = "hadoop-jwt";
private String originalUrlQueryParam = null;
- private String[] userAgentList = null;
+ private String[] userAgentList = null;
public String getAuthenticationProviderUrl() {
return authenticationProviderUrl;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java
index 6c7e1f0..9a4aa3b 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java b/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
index 28f934d..1e21870 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/PublicAPIServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/PublicAPIServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/PublicAPIServiceBase.java
index 869d795..ad79a2a 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/PublicAPIServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/PublicAPIServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java
index 07765e0..482f10c 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java
@@ -303,8 +303,8 @@ public abstract class RangerBaseModelService<T extends XXDBBase, V extends Range
}
/*
- * Search Operations
- *
+ * Search Operations
+ *
*/
public List<T> searchResources(SearchFilter searchCriteria,
@@ -379,11 +379,11 @@ public abstract class RangerBaseModelService<T extends XXDBBase, V extends Range
return count.longValue();
}
- protected Query createQuery(String searchString, String sortString, SearchFilter searchCriteria,
+ protected Query createQuery(String searchString, String sortString, SearchFilter searchCriteria,
List<SearchField> searchFieldList, boolean isCountQuery) {
EntityManager em = getDao().getEntityManager();
- Query query = searchUtil.createSearchQuery(em, searchString, sortString, searchCriteria,
+ Query query = searchUtil.createSearchQuery(em, searchString, sortString, searchCriteria,
searchFieldList, getClassType(), false, isCountQuery);
return query;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceService.java
index 0621e75..e5937e6 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceServiceBase.java
index c421be0..8b3d645 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java
index 747ea42..ca1f64e 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java
@@ -256,7 +256,7 @@ public class RangerServiceService extends RangerServiceServiceBase<XXService, Ra
if (!vConfig.containsKey(key)) {
oldConfig.put(key, entry.getValue());
newConfig.put(key,null);
- }
+ }
}
oldValue = jsonUtil.readMapToString(oldConfig);
value = jsonUtil.readMapToString(newConfig);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java
index 53a094f..822c614 100755
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java
@@ -45,7 +45,7 @@ public abstract class RangerServiceServiceBase<T extends XXServiceBase, V extend
public RangerServiceServiceBase() {
super();
- searchFields.add(new SearchField(SearchFilter.SERVICE_TYPE, "xSvcDef.name", DATA_TYPE.STRING,
+ searchFields.add(new SearchField(SearchFilter.SERVICE_TYPE, "xSvcDef.name", DATA_TYPE.STRING,
SEARCH_TYPE.FULL, "XXServiceDef xSvcDef", "obj.type = xSvcDef.id"));
searchFields.add(new SearchField(SearchFilter.SERVICE_TYPE_ID, "obj.type", DATA_TYPE.INTEGER, SEARCH_TYPE.FULL));
searchFields.add(new SearchField(SearchFilter.SERVICE_NAME, "obj.name", DATA_TYPE.STRING, SEARCH_TYPE.FULL));
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefService.java
index 8a3d14d..82eb252 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefServiceBase.java
index fe01e83..9482238 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapService.java
index 391774e..89c451e 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapServiceBase.java
index 727cb79..2b5c130 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/RangerTagServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerTagServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerTagServiceBase.java
index 940df90..1a6c8f8 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerTagServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerTagServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/UserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/UserService.java b/security-admin/src/main/java/org/apache/ranger/service/UserService.java
index 5c12793..826b9e8 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/UserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/UserService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/UserServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/UserServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/UserServiceBase.java
index 043358a..5ae948e 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/UserServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/UserServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java b/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java
index de3b87f..e8fff6a 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -85,9 +85,9 @@ public class XAccessAuditService extends XAccessAuditServiceBase<XXAccessAudit,
searchFields.add(new SearchField("repoType", "obj.repoType",
SearchField.DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL));
- searchFields.add(new SearchField("startDate", "obj.eventTime",
+ searchFields.add(new SearchField("startDate", "obj.eventTime",
DATA_TYPE.DATE, SEARCH_TYPE.GREATER_EQUAL_THAN));
- searchFields.add(new SearchField("endDate", "obj.eventTime",
+ searchFields.add(new SearchField("endDate", "obj.eventTime",
DATA_TYPE.DATE, SEARCH_TYPE.LESS_EQUAL_THAN));
searchFields.add(new SearchField("tags", "obj.tags", DATA_TYPE.STRING, SEARCH_TYPE.PARTIAL));
sortFields.add(new SortField("eventTime", "obj.eventTime", true, SORT_ORDER.DESC));
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditServiceBase.java
index 55391d0..133cf32 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java b/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java
index 8fbb74b..692795a 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -48,7 +48,7 @@ public class XAgentService {
public XAgentService() {
defaultDBDateFormat = PropertiesUtil.getProperty("ranger.db.defaultDateformat", defaultDBDateFormat);
- auditSupported = PropertiesUtil.getBooleanProperty("xa.audit.supported",
+ auditSupported = PropertiesUtil.getBooleanProperty("xa.audit.supported",
false);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java b/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java
index 794650c..81c720d 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XAssetServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAssetServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XAssetServiceBase.java
index d3e2dc5..4766689 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAssetServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAssetServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java
index 80d9947..1dfe19f 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XAuditMapServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapServiceBase.java
index 9da8012..72e8c6c 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreService.java b/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreService.java
index 68ab44a..c2dd320 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreServiceBase.java
index db85bd9..51beaac 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupService.java
index b6a829b..67f4c73 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java
index 680fa67..725f528 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java
index 19c3d19..d74d2bf 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java
index 8ac97ce..c6ec618 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java
index 8c67058..d1901d9 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java
index 25779f2..a91f365 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java b/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java
index e88f6b3..bc335cc 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -194,7 +194,7 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
if(policyType != AppConstants.ASSET_KNOX){
if(fieldName.equals("ipAddress"))
continue;
- }
+ }
VTrxLogAttr vTrxLogAttr = trxLogAttrs.get(fieldName);
@@ -213,7 +213,7 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
// value = xUser.getName();
if(fieldName.equals("ipAddress") && action.equalsIgnoreCase("update")){
prevValue = ""+field.get(mObj);
- value = value.equalsIgnoreCase("null") ? "" : value;
+ value = value.equalsIgnoreCase("null") ? "" : value;
}
else if(value == null || value.equalsIgnoreCase("null") || stringUtil.isEmpty(value)){
continue;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java
index afcd307..93f4e8d 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java
index a8fe1de..870e45d 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -42,9 +42,9 @@ public class XPolicyExportAuditService extends XPolicyExportAuditServiceBase<XXP
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
searchFields.add(new SearchField("repositoryName", "obj.repositoryName",
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
- searchFields.add(new SearchField("startDate", "obj.createTime",
+ searchFields.add(new SearchField("startDate", "obj.createTime",
DATA_TYPE.DATE, SEARCH_TYPE.GREATER_EQUAL_THAN));
- searchFields.add(new SearchField("endDate", "obj.createTime",
+ searchFields.add(new SearchField("endDate", "obj.createTime",
DATA_TYPE.DATE, SEARCH_TYPE.LESS_EQUAL_THAN));
sortFields.add(new SortField("createDate", "obj.createTime", true, SORT_ORDER.DESC));
[19/19] incubator-ranger git commit: Removing spaces before semicolons
Posted by co...@apache.org.
Removing spaces before semicolons
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/eb21ea6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/eb21ea6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/eb21ea6a
Branch: refs/heads/master
Commit: eb21ea6afb9f2ca0e26a769bfc6333ba3cce0e61
Parents: 09700f3
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Sep 28 10:25:34 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Sep 28 10:25:34 2016 +0100
----------------------------------------------------------------------
.../audit/destination/SolrAuditDestination.java | 18 +-
.../audit/entity/AuthzAuditEventDbObj.java | 2 +-
.../ranger/audit/model/EnumRepositoryType.java | 10 +-
.../ranger/audit/provider/DbAuditProvider.java | 4 +-
.../audit/provider/Log4jAuditProvider.java | 2 +-
.../apache/ranger/audit/provider/MiscUtil.java | 2 +-
.../audit/provider/hdfs/HdfsAuditProvider.java | 2 +-
.../audit/provider/hdfs/HdfsLogDestination.java | 2 +-
.../ranger/audit/utils/RollingTimeUtil.java | 2 +-
.../security/KrbPasswordSaverLoginModule.java | 12 +-
.../hadoop/security/SecureClientLogin.java | 8 +-
.../hadoop/config/RangerConfiguration.java | 26 +-
.../config/RangerLegacyConfigBuilder.java | 26 +-
.../hadoop/constants/RangerHadoopConstants.java | 58 ++--
.../plugin/audit/RangerDefaultAuditHandler.java | 4 +-
.../apache/ranger/plugin/client/BaseClient.java | 44 +--
.../plugin/client/HadoopConfigHolder.java | 176 +++++-----
.../plugin/errors/ValidationErrorCode.java | 2 +-
.../RangerPathResourceMatcher.java | 6 +-
.../plugin/store/rest/ServiceRESTStore.java | 2 +-
.../ranger/plugin/util/PasswordUtils.java | 90 ++---
.../ranger/plugin/util/RangerRESTClient.java | 34 +-
.../ranger/plugin/util/RangerRESTUtils.java | 16 +-
.../ranger/plugin/util/RangerSslHelper.java | 34 +-
.../plugin/policyengine/TestPolicyEngine.java | 2 +-
.../ranger/plugin/store/TestServiceStore.java | 14 +-
.../ranger/plugin/store/TestTagStore.java | 10 +-
.../utils/RangerCredentialProviderTest.java | 52 +--
.../ranger/utils/install/PasswordGenerator.java | 90 ++---
.../ranger/utils/install/XmlConfigChanger.java | 250 +++++++-------
.../apache/ranger/credentialapi/buildks.java | 24 +-
.../ranger/server/tomcat/EmbeddedServer.java | 4 +-
.../server/tomcat/StopEmbeddedServer.java | 14 +-
.../authorization/hbase/HbaseAuthUtilsImpl.java | 2 +-
.../hbase/RangerAuthorizationCoprocessor.java | 2 +-
.../hbase/client/HBaseConnectionMgr.java | 2 +-
.../services/hbase/client/HBaseResourceMgr.java | 12 +-
.../hadoop/HDFSAccessVerifier.java | 2 +-
.../hadoop/RangerHdfsAuthorizer.java | 20 +-
.../RangerAccessControlException.java | 2 +-
.../ranger/services/hdfs/client/HdfsClient.java | 68 ++--
.../services/hdfs/client/HdfsResourceMgr.java | 10 +-
.../hive/authorizer/RangerHiveAuditHandler.java | 2 +-
.../hive/authorizer/RangerHiveAuthorizer.java | 4 +-
.../hive/constants/RangerHiveConstants.java | 8 +-
.../ranger/services/hive/client/HiveClient.java | 172 +++++-----
.../services/hive/client/HiveResourceMgr.java | 12 +-
.../main/java/org/apache/util/sql/Jisql.java | 2 +-
.../java/org/apache/util/sql/MySQLPLRunner.java | 2 +-
.../apache/hadoop/crypto/key/DB2HSMMKUtil.java | 38 +--
.../apache/hadoop/crypto/key/HSM2DBMKUtil.java | 36 +-
.../hadoop/crypto/key/JKS2RangerUtil.java | 60 ++--
.../hadoop/crypto/key/Ranger2JKSUtil.java | 50 +--
.../org/apache/hadoop/crypto/key/RangerHSM.java | 2 +-
.../apache/hadoop/crypto/key/RangerKMSDB.java | 2 +-
.../hadoop/crypto/key/RangerKeyStore.java | 28 +-
.../crypto/key/RangerKeyStoreProvider.java | 6 +-
.../hadoop/crypto/key/RangerMasterKey.java | 50 +--
.../hadoop/crypto/key/kms/server/KMSWebApp.java | 2 +-
.../java/org/apache/ranger/entity/XXDBBase.java | 2 +-
.../ranger/services/knox/client/KnoxClient.java | 2 +-
.../services/knox/client/KnoxResourceMgr.java | 8 +-
.../services/kms/client/KMSResourceMgr.java | 10 +-
.../ranger/services/nifi/client/NiFiClient.java | 2 +-
.../yarn/authorizer/RangerYarnAuthorizer.java | 8 +-
.../ranger/services/yarn/client/YarnClient.java | 20 +-
.../services/yarn/client/YarnResourceMgr.java | 10 +-
.../access/RangerAccessControlLists.java | 44 +--
.../access/RangerAccessControlListsTest.java | 10 +-
.../RangerPluginClassLoaderUtil.java | 2 +-
.../policyengine/RangerPluginPerfTester.java | 4 +-
.../java/org/apache/ranger/biz/AssetMgr.java | 8 +-
.../java/org/apache/ranger/biz/KmsKeyMgr.java | 8 +-
.../org/apache/ranger/common/AppConstants.java | 30 +-
.../apache/ranger/common/PropertiesUtil.java | 2 +-
.../apache/ranger/common/RangerProperties.java | 12 +-
.../apache/ranger/common/RangerSearchUtil.java | 12 +-
.../org/apache/ranger/common/ServiceUtil.java | 10 +-
.../java/org/apache/ranger/entity/XXDBBase.java | 2 +-
.../java/org/apache/ranger/entity/XXGroup.java | 2 +-
.../java/org/apache/ranger/entity/XXUser.java | 2 +-
.../patch/PatchPersmissionModel_J10003.java | 2 +-
.../patch/cliutil/DbToSolrMigrationUtil.java | 2 +-
.../apache/ranger/service/XAgentService.java | 18 +-
.../java/org/apache/ranger/solr/SolrMgr.java | 2 +-
.../apache/ranger/common/TestStringUtil.java | 4 +-
.../authorization/storm/StormRangerPlugin.java | 2 +-
.../storm/authorizer/RangerStormAuthorizer.java | 34 +-
.../services/storm/client/StormClient.java | 28 +-
.../services/storm/client/StormResourceMgr.java | 12 +-
.../storm/client/json/model/Topology.java | 6 +-
.../ranger/tagsync/process/TagSyncConfig.java | 14 +-
.../tagsync/sink/tagadmin/TagAdminRESTSink.java | 4 +-
.../tagsync/source/atlasrest/AtlasRESTUtil.java | 4 +-
.../ranger/ldapconfigcheck/LdapConfig.java | 4 +-
.../process/CustomSSLSocketFactory.java | 14 +-
.../process/LdapUserGroupBuilder.java | 40 +--
.../process/PolicyMgrUserGroupBuilder.java | 4 +-
.../config/UserGroupSyncConfig.java | 136 ++++----
.../model/GetXGroupListResponse.java | 4 +-
.../model/GetXUserGroupListResponse.java | 4 +-
.../model/GetXUserListResponse.java | 4 +-
.../ranger/unixusersync/model/MUserInfo.java | 10 +-
.../ranger/unixusersync/model/XGroupInfo.java | 8 +-
.../unixusersync/model/XUserGroupInfo.java | 6 +-
.../ranger/unixusersync/model/XUserInfo.java | 8 +-
.../unixusersync/poc/ListUserGroupTest.java | 2 +-
.../poc/RangerUpdateUserGroupMapping.java | 4 +-
.../process/FileSourceUserGroupBuilder.java | 20 +-
.../process/PolicyMgrUserGroupBuilder.java | 332 +++++++++----------
.../process/UnixUserGroupBuilder.java | 78 ++---
.../ranger/usergroupsync/UserGroupSync.java | 44 +--
.../unix/jaas/ConsolePromptCallbackHandler.java | 6 +-
.../unix/jaas/RemoteUnixLoginModule.java | 64 ++--
.../unix/jaas/UnixGroupPrincipal.java | 6 +-
.../unix/jaas/UnixUserPrincipal.java | 6 +-
.../UnixAuthenticationTester.java | 6 +-
.../authentication/PasswordValidator.java | 54 +--
.../UnixAuthenticationService.java | 156 ++++-----
119 files changed, 1500 insertions(+), 1500 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
index 57f2f6d..c8f4f13 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
@@ -137,7 +137,7 @@ public class SolrAuditDestination extends AuditDestination {
+ zkHosts, t);
}
finally {
- resetInitializerInSOLR() ;
+ resetInitializerInSOLR();
}
} else if (solrURLs != null && !solrURLs.isEmpty()) {
try {
@@ -171,7 +171,7 @@ public class SolrAuditDestination extends AuditDestination {
+ solrURLs, t);
}
finally {
- resetInitializerInSOLR() ;
+ resetInitializerInSOLR();
}
}
}
@@ -182,8 +182,8 @@ public class SolrAuditDestination extends AuditDestination {
private void resetInitializerInSOLR() {
javax.security.auth.login.Configuration solrConfig = javax.security.auth.login.Configuration.getConfiguration();
- String solrConfigClassName = solrConfig.getClass().getName() ;
- String solrJassConfigEnd = "SolrJaasConfiguration" ;
+ String solrConfigClassName = solrConfig.getClass().getName();
+ String solrJassConfigEnd = "SolrJaasConfiguration";
if (solrConfigClassName.endsWith(solrJassConfigEnd)) {
try {
Field f = solrConfig.getClass().getDeclaredField("initiateAppNames");
@@ -316,11 +316,11 @@ public class SolrAuditDestination extends AuditDestination {
// SolrJ requires "java.security.auth.login.config" property to be set to identify itself that it is kerberized. So using a dummy property for it
// Acutal solrclient JAAS configs are read from the ranger-<component>-audit.xml present in components conf folder and set by InMemoryJAASConfiguration
// Refer InMemoryJAASConfiguration doc for JAAS Configuration
- String confFileName = System.getProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG) ;
- LOG.info("In solrAuditDestination.init() : JAAS Configuration set as [" + confFileName + "]") ;
+ String confFileName = System.getProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG);
+ LOG.info("In solrAuditDestination.init() : JAAS Configuration set as [" + confFileName + "]");
if ( System.getProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG) == null ) {
if ( MiscUtil.getBooleanProperty(props, propPrefix + "." + PROP_SOLR_FORCE_USE_INMEMORY_JAAS_CONFIG,false) ) {
- System.setProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG, "/dev/null") ;
+ System.setProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG, "/dev/null");
} else {
LOG.warn("No Client JAAS config present in solr audit config. Ranger Audit to Kerberized Solr will fail...");
}
@@ -331,8 +331,8 @@ public class SolrAuditDestination extends AuditDestination {
LOG.error("ERROR: Unable to load SolrClient JAAS config from Audit config file. Audit to Kerberized Solr will fail...", e);
}
finally {
- String confFileName = System.getProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG) ;
- LOG.info("In solrAuditDestination.init() (finally) : JAAS Configuration set as [" + confFileName + "]") ;
+ String confFileName = System.getProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG);
+ LOG.info("In solrAuditDestination.init() (finally) : JAAS Configuration set as [" + confFileName + "]");
}
LOG.info("<==SolrAuditDestination.init()" );
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java b/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java
index 8735fc6..6830e95 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java
@@ -192,7 +192,7 @@ public class AuthzAuditEventDbObj implements Serializable {
@Column(name = "repo_type")
public int getRepositoryType() {
- return this.repositoryType ;
+ return this.repositoryType;
}
public void setRepositoryType(int repositoryType) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java b/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java
index eb3e288..a8364c2 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java
@@ -21,17 +21,17 @@
public final class EnumRepositoryType {
- public static final int HDFS = 1 ;
+ public static final int HDFS = 1;
- public static final int HBASE = 2 ;
+ public static final int HBASE = 2;
- public static final int HIVE = 3 ;
+ public static final int HIVE = 3;
- public static final int XAAGENT = 4 ;
+ public static final int XAAGENT = 4;
public static final int KNOX = 5;
- public static final int STORM = 6 ;
+ public static final int STORM = 6;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java
index 34de6f7..0987688 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java
@@ -47,10 +47,10 @@ public class DbAuditProvider extends AuditDestination {
private static final Log LOG = LogFactory.getLog(DbAuditProvider.class);
public static final String AUDIT_DB_IS_ASYNC_PROP = "xasecure.audit.db.is.async";
- public static final String AUDIT_DB_MAX_QUEUE_SIZE_PROP = "xasecure.audit.db.async.max.queue.size" ;
+ public static final String AUDIT_DB_MAX_QUEUE_SIZE_PROP = "xasecure.audit.db.async.max.queue.size";
public static final String AUDIT_DB_MAX_FLUSH_INTERVAL_PROP = "xasecure.audit.db.async.max.flush.interval.ms";
- private static final String AUDIT_DB_BATCH_SIZE_PROP = "xasecure.audit.db.batch.size" ;
+ private static final String AUDIT_DB_BATCH_SIZE_PROP = "xasecure.audit.db.batch.size";
private static final String AUDIT_DB_RETRY_MIN_INTERVAL_PROP = "xasecure.audit.db.config.retry.min.interval.ms";
private static final String AUDIT_JPA_CONFIG_PROP_PREFIX = "xasecure.audit.jpa.";
private static final String AUDIT_DB_CREDENTIAL_PROVIDER_FILE = "xasecure.audit.credential.provider.file";
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/provider/Log4jAuditProvider.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/Log4jAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/Log4jAuditProvider.java
index 3beab69..353c809 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/Log4jAuditProvider.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/Log4jAuditProvider.java
@@ -34,7 +34,7 @@ public class Log4jAuditProvider extends AuditDestination {
private static final Log AUDITLOG = LogFactory.getLog("xaaudit." + Log4jAuditProvider.class.getName());
public static final String AUDIT_LOG4J_IS_ASYNC_PROP = "xasecure.audit.log4j.is.async";
- public static final String AUDIT_LOG4J_MAX_QUEUE_SIZE_PROP = "xasecure.audit.log4j.async.max.queue.size" ;
+ public static final String AUDIT_LOG4J_MAX_QUEUE_SIZE_PROP = "xasecure.audit.log4j.async.max.queue.size";
public static final String AUDIT_LOG4J_MAX_FLUSH_INTERVAL_PROP = "xasecure.audit.log4j.async.max.flush.interval.ms";
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
index edb1c63..4515843 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
@@ -77,7 +77,7 @@ public class MiscUtil {
private static String sApplicationType = null;
private static UserGroupInformation ugiLoginUser = null;
private static Subject subjectLoginUser = null;
- private static String local_hostname = null ;
+ private static String local_hostname = null;
private static Map<String, LogHistory> logHistoryList = new Hashtable<String, LogHistory>();
private static int logInterval = 30000; // 30 seconds
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsAuditProvider.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsAuditProvider.java
index 8cdf869..65429ad 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsAuditProvider.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsAuditProvider.java
@@ -32,7 +32,7 @@ public class HdfsAuditProvider extends BufferedAuditProvider {
private static final Log LOG = LogFactory.getLog(HdfsAuditProvider.class);
public static final String AUDIT_HDFS_IS_ASYNC_PROP = "xasecure.audit.hdfs.is.async";
- public static final String AUDIT_HDFS_MAX_QUEUE_SIZE_PROP = "xasecure.audit.hdfs.async.max.queue.size" ;
+ public static final String AUDIT_HDFS_MAX_QUEUE_SIZE_PROP = "xasecure.audit.hdfs.async.max.queue.size";
public static final String AUDIT_HDFS_MAX_FLUSH_INTERVAL_PROP = "xasecure.audit.hdfs.async.max.flush.interval.ms";
public HdfsAuditProvider() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java
index c09abb5..065e8b0 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java
@@ -425,7 +425,7 @@ public class HdfsLogDestination<T> implements LogDestination<T> {
return "";
}
- for(int i = 1; ; i++) {
+ for(int i = 1;; i++) {
String ret = fileName;
String strToAppend = "-" + Integer.toString(i);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/utils/RollingTimeUtil.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/utils/RollingTimeUtil.java b/agents-audit/src/main/java/org/apache/ranger/audit/utils/RollingTimeUtil.java
index 54675c7..f59817f 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/utils/RollingTimeUtil.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/utils/RollingTimeUtil.java
@@ -246,7 +246,7 @@ public class RollingTimeUtil {
// Test Method for RolloverTime calculation
// Set rollOverPeriod 10m,30m..,1h,2h,..1d,2d..,1w,2w..,1M,2M..1y..2y
// If nothing is set for rollOverPeriod or Duration default rollOverPeriod is 1 day
- String rollOverPeriod = "" ;
+ String rollOverPeriod = "";
RollingTimeUtil rollingTimeUtil = new RollingTimeUtil();
int duration = 86400;
Date nextRollOvertime = null;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java b/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
index e4f00f0..aa986fd 100644
--- a/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
+++ b/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
@@ -32,7 +32,7 @@ public class KrbPasswordSaverLoginModule implements LoginModule {
public static final String PASSWORD_PARAM = "javax.security.auth.login.password";
@SuppressWarnings("rawtypes")
- private Map sharedState = null ;
+ private Map sharedState = null;
public KrbPasswordSaverLoginModule() {
}
@@ -51,16 +51,16 @@ public class KrbPasswordSaverLoginModule implements LoginModule {
@Override
public void initialize(Subject subject, CallbackHandler callbackhandler, Map<String, ?> sharedMap, Map<String, ?> options) {
- this.sharedState = sharedMap ;
+ this.sharedState = sharedMap;
- String userName = (options != null) ? (String)options.get(USERNAME_PARAM) : null ;
+ String userName = (options != null) ? (String)options.get(USERNAME_PARAM) : null;
if (userName != null) {
- this.sharedState.put(USERNAME_PARAM,userName) ;
+ this.sharedState.put(USERNAME_PARAM,userName);
}
- String password = (options != null) ? (String)options.get(PASSWORD_PARAM) : null ;
+ String password = (options != null) ? (String)options.get(PASSWORD_PARAM) : null;
if (password != null) {
- this.sharedState.put(PASSWORD_PARAM,password.toCharArray()) ;
+ this.sharedState.put(PASSWORD_PARAM,password.toCharArray());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java b/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java
index a9f4da6..e6b3387 100644
--- a/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java
+++ b/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java
@@ -108,7 +108,7 @@ public class SecureClientLogin {
}
public static Principal createUserPrincipal(String aLoginName) {
- return new User(aLoginName) ;
+ return new User(aLoginName);
}
public static boolean isKerberosCredentialExists(String principal, String keytabPath){
@@ -163,7 +163,7 @@ public class SecureClientLogin {
class SecureClientLoginConfiguration extends javax.security.auth.login.Configuration {
private Map<String, String> kerberosOptions = new HashMap<String, String>();
- private boolean usePassword = false ;
+ private boolean usePassword = false;
public SecureClientLoginConfiguration(boolean useKeyTab, String principal, String credential) {
kerberosOptions.put("principal", principal);
@@ -173,13 +173,13 @@ class SecureClientLoginConfiguration extends javax.security.auth.login.Configura
kerberosOptions.put("keyTab", credential);
kerberosOptions.put("doNotPrompt", "true");
} else {
- usePassword = true ;
+ usePassword = true;
kerberosOptions.put("useKeyTab", "false");
kerberosOptions.put(KrbPasswordSaverLoginModule.USERNAME_PARAM, principal);
kerberosOptions.put(KrbPasswordSaverLoginModule.PASSWORD_PARAM, credential);
kerberosOptions.put("doNotPrompt", "false");
kerberosOptions.put("useFirstPass", "true");
- kerberosOptions.put("tryFirstPass","false") ;
+ kerberosOptions.put("tryFirstPass","false");
}
kerberosOptions.put("storeKey", "true");
kerberosOptions.put("refreshKrb5Config", "true");
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
index ffe352e..8a9be4f 100644
--- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
+++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
@@ -31,12 +31,12 @@ import org.apache.ranger.audit.provider.AuditProviderFactory;
public class RangerConfiguration extends Configuration {
- private static final Logger LOG = Logger.getLogger(RangerConfiguration.class) ;
+ private static final Logger LOG = Logger.getLogger(RangerConfiguration.class);
private static volatile RangerConfiguration config = null;
private RangerConfiguration() {
- super(false) ;
+ super(false);
}
public void addResourcesForServiceType(String serviceType) {
@@ -87,18 +87,18 @@ public class RangerConfiguration extends Configuration {
LOG.debug("==> addResourceIfReadable(" + aResourceName + ")");
}
- String fName = getFileLocation(aResourceName) ;
+ String fName = getFileLocation(aResourceName);
if (fName != null) {
if(LOG.isInfoEnabled()) {
LOG.info("addResourceIfReadable(" + aResourceName + "): resource file is " + fName);
}
- File f = new File(fName) ;
+ File f = new File(fName);
if (f.exists() && f.canRead()) {
- URL fUrl = null ;
+ URL fUrl = null;
try {
- fUrl = f.toURI().toURL() ;
- addResource(fUrl) ;
+ fUrl = f.toURI().toURL();
+ addResource(fUrl);
ret = true;
} catch (MalformedURLException e) {
LOG.error("Unable to find URL for the resource name [" + aResourceName + "]. Ignoring the resource:" + aResourceName);
@@ -134,7 +134,7 @@ public class RangerConfiguration extends Configuration {
AuditProviderFactory auditFactory = AuditProviderFactory.getInstance();
if(auditFactory == null) {
- LOG.error("Unable to find the AuditProviderFactory. (null) found") ;
+ LOG.error("Unable to find the AuditProviderFactory. (null) found");
return;
}
@@ -157,19 +157,19 @@ public class RangerConfiguration extends Configuration {
private String getFileLocation(String fileName) {
- String ret = null ;
+ String ret = null;
- URL lurl = RangerConfiguration.class.getClassLoader().getResource(fileName) ;
+ URL lurl = RangerConfiguration.class.getClassLoader().getResource(fileName);
if (lurl == null ) {
- lurl = RangerConfiguration.class.getClassLoader().getResource("/" + fileName) ;
+ lurl = RangerConfiguration.class.getClassLoader().getResource("/" + fileName);
}
if (lurl != null) {
- ret = lurl.getFile() ;
+ ret = lurl.getFile();
}
- return ret ;
+ return ret;
}
private void addSecurityResource(String serviceType) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java
index 89be842..3b0a3fc 100644
--- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java
+++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java
@@ -112,26 +112,26 @@ public class RangerLegacyConfigBuilder {
public static URL getAuditResource(String fName) throws Throwable {
- URL ret = null ;
+ URL ret = null;
try {
for(String cfgFile : new String[] { "hive-site.xml", "hbase-site.xml", "hdfs-site.xml" } ) {
- String loc = getFileLocation(cfgFile) ;
+ String loc = getFileLocation(cfgFile);
if (loc != null) {
File f = new File(loc);
if ( f.exists() && f.canRead()) {
- File parentFile = new File(loc).getParentFile() ;
+ File parentFile = new File(loc).getParentFile();
ret = new File(parentFile, RangerConfigConstants.XASECURE_AUDIT_FILE).toURI().toURL();
- break ;
+ break;
}
}
}
}
catch(Throwable t) {
- LOG.error("Unable to locate audit file location." + fName + " " + t) ;
+ LOG.error("Unable to locate audit file location." + fName + " " + t);
throw t;
}
- return ret ;
+ return ret;
}
public static Configuration buildRangerSecurityConf(String serviceType) {
@@ -191,21 +191,21 @@ public class RangerLegacyConfigBuilder {
}
public static String getFileLocation(String fileName) {
- String ret = null ;
+ String ret = null;
- URL lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource(fileName) ;
+ URL lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource(fileName);
if (lurl == null ) {
- lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource("/" + fileName) ;
+ lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource("/" + fileName);
}
if (lurl != null) {
- ret = lurl.getFile() ;
+ ret = lurl.getFile();
}
- return ret ;
+ return ret;
}
public static URL getFileURL(String fileName) {
- URL lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource(fileName) ;
- return lurl ;
+ URL lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource(fileName);
+ return lurl;
}
public static String getPropertyName(String rangerProp, String serviceType) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java
index 906a156..b3d761c 100644
--- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java
+++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java
@@ -20,8 +20,8 @@ package org.apache.ranger.authorization.hadoop.constants;
public class RangerHadoopConstants {
- public static final String RANGER_ADD_HDFS_PERMISSION_PROP = "xasecure.add-hadoop-authorization" ;
- public static final boolean RANGER_ADD_HDFS_PERMISSION_DEFAULT = false ;
+ public static final String RANGER_ADD_HDFS_PERMISSION_PROP = "xasecure.add-hadoop-authorization";
+ public static final boolean RANGER_ADD_HDFS_PERMISSION_DEFAULT = false;
public static final String READ_ACCCESS_TYPE = "read";
public static final String WRITE_ACCCESS_TYPE = "write";
public static final String EXECUTE_ACCCESS_TYPE = "execute";
@@ -29,52 +29,52 @@ public class RangerHadoopConstants {
public static final String HDFS_ROOT_FOLDER_PATH_ALT = "";
public static final String HDFS_ROOT_FOLDER_PATH = "/";
- public static final String HIVE_UPDATE_RANGER_POLICIES_ON_GRANT_REVOKE_PROP = "xasecure.hive.update.xapolicies.on.grant.revoke" ;
+ public static final String HIVE_UPDATE_RANGER_POLICIES_ON_GRANT_REVOKE_PROP = "xasecure.hive.update.xapolicies.on.grant.revoke";
public static final boolean HIVE_UPDATE_RANGER_POLICIES_ON_GRANT_REVOKE_DEFAULT_VALUE = true;
public static final String HIVE_BLOCK_UPDATE_IF_ROWFILTER_COLUMNMASK_SPECIFIED_PROP = "xasecure.hive.block.update.if.rowfilter.columnmask.specified";
public static final boolean HIVE_BLOCK_UPDATE_IF_ROWFILTER_COLUMNMASK_SPECIFIED_DEFAULT_VALUE = true;
- public static final String HBASE_UPDATE_RANGER_POLICIES_ON_GRANT_REVOKE_PROP = "xasecure.hbase.update.xapolicies.on.grant.revoke" ;
+ public static final String HBASE_UPDATE_RANGER_POLICIES_ON_GRANT_REVOKE_PROP = "xasecure.hbase.update.xapolicies.on.grant.revoke";
public static final boolean HBASE_UPDATE_RANGER_POLICIES_ON_GRANT_REVOKE_DEFAULT_VALUE = true;
- public static final String KNOX_ACCESS_VERIFIER_CLASS_NAME_PROP = "knox.authorization.verifier.classname" ;
- public static final String KNOX_ACCESS_VERIFIER_CLASS_NAME_DEFAULT_VALUE = "org.apache.ranger.pdp.knox.RangerAuthorizer" ;
+ public static final String KNOX_ACCESS_VERIFIER_CLASS_NAME_PROP = "knox.authorization.verifier.classname";
+ public static final String KNOX_ACCESS_VERIFIER_CLASS_NAME_DEFAULT_VALUE = "org.apache.ranger.pdp.knox.RangerAuthorizer";
- public static final String STORM_ACCESS_VERIFIER_CLASS_NAME_PROP = "storm.authorization.verifier.classname" ;
- public static final String STORM_ACCESS_VERIFIER_CLASS_NAME_DEFAULT_VALUE = "org.apache.ranger.pdp.storm.RangerAuthorizer" ;
+ public static final String STORM_ACCESS_VERIFIER_CLASS_NAME_PROP = "storm.authorization.verifier.classname";
+ public static final String STORM_ACCESS_VERIFIER_CLASS_NAME_DEFAULT_VALUE = "org.apache.ranger.pdp.storm.RangerAuthorizer";
- public static final String RANGER_ADD_YARN_PERMISSION_PROP = "ranger.add-yarn-authorization" ;
- public static final boolean RANGER_ADD_YARN_PERMISSION_DEFAULT = true ;
+ public static final String RANGER_ADD_YARN_PERMISSION_PROP = "ranger.add-yarn-authorization";
+ public static final boolean RANGER_ADD_YARN_PERMISSION_DEFAULT = true;
//
// Logging constants
//
public static final String AUDITLOG_FIELD_DELIMITER_PROP = "xasecure.auditlog.fieldDelimiterString";
- public static final String AUDITLOG_RANGER_MODULE_ACL_NAME_PROP = "xasecure.auditlog.xasecureAcl.name" ;
- public static final String AUDITLOG_HADOOP_MODULE_ACL_NAME_PROP = "xasecure.auditlog.hadoopAcl.name" ;
- public static final String AUDITLOG_YARN_MODULE_ACL_NAME_PROP = "ranger.auditlog.yarnAcl.name" ;
+ public static final String AUDITLOG_RANGER_MODULE_ACL_NAME_PROP = "xasecure.auditlog.xasecureAcl.name";
+ public static final String AUDITLOG_HADOOP_MODULE_ACL_NAME_PROP = "xasecure.auditlog.hadoopAcl.name";
+ public static final String AUDITLOG_YARN_MODULE_ACL_NAME_PROP = "ranger.auditlog.yarnAcl.name";
- public static final String DEFAULT_LOG_FIELD_DELIMITOR = "|" ;
- public static final String DEFAULT_XASECURE_MODULE_ACL_NAME = "xasecure-acl" ;
- public static final String DEFAULT_RANGER_MODULE_ACL_NAME = "ranger-acl" ;
- public static final String DEFAULT_HADOOP_MODULE_ACL_NAME = "hadoop-acl" ;
- public static final String DEFAULT_YARN_MODULE_ACL_NAME = "yarn-acl" ;
+ public static final String DEFAULT_LOG_FIELD_DELIMITOR = "|";
+ public static final String DEFAULT_XASECURE_MODULE_ACL_NAME = "xasecure-acl";
+ public static final String DEFAULT_RANGER_MODULE_ACL_NAME = "ranger-acl";
+ public static final String DEFAULT_HADOOP_MODULE_ACL_NAME = "hadoop-acl";
+ public static final String DEFAULT_YARN_MODULE_ACL_NAME = "yarn-acl";
- public static final String AUDITLOG_FIELDINFO_VISIBLE_PROP = "xasecure.auditlog.fieldInfoVisible" ;
- public static final boolean DEFAULT_AUDITLOG_FIELDINFO_VISIBLE = false ;
+ public static final String AUDITLOG_FIELDINFO_VISIBLE_PROP = "xasecure.auditlog.fieldInfoVisible";
+ public static final boolean DEFAULT_AUDITLOG_FIELDINFO_VISIBLE = false;
- public static final String AUDITLOG_ACCESS_GRANTED_TEXT_PROP = "xasecure.auditlog.accessgranted.text" ;
- public static final String AUDITLOG_ACCESS_DENIED_TEXT_PROP = "xasecure.auditlog.accessdenied.text" ;
+ public static final String AUDITLOG_ACCESS_GRANTED_TEXT_PROP = "xasecure.auditlog.accessgranted.text";
+ public static final String AUDITLOG_ACCESS_DENIED_TEXT_PROP = "xasecure.auditlog.accessdenied.text";
- public static final String DEFAULT_ACCESS_GRANTED_TEXT = "granted" ;
- public static final String DEFAULT_ACCESS_DENIED_TEXT = "denied" ;
+ public static final String DEFAULT_ACCESS_GRANTED_TEXT = "granted";
+ public static final String DEFAULT_ACCESS_DENIED_TEXT = "denied";
- public static final String AUDITLOG_EMPTY_STRING = "" ;
+ public static final String AUDITLOG_EMPTY_STRING = "";
- public static final String AUDITLOG_HDFS_EXCLUDE_LIST_PROP = "xasecure.auditlog.hdfs.excludeusers" ;
- public static final String AUDITLOG_REPOSITORY_NAME_PROP = "xasecure.audit.repository.name" ;
- public static final String AUDITLOG_IS_ENABLED_PROP = "xasecure.audit.is.enabled" ;
+ public static final String AUDITLOG_HDFS_EXCLUDE_LIST_PROP = "xasecure.auditlog.hdfs.excludeusers";
+ public static final String AUDITLOG_REPOSITORY_NAME_PROP = "xasecure.audit.repository.name";
+ public static final String AUDITLOG_IS_ENABLED_PROP = "xasecure.audit.is.enabled";
- public static final String KEYMGR_URL_PROP = "hdfs.keymanager.url" ;
+ public static final String KEYMGR_URL_PROP = "hdfs.keymanager.url";
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
index 4fd0c6e..3c342a3 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
@@ -38,13 +38,13 @@ import org.apache.ranger.plugin.util.RangerAccessRequestUtil;
public class RangerDefaultAuditHandler implements RangerAccessResultProcessor {
- protected static final String RangerModuleName = RangerConfiguration.getInstance().get(RangerHadoopConstants.AUDITLOG_RANGER_MODULE_ACL_NAME_PROP , RangerHadoopConstants.DEFAULT_RANGER_MODULE_ACL_NAME) ;
+ protected static final String RangerModuleName = RangerConfiguration.getInstance().get(RangerHadoopConstants.AUDITLOG_RANGER_MODULE_ACL_NAME_PROP , RangerHadoopConstants.DEFAULT_RANGER_MODULE_ACL_NAME);
private static final Log LOG = LogFactory.getLog(RangerDefaultAuditHandler.class);
static long sequenceNumber = 0;
private static String UUID = MiscUtil.generateUniqueId();
- private static AtomicInteger counter = new AtomicInteger(0); ;
+ private static AtomicInteger counter = new AtomicInteger(0);;
public RangerDefaultAuditHandler() {
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
index eeec8ff..4ba1f89 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
@@ -34,44 +34,44 @@ import org.apache.hadoop.security.SecureClientLogin;
import org.apache.ranger.plugin.util.PasswordUtils;
public abstract class BaseClient {
- private static final Log LOG = LogFactory.getLog(BaseClient.class) ;
+ private static final Log LOG = LogFactory.getLog(BaseClient.class);
private static final String DEFAULT_NAME_RULE = "DEFAULT";
- private String serviceName ;
- private String defaultConfigFile ;
- private Subject loginSubject ;
+ private String serviceName;
+ private String defaultConfigFile;
+ private Subject loginSubject;
private HadoopConfigHolder configHolder;
- protected Map<String,String> connectionProperties ;
+ protected Map<String,String> connectionProperties;
public BaseClient(String svcName, Map<String,String> connectionProperties) {
this(svcName, connectionProperties, null);
}
public BaseClient(String serivceName, Map<String,String> connectionProperties, String defaultConfigFile) {
- this.serviceName = serivceName ;
- this.connectionProperties = connectionProperties ;
- this.defaultConfigFile = defaultConfigFile ;
- init() ;
- login() ;
+ this.serviceName = serivceName;
+ this.connectionProperties = connectionProperties;
+ this.defaultConfigFile = defaultConfigFile;
+ init();
+ login();
}
private void init() {
if (connectionProperties == null) {
- configHolder = HadoopConfigHolder.getInstance(serviceName) ;
+ configHolder = HadoopConfigHolder.getInstance(serviceName);
}
else {
- configHolder = HadoopConfigHolder.getInstance(serviceName,connectionProperties, defaultConfigFile) ;
+ configHolder = HadoopConfigHolder.getInstance(serviceName,connectionProperties, defaultConfigFile);
}
}
protected void login() {
- ClassLoader prevCl = Thread.currentThread().getContextClassLoader() ;
+ ClassLoader prevCl = Thread.currentThread().getContextClassLoader();
String errMsg = " You can still save the repository and start creating "
+ "policies, but you would not be able to use autocomplete for "
+ "resource names. Check ranger_admin.log for more info.";
@@ -86,7 +86,7 @@ public abstract class BaseClient {
}
nameRules = DEFAULT_NAME_RULE;
}
- String userName = configHolder.getUserName() ;
+ String userName = configHolder.getUserName();
if(StringUtils.isEmpty(lookupPrincipal) || StringUtils.isEmpty(lookupKeytab)){
if (userName == null) {
String msgDesc = "Unable to find login username for hadoop environment, ["
@@ -97,33 +97,33 @@ public abstract class BaseClient {
throw hdpException;
}
- String keyTabFile = configHolder.getKeyTabFile() ;
+ String keyTabFile = configHolder.getKeyTabFile();
if (keyTabFile != null) {
if ( configHolder.isKerberosAuthentication() ) {
LOG.info("Init Login: security enabled, using username/keytab");
- loginSubject = SecureClientLogin.loginUserFromKeytab(userName, keyTabFile, nameRules) ;
+ loginSubject = SecureClientLogin.loginUserFromKeytab(userName, keyTabFile, nameRules);
}
else {
LOG.info("Init Login: using username");
- loginSubject = SecureClientLogin.login(userName) ;
+ loginSubject = SecureClientLogin.login(userName);
}
}
else {
- String encryptedPwd = configHolder.getPassword() ;
+ String encryptedPwd = configHolder.getPassword();
String password = PasswordUtils.decryptPassword(encryptedPwd);
if ( configHolder.isKerberosAuthentication() ) {
LOG.info("Init Login: using username/password");
- loginSubject = SecureClientLogin.loginUserWithPassword(userName, password) ;
+ loginSubject = SecureClientLogin.loginUserWithPassword(userName, password);
}
else {
LOG.info("Init Login: security not enabled, using username");
- loginSubject = SecureClientLogin.login(userName) ;
+ loginSubject = SecureClientLogin.login(userName);
}
}
}else{
if ( configHolder.isKerberosAuthentication() ) {
LOG.info("Init Lookup Login: security enabled, using lookupPrincipal/lookupKeytab");
- loginSubject = SecureClientLogin.loginUserFromKeytab(lookupPrincipal, lookupKeytab, nameRules) ;
+ loginSubject = SecureClientLogin.loginUserFromKeytab(lookupPrincipal, lookupKeytab, nameRules);
}else{
LOG.info("Init Login: security not enabled, using username");
loginSubject = SecureClientLogin.login(userName);
@@ -150,7 +150,7 @@ public abstract class BaseClient {
}
public String getSerivceName() {
- return serviceName ;
+ return serviceName;
}
protected Subject getLoginSubject() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java
index a728c19..902a8b9 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java
@@ -32,15 +32,15 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.security.SecureClientLogin;
public class HadoopConfigHolder {
- private static final Log LOG = LogFactory.getLog(HadoopConfigHolder.class) ;
- public static final String GLOBAL_LOGIN_PARAM_PROP_FILE = "hadoop-login.properties" ;
- public static final String DEFAULT_DATASOURCE_PARAM_PROP_FILE = "datasource.properties" ;
- public static final String RESOURCEMAP_PROP_FILE = "resourcenamemap.properties" ;
- public static final String DEFAULT_RESOURCE_NAME = "core-site.xml" ;
- public static final String RANGER_SECTION_NAME = "xalogin.xml" ;
- public static final String RANGER_LOGIN_USER_NAME_PROP = "username" ;
- public static final String RANGER_LOGIN_KEYTAB_FILE_PROP = "keytabfile" ;
- public static final String RANGER_LOGIN_PASSWORD = "password" ;
+ private static final Log LOG = LogFactory.getLog(HadoopConfigHolder.class);
+ public static final String GLOBAL_LOGIN_PARAM_PROP_FILE = "hadoop-login.properties";
+ public static final String DEFAULT_DATASOURCE_PARAM_PROP_FILE = "datasource.properties";
+ public static final String RESOURCEMAP_PROP_FILE = "resourcenamemap.properties";
+ public static final String DEFAULT_RESOURCE_NAME = "core-site.xml";
+ public static final String RANGER_SECTION_NAME = "xalogin.xml";
+ public static final String RANGER_LOGIN_USER_NAME_PROP = "username";
+ public static final String RANGER_LOGIN_KEYTAB_FILE_PROP = "keytabfile";
+ public static final String RANGER_LOGIN_PASSWORD = "password";
public static final String RANGER_LOOKUP_PRINCIPAL = "lookupprincipal";
public static final String RANGER_LOOKUP_KEYTAB = "lookupkeytab";
public static final String RANGER_PRINCIPAL = "rangerprincipal";
@@ -53,19 +53,19 @@ public class HadoopConfigHolder {
public static final String HADOOP_RPC_PROTECTION = "hadoop.rpc.protection";
- private static boolean initialized = false ;
- private static Map<String,HashMap<String,Properties>> dataSource2ResourceListMap = new HashMap<String,HashMap<String,Properties>>() ;
- private static Properties globalLoginProp = new Properties() ;
- private static Map<String,HadoopConfigHolder> dataSource2HadoopConfigHolder = new HashMap<String,HadoopConfigHolder>() ;
- private static Properties resourcemapProperties = null ;
+ private static boolean initialized = false;
+ private static Map<String,HashMap<String,Properties>> dataSource2ResourceListMap = new HashMap<String,HashMap<String,Properties>>();
+ private static Properties globalLoginProp = new Properties();
+ private static Map<String,HadoopConfigHolder> dataSource2HadoopConfigHolder = new HashMap<String,HadoopConfigHolder>();
+ private static Properties resourcemapProperties = null;
- private String datasourceName ;
- private String defaultConfigFile ;
- private String userName ;
- private String keyTabFile ;
- private String password ;
- private boolean isKerberosAuth ;
+ private String datasourceName;
+ private String defaultConfigFile;
+ private String userName;
+ private String keyTabFile;
+ private String password;
+ private boolean isKerberosAuth;
private String lookupPrincipal;
private String lookupKeytab;
private String nameRules;
@@ -76,17 +76,17 @@ public class HadoopConfigHolder {
private static Set<String> rangerInternalPropertyKeys = new HashSet<String>();
public static HadoopConfigHolder getInstance(String aDatasourceName) {
- HadoopConfigHolder ret = dataSource2HadoopConfigHolder.get(aDatasourceName) ;
+ HadoopConfigHolder ret = dataSource2HadoopConfigHolder.get(aDatasourceName);
if (ret == null) {
synchronized(HadoopConfigHolder.class) {
- HadoopConfigHolder temp = ret ;
+ HadoopConfigHolder temp = ret;
if (temp == null) {
- ret = new HadoopConfigHolder(aDatasourceName) ;
- dataSource2HadoopConfigHolder.put(aDatasourceName, ret) ;
+ ret = new HadoopConfigHolder(aDatasourceName);
+ dataSource2HadoopConfigHolder.put(aDatasourceName, ret);
}
}
}
- return ret ;
+ return ret;
}
public static HadoopConfigHolder getInstance(String aDatasourceName, Map<String,String> connectionProperties) {
@@ -95,25 +95,25 @@ public class HadoopConfigHolder {
public static HadoopConfigHolder getInstance(String aDatasourceName, Map<String,String> connectionProperties,
String defaultConfigFile) {
- HadoopConfigHolder ret = dataSource2HadoopConfigHolder.get(aDatasourceName) ;
+ HadoopConfigHolder ret = dataSource2HadoopConfigHolder.get(aDatasourceName);
if (ret == null) {
synchronized(HadoopConfigHolder.class) {
- HadoopConfigHolder temp = ret ;
+ HadoopConfigHolder temp = ret;
if (temp == null) {
- ret = new HadoopConfigHolder(aDatasourceName,connectionProperties, defaultConfigFile) ;
- dataSource2HadoopConfigHolder.put(aDatasourceName, ret) ;
+ ret = new HadoopConfigHolder(aDatasourceName,connectionProperties, defaultConfigFile);
+ dataSource2HadoopConfigHolder.put(aDatasourceName, ret);
}
}
}
else {
if (connectionProperties !=null && !connectionProperties.equals(ret.connectionProperties)) {
- ret = new HadoopConfigHolder(aDatasourceName,connectionProperties) ;
- dataSource2HadoopConfigHolder.remove(aDatasourceName) ;
- dataSource2HadoopConfigHolder.put(aDatasourceName, ret) ;
+ ret = new HadoopConfigHolder(aDatasourceName,connectionProperties);
+ dataSource2HadoopConfigHolder.remove(aDatasourceName);
+ dataSource2HadoopConfigHolder.put(aDatasourceName, ret);
}
}
- return ret ;
+ return ret;
}
@@ -121,7 +121,7 @@ public class HadoopConfigHolder {
private HadoopConfigHolder(String aDatasourceName) {
datasourceName = aDatasourceName;
if ( ! initialized ) {
- init() ;
+ init();
}
initLoginInfo();
}
@@ -133,21 +133,21 @@ public class HadoopConfigHolder {
private HadoopConfigHolder(String aDatasourceName, Map<String,String> connectionProperties,
String defaultConfigFile) {
datasourceName = aDatasourceName;
- this.connectionProperties = connectionProperties ;
+ this.connectionProperties = connectionProperties;
this.defaultConfigFile = defaultConfigFile;
- initConnectionProp() ;
+ initConnectionProp();
initLoginInfo();
}
private void initConnectionProp() {
for(String key : connectionProperties.keySet()) {
- String resourceName = getResourceName(key) ;
+ String resourceName = getResourceName(key);
if (resourceName == null) {
- resourceName = RANGER_SECTION_NAME ;
+ resourceName = RANGER_SECTION_NAME;
}
- String val = connectionProperties.get(key) ;
+ String val = connectionProperties.get(key);
addConfiguration(datasourceName, resourceName, key, val );
}
}
@@ -169,8 +169,8 @@ public class HadoopConfigHolder {
public static void initResourceMap() {
if (resourcemapProperties == null) {
- resourcemapProperties = new Properties() ;
- InputStream in = HadoopConfigHolder.class.getClassLoader().getResourceAsStream(RESOURCEMAP_PROP_FILE) ;
+ resourcemapProperties = new Properties();
+ InputStream in = HadoopConfigHolder.class.getClassLoader().getResourceAsStream(RESOURCEMAP_PROP_FILE);
if (in != null) {
try {
resourcemapProperties.load(in);
@@ -187,7 +187,7 @@ public class HadoopConfigHolder {
finally {
if (in != null) {
try {
- in.close() ;
+ in.close();
}
catch(IOException ioe) {
// Ignore IOException during close of stream
@@ -206,15 +206,15 @@ public class HadoopConfigHolder {
private static synchronized void init() {
if (initialized) {
- return ;
+ return;
}
try {
- InputStream in = HadoopConfigHolder.class.getClassLoader().getResourceAsStream(DEFAULT_DATASOURCE_PARAM_PROP_FILE) ;
+ InputStream in = HadoopConfigHolder.class.getClassLoader().getResourceAsStream(DEFAULT_DATASOURCE_PARAM_PROP_FILE);
if (in != null) {
- Properties prop = new Properties() ;
+ Properties prop = new Properties();
try {
- prop.load(in) ;
+ prop.load(in);
} catch (IOException e) {
throw new HadoopException("Unable to get configuration information for Hadoop environments", e);
}
@@ -227,36 +227,36 @@ public class HadoopConfigHolder {
}
if (prop.size() == 0)
- return ;
+ return;
for(Object keyobj : prop.keySet()) {
String key = (String)keyobj;
- String val = prop.getProperty(key) ;
+ String val = prop.getProperty(key);
- int dotLocatedAt = key.indexOf(".") ;
+ int dotLocatedAt = key.indexOf(".");
if (dotLocatedAt == -1) {
- continue ;
+ continue;
}
- String dataSource = key.substring(0,dotLocatedAt) ;
+ String dataSource = key.substring(0,dotLocatedAt);
- String propKey = key.substring(dotLocatedAt+1) ;
- int resourceFoundAt = propKey.indexOf(".") ;
+ String propKey = key.substring(dotLocatedAt+1);
+ int resourceFoundAt = propKey.indexOf(".");
if (resourceFoundAt > -1) {
- String resourceName = propKey.substring(0, resourceFoundAt) + ".xml" ;
- propKey = propKey.substring(resourceFoundAt+1) ;
- addConfiguration(dataSource, resourceName, propKey, val) ;
+ String resourceName = propKey.substring(0, resourceFoundAt) + ".xml";
+ propKey = propKey.substring(resourceFoundAt+1);
+ addConfiguration(dataSource, resourceName, propKey, val);
}
}
}
- in = HadoopConfigHolder.class.getClassLoader().getResourceAsStream(GLOBAL_LOGIN_PARAM_PROP_FILE) ;
+ in = HadoopConfigHolder.class.getClassLoader().getResourceAsStream(GLOBAL_LOGIN_PARAM_PROP_FILE);
if (in != null) {
- Properties tempLoginProp = new Properties() ;
+ Properties tempLoginProp = new Properties();
try {
- tempLoginProp.load(in) ;
+ tempLoginProp.load(in);
} catch (IOException e) {
throw new HadoopException("Unable to get login configuration information for Hadoop environments from file: [" + GLOBAL_LOGIN_PARAM_PROP_FILE + "]", e);
}
@@ -267,21 +267,21 @@ public class HadoopConfigHolder {
// Ignored exception when the stream is closed.
}
}
- globalLoginProp = tempLoginProp ;
+ globalLoginProp = tempLoginProp;
}
}
finally {
- initialized = true ;
+ initialized = true;
}
}
private void initLoginInfo() {
- Properties prop = this.getRangerSection() ;
+ Properties prop = this.getRangerSection();
if (prop != null) {
- userName = prop.getProperty(RANGER_LOGIN_USER_NAME_PROP) ;
- keyTabFile = prop.getProperty(RANGER_LOGIN_KEYTAB_FILE_PROP) ;
- password = prop.getProperty(RANGER_LOGIN_PASSWORD) ;
+ userName = prop.getProperty(RANGER_LOGIN_USER_NAME_PROP);
+ keyTabFile = prop.getProperty(RANGER_LOGIN_KEYTAB_FILE_PROP);
+ password = prop.getProperty(RANGER_LOGIN_PASSWORD);
lookupPrincipal = prop.getProperty(RANGER_LOOKUP_PRINCIPAL);
lookupKeytab = prop.getProperty(RANGER_LOOKUP_KEYTAB);
nameRules = prop.getProperty(RANGER_NAME_RULES);
@@ -300,11 +300,11 @@ public class HadoopConfigHolder {
public Properties getRangerSection() {
- Properties prop = this.getProperties(RANGER_SECTION_NAME) ;
+ Properties prop = this.getProperties(RANGER_SECTION_NAME);
if (prop == null) {
- prop = globalLoginProp ;
+ prop = globalLoginProp;
}
- return prop ;
+ return prop;
}
@@ -312,55 +312,55 @@ public class HadoopConfigHolder {
private static void addConfiguration(String dataSource, String resourceName, String propertyName, String value) {
if (dataSource == null || dataSource.isEmpty()) {
- return ;
+ return;
}
if (propertyName == null || propertyName.isEmpty()) {
- return ;
+ return;
}
if (resourceName == null) {
- resourceName = DEFAULT_RESOURCE_NAME ;
+ resourceName = DEFAULT_RESOURCE_NAME;
}
- HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(dataSource) ;
+ HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(dataSource);
if (resourceName2PropertiesMap == null) {
- resourceName2PropertiesMap = new HashMap<String,Properties>() ;
- dataSource2ResourceListMap.put(dataSource, resourceName2PropertiesMap) ;
+ resourceName2PropertiesMap = new HashMap<String,Properties>();
+ dataSource2ResourceListMap.put(dataSource, resourceName2PropertiesMap);
}
- Properties prop = resourceName2PropertiesMap.get(resourceName) ;
+ Properties prop = resourceName2PropertiesMap.get(resourceName);
if (prop == null) {
- prop = new Properties() ;
- resourceName2PropertiesMap.put(resourceName, prop) ;
+ prop = new Properties();
+ resourceName2PropertiesMap.put(resourceName, prop);
}
if (value == null) {
- prop.remove(propertyName) ;
+ prop.remove(propertyName);
}
else {
- prop.put(propertyName, value) ;
+ prop.put(propertyName, value);
}
}
public String getDatasourceName() {
- return datasourceName ;
+ return datasourceName;
}
public boolean hasResourceExists(String aResourceName) { // dilli
- HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(datasourceName) ;
- return (resourceName2PropertiesMap != null && resourceName2PropertiesMap.containsKey(aResourceName)) ;
+ HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(datasourceName);
+ return (resourceName2PropertiesMap != null && resourceName2PropertiesMap.containsKey(aResourceName));
}
public Properties getProperties(String aResourceName) {
- Properties ret = null ;
- HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(datasourceName) ;
+ Properties ret = null;
+ HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(datasourceName);
if (resourceName2PropertiesMap != null) {
- ret = resourceName2PropertiesMap.get(aResourceName) ;
+ ret = resourceName2PropertiesMap.get(aResourceName);
}
- return ret ;
+ return ret;
}
public String getHadoopSecurityAuthentication() {
@@ -427,10 +427,10 @@ public class HadoopConfigHolder {
LOG.debug("==> HadoopConfigHolder.getProperties( " + " DataSource : " + sectionName + " Property : " + property + ")" );
}
- Properties repoParam = null ;
+ Properties repoParam = null;
String ret = null;
- HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(this.getDatasourceName()) ;
+ HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(this.getDatasourceName());
if ( resourceName2PropertiesMap != null) {
repoParam=resourceName2PropertiesMap.get(sectionName);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/errors/ValidationErrorCode.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/errors/ValidationErrorCode.java b/agents-common/src/main/java/org/apache/ranger/plugin/errors/ValidationErrorCode.java
index 556f8b3..d0f015d 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/errors/ValidationErrorCode.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/errors/ValidationErrorCode.java
@@ -90,7 +90,7 @@ public enum ValidationErrorCode {
POLICY_VALIDATION_ERR_MISSING_RESOURCE_LIST(3026, "Resource list was empty or contains null. At least one resource must be specified"),
POLICY_VALIDATION_ERR_POLICY_UPDATE_MOVE_SERVICE_NOT_ALLOWED(3027, "attempt to move policy id={0} from service={1} to service={2} is not allowed"),
POLICY_VALIDATION_ERR_POLICY_TYPE_CHANGE_NOT_ALLOWED(3028, "attempt to change type of policy id={0} from type={1} to type={2} is not allowed"),
- ;
+ ;
private static final Log LOG = LogFactory.getLog(ValidationErrorCode.class);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java
index 07f21c4..7bf30f3 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java
@@ -150,18 +150,18 @@ public class RangerPathResourceMatcher extends RangerDefaultResourceMatcher {
for(String p : pathElements) {
sb.append(p);
- ret = FilenameUtils.wildcardMatch(sb.toString(), wildcardPath, caseSensitivity) ;
+ ret = FilenameUtils.wildcardMatch(sb.toString(), wildcardPath, caseSensitivity);
if (ret) {
break;
}
- sb.append(pathSeparatorChar) ;
+ sb.append(pathSeparatorChar);
}
sb = null;
} else { // pathToCheck consists of only pathSeparatorChar
- ret = FilenameUtils.wildcardMatch(pathToCheck, wildcardPath, caseSensitivity) ;
+ ret = FilenameUtils.wildcardMatch(pathToCheck, wildcardPath, caseSensitivity);
}
}
return ret;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java
index 22329d0..8f01934 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java
@@ -72,7 +72,7 @@ public class ServiceRESTStore extends AbstractServiceStore {
public final String REST_URL_POLICY_GET_FOR_SERVICE_IF_UPDATED = "/service/plugins/policies/download/";
public final String REST_URL_POLICY_GET_FOR_SECURE_SERVICE_IF_UPDATED = "/service/plugins/secure/policies/download/";
- public static final String REST_MIME_TYPE_JSON = "application/json" ;
+ public static final String REST_MIME_TYPE_JSON = "application/json";
private Boolean populateExistingBaseFields = false;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
index a546ebf..f47fd29 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
@@ -31,92 +31,92 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.core.util.Base64;
public class PasswordUtils {
- private static final Logger LOG = LoggerFactory.getLogger(PasswordUtils.class) ;
+ private static final Logger LOG = LoggerFactory.getLogger(PasswordUtils.class);
- private static final char[] ENCRYPT_KEY = "tzL1AKl5uc4NKYaoQ4P3WLGIBFPXWPWdu1fRm9004jtQiV".toCharArray() ;
+ private static final char[] ENCRYPT_KEY = "tzL1AKl5uc4NKYaoQ4P3WLGIBFPXWPWdu1fRm9004jtQiV".toCharArray();
- private static final byte[] SALT = "f77aLYLo".getBytes() ;
+ private static final byte[] SALT = "f77aLYLo".getBytes();
- private static final int ITERATION_COUNT = 17 ;
+ private static final int ITERATION_COUNT = 17;
- private static final String CRYPT_ALGO = "PBEWithMD5AndDES" ;
+ private static final String CRYPT_ALGO = "PBEWithMD5AndDES";
- private static final String PBE_KEY_ALGO = "PBEWithMD5AndDES" ;
+ private static final String PBE_KEY_ALGO = "PBEWithMD5AndDES";
- private static final String LEN_SEPARATOR_STR = ":" ;
+ private static final String LEN_SEPARATOR_STR = ":";
public static String encryptPassword(String aPassword) throws IOException {
Map<String, String> env = System.getenv();
- String encryptKeyStr = env.get("ENCRYPT_KEY") ;
+ String encryptKeyStr = env.get("ENCRYPT_KEY");
char[] encryptKey;
if (encryptKeyStr == null) {
encryptKey=ENCRYPT_KEY;
}else{
encryptKey=encryptKeyStr.toCharArray();
}
- String saltStr = env.get("ENCRYPT_SALT") ;
+ String saltStr = env.get("ENCRYPT_SALT");
byte[] salt;
if (saltStr == null) {
- salt = SALT ;
+ salt = SALT;
}else{
salt=saltStr.getBytes();
}
- String ret = null ;
- String strToEncrypt = null ;
+ String ret = null;
+ String strToEncrypt = null;
if (aPassword == null) {
- strToEncrypt = "" ;
+ strToEncrypt = "";
}
else {
- strToEncrypt = aPassword.length() + LEN_SEPARATOR_STR + aPassword ;
+ strToEncrypt = aPassword.length() + LEN_SEPARATOR_STR + aPassword;
}
try {
- Cipher engine = Cipher.getInstance(CRYPT_ALGO) ;
- PBEKeySpec keySpec = new PBEKeySpec(encryptKey) ;
- SecretKeyFactory skf = SecretKeyFactory.getInstance(PBE_KEY_ALGO) ;
- SecretKey key = skf.generateSecret(keySpec) ;
+ Cipher engine = Cipher.getInstance(CRYPT_ALGO);
+ PBEKeySpec keySpec = new PBEKeySpec(encryptKey);
+ SecretKeyFactory skf = SecretKeyFactory.getInstance(PBE_KEY_ALGO);
+ SecretKey key = skf.generateSecret(keySpec);
engine.init(Cipher.ENCRYPT_MODE, key, new PBEParameterSpec(salt, ITERATION_COUNT));
- byte[] encryptedStr = engine.doFinal(strToEncrypt.getBytes()) ;
- ret = new String(Base64.encode(encryptedStr)) ;
+ byte[] encryptedStr = engine.doFinal(strToEncrypt.getBytes());
+ ret = new String(Base64.encode(encryptedStr));
}
catch(Throwable t) {
LOG.error("Unable to encrypt password due to error", t);
- throw new IOException("Unable to encrypt password due to error", t) ;
+ throw new IOException("Unable to encrypt password due to error", t);
}
- return ret ;
+ return ret;
}
public static String decryptPassword(String aPassword) throws IOException {
- String ret = null ;
+ String ret = null;
Map<String, String> env = System.getenv();
- String encryptKeyStr = env.get("ENCRYPT_KEY") ;
+ String encryptKeyStr = env.get("ENCRYPT_KEY");
char[] encryptKey;
if (encryptKeyStr == null) {
encryptKey=ENCRYPT_KEY;
}else{
encryptKey=encryptKeyStr.toCharArray();
}
- String saltStr = env.get("ENCRYPT_SALT") ;
+ String saltStr = env.get("ENCRYPT_SALT");
byte[] salt;
if (saltStr == null) {
- salt = SALT ;
+ salt = SALT;
}else{
salt=saltStr.getBytes();
}
try {
- byte[] decodedPassword = Base64.decode(aPassword) ;
- Cipher engine = Cipher.getInstance(CRYPT_ALGO) ;
- PBEKeySpec keySpec = new PBEKeySpec(encryptKey) ;
- SecretKeyFactory skf = SecretKeyFactory.getInstance(PBE_KEY_ALGO) ;
- SecretKey key = skf.generateSecret(keySpec) ;
+ byte[] decodedPassword = Base64.decode(aPassword);
+ Cipher engine = Cipher.getInstance(CRYPT_ALGO);
+ PBEKeySpec keySpec = new PBEKeySpec(encryptKey);
+ SecretKeyFactory skf = SecretKeyFactory.getInstance(PBE_KEY_ALGO);
+ SecretKey key = skf.generateSecret(keySpec);
engine.init(Cipher.DECRYPT_MODE, key,new PBEParameterSpec(salt, ITERATION_COUNT));
- String decrypted = new String(engine.doFinal(decodedPassword)) ;
- int foundAt = decrypted.indexOf(LEN_SEPARATOR_STR) ;
+ String decrypted = new String(engine.doFinal(decodedPassword));
+ int foundAt = decrypted.indexOf(LEN_SEPARATOR_STR);
if (foundAt > -1) {
if (decrypted.length() > foundAt) {
- ret = decrypted.substring(foundAt+1) ;
+ ret = decrypted.substring(foundAt+1);
}
else {
- ret = "" ;
+ ret = "";
}
}
else {
@@ -125,35 +125,35 @@ public class PasswordUtils {
}
catch(Throwable t) {
LOG.error("Unable to decrypt password due to error", t);
- throw new IOException("Unable to decrypt password due to error", t) ;
+ throw new IOException("Unable to decrypt password due to error", t);
}
- return ret ;
+ return ret;
}
public static void main(String[] args) {
- String[] testPasswords = { "a", "a123", "dsfdsgdg", "*7263^5#", "", null } ;
+ String[] testPasswords = { "a", "a123", "dsfdsgdg", "*7263^5#", "", null };
for(String password : testPasswords) {
try {
- String ePassword = PasswordUtils.encryptPassword(password) ;
- String dPassword = PasswordUtils.decryptPassword(ePassword) ;
+ String ePassword = PasswordUtils.encryptPassword(password);
+ String dPassword = PasswordUtils.decryptPassword(ePassword);
if (password == null ) {
if (dPassword != null) {
- throw new RuntimeException("The password expected [" + password + "]. Found [" + dPassword + "]") ;
+ throw new RuntimeException("The password expected [" + password + "]. Found [" + dPassword + "]");
}
else {
- System.out.println("Password: [" + password + "] matched after decrypt. Encrypted: [" + ePassword + "]") ;
+ System.out.println("Password: [" + password + "] matched after decrypt. Encrypted: [" + ePassword + "]");
}
}
else if (! password.equals(dPassword)) {
- throw new RuntimeException("The password expected [" + password + "]. Found [" + dPassword + "]") ;
+ throw new RuntimeException("The password expected [" + password + "]. Found [" + dPassword + "]");
}
else {
- System.out.println("Password: [" + password + "] matched after decrypt. Encrypted: [" + ePassword + "]") ;
+ System.out.println("Password: [" + password + "] matched after decrypt. Encrypted: [" + ePassword + "]");
}
}
catch(IOException ioe) {
ioe.printStackTrace();
- System.out.println("Password verification failed for password [" + password + "]:" + ioe) ;
+ System.out.println("Password verification failed for password [" + password + "]:" + ioe);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
index fa800fe..5218624 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
@@ -79,9 +79,9 @@ public class RangerRESTClient {
public static final String RANGER_POLICYMGR_TRUSTSTORE_FILE_CREDENTIAL_ALIAS = "sslTrustStore";
public static final String RANGER_POLICYMGR_TRUSTSTORE_FILE_TYPE_DEFAULT = "jks";
- public static final String RANGER_SSL_KEYMANAGER_ALGO_TYPE = "SunX509" ;
- public static final String RANGER_SSL_TRUSTMANAGER_ALGO_TYPE = "SunX509" ;
- public static final String RANGER_SSL_CONTEXT_ALGO_TYPE = "SSL" ;
+ public static final String RANGER_SSL_KEYMANAGER_ALGO_TYPE = "SunX509";
+ public static final String RANGER_SSL_TRUSTMANAGER_ALGO_TYPE = "SunX509";
+ public static final String RANGER_SSL_CONTEXT_ALGO_TYPE = "SSL";
private String mUrl = null;
private String mSslConfigFileName = null;
@@ -232,12 +232,12 @@ public class RangerRESTClient {
mIsSSL = StringUtil.containsIgnoreCase(mUrl, "https");
- InputStream in = null ;
+ InputStream in = null;
try {
- Configuration conf = new Configuration() ;
+ Configuration conf = new Configuration();
- in = getFileInputStream(mSslConfigFileName) ;
+ in = getFileInputStream(mSslConfigFileName);
if (in != null) {
conf.addResource(in);
@@ -267,10 +267,10 @@ public class RangerRESTClient {
String keyStoreFilepwd = getCredential(mKeyStoreURL, mKeyStoreAlias);
if (!StringUtil.isEmpty(mKeyStoreFile) && !StringUtil.isEmpty(keyStoreFilepwd)) {
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(mKeyStoreFile) ;
+ in = getFileInputStream(mKeyStoreFile);
if (in != null) {
KeyStore keyStore = KeyStore.getInstance(mKeyStoreType);
@@ -311,10 +311,10 @@ public class RangerRESTClient {
String trustStoreFilepwd = getCredential(mTrustStoreURL, mTrustStoreAlias);
if (!StringUtil.isEmpty(mTrustStoreFile) && !StringUtil.isEmpty(trustStoreFilepwd)) {
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(mTrustStoreFile) ;
+ in = getFileInputStream(mTrustStoreFile);
if (in != null) {
KeyStore trustStore = KeyStore.getInstance(mTrustStoreType);
@@ -373,28 +373,28 @@ public class RangerRESTClient {
}
private InputStream getFileInputStream(String fileName) throws IOException {
- InputStream in = null ;
+ InputStream in = null;
if(! StringUtil.isEmpty(fileName)) {
- File f = new File(fileName) ;
+ File f = new File(fileName);
if (f.exists()) {
- in = new FileInputStream(f) ;
+ in = new FileInputStream(f);
}
else {
- in = ClassLoader.getSystemResourceAsStream(fileName) ;
+ in = ClassLoader.getSystemResourceAsStream(fileName);
}
}
- return in ;
+ return in;
}
private void close(InputStream str, String filename) {
if (str != null) {
try {
- str.close() ;
+ str.close();
} catch (IOException excp) {
- LOG.error("Error while closing file: [" + filename + "]", excp) ;
+ LOG.error("Error while closing file: [" + filename + "]", excp);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
index e622ad2..ed674ee 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
@@ -52,13 +52,13 @@ public class RangerRESTUtils {
public static final String REST_URL_LOOKUP_TAG_NAMES = "/service/tags/lookup";
- public static final String REST_EXPECTED_MIME_TYPE = "application/json" ;
- public static final String REST_MIME_TYPE_JSON = "application/json" ;
+ public static final String REST_EXPECTED_MIME_TYPE = "application/json";
+ public static final String REST_MIME_TYPE_JSON = "application/json";
public static final String REST_PARAM_LAST_KNOWN_POLICY_VERSION = "lastKnownVersion";
public static final String REST_PARAM_PLUGIN_ID = "pluginId";
- private static final int MAX_PLUGIN_ID_LEN = 255 ;
+ private static final int MAX_PLUGIN_ID_LEN = 255;
public String getPolicyRestUrl(String propertyPrefix) {
@@ -112,22 +112,22 @@ public class RangerRESTUtils {
String hostName = null;
try {
- hostName = InetAddress.getLocalHost().getHostName() ;
+ hostName = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException e) {
LOG.error("ERROR: Unable to find hostname for the agent ", e);
- hostName = "unknownHost" ;
+ hostName = "unknownHost";
}
- String ret = hostName + "-" + serviceName ;
+ String ret = hostName + "-" + serviceName;
if(! StringUtils.isEmpty(appId)) {
ret = appId + "@" + ret;
}
if (ret.length() > MAX_PLUGIN_ID_LEN ) {
- ret = ret.substring(0,MAX_PLUGIN_ID_LEN) ;
+ ret = ret.substring(0,MAX_PLUGIN_ID_LEN);
}
- return ret ;
+ return ret ;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
index a770183..ee8a34e 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
@@ -63,9 +63,9 @@ public class RangerSslHelper {
static final String RANGER_POLICYMGR_TRUSTSTORE_FILE_CREDENTIAL_ALIAS = "sslTrustStore";
static final String RANGER_POLICYMGR_TRUSTSTORE_FILE_TYPE_DEFAULT = "jks";
- static final String RANGER_SSL_KEYMANAGER_ALGO_TYPE = "SunX509" ;
- static final String RANGER_SSL_TRUSTMANAGER_ALGO_TYPE = "SunX509" ;
- static final String RANGER_SSL_CONTEXT_ALGO_TYPE = "SSL" ;
+ static final String RANGER_SSL_KEYMANAGER_ALGO_TYPE = "SunX509";
+ static final String RANGER_SSL_TRUSTMANAGER_ALGO_TYPE = "SunX509";
+ static final String RANGER_SSL_CONTEXT_ALGO_TYPE = "SSL";
private String mKeyStoreURL = null;
private String mKeyStoreAlias = null;
@@ -108,12 +108,12 @@ public class RangerSslHelper {
}
void readConfig() {
- InputStream in = null ;
+ InputStream in = null;
try {
- Configuration conf = new Configuration() ;
+ Configuration conf = new Configuration();
- in = getFileInputStream(mSslConfigFileName) ;
+ in = getFileInputStream(mSslConfigFileName);
if (in != null) {
conf.addResource(in);
@@ -156,10 +156,10 @@ public class RangerSslHelper {
String keyStoreFilepwd = getCredential(mKeyStoreURL, mKeyStoreAlias);
if (!StringUtil.isEmpty(mKeyStoreFile) && !StringUtil.isEmpty(keyStoreFilepwd)) {
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(mKeyStoreFile) ;
+ in = getFileInputStream(mKeyStoreFile);
if (in != null) {
KeyStore keyStore = KeyStore.getInstance(mKeyStoreType);
@@ -200,10 +200,10 @@ public class RangerSslHelper {
String trustStoreFilepwd = getCredential(mTrustStoreURL, mTrustStoreAlias);
if (!StringUtil.isEmpty(mTrustStoreFile) && !StringUtil.isEmpty(trustStoreFilepwd)) {
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(mTrustStoreFile) ;
+ in = getFileInputStream(mTrustStoreFile);
if (in != null) {
KeyStore trustStore = KeyStore.getInstance(mTrustStoreType);
@@ -261,28 +261,28 @@ public class RangerSslHelper {
}
private InputStream getFileInputStream(String fileName) throws IOException {
- InputStream in = null ;
+ InputStream in = null;
if(! StringUtil.isEmpty(fileName)) {
- File f = new File(fileName) ;
+ File f = new File(fileName);
if (f.exists()) {
- in = new FileInputStream(f) ;
+ in = new FileInputStream(f);
}
else {
- in = ClassLoader.getSystemResourceAsStream(fileName) ;
+ in = ClassLoader.getSystemResourceAsStream(fileName);
}
}
- return in ;
+ return in;
}
private void close(InputStream str, String filename) {
if (str != null) {
try {
- str.close() ;
+ str.close();
} catch (IOException excp) {
- LOG.error("Error while closing file: [" + filename + "]", excp) ;
+ LOG.error("Error while closing file: [" + filename + "]", excp);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
index 5bd0282..cb0af84 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
@@ -105,7 +105,7 @@ public class TestPolicyEngine {
System.out.println("provider=" + provider.toString());
- File file = File.createTempFile("ranger-admin-test-site", ".xml") ;
+ File file = File.createTempFile("ranger-admin-test-site", ".xml");
file.deleteOnExit();
FileOutputStream outStream = new FileOutputStream(file);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java
index 077289a..90e97b7 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java
@@ -49,19 +49,19 @@ public class TestServiceStore {
public static void setupTest() throws Exception {
- File file = File.createTempFile("fileStore", "dir") ;
+ File file = File.createTempFile("fileStore", "dir");
if (file.exists()) {
- file.delete() ;
+ file.delete();
}
file.deleteOnExit();
- file.mkdirs() ;
+ file.mkdirs();
- String fileStoreDir = file.getAbsolutePath() ;
+ String fileStoreDir = file.getAbsolutePath();
- System.out.println("Using fileStoreDirectory as [" + fileStoreDir + "]") ;
+ System.out.println("Using fileStoreDirectory as [" + fileStoreDir + "]");
svcStore = new ServiceFileStore(fileStoreDir);
svcStore.init();
@@ -250,8 +250,8 @@ public class TestServiceStore {
assertEquals("getPolicies(filter=origPolicyName) failed", 1, policies == null ? 0 : policies.size());
filter = null;
- String osName = System.getProperty("os.name") ;
- boolean windows = (osName != null && osName.toLowerCase().startsWith("windows")) ;
+ String osName = System.getProperty("os.name");
+ boolean windows = (osName != null && osName.toLowerCase().startsWith("windows"));
if (! windows ) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java
index af09562..d8d61d4 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java
@@ -66,18 +66,18 @@ public class TestTagStore {
" </property>\n" +
"</configuration>\n";
- File file = File.createTempFile("ranger-admin-test-site", ".xml") ;
+ File file = File.createTempFile("ranger-admin-test-site", ".xml");
file.deleteOnExit();
- tagStoreDir = File.createTempFile("tagStore", "dir") ;
+ tagStoreDir = File.createTempFile("tagStore", "dir");
if (tagStoreDir.exists()) {
- tagStoreDir.delete() ;
+ tagStoreDir.delete();
}
- tagStoreDir.mkdirs() ;
+ tagStoreDir.mkdirs();
- String tagStoreDirName = tagStoreDir.getAbsolutePath() ;
+ String tagStoreDirName = tagStoreDir.getAbsolutePath();
String text = String.format(textTemplate, tagStoreDirName, tagStoreDirName);
[12/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
index 038c1c1..49a48cd 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java
index 3764d1c..1ae3fc3 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java
index 3c685e9..fed3f12 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/TimedEventUtil.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/TimedEventUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/TimedEventUtil.java
index c6a7bbe..b36d581 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/TimedEventUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/TimedEventUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -38,7 +38,7 @@ public class TimedEventUtil{
}, timeout, timeUnit);
}
- public static <T> T timedTask(Callable<T> callableObj, long timeout,
+ public static <T> T timedTask(Callable<T> callableObj, long timeout,
TimeUnit timeUnit) throws Exception{
return callableObj.call();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java b/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java
index f36a9a6..55384a0 100644
--- a/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java
+++ b/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcherTest.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcherTest.java b/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcherTest.java
index cd9c4d4..10780cf 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcherTest.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcherTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSimpleMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSimpleMatcher.java b/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSimpleMatcher.java
index 7ad7252..b9c734a 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSimpleMatcher.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSimpleMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcherTest.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcherTest.java b/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcherTest.java
index 3611896..ec64e33 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcherTest.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcherTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -44,7 +44,7 @@ public class RangerTimeOfDayMatcherTest {
@Test
public void test_patterMatching_happyPath() {
// sensible values and some goofy ones work
- String[] durations = new String[] {
+ String[] durations = new String[] {
"9am-5pm", " 9Am -5 Pm", " 9Am -5 Pm", "9 AM -5 p.m.", "9a.M - 5Pm.",
"9:30am-5:30pm", " 9:00Am -5:59 Pm",
" 9 am - 4 pm ", "9pm-5AM",
@@ -160,8 +160,8 @@ public class RangerTimeOfDayMatcherTest {
{ 8, false },
{9, true },
{10, true },
- {16, true},
- {17, true},
+ {16, true},
+ {17, true},
{18, false },
{23, false },
};
@@ -199,9 +199,9 @@ public class RangerTimeOfDayMatcherTest {
{ 8, 0, false },
{ 9, 15, true },
{10, 0, true },
- {17, 0, true},
- {17, 30, true},
- {17, 31, false},
+ {17, 0, true},
+ {17, 30, true},
+ {17, 31, false},
{18, 0, false },
{22, 59, false },
{23, 0, true },
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java
index 62cd547..eae8aa5 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -162,7 +162,7 @@ public class TestRangerPolicyResourceSignature {
String expectedVersion = "version=1";
String expectedType = "type=0";
String expectedResource = "{" +
- "col={values=[col1, col2, col3],excludes=false,recursive=true}, " +
+ "col={values=[col1, col2, col3],excludes=false,recursive=true}, " +
"db={values=[db1, db2],excludes=false,recursive=false}, " +
"table={values=[tbl1, tbl2, tbl3],excludes=true,recursive=false}" +
"}";
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestDirectedGraph.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestDirectedGraph.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestDirectedGraph.java
index f58ae2b..3ec20d9 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestDirectedGraph.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestDirectedGraph.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -40,17 +40,17 @@ public class TestDirectedGraph {
* v
* AA -> BB -> CC
* ^ |
- * | v
+ * | v
* EE <- DD -> FF
* |
* v
* HH
- *
- * This directed graph has
+ *
+ * This directed graph has
* - 1 cycle [BB CC DD EE],
* - 2 sources [AA GG],
* - 2 sinks [HH FF]
- * - 4 hierarchies { [AA BB CC DD FF], [AA BB CC DD EE HH], [GG CC DD FF], [GG CC DD EE HH] }
+ * - 4 hierarchies { [AA BB CC DD FF], [AA BB CC DD EE HH], [GG CC DD FF], [GG CC DD EE HH] }
*/
DirectedGraph graph = new DirectedGraph();
// first add all of the arcs - from top row to bottom row and from left to right
@@ -59,7 +59,7 @@ public class TestDirectedGraph {
// 2nd row
graph.addArc("AA", "BB"); graph.addArc("BB", "CC");
// 3rd row
- graph.addArc("EE", "BB"); graph.addArc("DD", "EE"); graph.addArc("CC", "DD"); graph.addArc("DD", "FF");
+ graph.addArc("EE", "BB"); graph.addArc("DD", "EE"); graph.addArc("CC", "DD"); graph.addArc("DD", "FF");
// 4th row
graph.addArc("EE", "HH");
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
index fecb67a..caa8e35 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -92,10 +92,10 @@ public class TestRangerPolicyValidator {
"isAllowed", new Boolean[] { true, true }),
ImmutableMap.of( // no users, access type different case
"groups", new String[] {"group3", "group4"},
- "accesses", new String[]{"W", "x"},
+ "accesses", new String[]{"W", "x"},
"isAllowed", new Boolean[] { true, true }),
ImmutableMap.of( // no groups
- "users", new String[] {"user3" ," user4"},
+ "users", new String[] {"user3" ," user4"},
"accesses", new String[] { "r", "x" },
"isAllowed", new Boolean[] { true, true }),
ImmutableMap.of( // isallowed on access types is null, case is different from that in definition
@@ -110,14 +110,14 @@ public class TestRangerPolicyValidator {
// { name, excludesSupported, recursiveSupported, mandatory, reg-exp, parent-level }
{ "db", null, null, true, "db\\d+", null }, // valid values: db1, db22, db983, etc.; invalid: db, db12x, ttx11, etc.; null => false for excludes and recursive
{ "tbl", true, true, true, null, "db" }, // regex == null => anything goes; excludes == true, recursive == true
- { "col", false, true, false, "col\\d{1,2}", "tbl" }, // valid: col1, col47, etc.; invalid: col, col238, col1, etc., excludes == false, recursive == true
+ { "col", false, true, false, "col\\d{1,2}", "tbl" }, // valid: col1, col47, etc.; invalid: col, col238, col1, etc., excludes == false, recursive == true
};
private final Object[][] resourceDefData_multipleHierarchies = new Object[][] {
// { name, excludesSupported, recursiveSupported, mandatory, reg-exp, parent-level }
{ "db", null, null, true, "db\\d+", null }, // valid values: db1, db22, db983, etc.; invalid: db, db12x, ttx11, etc.; null => false for excludes and recursive
{ "tbl", true, true, true, null, "db" }, // regex == null => anything goes; excludes == true, recursive == true
- { "col", false, true, false, "col\\d{1,2}", "tbl" }, // valid: col1, col47, etc.; invalid: col, col238, col1, etc., excludes == false, recursive == true
+ { "col", false, true, false, "col\\d{1,2}", "tbl" }, // valid: col1, col47, etc.; invalid: col, col238, col1, etc., excludes == false, recursive == true
{ "udf", true, true, true, null, "db" } // same parent as tbl (simulating hive's multiple resource hierarchies)
};
@@ -135,15 +135,15 @@ public class TestRangerPolicyValidator {
private final Object[][] policyResourceMap_bad = new Object[][] {
// resource-name, values, excludes, recursive
- { "db", new String[] { "db1", "db2" }, null, true }, // mandatory "tbl" missing; recursive==true specified when resource-def does not support it (null)
+ { "db", new String[] { "db1", "db2" }, null, true }, // mandatory "tbl" missing; recursive==true specified when resource-def does not support it (null)
{"col", new String[] { "col12", "col 1" }, true, true }, // wrong format of value for "col"; excludes==true specified when resource-def does not allow it (false)
{"extra", new String[] { "extra1", "extra2" }, null, null } // spurious "extra" specified
};
private final Object[][] policyResourceMap_bad_multiple_hierarchies = new Object[][] {
// resource-name, values, excludes, recursive
- { "db", new String[] { "db1", "db2" }, null, true },
- { "tbl", new String[] { "tbl11", "tbl2" }, null, true },
+ { "db", new String[] { "db1", "db2" }, null, true },
+ { "tbl", new String[] { "tbl11", "tbl2" }, null, true },
{ "col", new String[] { "col1", "col2" }, true, true },
{ "udf", new String[] { "extra1", "extra2" }, null, null } // either udf or tbl/db/col should be specified, not both
};
@@ -173,7 +173,7 @@ public class TestRangerPolicyValidator {
_failures.clear(); Assert.assertTrue(_validator.isValid(2L, Action.DELETE, _failures));
Assert.assertTrue(_failures.isEmpty());
- // if policy exists then delete validation should pass, too!
+ // if policy exists then delete validation should pass, too!
_failures.clear(); Assert.assertTrue(_validator.isValid(3L, Action.DELETE, _failures));
Assert.assertTrue(_failures.isEmpty());
}
@@ -224,7 +224,7 @@ public class TestRangerPolicyValidator {
@Test
public final void testIsValid_happyPath() throws Exception {
- // valid policy has valid non-empty name and service name
+ // valid policy has valid non-empty name and service name
when(_policy.getService()).thenReturn("service-name");
// service name exists
RangerService service = mock(RangerService.class);
@@ -503,7 +503,7 @@ public class TestRangerPolicyValidator {
RangerPolicyResourceSignature signature = mock(RangerPolicyResourceSignature.class);
when(_factory.createPolicyResourceSignature(_policy)).thenReturn(signature);
when(signature.getSignature()).thenReturn("hash-1");
- when(_store.getPoliciesByResourceSignature("service-name", "hash-1", true)).thenReturn(null); // store does not have any policies for that signature hash
+ when(_store.getPoliciesByResourceSignature("service-name", "hash-1", true)).thenReturn(null); // store does not have any policies for that signature hash
for (Action action : cu) {
for (boolean isAdmin : new boolean[] { true, false }) {
_failures.clear(); Assert.assertFalse(_validator.isValid(_policy, action, isAdmin, _failures));
@@ -684,7 +684,7 @@ public class TestRangerPolicyValidator {
// { "resource-name", "values" "isExcludes", "isRecursive" }
// values collection is null as it isn't relevant to the part being tested with this data
{ "db", null, null, true }, // null should be treated as false
- { "tbl", null, false, false }, // set to false where def is null and def is true
+ { "tbl", null, false, false }, // set to false where def is null and def is true
{ "col", null, true, null} // set to null where def is false
};
@@ -704,8 +704,8 @@ public class TestRangerPolicyValidator {
private Object[][] policyResourceMap_failures = new Object[][] {
// { "resource-name", "values" "isExcludes", "isRecursive" }
// values collection is null as it isn't relevant to the part being tested with this data
- { "db", null, true, true }, // ok: def has true for both
- { "tbl", null, true, null }, // excludes: definition does not allow excludes by resource has it set to true
+ { "db", null, true, true }, // ok: def has true for both
+ { "tbl", null, true, null }, // excludes: definition does not allow excludes by resource has it set to true
{ "col", null, false, true } // recursive: def==null (i.e. false), policy==true
};
@@ -715,7 +715,7 @@ public class TestRangerPolicyValidator {
List<RangerResourceDef> resourceDefs = _utils.createResourceDefs(resourceDef_happyPath);
Map<String, RangerPolicyResource> resourceMap = _utils.createPolicyResourceMap(policyResourceMap_failures);
when(_serviceDef.getResources()).thenReturn(resourceDefs);
- // should not error out on
+ // should not error out on
Assert.assertFalse(_validator.isValidResourceFlags(resourceMap, _failures, resourceDefs, "a-service-def", "a-policy", false));
_utils.checkFailureForSemanticError(_failures, "isExcludes", "tbl");
_utils.checkFailureForSemanticError(_failures, "isRecursive", "col");
@@ -738,10 +738,10 @@ public class TestRangerPolicyValidator {
Assert.assertTrue(_validator.isPolicyResourceUnique(_policy, _failures, action));
Assert.assertTrue(_validator.isPolicyResourceUnique(_policy, _failures, action));
}
- /*
+ /*
* If store has a policy with matching signature then the check should fail with appropriate error message.
* - For create any match is a problem
- * - Signature check can never fail for disabled policies!
+ * - Signature check can never fail for disabled policies!
*/
RangerPolicy policy1 = mock(RangerPolicy.class); policies.add(policy1);
when(_store.getPoliciesByResourceSignature("service-name", hash, true)).thenReturn(policies);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java
index af158b0..ae42652 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -44,7 +44,7 @@ public class TestRangerServiceDefHelper {
@Before
public void before() {
- _serviceDef = mock(RangerServiceDef.class);
+ _serviceDef = mock(RangerServiceDef.class);
when(_serviceDef.getName()).thenReturn("a-service-def");
// wipe the cache clean
RangerServiceDefHelper._Cache.clear();
@@ -54,19 +54,19 @@ public class TestRangerServiceDefHelper {
public void test_getResourceHierarchies() {
/*
* Create a service-def with following resource graph
- *
+ *
* Database -> UDF
* |
* v
* Table -> Column
* |
* v
- * Table-Attribute
- *
+ * Table-Attribute
+ *
* It contains following hierarchies
* - [ Database UDF]
* - [ Database Table Column ]
- * - [ Database Table Table-Attribute ]
+ * - [ Database Table Table-Attribute ]
*/
RangerResourceDef Database = createResourceDef("Database", "");
RangerResourceDef UDF = createResourceDef("UDF", "Database");
@@ -81,7 +81,7 @@ public class TestRangerServiceDefHelper {
_helper = new RangerServiceDefHelper(_serviceDef);
assertTrue(_helper.isResourceGraphValid());
Set<List<RangerResourceDef>> hierarchies = _helper.getResourceHierarchies(RangerPolicy.POLICY_TYPE_ACCESS);
- // there should be
+ // there should be
List<RangerResourceDef> hierarchy = Lists.newArrayList(Database, UDF);
assertTrue(hierarchies.contains(hierarchy));
hierarchy = Lists.newArrayList(Database, Table, Column);
@@ -97,7 +97,7 @@ public class TestRangerServiceDefHelper {
* A --> B --> C
* ^ |
* | |
- * |---- D <---
+ * |---- D <---
*/
RangerResourceDef A = createResourceDef("A", "D"); // A's parent is D, etc.
RangerResourceDef B = createResourceDef("B", "C");
@@ -118,13 +118,13 @@ public class TestRangerServiceDefHelper {
* |
* v
* Table -> Column
- *
+ *
* Namespace -> package
* |
* v
* function
- *
- * Check that helper corrects reports back all of the hierarchies: levels in it and their order.
+ *
+ * Check that helper corrects reports back all of the hierarchies: levels in it and their order.
*/
RangerResourceDef database = createResourceDef("database", "");
RangerResourceDef tableSpace = createResourceDef("table-space", "database");
@@ -132,14 +132,14 @@ public class TestRangerServiceDefHelper {
RangerResourceDef column = createResourceDef("column", "table");
RangerResourceDef namespace = createResourceDef("namespace", "");
RangerResourceDef function = createResourceDef("function", "namespace");
- RangerResourceDef Package = createResourceDef("package", "namespace");
+ RangerResourceDef Package = createResourceDef("package", "namespace");
List<RangerResourceDef> resourceDefs = Lists.newArrayList(database, tableSpace, table, column, namespace, function, Package);
when(_serviceDef.getResources()).thenReturn(resourceDefs);
_helper = new RangerServiceDefHelper(_serviceDef);
assertTrue(_helper.isResourceGraphValid());
Set<List<RangerResourceDef>> hierarchies = _helper.getResourceHierarchies(RangerPolicy.POLICY_TYPE_ACCESS);
- Set<List<String>> expectedHierarchies = new HashSet<List<String>>();
+ Set<List<String>> expectedHierarchies = new HashSet<List<String>>();
expectedHierarchies.add(Lists.newArrayList("database", "table-space"));
expectedHierarchies.add(Lists.newArrayList("database", "table", "column"));
expectedHierarchies.add(Lists.newArrayList("namespace", "package"));
@@ -157,30 +157,30 @@ public class TestRangerServiceDefHelper {
public final void test_isResourceGraphValid_forest_singleNodeTrees() {
/*
* Create a service-def which is a forest with a few single node trees
- *
+ *
* Database
- *
+ *
* Server
- *
+ *
* Namespace -> package
* |
* v
* function
- *
- * Check that helper corrects reports back all of the hierarchies: levels in it and their order.
+ *
+ * Check that helper corrects reports back all of the hierarchies: levels in it and their order.
*/
RangerResourceDef database = createResourceDef("database", "");
RangerResourceDef server = createResourceDef("server", "");
RangerResourceDef namespace = createResourceDef("namespace", "");
RangerResourceDef function = createResourceDef("function", "namespace");
- RangerResourceDef Package = createResourceDef("package", "namespace");
+ RangerResourceDef Package = createResourceDef("package", "namespace");
List<RangerResourceDef> resourceDefs = Lists.newArrayList(database, server, namespace, function, Package);
when(_serviceDef.getResources()).thenReturn(resourceDefs);
_helper = new RangerServiceDefHelper(_serviceDef);
assertTrue(_helper.isResourceGraphValid());
Set<List<RangerResourceDef>> hierarchies = _helper.getResourceHierarchies(RangerPolicy.POLICY_TYPE_ACCESS);
- Set<List<String>> expectedHierarchies = new HashSet<List<String>>();
+ Set<List<String>> expectedHierarchies = new HashSet<List<String>>();
expectedHierarchies.add(Lists.newArrayList("database"));
expectedHierarchies.add(Lists.newArrayList("server"));
expectedHierarchies.add(Lists.newArrayList("namespace", "package"));
@@ -222,7 +222,7 @@ public class TestRangerServiceDefHelper {
when(_serviceDef.getUpdateTime()).thenReturn(getLastMonth());
_helper = new RangerServiceDefHelper(_serviceDef);
assertTrue("Didn't get a delegate different than what was put in the cache", delegate != _helper._delegate);
- // now that a new instance was added to the cache let's ensure that it got added to the cache
+ // now that a new instance was added to the cache let's ensure that it got added to the cache
Delegate newDelegate = _helper._delegate;
_helper = new RangerServiceDefHelper(_serviceDef);
assertTrue("Didn't get a delegate different than what was put in the cache", newDelegate == _helper._delegate);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefValidator.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefValidator.java
index 2ce8c03..33e6f4a 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefValidator.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefValidator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -61,7 +61,7 @@ public class TestRangerServiceDefValidator {
final Object[][] enums_good = new Object[][] {
{ 1L, "authentication-type", new String[] { "simple", "kerberos" } },
- { 2L, "time-unit", new String[] { "day", "hour", "minute" } },
+ { 2L, "time-unit", new String[] { "day", "hour", "minute" } },
};
@Test
@@ -78,7 +78,7 @@ public class TestRangerServiceDefValidator {
@Test
public final void testIsValid_Long_failures() throws Exception {
Long id = null;
- // passing in wrong action type
+ // passing in wrong action type
boolean result = _validator.isValid((Long)null, Action.CREATE, _failures);
assertFalse(result);
_utils.checkFailureForInternalError(_failures);
@@ -277,7 +277,7 @@ public class TestRangerServiceDefValidator {
final Object[][] enums_bad_enumName_duplicate_differentCase = new Object[][] {
// { id, enum-name, enum-values }
- { 1L, "authentication-type", new String[] { "simple", "kerberos" } },
+ { 1L, "authentication-type", new String[] { "simple", "kerberos" } },
{ 1L, "time-unit", new String[] { "day", "hour", "minute" } },
{ 1L, "Authentication-Type", new String[] { } },// duplicate enum-name different in case
};
@@ -326,7 +326,7 @@ public class TestRangerServiceDefValidator {
// add an element with same name as the first element
String name = input.iterator().next().getName();
when(anEnumDef.getName()).thenReturn(name);
- List<RangerEnumElementDef> elementDefs = _utils.createEnumElementDefs(new String[] {"val1", "val2"});
+ List<RangerEnumElementDef> elementDefs = _utils.createEnumElementDefs(new String[] {"val1", "val2"});
when(anEnumDef.getElements()).thenReturn(elementDefs);
input.add(anEnumDef);
_failures.clear(); assertFalse(_validator.isValidEnums(input, _failures));
@@ -419,7 +419,7 @@ public class TestRangerServiceDefValidator {
{ "db", null, null, null, null, "" , 10 },
{ "table", null, null, null, null, "db", 20 }, // same as db's level
{ "column-family", null, null, null, null, "table", null }, // level is null!
- { "column", null, null, null, null, "column-family", 20 }, // level is duplicate for [db->table->column-family-> column] hierarchy
+ { "column", null, null, null, null, "column-family", 20 }, // level is duplicate for [db->table->column-family-> column] hierarchy
{ "udf", null, null, null, null, "db", 10 }, // udf's id conflicts with that of db in the [db->udf] hierarchy
};
@@ -470,9 +470,9 @@ public class TestRangerServiceDefValidator {
{ null, null, "" }, // id and name both null, type is empty
{ 1L, "security", "blah" }, // bad type for service def
{ 1L, "port", "int" }, // duplicate id
- { 2L, "security", "string" }, // duplicate name
- { 3L, "timeout", "enum", "units", null }, // , sub-type (units) is not among known enum types
- { 4L, "auth", "enum", "authentication-type", "dimple" }, // default value is not among known values for the enum (sub-type)
+ { 2L, "security", "string" }, // duplicate name
+ { 3L, "timeout", "enum", "units", null }, // , sub-type (units) is not among known enum types
+ { 4L, "auth", "enum", "authentication-type", "dimple" }, // default value is not among known values for the enum (sub-type)
};
List<RangerServiceConfigDef> configs = _utils.createServiceDefConfigs(config_def_data_bad);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java
index c0f906b..40af3ce 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -161,7 +161,7 @@ public class TestRangerServiceValidator {
@Test
public void test_isValid_happyPath() throws Exception {
- // create a service def with some required parameters
+ // create a service def with some required parameters
Object[][] serviceDefInput = new Object[][] {
{ "param1", true },
{ "param2", true },
@@ -178,7 +178,7 @@ public class TestRangerServiceValidator {
when(service.getType()).thenReturn("aType");
// contains an extra parameter (param6) and one optional is missing(param4)
String[] configs = new String[] { "param1", "param2", "param3", "param5", "param6" };
- Map<String, String> configMap = _utils.createMap(configs);
+ Map<String, String> configMap = _utils.createMap(configs);
when(service.getConfigs()).thenReturn(configMap);
// wire then into the store
// service does not exists
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java
index f189c21..5519a2c 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -79,7 +79,7 @@ public class TestRangerValidator {
@Test
public void test_ctor_firewalling() {
try {
- // service store can't be null during construction
+ // service store can't be null during construction
new RangerValidatorForTest(null);
Assert.fail("Should have thrown exception!");
} catch (IllegalArgumentException e) {
@@ -510,7 +510,7 @@ public class TestRangerValidator {
String fieldName = "value-field-Name";
String collectionName = "value-collection-Name";
Set<String> alreadySeen = new HashSet<String>();
- // null/empty string value is invalid
+ // null/empty string value is invalid
for (String value : new String[] { null, "", " " }) {
Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures));
_utils.checkFailureForMissingValue(_failures, fieldName);
@@ -537,7 +537,7 @@ public class TestRangerValidator {
String collectionName = "field-collection-Name";
Set<Long> alreadySeen = new HashSet<Long>();
Long value = null;
- // null value is invalid
+ // null value is invalid
Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures));
_utils.checkFailureForMissingValue(_failures, fieldName);
@@ -558,7 +558,7 @@ public class TestRangerValidator {
String collectionName = "field-collection-Name";
Set<Integer> alreadySeen = new HashSet<Integer>();
Integer value = null;
- // null value is invalid
+ // null value is invalid
Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures));
_utils.checkFailureForMissingValue(_failures, fieldName);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java
index a59a159..5570ce5 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -200,7 +200,7 @@ public class ValidationTestUtils {
List<RangerPolicyItem> policyItems = new ArrayList<RangerPolicyItem>();
for (Object object : data) {
@SuppressWarnings("unchecked")
- Map<String, Object[]> map = (Map<String, Object[]>) object;
+ Map<String, Object[]> map = (Map<String, Object[]>) object;
RangerPolicyItem policyItem = mock(RangerPolicyItem.class);
List<String> usersList = null;
@@ -222,7 +222,7 @@ public class ValidationTestUtils {
accessesList = new ArrayList<RangerPolicyItemAccess>();
for (int i = 0; i < accesses.length; i++) {
String access = accesses[i];
- Boolean isAllowed = isAllowedFlags[i];
+ Boolean isAllowed = isAllowedFlags[i];
RangerPolicyItemAccess itemAccess = mock(RangerPolicyItemAccess.class);
when(itemAccess.getType()).thenReturn(access);
when(itemAccess.getIsAllowed()).thenReturn(isAllowed);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyDb.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyDb.java b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyDb.java
index f41dde4..097e6ff 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyDb.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyDb.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
index 9937757..5bd0282 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluatorTest.java b/agents-common/src/test/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluatorTest.java
index 9a3333c..769e205 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluatorTest.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluatorTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestResourceMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestResourceMatcher.java b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestResourceMatcher.java
index 2cb8fde..39bd056 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestResourceMatcher.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestResourceMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java
index 3575b29..077289a 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -55,7 +55,7 @@ public class TestServiceStore {
file.delete() ;
}
- file.deleteOnExit();
+ file.deleteOnExit();
file.mkdirs() ;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java
index a24d32c..af09562 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java
----------------------------------------------------------------------
diff --git a/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java b/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java
index 6ac702a..a61d81b 100644
--- a/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java
+++ b/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,19 +32,19 @@ public final class RangerCredentialProvider {
private static Log LOG = LogFactory.getLog(RangerCredentialProvider.class);
- private static final RangerCredentialProvider CRED_PROVIDER = new RangerCredentialProvider();
-
+ private static final RangerCredentialProvider CRED_PROVIDER = new RangerCredentialProvider();
+
protected RangerCredentialProvider() {
- //
+ //
}
-
+
public static RangerCredentialProvider getInstance() {
return CRED_PROVIDER;
}
-
+
public char[] getCredentialString(String url, String alias) {
- List<CredentialProvider> providers = getCredentialProviders(url);
-
+ List<CredentialProvider> providers = getCredentialProviders(url);
+
if(providers != null) {
for( CredentialProvider provider: providers) {
try {
@@ -54,23 +54,23 @@ public final class RangerCredentialProvider {
return credEntry.getCredential();
}
} catch(Exception ie) {
- LOG.error("Unable to get the Credential Provider from the Configuration", ie);
+ LOG.error("Unable to get the Credential Provider from the Configuration", ie);
}
}
}
return null;
}
-
+
List<CredentialProvider> getCredentialProviders(String url){
try {
Configuration conf = new Configuration();
conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, url);
- return CredentialProviderFactory.getProviders(conf);
+ return CredentialProviderFactory.getProviders(conf);
} catch(Exception ie) {
LOG.error("Unable to get the Credential Provider from the Configuration", ie);
- }
+ }
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
----------------------------------------------------------------------
diff --git a/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java b/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
index dd26dc2..1d56bea 100644
--- a/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
+++ b/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -75,7 +75,7 @@ public class XmlConfigChanger {
XmlConfigChanger xmlConfigChanger = new XmlConfigChanger() ;
xmlConfigChanger.parseConfig(args);
try {
- xmlConfigChanger.run();
+ xmlConfigChanger.run();
}
catch(Throwable t) {
System.err.println("*************************************************************************") ;
@@ -288,7 +288,7 @@ public class XmlConfigChanger {
FileOutputStream out = new FileOutputStream(outFile) ;
StreamResult result = new StreamResult(out) ;
transformer.transform(source, result);
- out.close();
+ out.close();
}
finally {
@@ -364,7 +364,7 @@ public class XmlConfigChanger {
if (cnl.item(j).hasChildNodes()) {
valueNode = cnl.item(j).getChildNodes().item(0) ;
}
- if (valueNode == null) { // Value Node is defined with
+ if (valueNode == null) { // Value Node is defined with
ret = "" ;
}
else {
@@ -403,7 +403,7 @@ public class XmlConfigChanger {
if (nodeName.equals(NAME_NODE_NAME)) {
String pName = cnl.item(j).getChildNodes().item(0).getNodeValue() ;
found = pName.equals(propName) ;
- if (found)
+ if (found)
break ;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/CredentialReader.java
----------------------------------------------------------------------
diff --git a/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/CredentialReader.java b/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/CredentialReader.java
index ecede34..94e6afd 100644
--- a/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/CredentialReader.java
+++ b/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/CredentialReader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -33,7 +33,7 @@ public class CredentialReader {
try{
if(CrendentialProviderPath==null || alias==null){
return null;
- }
+ }
char[] pass = null;
Configuration conf = new Configuration();
String crendentialProviderPrefixJceks=JavaKeyStoreProvider.SCHEME_NAME + "://file";
@@ -69,7 +69,7 @@ public class CredentialReader {
if(pass!=null && pass.length>0){
credential=String.valueOf(pass);
break;
- }
+ }
}
}
}catch(Exception ex){
@@ -78,10 +78,10 @@ public class CredentialReader {
}
return credential;
}
-
+
/*
public static void main(String args[]) throws Exception{
- String keystoreFile =new String("/tmp/mykey3.jceks");
+ String keystoreFile =new String("/tmp/mykey3.jceks");
String password=CredentialReader.getDecryptedString(keystoreFile, "mykey3");
System.out.println(password);
}*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java
----------------------------------------------------------------------
diff --git a/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java b/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java
index d8ffe2c..ed7a1fa 100644
--- a/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java
+++ b/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -84,7 +84,7 @@ public class buildks {
return returnCode;
}
tempCredential=CredentialReader.getDecryptedString(providerPath, alias);
- }else{
+ }else{
return returnCode;
}
@@ -134,7 +134,7 @@ public class buildks {
return returnCode;
}
displayCommand(args);
- }else{
+ }else{
return returnCode;
}
@@ -159,7 +159,7 @@ public class buildks {
ex.printStackTrace();
} catch(Exception ex){
ex.printStackTrace();
- }
+ }
return returnCode;
}
public int createCredentialFromUserInput(){
@@ -217,7 +217,7 @@ public class buildks {
ex.printStackTrace();
} catch(Exception ex){
ex.printStackTrace();
- }
+ }
return returnCode;
}
@@ -237,7 +237,7 @@ public class buildks {
}
//display command which need to be executed or entered
displayCommand(args);
- }else{
+ }else{
return returnCode;
}
CredentialShell cs = new CredentialShell();
@@ -256,7 +256,7 @@ public class buildks {
ex.printStackTrace();
} catch(Exception ex){
ex.printStackTrace();
- }
+ }
return returnCode;
}
@@ -279,7 +279,7 @@ public class buildks {
//display command which need to be executed or entered
displayCommand(args);
- }else{
+ }else{
return returnCode;
}
CredentialShell cs = new CredentialShell();
@@ -298,7 +298,7 @@ public class buildks {
ex.printStackTrace();
} catch(Exception ex){
ex.printStackTrace();
- }
+ }
return returnCode;
}
@@ -495,7 +495,7 @@ public class buildks {
}
return isValid;
}
-
+
private static boolean isCredentialShellInteractiveEnabled() {
boolean ret = false ;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java
----------------------------------------------------------------------
diff --git a/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java b/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java
index f20a7b4..4c2e86e 100644
--- a/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java
+++ b/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java
@@ -28,12 +28,12 @@ import org.junit.Test;
public class TestCredentialReader {
private final String keystoreFile = new File(System.getProperty("user.home")+"/testkeystore.jceks").toURI().getPath();
@Before
- public void setup() throws Exception {
+ public void setup() throws Exception {
buildks buildksOBJ=new buildks();
String[] argsCreateCommand = {"create", "TestCredential2", "-value", "PassworD123", "-provider", "jceks://file@/" + keystoreFile};
- int rc2=buildksOBJ.createCredential(argsCreateCommand);
+ int rc2=buildksOBJ.createCredential(argsCreateCommand);
assertEquals( 0, rc2);
- assertTrue(rc2==0);
+ assertTrue(rc2==0);
}
@Test
@@ -42,12 +42,12 @@ public class TestCredentialReader {
assertEquals( "PassworD123", password);
assertTrue(password,"PassworD123".equals(password));
//delete after use
-
+
String[] argsdeleteCommand = new String[] {"delete", "TestCredential2", "-provider", "jceks://file@/" + keystoreFile};
-
+
buildks buildksOBJ=new buildks();
buildksOBJ.deleteCredential(argsdeleteCommand, true);
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java
----------------------------------------------------------------------
diff --git a/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java b/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java
index 8379f83..5386838 100644
--- a/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java
+++ b/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java
@@ -26,18 +26,18 @@ import org.junit.Test;
public class Testbuildks {
private final String keystoreFile = new File(System.getProperty("user.home")+"/testkeystore.jceks").toURI().getPath();
@Test
- public void testBuildKSsuccess() throws Exception {
+ public void testBuildKSsuccess() throws Exception {
buildks buildksOBJ=new buildks();
String[] argsCreateCommand = {"create", "TestCredential1", "-value", "PassworD123", "-provider", "jceks://file@/" + keystoreFile};
- int rc1=buildksOBJ.createCredential(argsCreateCommand);
+ int rc1=buildksOBJ.createCredential(argsCreateCommand);
assertEquals( 0, rc1);
assertTrue(rc1==0);
-
+
String[] argsListCommand = {"list", "-provider","jceks://file@/" + keystoreFile};
int rc2=buildksOBJ.listCredential(argsListCommand);
assertEquals(0, rc2);
assertTrue(rc2==0);
-
+
String[] argsGetCommand = {"get", "TestCredential1", "-provider", "jceks://file@/" +keystoreFile };
String pw=buildksOBJ.getCredential(argsGetCommand);
assertEquals("PassworD123", pw);
@@ -50,7 +50,7 @@ public class Testbuildks {
int rc3=buildksOBJ.deleteCredential(argsDeleteCommand, isSilentMode);
assertEquals(0, rc3);
assertTrue(rc3==0);
-
+
if(rc1==rc2 && rc2==rc3 && rc3==0 && getCredentialPassed){
System.out.println("Test Case has been completed successfully..");
}
@@ -58,24 +58,24 @@ public class Testbuildks {
@Test
public void testInvalidProvider() throws Exception {
- buildks buildksOBJ=new buildks();
- String[] argsCreateCommand = {"create", "TestCredential1", "-value", "PassworD123", "-provider", "jksp://file@/"+keystoreFile};
- int rc1=buildksOBJ.createCredential(argsCreateCommand);
+ buildks buildksOBJ=new buildks();
+ String[] argsCreateCommand = {"create", "TestCredential1", "-value", "PassworD123", "-provider", "jksp://file@/"+keystoreFile};
+ int rc1=buildksOBJ.createCredential(argsCreateCommand);
assertEquals(-1, rc1);
assertTrue(rc1==-1);
- }
-
+ }
+
@Test
public void testInvalidCommand() throws Exception {
- buildks buildksOBJ=new buildks();
- String[] argsCreateCommand = {"creat", "TestCredential1", "-value", "PassworD123", "-provider", "jksp://file@/"+keystoreFile};
- int rc1=buildksOBJ.createCredential(argsCreateCommand);
+ buildks buildksOBJ=new buildks();
+ String[] argsCreateCommand = {"creat", "TestCredential1", "-value", "PassworD123", "-provider", "jksp://file@/"+keystoreFile};
+ int rc1=buildksOBJ.createCredential(argsCreateCommand);
assertEquals(-1, rc1);
assertTrue(rc1==-1);
- }
+ }
/*public static void main(String args[]) throws Exception{
Testbuildks tTestbuildks=new Testbuildks();
tTestbuildks.testBuildKSsuccess();
- }*/
-
+ }*/
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
----------------------------------------------------------------------
diff --git a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
index a74f8d1..aec41f5 100644
--- a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
+++ b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -132,7 +132,7 @@ public class EmbeddedServer {
String enabledProtocols = "SSLv2Hello, TLSv1, TLSv1.1, TLSv1.2";
ssl.setAttribute("sslEnabledProtocols", enabledProtocols);
- server.getService().addConnector(ssl);
+ server.getService().addConnector(ssl);
//
// Making this as a default connector
@@ -251,29 +251,29 @@ public class EmbeddedServer {
e.printStackTrace();
}
}else{
- try{
- server.start();
+ try{
+ server.start();
server.getServer().await();
shutdownServer();
} catch (LifecycleException e) {
LOG.severe("Tomcat Server failed to start:" + e.toString());
- e.printStackTrace();
+ e.printStackTrace();
} catch (Exception e) {
LOG.severe("Tomcat Server failed to start:" + e.toString());
- e.printStackTrace();
+ e.printStackTrace();
}
}
}else{
- try{
- server.start();
+ try{
+ server.start();
server.getServer().await();
shutdownServer();
} catch (LifecycleException e) {
LOG.severe("Tomcat Server failed to start:" + e.toString());
- e.printStackTrace();
+ e.printStackTrace();
} catch (Exception e) {
LOG.severe("Tomcat Server failed to start:" + e.toString());
- e.printStackTrace();
+ e.printStackTrace();
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/StopEmbeddedServer.java
----------------------------------------------------------------------
diff --git a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/StopEmbeddedServer.java b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/StopEmbeddedServer.java
index ef80f43..fa30598 100644
--- a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/StopEmbeddedServer.java
+++ b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/StopEmbeddedServer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -47,7 +47,7 @@ public class StopEmbeddedServer extends EmbeddedServer {
out.println(shutdownCommand) ;
- out.flush();
+ out.flush();
out.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java
index 48b1b11..e49405d 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -85,7 +85,7 @@ public class AuthorizationSession {
}
AuthorizationSession access(String anAccess) {
- _access = anAccess;
+ _access = anAccess;
return this;
}
@@ -229,7 +229,7 @@ public class AuthorizationSession {
if (_auditHandler != null) {
List<AuthzAuditEvent> events = null;
/*
- * What we log to audit depends on authorization status. For success we log all accumulated events. In case of failure
+ * What we log to audit depends on authorization status. For success we log all accumulated events. In case of failure
* we log just the last set of audit messages as we only need to record the cause of overall denial.
*/
if (authorized) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/ColumnIterator.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/ColumnIterator.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/ColumnIterator.java
index 533a1c1..ccccb4e 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/ColumnIterator.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/ColumnIterator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuditHandler.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuditHandler.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuditHandler.java
index c77dc20..1344e29 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuditHandler.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuditHandler.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,9 +32,9 @@ public interface HbaseAuditHandler extends RangerAccessResultProcessor {
/**
* Discards and returns the last audit events captured by the audit handler. Last audit event should be the ones generated during the most recent authorization request.
- * However, it won't be all of the audit events called during an authorize call since implementation class may not override the method which takes a list of responses -- in
+ * However, it won't be all of the audit events called during an authorize call since implementation class may not override the method which takes a list of responses -- in
* which case there would be several audit messages generated by one call but this only allows you to get last of those messages created during single auth request.
- * After this call the last set of audit events won't be returned by <code>getCapturedEvents</code>.
+ * After this call the last set of audit events won't be returned by <code>getCapturedEvents</code>.
* @return
*/
AuthzAuditEvent getAndDiscardMostRecentEvent();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuditHandlerImpl.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuditHandlerImpl.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuditHandlerImpl.java
index 6fbf5fc..845cd51 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuditHandlerImpl.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuditHandlerImpl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtils.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtils.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtils.java
index 58f59bb..f8ee168 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtils.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtils.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImpl.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImpl.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImpl.java
index d80a04a..32d08fb 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImpl.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImpl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseFactory.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseFactory.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseFactory.java
index 3488d70..1322e0f 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseFactory.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,7 +29,7 @@ public class HbaseFactory {
static final HbaseAuthUtils _AuthUtils = new HbaseAuthUtilsImpl();
static final HbaseFactory _Factory = new HbaseFactory();
/**
- * This is a singleton
+ * This is a singleton
*/
private HbaseFactory() {
// TODO remove this clutch to enforce singleton by moving to a DI framework
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseUserUtils.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseUserUtils.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseUserUtils.java
index 05d67d6..e2f1efd 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseUserUtils.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseUserUtils.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -38,7 +38,7 @@ public interface HbaseUserUtils {
Set<String> getUserGroups(User user);
/**
- * May return null in case of an error
+ * May return null in case of an error
* @return
*/
User getUser();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseUserUtilsImpl.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseUserUtilsImpl.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseUserUtilsImpl.java
index ddc84d8..23cd5fc 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseUserUtilsImpl.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseUserUtilsImpl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -36,7 +36,7 @@ public class HbaseUserUtilsImpl implements HbaseUserUtils {
private static final Log LOG = LogFactory.getLog(HbaseUserUtilsImpl.class.getName());
private static final String SUPERUSER_CONFIG_PROP = "hbase.superuser";
- // only to detect problems with initialization order, not for thread-safety.
+ // only to detect problems with initialization order, not for thread-safety.
static final AtomicBoolean _Initialized = new AtomicBoolean(false);
// should never be null
static final AtomicReference<Set<String>> _SuperUsers = new AtomicReference<Set<String>>(new HashSet<String>());
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
index ac5f1e4..a422960 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -133,7 +133,7 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess
final HbaseAuthUtils _authUtils = _factory.getAuthUtils();
private static volatile RangerHBasePlugin hbasePlugin = null;
- // Utilities Methods
+ // Utilities Methods
protected byte[] getTableName(RegionCoprocessorEnvironment e) {
Region region = e.getRegion();
byte[] tableName = null;
@@ -163,7 +163,7 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess
return isSpecialTable(Bytes.toString(tableName));
}
protected boolean isSpecialTable(String input) {
- final String[] specialTables = new String[] { "hbase:meta", "-ROOT-", ".META."};
+ final String[] specialTables = new String[] { "hbase:meta", "-ROOT-", ".META."};
for (String specialTable : specialTables ) {
if (specialTable.equals(input)) {
return true;
@@ -208,7 +208,7 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess
return strAddr;
}
- // Methods that are used within the CoProcessor
+ // Methods that are used within the CoProcessor
private void requireScannerOwner(InternalScanner s) throws AccessDeniedException {
if (!RpcServer.isInRpcCallContext()) {
return;
@@ -292,7 +292,7 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess
}
}
- ColumnFamilyAccessResult evaluateAccess(String operation, Action action, final RegionCoprocessorEnvironment env,
+ ColumnFamilyAccessResult evaluateAccess(String operation, Action action, final RegionCoprocessorEnvironment env,
final Map<byte[], ? extends Collection<?>> familyMap) throws AccessDeniedException {
String access = _authUtils.getAccess(action);
@@ -326,7 +326,7 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess
}
// let's create a session that would be reused. Set things on it that won't change.
- HbaseAuditHandler auditHandler = _factory.getAuditHandler();
+ HbaseAuditHandler auditHandler = _factory.getAuditHandler();
AuthorizationSession session = new AuthorizationSession(hbasePlugin)
.operation(operation)
.remoteAddress(getRemoteAddress())
@@ -354,7 +354,7 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess
AuthzAuditEvent event = auditHandler.getAndDiscardMostRecentEvent(); // this could be null, of course, depending on audit settings of table.
// if authorized then pass captured events as access allowed set else as access denied set.
- result = new ColumnFamilyAccessResult(authorized, authorized,
+ result = new ColumnFamilyAccessResult(authorized, authorized,
authorized ? Collections.singletonList(event) : null,
null, authorized ? null : event, reason, null);
if (LOG.isDebugEnabled()) {
@@ -525,7 +525,7 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess
return combinedFilter;
}
- void requirePermission(final String operation, final Action action, final RegionCoprocessorEnvironment regionServerEnv, final Map<byte[], ? extends Collection<?>> familyMap)
+ void requirePermission(final String operation, final Action action, final RegionCoprocessorEnvironment regionServerEnv, final Map<byte[], ? extends Collection<?>> familyMap)
throws AccessDeniedException {
ColumnFamilyAccessResult accessResult = evaluateAccess(operation, action, regionServerEnv, familyMap);
@@ -550,7 +550,7 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess
* @param columnFamily
* @param column
* @return
- * @throws AccessDeniedException
+ * @throws AccessDeniedException
*/
void authorizeAccess(String operation, String otherInformation, Action action, String table, String columnFamily, String column) throws AccessDeniedException {
@@ -571,7 +571,7 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess
}
User user = getActiveUser();
- HbaseAuditHandler auditHandler = _factory.getAuditHandler();
+ HbaseAuditHandler auditHandler = _factory.getAuditHandler();
AuthorizationSession session = new AuthorizationSession(hbasePlugin)
.operation(operation)
.otherInformation(otherInformation)
@@ -595,13 +595,13 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess
session.publishResults();
}
- boolean canSkipAccessCheck(final String operation, String access, final String table)
+ boolean canSkipAccessCheck(final String operation, String access, final String table)
throws AccessDeniedException {
User user = getActiveUser();
boolean result = false;
if (user == null) {
- String message = "Unexpeceted: User is null: access denied, not audited!";
+ String message = "Unexpeceted: User is null: access denied, not audited!";
LOG.warn("canSkipAccessCheck: exiting" + message);
throw new AccessDeniedException("No user associated with request (" + operation + ") for action: " + access + "on table:" + table);
} else if (isAccessForMetadataRead(access, table)) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorBase.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorBase.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorBase.java
index 06500f2..f34bc12 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorBase.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorBase.java
@@ -57,7 +57,7 @@ import org.apache.hadoop.hbase.replication.ReplicationEndpoint;
/**
- * This class exists only to prevent the clutter of methods that we don't intend to implement in the main co-processor class.
+ * This class exists only to prevent the clutter of methods that we don't intend to implement in the main co-processor class.
* @author alal
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilter.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilter.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilter.java
index e281099..0254100 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilter.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/services/hbase/RangerServiceHBase.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/RangerServiceHBase.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/RangerServiceHBase.java
index e5031af..7d5bf9b 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/RangerServiceHBase.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/RangerServiceHBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[11/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java
index 1c9a57e..f0f086c 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -64,7 +64,7 @@ public class HBaseClient extends BaseClient {
}
- //TODO: temporary solution - to be added to the UI for HBase
+ //TODO: temporary solution - to be added to the UI for HBase
private static Map<String,String> addDefaultHBaseProp(Map<String,String> connectionProp) {
if (connectionProp != null) {
String param = "zookeeper.znode.parent";
@@ -283,7 +283,7 @@ public class HBaseClient extends BaseClient {
} catch(IOException io) {
String msgDesc = "getTableList: Unable to get HBase table List for [repository:"
- + getConfigHolder().getDatasourceName() + ",table-match:"
+ + getConfigHolder().getDatasourceName() + ",table-match:"
+ tableNameMatching + "].";
HadoopException hdpException = new HadoopException(msgDesc, io);
hdpException.generateResponseDataMap(false, getMessage(io),
@@ -292,7 +292,7 @@ public class HBaseClient extends BaseClient {
throw hdpException;
} catch (Throwable e) {
String msgDesc = "getTableList : Unable to get HBase table List for [repository:"
- + getConfigHolder().getDatasourceName() + ",table-match:"
+ + getConfigHolder().getDatasourceName() + ",table-match:"
+ tableNameMatching + "].";
LOG.error(msgDesc + e);
HadoopException hdpException = new HadoopException(msgDesc, e);
@@ -395,7 +395,7 @@ public class HBaseClient extends BaseClient {
hdpException.generateResponseDataMap(false, getMessage(io),
msgDesc + errMsg, null, null);
LOG.error(msgDesc + io);
- throw hdpException;
+ throw hdpException;
} catch (SecurityException se) {
String msgDesc = "getColumnFamilyList: Unable to get HBase ColumnFamilyList for "
+ "[repository:" +getConfigHolder().getDatasourceName() + ",table:" + tblName
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java
index 8dd1c17..cafc8dc 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -95,10 +95,10 @@ public class HBaseConnectionMgr {
client = TimedEventUtil.timedTask(connectHBase, 5, TimeUnit.SECONDS);
}
} catch(Exception e){
- LOG.error("Error connecting HBase repository : "+
+ LOG.error("Error connecting HBase repository : "+
serviceName +" using config : "+ configs);
}
- }
+ }
if(client!=null){
HBaseClient oldClient = hbaseConnectionCache.putIfAbsent(serviceName, client);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java
index 9b3b326..32cfc25 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -73,8 +73,8 @@ public class HBaseResourceMgr {
if ( userInput != null && resource != null) {
if ( resourceMap != null && !resourceMap.isEmpty() ) {
- tableList = resourceMap.get(TABLE);
- columnFamilyList = resourceMap.get(COLUMNFAMILY);
+ tableList = resourceMap.get(TABLE);
+ columnFamilyList = resourceMap.get(COLUMNFAMILY);
}
switch (resource.trim().toLowerCase()) {
case TABLE:
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/AuthorizationSessionTest.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/AuthorizationSessionTest.java b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/AuthorizationSessionTest.java
index f1c0960..2c8f9af 100644
--- a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/AuthorizationSessionTest.java
+++ b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/AuthorizationSessionTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -110,7 +110,7 @@ public class AuthorizationSessionTest {
session.columnFamily("family");
try {
session.verifyBuildable();
- } catch (IllegalStateException e) {
+ } catch (IllegalStateException e) {
Assert.fail("Should have thrown an exception");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/ColumnIteratorTest.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/ColumnIteratorTest.java b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/ColumnIteratorTest.java
index d59881e..4b40038 100644
--- a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/ColumnIteratorTest.java
+++ b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/ColumnIteratorTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImplTest.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImplTest.java b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImplTest.java
index e40f31a..1b8edd4 100644
--- a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImplTest.java
+++ b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImplTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorTest.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorTest.java b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorTest.java
index 19f390f..f982910 100644
--- a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorTest.java
+++ b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java
index 643f08a..48b8a17 100644
--- a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java
+++ b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/TestPolicyEngine.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/TestPolicyEngine.java b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/TestPolicyEngine.java
index cfac635..9f0e5ac 100644
--- a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/TestPolicyEngine.java
+++ b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/TestPolicyEngine.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hbase-agent/src/test/java/org/apache/ranger/services/hbase/TestRangerServiceHBase.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/test/java/org/apache/ranger/services/hbase/TestRangerServiceHBase.java b/hbase-agent/src/test/java/org/apache/ranger/services/hbase/TestRangerServiceHBase.java
index f771620..ac7a146 100644
--- a/hbase-agent/src/test/java/org/apache/ranger/services/hbase/TestRangerServiceHBase.java
+++ b/hbase-agent/src/test/java/org/apache/ranger/services/hbase/TestRangerServiceHBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -63,7 +63,7 @@ public class TestRangerServiceHBase {
HashMap<String,Object> ret = null;
String errorMessage = null;
- try {
+ try {
ret = svcHBase.validateConfig();
}catch (Exception e) {
errorMessage = e.getMessage();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java
index 1bbae6b..b1ecbd2 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
index 93dca87..0932956 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/AuthCodeInjectionJavaAgent.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/AuthCodeInjectionJavaAgent.java b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/AuthCodeInjectionJavaAgent.java
index b7fd50a..065c8a5 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/AuthCodeInjectionJavaAgent.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/AuthCodeInjectionJavaAgent.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/HadoopAuthClassTransformer.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/HadoopAuthClassTransformer.java b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/HadoopAuthClassTransformer.java
index 68867df..7356cae 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/HadoopAuthClassTransformer.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/HadoopAuthClassTransformer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/exceptions/RangerAccessControlException.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/exceptions/RangerAccessControlException.java b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/exceptions/RangerAccessControlException.java
index 68ca895..3a66da3 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/exceptions/RangerAccessControlException.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/exceptions/RangerAccessControlException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/RangerServiceHdfs.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/RangerServiceHdfs.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/RangerServiceHdfs.java
index bdf29f7..e1648dc 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/RangerServiceHdfs.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/RangerServiceHdfs.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
index ecc406c..62db66f 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -133,7 +133,7 @@ public class HdfsClient extends BaseClient {
}
} catch (IOException ioe) {
String msgDesc = "listFilesInternal: Unable to get listing of files for directory "
- + baseDir + fileMatching
+ + baseDir + fileMatching
+ "] from Hadoop environment ["
+ getSerivceName()
+ "].";
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java
index 18cbc12..ede8077 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java
index 8b49965..0a2eba0 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -108,7 +108,7 @@ public class HdfsResourceMgr {
};
if ( callableObj != null) {
synchronized(hdfsClient) {
- resultList = TimedEventUtil.timedTask(callableObj, 5,TimeUnit.SECONDS);
+ resultList = TimedEventUtil.timedTask(callableObj, 5,TimeUnit.SECONDS);
}
}
if(LOG.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/HDFSRangerTest.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/HDFSRangerTest.java b/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/HDFSRangerTest.java
index 56aac0b..726494a 100644
--- a/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/HDFSRangerTest.java
+++ b/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/HDFSRangerTest.java
@@ -40,18 +40,18 @@ import org.apache.ranger.authorization.hadoop.exceptions.RangerAccessControlExce
import org.junit.Assert;
/**
- * Here we plug the Ranger AccessControlEnforcer into HDFS.
- *
- * A custom RangerAdminClient is plugged into Ranger in turn, which loads security policies from a local file. These policies were
+ * Here we plug the Ranger AccessControlEnforcer into HDFS.
+ *
+ * A custom RangerAdminClient is plugged into Ranger in turn, which loads security policies from a local file. These policies were
* generated in the Ranger Admin UI for a service called "HDFSTest". It contains three policies, each of which grants read, write and
* execute permissions in turn to "/tmp/tmpdir", "/tmp/tmpdir2" and "/tmp/tmpdir3" to a user called "bob" and to a group called "IT".
*/
public class HDFSRangerTest {
-
+
private static final File baseDir = new File("./target/hdfs/").getAbsoluteFile();
private static MiniDFSCluster hdfsCluster;
private static String defaultFs;
-
+
@org.junit.BeforeClass
public static void setup() throws Exception {
Configuration conf = new Configuration();
@@ -61,17 +61,17 @@ public class HDFSRangerTest {
hdfsCluster = builder.build();
defaultFs = conf.get("fs.defaultFS");
}
-
+
@org.junit.AfterClass
public static void cleanup() throws Exception {
FileUtil.fullyDelete(baseDir);
hdfsCluster.shutdown();
}
-
+
@org.junit.Test
public void readTest() throws Exception {
FileSystem fileSystem = hdfsCluster.getFileSystem();
-
+
// Write a file - the AccessControlEnforcer won't be invoked as we are the "superuser"
final Path file = new Path("/tmp/tmpdir/data-file2");
FSDataOutputStream out = fileSystem.create(file);
@@ -80,10 +80,10 @@ public class HDFSRangerTest {
out.flush();
}
out.close();
-
+
// Change permissions to read-only
fileSystem.setPermission(file, new FsPermission(FsAction.READ, FsAction.NONE, FsAction.NONE));
-
+
// Now try to read the file as "bob" - this should be allowed (by the policy - user)
UserGroupInformation ugi = UserGroupInformation.createUserForTesting("bob", new String[] {});
ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -91,21 +91,21 @@ public class HDFSRangerTest {
public Void run() throws Exception {
Configuration conf = new Configuration();
conf.set("fs.defaultFS", defaultFs);
-
+
FileSystem fs = FileSystem.get(conf);
-
+
// Read the file
FSDataInputStream in = fs.open(file);
ByteArrayOutputStream output = new ByteArrayOutputStream();
IOUtils.copy(in, output);
String content = new String(output.toByteArray());
Assert.assertTrue(content.startsWith("data0"));
-
+
fs.close();
return null;
}
});
-
+
// Now try to read the file as "alice" - this should be allowed (by the policy - group)
ugi = UserGroupInformation.createUserForTesting("alice", new String[] {"IT"});
ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -113,21 +113,21 @@ public class HDFSRangerTest {
public Void run() throws Exception {
Configuration conf = new Configuration();
conf.set("fs.defaultFS", defaultFs);
-
+
FileSystem fs = FileSystem.get(conf);
-
+
// Read the file
FSDataInputStream in = fs.open(file);
ByteArrayOutputStream output = new ByteArrayOutputStream();
IOUtils.copy(in, output);
String content = new String(output.toByteArray());
Assert.assertTrue(content.startsWith("data0"));
-
+
fs.close();
return null;
}
});
-
+
// Now try to read the file as unknown user "eve" - this should not be allowed
ugi = UserGroupInformation.createUserForTesting("eve", new String[] {});
ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -135,9 +135,9 @@ public class HDFSRangerTest {
public Void run() throws Exception {
Configuration conf = new Configuration();
conf.set("fs.defaultFS", defaultFs);
-
+
FileSystem fs = FileSystem.get(conf);
-
+
// Read the file
try {
fs.open(file);
@@ -146,18 +146,18 @@ public class HDFSRangerTest {
// expected
Assert.assertTrue(RangerAccessControlException.class.getName().equals(ex.getClassName()));
}
-
+
fs.close();
return null;
}
});
}
-
+
@org.junit.Test
public void writeTest() throws Exception {
-
+
FileSystem fileSystem = hdfsCluster.getFileSystem();
-
+
// Write a file - the AccessControlEnforcer won't be invoked as we are the "superuser"
final Path file = new Path("/tmp/tmpdir2/data-file3");
FSDataOutputStream out = fileSystem.create(file);
@@ -166,7 +166,7 @@ public class HDFSRangerTest {
out.flush();
}
out.close();
-
+
// Now try to write to the file as "bob" - this should be allowed (by the policy - user)
UserGroupInformation ugi = UserGroupInformation.createUserForTesting("bob", new String[] {});
ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -174,17 +174,17 @@ public class HDFSRangerTest {
public Void run() throws Exception {
Configuration conf = new Configuration();
conf.set("fs.defaultFS", defaultFs);
-
+
FileSystem fs = FileSystem.get(conf);
-
+
// Write to the file
fs.append(file);
-
+
fs.close();
return null;
}
});
-
+
// Now try to write to the file as "alice" - this should be allowed (by the policy - group)
ugi = UserGroupInformation.createUserForTesting("alice", new String[] {"IT"});
ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -192,17 +192,17 @@ public class HDFSRangerTest {
public Void run() throws Exception {
Configuration conf = new Configuration();
conf.set("fs.defaultFS", defaultFs);
-
+
FileSystem fs = FileSystem.get(conf);
-
+
// Write to the file
fs.append(file);
-
+
fs.close();
return null;
}
});
-
+
// Now try to read the file as unknown user "eve" - this should not be allowed
ugi = UserGroupInformation.createUserForTesting("eve", new String[] {});
ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -210,9 +210,9 @@ public class HDFSRangerTest {
public Void run() throws Exception {
Configuration conf = new Configuration();
conf.set("fs.defaultFS", defaultFs);
-
+
FileSystem fs = FileSystem.get(conf);
-
+
// Write to the file
try {
fs.append(file);
@@ -221,17 +221,17 @@ public class HDFSRangerTest {
// expected
Assert.assertTrue(RangerAccessControlException.class.getName().equals(ex.getClassName()));
}
-
+
fs.close();
return null;
}
});
}
-
+
@org.junit.Test
public void executeTest() throws Exception {
FileSystem fileSystem = hdfsCluster.getFileSystem();
-
+
// Write a file - the AccessControlEnforcer won't be invoked as we are the "superuser"
final Path file = new Path("/tmp/tmpdir3/data-file2");
FSDataOutputStream out = fileSystem.create(file);
@@ -240,14 +240,14 @@ public class HDFSRangerTest {
out.flush();
}
out.close();
-
+
// Change permissions to read-only
fileSystem.setPermission(file, new FsPermission(FsAction.READ, FsAction.NONE, FsAction.NONE));
-
+
// Change the parent directory permissions to be execute only for the owner
Path parentDir = new Path("/tmp/tmpdir3");
fileSystem.setPermission(parentDir, new FsPermission(FsAction.EXECUTE, FsAction.NONE, FsAction.NONE));
-
+
// Try to read the directory as "bob" - this should be allowed (by the policy - user)
UserGroupInformation ugi = UserGroupInformation.createUserForTesting("bob", new String[] {});
ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -255,17 +255,17 @@ public class HDFSRangerTest {
public Void run() throws Exception {
Configuration conf = new Configuration();
conf.set("fs.defaultFS", defaultFs);
-
+
FileSystem fs = FileSystem.get(conf);
-
+
RemoteIterator<LocatedFileStatus> iter = fs.listFiles(file.getParent(), false);
Assert.assertTrue(iter.hasNext());
-
+
fs.close();
return null;
}
});
-
+
// Try to read the directory as "alice" - this should be allowed (by the policy - group)
ugi = UserGroupInformation.createUserForTesting("alice", new String[] {"IT"});
ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -273,17 +273,17 @@ public class HDFSRangerTest {
public Void run() throws Exception {
Configuration conf = new Configuration();
conf.set("fs.defaultFS", defaultFs);
-
+
FileSystem fs = FileSystem.get(conf);
-
+
RemoteIterator<LocatedFileStatus> iter = fs.listFiles(file.getParent(), false);
Assert.assertTrue(iter.hasNext());
-
+
fs.close();
return null;
}
});
-
+
// Now try to read the directory as unknown user "eve" - this should not be allowed
ugi = UserGroupInformation.createUserForTesting("eve", new String[] {});
ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -291,9 +291,9 @@ public class HDFSRangerTest {
public Void run() throws Exception {
Configuration conf = new Configuration();
conf.set("fs.defaultFS", defaultFs);
-
+
FileSystem fs = FileSystem.get(conf);
-
+
// Write to the file
try {
RemoteIterator<LocatedFileStatus> iter = fs.listFiles(file.getParent(), false);
@@ -303,12 +303,12 @@ public class HDFSRangerTest {
// expected
Assert.assertTrue(RangerAccessControlException.class.getName().equals(ex.getClassName()));
}
-
+
fs.close();
return null;
}
});
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/RangerAdminClientImpl.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/RangerAdminClientImpl.java b/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/RangerAdminClientImpl.java
index 06150f9..5c612e9 100644
--- a/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/RangerAdminClientImpl.java
+++ b/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/RangerAdminClientImpl.java
@@ -64,21 +64,21 @@ public class RangerAdminClientImpl implements RangerAdminClient {
}
public void grantAccess(GrantRevokeRequest request) throws Exception {
-
+
}
public void revokeAccess(GrantRevokeRequest request) throws Exception {
-
+
}
public ServiceTags getServiceTagsIfUpdated(long lastKnownVersion) throws Exception {
return null;
-
+
}
public List<String> getTagTypes(String tagTypePattern) throws Exception {
return null;
}
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/client/HdfsClientTest.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/client/HdfsClientTest.java b/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/client/HdfsClientTest.java
index d7fc26d..fbc2e37 100644
--- a/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/client/HdfsClientTest.java
+++ b/hdfs-agent/src/test/java/org/apache/ranger/services/hdfs/client/HdfsClientTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/main/java/com/xasecure/authorization/hive/authorizer/XaSecureHiveAuthorizerFactory.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/com/xasecure/authorization/hive/authorizer/XaSecureHiveAuthorizerFactory.java b/hive-agent/src/main/java/com/xasecure/authorization/hive/authorizer/XaSecureHiveAuthorizerFactory.java
index e941704..5bbeb87 100644
--- a/hive-agent/src/main/java/com/xasecure/authorization/hive/authorizer/XaSecureHiveAuthorizerFactory.java
+++ b/hive-agent/src/main/java/com/xasecure/authorization/hive/authorizer/XaSecureHiveAuthorizerFactory.java
@@ -22,9 +22,9 @@ import org.apache.ranger.authorization.hive.authorizer.RangerHiveAuthorizerFacto
/**
* This class exists only to provide for seamless upgrade/downgrade capabilities. Coprocessor name is in hbase config files in /etc/.../conf which
- * is not only out of bounds for any upgrade script but also must be of a form to allow for downgrad! Thus when class names were changed XaSecure* -> Ranger*
+ * is not only out of bounds for any upgrade script but also must be of a form to allow for downgrad! Thus when class names were changed XaSecure* -> Ranger*
* this shell class serves to allow for seamles upgrade as well as downgrade.
- *
+ *
* This class is final because if one needs to customize coprocessor it is expected that RangerAuthorizationCoprocessor would be modified/extended as that is
* the "real" coprocessor! This class, hence, should NEVER be more than an EMPTY shell!
*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAccessRequest.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAccessRequest.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAccessRequest.java
index 6f1c8a4..b9f1cde 100644
--- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAccessRequest.java
+++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAccessRequest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuditHandler.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuditHandler.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuditHandler.java
index d98fe81..184a448 100644
--- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuditHandler.java
+++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuditHandler.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -100,7 +100,7 @@ public class RangerHiveAuditHandler extends RangerDefaultAuditHandler {
RangerAccessResult result = iterator.next();
if(result.getIsAudited()) {
if (!result.getIsAllowed()) {
- deniedAuditEvent = createAuditEvent(result);
+ deniedAuditEvent = createAuditEvent(result);
} else {
long policyId = result.getPolicyId();
if (auditEvents.containsKey(policyId)) { // add this result to existing event by updating column values
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
index aff915e..4b1cd09 100644
--- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
+++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -436,14 +436,14 @@ public class RangerHiveAuthorizer extends RangerHiveAuthorizerBase {
List<HivePrivilegeObject> ret = null;
// bail out early if nothing is there to validate!
- if (objs == null) {
+ if (objs == null) {
LOG.debug("filterListCmdObjects: meta objects list was null!");
} else if (objs.isEmpty()) {
LOG.debug("filterListCmdObjects: meta objects list was empty!");
ret = objs;
} else if (getCurrentUserGroupInfo() == null) {
/*
- * This is null for metastore and there doesn't seem to be a way to tell if one is running as metastore or hiveserver2!
+ * This is null for metastore and there doesn't seem to be a way to tell if one is running as metastore or hiveserver2!
*/
LOG.warn("filterListCmdObjects: user information not available");
ret = objs;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerBase.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerBase.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerBase.java
index 724c931..c313870 100644
--- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerBase.java
+++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -50,7 +50,7 @@ public abstract class RangerHiveAuthorizerBase implements HiveAuthorizer {
private HiveAuthenticationProvider mHiveAuthenticator;
private HiveAuthzSessionContext mSessionContext;
private UserGroupInformation mUgi;
-
+
public RangerHiveAuthorizerBase(HiveMetastoreClientFactory metastoreClientFactory,
HiveConf hiveConf,
HiveAuthenticationProvider hiveAuthenticator,
@@ -122,7 +122,7 @@ public abstract class RangerHiveAuthorizerBase implements HiveAuthorizer {
* @throws HiveAccessControlException
*/
@Override
- public List<HivePrivilegeInfo> showPrivileges(HivePrincipal principal, HivePrivilegeObject privObj)
+ public List<HivePrivilegeInfo> showPrivileges(HivePrincipal principal, HivePrivilegeObject privObj)
throws HiveAuthzPluginException, HiveAccessControlException {
LOG.debug("RangerHiveAuthorizerBase.showPrivileges()");
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerFactory.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerFactory.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerFactory.java
index bd410b7..fc4821a 100644
--- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerFactory.java
+++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveResource.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveResource.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveResource.java
index a29acea..09ecd1e 100644
--- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveResource.java
+++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveResource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/main/java/org/apache/ranger/authorization/hive/constants/RangerHiveConstants.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/constants/RangerHiveConstants.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/constants/RangerHiveConstants.java
index 711683e..cb7044c 100644
--- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/constants/RangerHiveConstants.java
+++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/constants/RangerHiveConstants.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java
index 32d212c..9ce0347 100644
--- a/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java
+++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
index b9dd949..0bc4946 100644
--- a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
+++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -318,10 +318,10 @@ public class HiveClient extends BaseClient implements Closeable {
String sql = null ;
- if (dbList != null && !dbList.isEmpty() &&
+ if (dbList != null && !dbList.isEmpty() &&
tblList != null && !tblList.isEmpty()) {
for (String db: dbList) {
- for(String tbl:tblList) {
+ for(String tbl:tblList) {
try {
sql = "use " + db;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
index c60a2fc..19badc8 100644
--- a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
+++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,7 +41,7 @@ public class HiveConnectionMgr {
hiveConnectionCache = new ConcurrentHashMap<String, HiveClient>();
repoConnectStatusMap = new ConcurrentHashMap<String, Boolean>();
}
-
+
public HiveClient getHiveConnection(final String serviceName, final String serviceType, final Map<String,String> configs) {
HiveClient hiveClient = null;
@@ -61,7 +61,7 @@ public class HiveConnectionMgr {
try {
hiveClient = TimedEventUtil.timedTask(connectHive, 5, TimeUnit.SECONDS);
} catch(Exception e){
- LOG.error("Error connecting hive repository : "+
+ LOG.error("Error connecting hive repository : "+
serviceName +" using config : "+ configs, e);
}
HiveClient oldClient = hiveConnectionCache.putIfAbsent(serviceName, hiveClient);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java
index 73feff9..ff13fcf 100644
--- a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java
+++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -79,11 +79,11 @@ public class HiveResourceMgr {
}
if ( userInput != null && resource != null) {
- if ( resourceMap != null && !resourceMap.isEmpty() ) {
- databaseList = resourceMap.get(DATABASE);
- tableList = resourceMap.get(TABLE);
- columnList = resourceMap.get(COLUMN);
- }
+ if ( resourceMap != null && !resourceMap.isEmpty() ) {
+ databaseList = resourceMap.get(DATABASE);
+ tableList = resourceMap.get(TABLE);
+ columnList = resourceMap.get(COLUMN);
+ }
switch (resource.trim().toLowerCase()) {
case DATABASE:
databaseName = userInput;
@@ -103,7 +103,7 @@ public class HiveResourceMgr {
try {
if(LOG.isDebugEnabled()) {
- LOG.debug("==> HiveResourceMgr.getHiveResources() UserInput: "+ userInput + " configs: " + configs + " databaseList: " + databaseList + " tableList: "
+ LOG.debug("==> HiveResourceMgr.getHiveResources() UserInput: "+ userInput + " configs: " + configs + " databaseList: " + databaseList + " tableList: "
+ tableList + " columnList: " + columnList ) ;
}
@@ -180,7 +180,7 @@ public class HiveResourceMgr {
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveResourceMgr.getHiveResources() UserInput: "+ userInput + " configs: " + configs + " databaseList: " + databaseList + " tableList: "
+ LOG.debug("<== HiveResourceMgr.getHiveResources() UserInput: "+ userInput + " configs: " + configs + " databaseList: " + databaseList + " tableList: "
+ tableList + " columnList: " + columnList + "Result :" + resultList ) ;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java b/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java
index 1caf1cb..3faa097 100644
--- a/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java
+++ b/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java
@@ -37,87 +37,87 @@ import org.junit.Assert;
import org.junit.Test;
/**
- *
+ *
* Here we plug the Ranger RangerHiveAuthorizerFactory into HIVE.
- *
- * A custom RangerAdminClient is plugged into Ranger in turn, which loads security policies from a local file. These policies were
+ *
+ * A custom RangerAdminClient is plugged into Ranger in turn, which loads security policies from a local file. These policies were
* generated in the Ranger Admin UI for a service called "HIVETest":
- *
+ *
* a) A user "bob" can do a select/update on the table "words"
* b) A group called "IT" can do a select only on the "count" column in "words"
* c) "bob" can create any database
* d) "dave" can do a select on the table "words" but only if the "count" column is >= 80
- * e) "jane" can do a select on the table "words", but only get a "hash" of the word, and not the word itself.
- *
+ * e) "jane" can do a select on the table "words", but only get a "hash" of the word, and not the word itself.
+ *
*/
public class HIVERangerAuthorizerTest {
-
+
private static final File hdfsBaseDir = new File("./target/hdfs/").getAbsoluteFile();
private static HiveServer2 hiveServer;
private static int port;
-
+
@org.junit.BeforeClass
public static void setup() throws Exception {
// Get a random port
ServerSocket serverSocket = new ServerSocket(0);
port = serverSocket.getLocalPort();
serverSocket.close();
-
+
HiveConf conf = new HiveConf();
-
+
// Warehouse
File warehouseDir = new File("./target/hdfs/warehouse").getAbsoluteFile();
conf.set(HiveConf.ConfVars.METASTOREWAREHOUSE.varname, warehouseDir.getPath());
-
+
// Scratchdir
File scratchDir = new File("./target/hdfs/scratchdir").getAbsoluteFile();
conf.set("hive.exec.scratchdir", scratchDir.getPath());
-
+
// Create a temporary directory for the Hive metastore
File metastoreDir = new File("./target/rangerauthzmetastore/").getAbsoluteFile();
conf.set(HiveConf.ConfVars.METASTORECONNECTURLKEY.varname,
String.format("jdbc:derby:;databaseName=%s;create=true", metastoreDir.getPath()));
-
+
conf.set(HiveConf.ConfVars.METASTORE_AUTO_CREATE_ALL.varname, "true");
conf.set(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_PORT.varname, "" + port);
-
+
// Enable authorization
conf.set(HiveConf.ConfVars.HIVE_AUTHORIZATION_ENABLED.varname, "true");
conf.set(HiveConf.ConfVars.HIVE_SERVER2_ENABLE_DOAS.varname, "true");
- conf.set(HiveConf.ConfVars.HIVE_AUTHORIZATION_MANAGER.varname,
+ conf.set(HiveConf.ConfVars.HIVE_AUTHORIZATION_MANAGER.varname,
"org.apache.ranger.authorization.hive.authorizer.RangerHiveAuthorizerFactory");
conf.set(HiveConf.ConfVars.METASTORE_SCHEMA_VERIFICATION.toString(), "false");
-
+
hiveServer = new HiveServer2();
hiveServer.init(conf);
hiveServer.start();
-
+
Class.forName("org.apache.hive.jdbc.HiveDriver");
-
+
// Create database
String initialUrl = "jdbc:hive2://localhost:" + port;
Connection connection = DriverManager.getConnection(initialUrl, "admin", "admin");
Statement statement = connection.createStatement();
-
+
statement.execute("CREATE DATABASE IF NOT EXISTS rangerauthz");
-
+
statement.close();
connection.close();
-
+
// Load data into HIVE
String url = "jdbc:hive2://localhost:" + port + "/rangerauthz";
connection = DriverManager.getConnection(url, "admin", "admin");
statement = connection.createStatement();
// statement.execute("CREATE TABLE WORDS (word STRING, count INT)");
statement.execute("create table if not exists words (word STRING, count INT) row format delimited fields terminated by '\t' stored as textfile");
-
+
// Copy "wordcount.txt" to "target" to avoid overwriting it during load
File inputFile = new File(HIVERangerAuthorizerTest.class.getResource("../../../../../wordcount.txt").toURI());
Path outputPath = Paths.get(inputFile.toPath().getParent().getParent().toString() + File.separator + "wordcountout.txt");
Files.copy(inputFile.toPath(), outputPath);
-
+
statement.execute("LOAD DATA INPATH '" + outputPath + "' OVERWRITE INTO TABLE words");
-
+
// Just test to make sure it's working
ResultSet resultSet = statement.executeQuery("SELECT * FROM words where count == '100'");
if (resultSet.next()) {
@@ -125,11 +125,11 @@ public class HIVERangerAuthorizerTest {
} else {
Assert.fail("No ResultSet found");
}
-
+
statement.close();
connection.close();
}
-
+
@org.junit.AfterClass
public static void cleanup() throws Exception {
hiveServer.stop();
@@ -137,11 +137,11 @@ public class HIVERangerAuthorizerTest {
File metastoreDir = new File("./target/rangerauthzmetastore/").getAbsoluteFile();
FileUtil.fullyDelete(metastoreDir);
}
-
+
// this should be allowed (by the policy - user)
@Test
public void testHiveSelectAllAsBob() throws Exception {
-
+
String url = "jdbc:hive2://localhost:" + port + "/rangerauthz";
Connection connection = DriverManager.getConnection(url, "bob", "bob");
Statement statement = connection.createStatement();
@@ -157,36 +157,36 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
}
-
+
// the "IT" group doesn't have permission to select all
@Test
public void testHiveSelectAllAsAlice() throws Exception {
-
+
UserGroupInformation ugi = UserGroupInformation.createUserForTesting("alice", new String[] {"IT"});
ugi.doAs(new PrivilegedExceptionAction<Void>() {
public Void run() throws Exception {
String url = "jdbc:hive2://localhost:" + port + "/rangerauthz";
Connection connection = DriverManager.getConnection(url, "alice", "alice");
Statement statement = connection.createStatement();
-
+
try {
statement.executeQuery("SELECT * FROM words where count == '100'");
Assert.fail("Failure expected on an unauthorized call");
} catch (SQLException ex) {
// expected
}
-
+
statement.close();
connection.close();
return null;
}
});
}
-
+
// this should be allowed (by the policy - user)
@Test
public void testHiveSelectSpecificColumnAsBob() throws Exception {
-
+
String url = "jdbc:hive2://localhost:" + port + "/rangerauthz";
Connection connection = DriverManager.getConnection(url, "bob", "bob");
Statement statement = connection.createStatement();
@@ -201,11 +201,11 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
}
-
+
// this should be allowed (by the policy - group)
@Test
public void testHiveSelectSpecificColumnAsAlice() throws Exception {
-
+
UserGroupInformation ugi = UserGroupInformation.createUserForTesting("alice", new String[] {"IT"});
ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -227,11 +227,11 @@ public class HIVERangerAuthorizerTest {
}
});
}
-
+
// An unknown user shouldn't be allowed
@Test
public void testHiveSelectSpecificColumnAsEve() throws Exception {
-
+
String url = "jdbc:hive2://localhost:" + port + "/rangerauthz";
Connection connection = DriverManager.getConnection(url, "eve", "eve");
Statement statement = connection.createStatement();
@@ -246,11 +246,11 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
}
-
+
// test "alice", but in the wrong group
@Test
public void testHiveSelectSpecificColumnAsAliceWrongGroup() throws Exception {
-
+
UserGroupInformation ugi = UserGroupInformation.createUserForTesting("alice", new String[] {"DevOps"});
ugi.doAs(new PrivilegedExceptionAction<Void>() {
@@ -272,17 +272,17 @@ public class HIVERangerAuthorizerTest {
}
});
}
-
+
// this should be allowed (by the policy - user)
@Test
public void testHiveUpdateAllAsBob() throws Exception {
-
+
String url = "jdbc:hive2://localhost:" + port + "/rangerauthz";
Connection connection = DriverManager.getConnection(url, "bob", "bob");
Statement statement = connection.createStatement();
statement.execute("insert into words (word, count) values ('newword', 5)");
-
+
ResultSet resultSet = statement.executeQuery("SELECT * FROM words where word == 'newword'");
if (resultSet.next()) {
Assert.assertEquals("newword", resultSet.getString(1));
@@ -294,7 +294,7 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
}
-
+
// this should not be allowed as "alice" can't insert into the table
@Test
public void testHiveUpdateAllAsAlice() throws Exception {
@@ -304,27 +304,27 @@ public class HIVERangerAuthorizerTest {
String url = "jdbc:hive2://localhost:" + port + "/rangerauthz";
Connection connection = DriverManager.getConnection(url, "alice", "alice");
Statement statement = connection.createStatement();
-
+
try {
statement.execute("insert into words (word, count) values ('newword2', 5)");
Assert.fail("Failure expected on an unauthorized call");
} catch (SQLException ex) {
// expected
}
-
-
+
+
statement.close();
connection.close();
return null;
}
});
}
-
+
@Test
public void testHiveCreateDropDatabase() throws Exception {
-
+
String url = "jdbc:hive2://localhost:" + port;
-
+
// Try to create a database as "bob" - this should be allowed
Connection connection = DriverManager.getConnection(url, "bob", "bob");
Statement statement = connection.createStatement();
@@ -333,7 +333,7 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
-
+
// Try to create a database as "alice" - this should not be allowed
connection = DriverManager.getConnection(url, "alice", "alice");
statement = connection.createStatement();
@@ -344,7 +344,7 @@ public class HIVERangerAuthorizerTest {
} catch (SQLException ex) {
// expected
}
-
+
// Try to drop a database as "bob" - this should not be allowed
connection = DriverManager.getConnection(url, "bob", "bob");
statement = connection.createStatement();
@@ -355,7 +355,7 @@ public class HIVERangerAuthorizerTest {
} catch (SQLException ex) {
// expected
}
-
+
// Try to drop a database as "admin" - this should be allowed
connection = DriverManager.getConnection(url, "admin", "admin");
statement = connection.createStatement();
@@ -365,12 +365,12 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
}
-
+
@Test
public void testBobSelectOnDifferentDatabase() throws Exception {
-
+
String url = "jdbc:hive2://localhost:" + port;
-
+
// Create a database as "admin"
Connection connection = DriverManager.getConnection(url, "admin", "admin");
Statement statement = connection.createStatement();
@@ -379,16 +379,16 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
-
+
// Create a "words" table in "admintemp"
url = "jdbc:hive2://localhost:" + port + "/admintemp";
connection = DriverManager.getConnection(url, "admin", "admin");
statement = connection.createStatement();
statement.execute("CREATE TABLE if not exists WORDS (word STRING, count INT)");
-
+
statement.close();
connection.close();
-
+
// Now try to read it as "bob"
connection = DriverManager.getConnection(url, "bob", "bob");
statement = connection.createStatement();
@@ -402,7 +402,7 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
-
+
// Drop the table and database as "admin"
connection = DriverManager.getConnection(url, "admin", "admin");
statement = connection.createStatement();
@@ -413,19 +413,19 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
}
-
+
@Test
public void testBobSelectOnDifferentTables() throws Exception {
-
+
// Create a "words2" table in "rangerauthz"
String url = "jdbc:hive2://localhost:" + port + "/rangerauthz";
Connection connection = DriverManager.getConnection(url, "admin", "admin");
Statement statement = connection.createStatement();
statement.execute("CREATE TABLE if not exists WORDS2 (word STRING, count INT)");
-
+
statement.close();
connection.close();
-
+
// Now try to read it as "bob"
connection = DriverManager.getConnection(url, "bob", "bob");
statement = connection.createStatement();
@@ -439,7 +439,7 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
-
+
// Drop the table as "admin"
connection = DriverManager.getConnection(url, "admin", "admin");
statement = connection.createStatement();
@@ -449,67 +449,67 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
}
-
+
@Test
public void testBobAlter() throws Exception {
-
+
String url = "jdbc:hive2://localhost:" + port + "/rangerauthz";
-
+
// Create a new table as admin
Connection connection = DriverManager.getConnection(url, "admin", "admin");
Statement statement = connection.createStatement();
statement.execute("CREATE TABLE IF NOT EXISTS WORDS2 (word STRING, count INT)");
-
+
statement.close();
connection.close();
-
+
// Try to add a new column in words as "bob" - this should fail
url = "jdbc:hive2://localhost:" + port + "/rangerauthz";
connection = DriverManager.getConnection(url, "bob", "bob");
statement = connection.createStatement();
-
+
try {
statement.execute("ALTER TABLE WORDS2 ADD COLUMNS (newcol STRING)");
Assert.fail("Failure expected on an unauthorized call");
} catch (SQLException ex) {
// expected
}
-
+
statement.close();
connection.close();
-
+
// Now alter it as "admin"
connection = DriverManager.getConnection(url, "admin", "admin");
statement = connection.createStatement();
-
+
statement.execute("ALTER TABLE WORDS2 ADD COLUMNS (newcol STRING)");
-
+
statement.close();
connection.close();
-
+
// Try to alter it as "bob" - this should fail
connection = DriverManager.getConnection(url, "bob", "bob");
statement = connection.createStatement();
-
+
try {
statement.execute("ALTER TABLE WORDS2 REPLACE COLUMNS (word STRING, count INT)");
Assert.fail("Failure expected on an unauthorized call");
} catch (SQLException ex) {
// expected
}
-
+
statement.close();
connection.close();
-
+
// Now alter it as "admin"
connection = DriverManager.getConnection(url, "admin", "admin");
statement = connection.createStatement();
-
+
statement.execute("ALTER TABLE WORDS2 REPLACE COLUMNS (word STRING, count INT)");
-
+
statement.close();
connection.close();
-
+
// Drop the table as "admin"
connection = DriverManager.getConnection(url, "admin", "admin");
statement = connection.createStatement();
@@ -519,10 +519,10 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
}
-
+
@Test
public void testHiveRowFilter() throws Exception {
-
+
// dave can do a select where the count is >= 80
String url = "jdbc:hive2://localhost:" + port + "/rangerauthz";
Connection connection = DriverManager.getConnection(url, "dave", "dave");
@@ -536,19 +536,19 @@ public class HIVERangerAuthorizerTest {
} else {
Assert.fail("No ResultSet found");
}
-
+
resultSet = statement.executeQuery("SELECT * FROM words where count == '79'");
if (resultSet.next()) {
Assert.fail("Authorization should not be granted for count < 80");
}
-
+
statement.close();
connection.close();
-
+
// "bob" should be able to read a count of "79" as the filter doesn't apply to him
connection = DriverManager.getConnection(url, "bob", "bob");
statement = connection.createStatement();
-
+
resultSet = statement.executeQuery("SELECT * FROM words where count == '79'");
if (resultSet.next()) {
Assert.assertEquals("cannot", resultSet.getString(1));
@@ -556,14 +556,14 @@ public class HIVERangerAuthorizerTest {
} else {
Assert.fail("No ResultSet found");
}
-
+
statement.close();
connection.close();
}
-
+
@Test
public void testHiveDataMasking() throws Exception {
-
+
String url = "jdbc:hive2://localhost:" + port + "/rangerauthz";
Connection connection = DriverManager.getConnection(url, "jane", "jane");
Statement statement = connection.createStatement();
@@ -576,7 +576,7 @@ public class HIVERangerAuthorizerTest {
} else {
Assert.fail("No ResultSet found");
}
-
+
statement.close();
connection.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/hive-agent/src/test/java/org/apache/ranger/services/hive/RangerAdminClientImpl.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/test/java/org/apache/ranger/services/hive/RangerAdminClientImpl.java b/hive-agent/src/test/java/org/apache/ranger/services/hive/RangerAdminClientImpl.java
index 32e1966..43770c2 100644
--- a/hive-agent/src/test/java/org/apache/ranger/services/hive/RangerAdminClientImpl.java
+++ b/hive-agent/src/test/java/org/apache/ranger/services/hive/RangerAdminClientImpl.java
@@ -64,21 +64,21 @@ public class RangerAdminClientImpl implements RangerAdminClient {
}
public void grantAccess(GrantRevokeRequest request) throws Exception {
-
+
}
public void revokeAccess(GrantRevokeRequest request) throws Exception {
-
+
}
public ServiceTags getServiceTagsIfUpdated(long lastKnownVersion) throws Exception {
return null;
-
+
}
public List<String> getTagTypes(String tagTypePattern) throws Exception {
return null;
}
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/jisql/src/main/java/org/apache/util/outputformatter/CSVFormatter.java
----------------------------------------------------------------------
diff --git a/jisql/src/main/java/org/apache/util/outputformatter/CSVFormatter.java b/jisql/src/main/java/org/apache/util/outputformatter/CSVFormatter.java
index 6e80b42..158e25c 100644
--- a/jisql/src/main/java/org/apache/util/outputformatter/CSVFormatter.java
+++ b/jisql/src/main/java/org/apache/util/outputformatter/CSVFormatter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -40,28 +40,28 @@ public class CSVFormatter implements JisqlFormatter {
private char delimiter = ',';
private boolean includeColumnNames = false;
-
+
/**
* Sets a the supported option list for this formatter. This formatter accepts
* the following options:
- *
+ *
* <p> </p>
- *
+ *
* <ul>
* <li><<b>delimiter</b> specifies the delimiter to use. By default a comma is
* used</li>
* <li><b>colnames</b> if included then column names are printed as the first
* line of output. By default they are not included</li>
* </ul>
- *
+ *
* @param parser the OptionParser to use.
- *
+ *
*/
public void setSupportedOptions( OptionParser parser ) {
parser.accepts( "delimiter" ).withRequiredArg().ofType( String.class );
parser.accepts( "colnames" );
}
-
+
/**
* Consumes any options that were specified on the command line.
*
@@ -73,7 +73,7 @@ public class CSVFormatter implements JisqlFormatter {
public void consumeOptions( OptionSet options ) throws Exception {
if( options.has( "delimiter" ) )
delimiter = ((String)(options.valueOf( "delimiter" ))).charAt( 0 );
-
+
if( options.has( "colnames" ) )
includeColumnNames = true;
}
@@ -83,7 +83,7 @@ public class CSVFormatter implements JisqlFormatter {
* message should contain information on how to call the formatter.
*
* @param out the PrintStream to display the usage message on.
- *
+ *
*/
public void usage( PrintStream out ) {
out.println("\t-delimiter specifies the character to use as the delimiter. This defaults to \"" + delimiter + "\"" );
@@ -140,10 +140,10 @@ public class CSVFormatter implements JisqlFormatter {
else
csvWriter.write( "" );
}
-
+
csvWriter.endRecord();
}
-
+
csvWriter.flush();
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/jisql/src/main/java/org/apache/util/outputformatter/DefaultFormatter.java
----------------------------------------------------------------------
diff --git a/jisql/src/main/java/org/apache/util/outputformatter/DefaultFormatter.java b/jisql/src/main/java/org/apache/util/outputformatter/DefaultFormatter.java
index a3bb626..f58e91e 100644
--- a/jisql/src/main/java/org/apache/util/outputformatter/DefaultFormatter.java
+++ b/jisql/src/main/java/org/apache/util/outputformatter/DefaultFormatter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,11 +41,11 @@ public class DefaultFormatter implements JisqlFormatter {
private boolean debug = false;
private String delimiter = " | ";
-
+
/**
* Sets a the option list for this formatter. This formatter accepts the
* following options:
- *
+ *
* <li><b>-noheader</b> do not print the header column info.</li>
* <li><b>-spacer</b> The character to use for "empty" space. This
* defaults to the space character. From mrider - "I added the ability to
@@ -62,9 +62,9 @@ public class DefaultFormatter implements JisqlFormatter {
* <li><b>-w</b> specify the max width of a column. The default is 2048</li>
* <li><b>-debug</b> add debug headers to the output</li>
* </ul>
- *
+ *
* @param parser the OptionParser to use.
- *
+ *
*/
public void setSupportedOptions( OptionParser parser ) {
parser.accepts( "trim" );
@@ -80,7 +80,7 @@ public class DefaultFormatter implements JisqlFormatter {
/**
* Consumes any options that were specified on the command line.
*
- * @param options the OptionSet that the main driver is using.
+ * @param options the OptionSet that the main driver is using.
*
* @throws Exception if there is a problem parsing the command line arguments.
*
@@ -104,14 +104,14 @@ public class DefaultFormatter implements JisqlFormatter {
if( options.has( "noheader" ) )
printHeader = false;
-
+
if( options.has( "debug" ) )
debug = true;
if( options.hasArgument( "delimiter" ) )
delimiter = (String)options.valueOf( "delimiter" );
}
-
+
/**
@@ -119,7 +119,7 @@ public class DefaultFormatter implements JisqlFormatter {
* message should contain information on how to call the formatter.
*
* @param out the stream to print the output on
- *
+ *
*/
public void usage( PrintStream out ) {
out.println("\t-w specifies the maximum field width for a column. The default is to output the full width of the column");
@@ -222,12 +222,12 @@ public class DefaultFormatter implements JisqlFormatter {
/**
* Formats a label for output.
- *
+ *
* @param s - the label to format
* @param width - the width of the field
- *
+ *
* @return the formated label
- *
+ *
*/
private String formatLabel(String s, int width) {
if (s == null)
@@ -260,12 +260,12 @@ public class DefaultFormatter implements JisqlFormatter {
/**
* Formats a separator for display.
- *
+ *
* @param s - the field for which the separator is being generated
* @param width - the width of the field
- *
+ *
* @return the formated separator
- *
+ *
*/
private String formatSeparator(String s, int width) {
s = "NULL";
@@ -295,13 +295,13 @@ public class DefaultFormatter implements JisqlFormatter {
/**
* Formats a value for display.
- *
+ *
* @param label the label associated with the value (for width purposes)
* @param s - the value to format
* @param width - the width of the field from the db.
- *
+ *
* @return the formatted field.
- *
+ *
*/
private String formatValue(String label, String s, int width) {
if (s == null) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/jisql/src/main/java/org/apache/util/outputformatter/JisqlFormatter.java
----------------------------------------------------------------------
diff --git a/jisql/src/main/java/org/apache/util/outputformatter/JisqlFormatter.java b/jisql/src/main/java/org/apache/util/outputformatter/JisqlFormatter.java
index aac7b8e..ec6d1f0 100644
--- a/jisql/src/main/java/org/apache/util/outputformatter/JisqlFormatter.java
+++ b/jisql/src/main/java/org/apache/util/outputformatter/JisqlFormatter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,14 +31,14 @@ import joptsimple.OptionSet;
*
*/
public interface JisqlFormatter {
-
+
/**
* Sets a the option list for this formatter.
- *
+ *
* @param parser - the OptionParser to use.
*/
void setSupportedOptions( OptionParser parser );
-
+
/**
* Consumes any options that were specified on the command line.
*
@@ -63,14 +63,14 @@ public interface JisqlFormatter {
*/
void usage( PrintStream out );
-
+
/**
* Outputs a header for a query. This is called before any data is
* output.
*
* @param out where to put header output.
* @param metaData the ResultSetMetaData for the output.
- *
+ *
*/
void formatHeader( PrintStream out, ResultSetMetaData metaData ) throws Exception;
@@ -90,7 +90,7 @@ public interface JisqlFormatter {
*
* @param out where to put footer output.
* @param metaData the ResultSetMetaData for the output.
- *
+ *
*/
void formatFooter( PrintStream out, ResultSetMetaData metaData ) throws Exception;
}
[14/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
Removing trailing whitespace (via sed)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/09700f35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/09700f35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/09700f35
Branch: refs/heads/master
Commit: 09700f35ad41dbb7c23cedbc8ee68a16d9565de8
Parents: 5359e37
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Sep 28 10:18:59 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Sep 28 10:18:59 2016 +0100
----------------------------------------------------------------------
.../ranger/audit/dao/AuthzAuditEventDao.java | 4 +-
.../org/apache/ranger/audit/dao/BaseDao.java | 4 +-
.../org/apache/ranger/audit/dao/DaoManager.java | 4 +-
.../audit/destination/AuditDestination.java | 8 +-
.../audit/destination/DBAuditDestination.java | 6 +-
.../audit/destination/FileAuditDestination.java | 8 +-
.../audit/destination/HDFSAuditDestination.java | 10 +-
.../destination/Log4JAuditDestination.java | 4 +-
.../audit/destination/SolrAuditDestination.java | 6 +-
.../audit/entity/AuthzAuditEventDbObj.java | 4 +-
.../ranger/audit/model/AuditEventBase.java | 4 +-
.../ranger/audit/model/AuthzAuditEvent.java | 4 +-
.../ranger/audit/model/EnumRepositoryType.java | 6 +-
.../audit/provider/AsyncAuditProvider.java | 4 +-
.../audit/provider/AuditMessageException.java | 4 +-
.../ranger/audit/provider/BaseAuditHandler.java | 6 +-
.../audit/provider/LocalFileLogBuffer.java | 4 +-
.../apache/ranger/audit/provider/LogBuffer.java | 4 +-
.../ranger/audit/provider/LogDestination.java | 6 +-
.../apache/ranger/audit/provider/MiscUtil.java | 2 +-
.../audit/provider/hdfs/HdfsLogDestination.java | 12 +-
.../audit/provider/solr/SolrAuditProvider.java | 14 +-
.../ranger/audit/queue/AuditAsyncQueue.java | 12 +-
.../ranger/audit/queue/AuditBatchQueue.java | 16 +-
.../ranger/audit/queue/AuditFileSpool.java | 14 +-
.../apache/ranger/audit/queue/AuditQueue.java | 8 +-
.../ranger/audit/queue/AuditSummaryQueue.java | 12 +-
.../apache/ranger/audit/test/TestEvents.java | 4 +-
.../audit/utils/InMemoryJAASConfiguration.java | 18 +-
.../security/KrbPasswordSaverLoginModule.java | 4 +-
.../hadoop/security/SecureClientLogin.java | 10 +-
.../ranger/admin/client/RangerAdminClient.java | 4 +-
.../admin/client/RangerAdminRESTClient.java | 6 +-
.../admin/client/datatype/GrantRevokeData.java | 4 +-
.../hadoop/config/RangerConfigConstants.java | 6 +-
.../hadoop/config/RangerConfiguration.java | 4 +-
.../config/RangerLegacyConfigBuilder.java | 26 +--
.../ranger/authorization/utils/StringUtil.java | 4 +-
.../plugin/audit/RangerDefaultAuditHandler.java | 4 +-
.../audit/RangerMultiResourceAuditHandler.java | 4 +-
.../apache/ranger/plugin/client/BaseClient.java | 6 +-
.../plugin/client/HadoopConfigHolder.java | 12 +-
.../ranger/plugin/client/HadoopException.java | 4 +-
.../RangerAbstractConditionEvaluator.java | 4 +-
.../RangerConditionEvaluator.java | 4 +-
.../conditionevaluator/RangerIpMatcher.java | 6 +-
.../RangerTimeOfDayMatcher.java | 4 +-
.../RangerAbstractContextEnricher.java | 4 +-
.../contextenricher/RangerContextEnricher.java | 4 +-
.../plugin/model/RangerBaseModelObject.java | 6 +-
.../ranger/plugin/model/RangerPolicy.java | 4 +-
.../model/RangerPolicyResourceSignature.java | 4 +-
.../ranger/plugin/model/RangerService.java | 4 +-
.../ranger/plugin/model/RangerServiceDef.java | 6 +-
.../model/validation/RangerPolicyValidator.java | 16 +-
.../validation/RangerServiceDefHelper.java | 44 ++---
.../validation/RangerServiceDefValidator.java | 8 +-
.../validation/RangerServiceValidator.java | 4 +-
.../model/validation/RangerValidator.java | 8 +-
.../validation/ValidationFailureDetails.java | 10 +-
.../ValidationFailureDetailsBuilder.java | 4 +-
.../policyengine/RangerAccessRequest.java | 4 +-
.../policyengine/RangerAccessRequestImpl.java | 4 +-
.../policyengine/RangerAccessResource.java | 4 +-
.../policyengine/RangerAccessResourceImpl.java | 4 +-
.../plugin/policyengine/RangerAccessResult.java | 4 +-
.../RangerAccessResultProcessor.java | 4 +-
.../policyengine/RangerMutableResource.java | 4 +-
.../plugin/policyengine/RangerPolicyEngine.java | 4 +-
.../policyengine/RangerPolicyEngineCache.java | 4 +-
.../policyengine/RangerPolicyEngineImpl.java | 4 +-
.../RangerAbstractPolicyEvaluator.java | 4 +-
.../RangerAbstractPolicyItemEvaluator.java | 4 +-
.../RangerDefaultPolicyEvaluator.java | 4 +-
.../RangerDefaultPolicyItemEvaluator.java | 4 +-
.../policyevaluator/RangerPolicyEvaluator.java | 4 +-
.../RangerPolicyItemEvaluator.java | 4 +-
.../RangerDefaultPolicyResourceMatcher.java | 4 +-
.../RangerPolicyResourceMatcher.java | 4 +-
.../RangerAbstractResourceMatcher.java | 4 +-
.../RangerDefaultResourceMatcher.java | 4 +-
.../RangerPathResourceMatcher.java | 4 +-
.../resourcematcher/RangerResourceMatcher.java | 4 +-
.../ranger/plugin/service/RangerBasePlugin.java | 4 +-
.../plugin/service/RangerBaseService.java | 4 +-
.../plugin/service/ResourceLookupContext.java | 4 +-
.../plugin/store/AbstractPredicateUtil.java | 4 +-
.../plugin/store/EmbeddedServiceDefsUtil.java | 14 +-
.../ranger/plugin/store/ServiceStore.java | 4 +-
.../ranger/plugin/store/file/FileStoreUtil.java | 4 +-
.../plugin/store/file/ServiceFileStore.java | 6 +-
.../plugin/store/rest/ServiceRESTStore.java | 4 +-
.../ranger/plugin/util/GrantRevokeRequest.java | 4 +-
.../ranger/plugin/util/PasswordUtils.java | 2 +-
.../ranger/plugin/util/PolicyRefresher.java | 6 +-
.../plugin/util/RangerAccessRequestUtil.java | 4 +-
.../ranger/plugin/util/RangerObjectFactory.java | 4 +-
.../ranger/plugin/util/RangerPerfTracer.java | 4 +-
.../ranger/plugin/util/RangerRESTClient.java | 6 +-
.../ranger/plugin/util/RangerRESTUtils.java | 6 +-
.../ranger/plugin/util/RangerSslHelper.java | 4 +-
.../apache/ranger/plugin/util/SearchFilter.java | 4 +-
.../ranger/plugin/util/ServicePolicies.java | 4 +-
.../apache/ranger/plugin/util/ServiceTags.java | 4 +-
.../ranger/plugin/util/TimedEventUtil.java | 6 +-
.../ranger/services/tag/RangerServiceTag.java | 4 +-
.../conditionevaluator/RangerIpMatcherTest.java | 4 +-
.../conditionevaluator/RangerSimpleMatcher.java | 4 +-
.../RangerTimeOfDayMatcherTest.java | 16 +-
.../TestRangerPolicyResourceSignature.java | 6 +-
.../model/validation/TestDirectedGraph.java | 14 +-
.../validation/TestRangerPolicyValidator.java | 36 ++--
.../validation/TestRangerServiceDefHelper.java | 44 ++---
.../TestRangerServiceDefValidator.java | 20 +-
.../validation/TestRangerServiceValidator.java | 8 +-
.../model/validation/TestRangerValidator.java | 12 +-
.../model/validation/ValidationTestUtils.java | 8 +-
.../plugin/policyengine/TestPolicyDb.java | 4 +-
.../plugin/policyengine/TestPolicyEngine.java | 4 +-
.../RangerDefaultPolicyEvaluatorTest.java | 4 +-
.../resourcematcher/TestResourceMatcher.java | 4 +-
.../ranger/plugin/store/TestServiceStore.java | 6 +-
.../ranger/plugin/store/TestTagStore.java | 4 +-
.../hadoop/utils/RangerCredentialProvider.java | 26 +--
.../ranger/utils/install/XmlConfigChanger.java | 12 +-
.../ranger/credentialapi/CredentialReader.java | 12 +-
.../apache/ranger/credentialapi/buildks.java | 22 +--
.../credentialapi/TestCredentialReader.java | 14 +-
.../ranger/credentialapi/Testbuildks.java | 32 ++--
.../ranger/server/tomcat/EmbeddedServer.java | 22 +--
.../server/tomcat/StopEmbeddedServer.java | 6 +-
.../hbase/AuthorizationSession.java | 8 +-
.../authorization/hbase/ColumnIterator.java | 4 +-
.../authorization/hbase/HbaseAuditHandler.java | 8 +-
.../hbase/HbaseAuditHandlerImpl.java | 4 +-
.../authorization/hbase/HbaseAuthUtils.java | 4 +-
.../authorization/hbase/HbaseAuthUtilsImpl.java | 4 +-
.../authorization/hbase/HbaseFactory.java | 6 +-
.../authorization/hbase/HbaseUserUtils.java | 6 +-
.../authorization/hbase/HbaseUserUtilsImpl.java | 6 +-
.../hbase/RangerAuthorizationCoprocessor.java | 26 +--
.../RangerAuthorizationCoprocessorBase.java | 2 +-
.../hbase/RangerAuthorizationFilter.java | 4 +-
.../services/hbase/RangerServiceHBase.java | 4 +-
.../services/hbase/client/HBaseClient.java | 12 +-
.../hbase/client/HBaseConnectionMgr.java | 8 +-
.../services/hbase/client/HBaseResourceMgr.java | 8 +-
.../hbase/AuthorizationSessionTest.java | 6 +-
.../authorization/hbase/ColumnIteratorTest.java | 4 +-
.../hbase/HbaseAuthUtilsImplTest.java | 4 +-
.../RangerAuthorizationCoprocessorTest.java | 4 +-
.../hbase/RangerAuthorizationFilterTest.java | 4 +-
.../authorization/hbase/TestPolicyEngine.java | 4 +-
.../services/hbase/TestRangerServiceHBase.java | 6 +-
.../hadoop/HDFSAccessVerifier.java | 4 +-
.../hadoop/RangerHdfsAuthorizer.java | 4 +-
.../agent/AuthCodeInjectionJavaAgent.java | 4 +-
.../agent/HadoopAuthClassTransformer.java | 4 +-
.../RangerAccessControlException.java | 4 +-
.../ranger/services/hdfs/RangerServiceHdfs.java | 4 +-
.../ranger/services/hdfs/client/HdfsClient.java | 6 +-
.../services/hdfs/client/HdfsConnectionMgr.java | 4 +-
.../services/hdfs/client/HdfsResourceMgr.java | 6 +-
.../ranger/services/hdfs/HDFSRangerTest.java | 108 +++++------
.../services/hdfs/RangerAdminClientImpl.java | 8 +-
.../services/hdfs/client/HdfsClientTest.java | 4 +-
.../XaSecureHiveAuthorizerFactory.java | 4 +-
.../authorizer/RangerHiveAccessRequest.java | 4 +-
.../hive/authorizer/RangerHiveAuditHandler.java | 6 +-
.../hive/authorizer/RangerHiveAuthorizer.java | 8 +-
.../authorizer/RangerHiveAuthorizerBase.java | 8 +-
.../authorizer/RangerHiveAuthorizerFactory.java | 4 +-
.../hive/authorizer/RangerHiveResource.java | 4 +-
.../hive/constants/RangerHiveConstants.java | 4 +-
.../ranger/services/hive/RangerServiceHive.java | 4 +-
.../ranger/services/hive/client/HiveClient.java | 8 +-
.../services/hive/client/HiveConnectionMgr.java | 8 +-
.../services/hive/client/HiveResourceMgr.java | 18 +-
.../services/hive/HIVERangerAuthorizerTest.java | 184 +++++++++----------
.../services/hive/RangerAdminClientImpl.java | 8 +-
.../util/outputformatter/CSVFormatter.java | 24 +--
.../util/outputformatter/DefaultFormatter.java | 38 ++--
.../util/outputformatter/JisqlFormatter.java | 16 +-
.../util/outputformatter/XMLFormatter.java | 20 +-
.../main/java/org/apache/util/sql/Jisql.java | 54 +++---
.../java/org/apache/util/sql/MaskingThread.java | 4 +-
.../java/org/apache/util/sql/MySQLPLRunner.java | 54 +++---
.../apache/hadoop/crypto/key/DB2HSMMKUtil.java | 4 +-
.../apache/hadoop/crypto/key/HSM2DBMKUtil.java | 4 +-
.../hadoop/crypto/key/JKS2RangerUtil.java | 10 +-
.../hadoop/crypto/key/Ranger2JKSUtil.java | 10 +-
.../org/apache/hadoop/crypto/key/RangerHSM.java | 8 +-
.../apache/hadoop/crypto/key/RangerKMSDB.java | 2 +-
.../hadoop/crypto/key/RangerKeyStore.java | 58 +++---
.../crypto/key/RangerKeyStoreProvider.java | 12 +-
.../hadoop/crypto/key/RangerMasterKey.java | 18 +-
.../hadoop/crypto/key/kms/server/KMS.java | 6 +-
.../crypto/key/kms/server/KMSConfiguration.java | 6 +-
.../hadoop/crypto/key/kms/server/KMSWebApp.java | 4 +-
.../kms/server/KeyAuthorizationKeyProvider.java | 8 +-
.../java/org/apache/ranger/entity/XXDBBase.java | 2 +-
.../java/org/apache/ranger/kms/dao/BaseDao.java | 4 +-
.../crypto/key/kms/server/DerbyTestUtils.java | 14 +-
.../kms/server/RangerKeyStoreProviderTest.java | 32 ++--
.../key/kms/server/RangerMasterKeyTest.java | 16 +-
.../crypto/key/kms/server/TestKMSACLs.java | 2 +-
.../server/TestKeyAuthorizationKeyProvider.java | 8 +-
.../client/RangerAdminJersey2RESTClient.java | 8 +-
.../authorization/knox/KnoxRangerPlugin.java | 6 +-
.../ranger/services/knox/RangerServiceKnox.java | 4 +-
.../services/knox/client/KnoxConnectionMgr.java | 6 +-
.../services/knox/client/KnoxResourceMgr.java | 14 +-
.../knox/client/TestRangerServiceKnox.java | 6 +-
.../atlas/authorizer/RangerAtlasAuthorizer.java | 4 +-
.../atlas/authorizer/RangerAtlasResource.java | 4 +-
.../services/atlas/RangerServiceAtlas.java | 4 +-
.../kafka/authorizer/RangerKafkaAuthorizer.java | 18 +-
.../services/kafka/RangerServiceKafka.java | 4 +-
.../kafka/client/ServiceKafkaClient.java | 4 +-
.../kafka/client/ServiceKafkaConnectionMgr.java | 4 +-
.../kms/authorizer/RangerKmsAuthorizer.java | 28 +--
.../ranger/services/kms/client/KMSClient.java | 6 +-
.../services/kms/client/KMSConnectionMgr.java | 8 +-
.../services/kms/client/KMSResourceMgr.java | 8 +-
.../client/json/model/KMSSchedulerResponse.java | 4 +-
.../kms/authorizer/DerbyTestUtils.java | 14 +-
.../kms/authorizer/RangerAdminClientImpl.java | 8 +-
.../kms/authorizer/RangerKmsAuthorizerTest.java | 64 +++----
.../solr/authorizer/RangerSolrAuthorizer.java | 10 +-
.../ranger/services/solr/RangerServiceSolr.java | 4 +-
.../services/solr/client/ServiceSolrClient.java | 4 +-
.../solr/client/ServiceSolrConnectionMgr.java | 4 +-
.../yarn/authorizer/RangerYarnAuthorizer.java | 4 +-
.../ranger/services/yarn/client/YarnClient.java | 10 +-
.../services/yarn/client/YarnConnectionMgr.java | 4 +-
.../services/yarn/client/YarnResourceMgr.java | 8 +-
.../json/model/YarnSchedulerResponse.java | 4 +-
.../atlas/authorizer/RangerAtlasAuthorizer.java | 22 +--
.../RangerSampleSimpleMatcher.java | 4 +-
.../RangerSampleCountryProvider.java | 4 +-
.../RangerSampleProjectProvider.java | 4 +-
.../RangerSampleSimpleMatcherTest.java | 6 +-
.../hbase/XaSecureAuthorizationCoprocessor.java | 4 +-
.../hbase/RangerAuthorizationCoprocessor.java | 12 +-
.../access/RangerAccessControlListsTest.java | 4 +-
.../hadoop/RangerHdfsAuthorizer.java | 4 +-
.../XaSecureHiveAuthorizerFactory.java | 4 +-
.../authorizer/RangerHiveAuthorizerFactory.java | 8 +-
.../kafka/authorizer/RangerKafkaAuthorizer.java | 4 +-
.../kms/authorizer/RangerKmsAuthorizer.java | 4 +-
.../RangerPDPKnoxDeploymentContributor.java | 2 +-
.../classloader/RangerPluginClassLoader.java | 16 +-
.../RangerPluginClassLoaderUtil.java | 14 +-
.../test/Impl/TestChildFistClassLoader.java | 6 +-
.../classloader/test/Impl/TestPluginImpl.java | 4 +-
.../plugin/classloader/test/Impl/TestPrint.java | 4 +-
.../plugin/classloader/test/TestPlugin.java | 4 +-
.../classloader/test/TestPrintParent.java | 4 +-
.../solr/authorizer/RangerSolrAuthorizer.java | 4 +-
.../storm/authorizer/RangerStormAuthorizer.java | 4 +-
.../policyengine/RangerPluginPerfTester.java | 4 +-
.../apache/ranger/common/RangerVersionInfo.java | 14 +-
.../yarn/authorizer/RangerYarnAuthorizer.java | 4 +-
.../unix/jaas/RoleUserAuthorityGranter.java | 4 +-
.../java/org/apache/ranger/biz/AssetMgr.java | 8 +-
.../org/apache/ranger/biz/AssetMgrBase.java | 4 +-
.../java/org/apache/ranger/biz/BaseMgr.java | 4 +-
.../java/org/apache/ranger/biz/KmsKeyMgr.java | 18 +-
.../org/apache/ranger/biz/RangerBizUtil.java | 50 ++---
.../ranger/biz/RangerPolicyRetriever.java | 4 +-
.../apache/ranger/biz/RangerTagDBRetriever.java | 4 +-
.../org/apache/ranger/biz/ServiceDBStore.java | 16 +-
.../java/org/apache/ranger/biz/ServiceMgr.java | 8 +-
.../java/org/apache/ranger/biz/SessionMgr.java | 6 +-
.../java/org/apache/ranger/biz/TagDBStore.java | 4 +-
.../java/org/apache/ranger/biz/UserMgr.java | 6 +-
.../java/org/apache/ranger/biz/UserMgrBase.java | 4 +-
.../java/org/apache/ranger/biz/XAuditMgr.java | 4 +-
.../org/apache/ranger/biz/XAuditMgrBase.java | 4 +-
.../java/org/apache/ranger/biz/XUserMgr.java | 8 +-
.../org/apache/ranger/biz/XUserMgrBase.java | 4 +-
.../org/apache/ranger/common/AppConstants.java | 8 +-
.../org/apache/ranger/common/ContextUtil.java | 4 +-
.../java/org/apache/ranger/common/DateUtil.java | 14 +-
.../apache/ranger/common/ErrorMessageUtil.java | 4 +-
.../java/org/apache/ranger/common/GUIDUtil.java | 4 +-
.../java/org/apache/ranger/common/HTTPUtil.java | 6 +-
.../java/org/apache/ranger/common/JSONUtil.java | 4 +-
.../java/org/apache/ranger/common/MapUtil.java | 4 +-
.../org/apache/ranger/common/MessageEnums.java | 4 +-
.../org/apache/ranger/common/MyCallBack.java | 4 +-
.../apache/ranger/common/PropertiesUtil.java | 4 +-
.../org/apache/ranger/common/RESTErrorUtil.java | 6 +-
.../apache/ranger/common/RangerCommonEnums.java | 6 +-
.../apache/ranger/common/RangerConfigUtil.java | 8 +-
.../apache/ranger/common/RangerConstants.java | 4 +-
.../org/apache/ranger/common/RangerFactory.java | 4 +-
.../common/RangerJAXBContextResolver.java | 6 +-
.../apache/ranger/common/RangerProperties.java | 2 +-
.../apache/ranger/common/RangerSearchUtil.java | 14 +-
.../common/RangerServicePoliciesCache.java | 2 +-
.../ranger/common/RangerServiceTagsCache.java | 2 +-
.../ranger/common/RangerValidatorFactory.java | 4 +-
.../apache/ranger/common/RequestContext.java | 6 +-
.../apache/ranger/common/SearchCriteria.java | 4 +-
.../org/apache/ranger/common/SearchField.java | 4 +-
.../org/apache/ranger/common/SearchGroup.java | 4 +-
.../org/apache/ranger/common/SearchUtil.java | 6 +-
.../org/apache/ranger/common/SearchValue.java | 10 +-
.../org/apache/ranger/common/ServiceUtil.java | 58 +++---
.../org/apache/ranger/common/SortField.java | 12 +-
.../org/apache/ranger/common/StringUtil.java | 16 +-
.../apache/ranger/common/TimedEventUtil.java | 6 +-
.../org/apache/ranger/common/TimedExecutor.java | 6 +-
.../common/TimedExecutorConfigurator.java | 4 +-
.../apache/ranger/common/UserSessionBase.java | 4 +-
.../annotation/RangerAnnotationClassName.java | 4 +-
.../annotation/RangerAnnotationJSMgrName.java | 6 +-
.../annotation/RangerAnnotationRestAPI.java | 4 +-
.../org/apache/ranger/common/db/BaseDao.java | 4 +-
.../ranger/common/db/JPABeanCallbacks.java | 4 +-
.../org/apache/ranger/common/view/VEnum.java | 14 +-
.../apache/ranger/common/view/VEnumElement.java | 4 +-
.../org/apache/ranger/common/view/VList.java | 12 +-
.../apache/ranger/common/view/VTrxLogAttr.java | 4 +-
.../apache/ranger/common/view/ViewBaseBean.java | 4 +-
.../ranger/credentialapi/CredentialReader.java | 14 +-
.../org/apache/ranger/db/RangerDaoManager.java | 4 +-
.../apache/ranger/db/RangerDaoManagerBase.java | 6 +-
.../org/apache/ranger/db/XXAccessAuditDao.java | 4 +-
.../java/org/apache/ranger/db/XXAssetDao.java | 8 +-
.../org/apache/ranger/db/XXAuditMapDao.java | 4 +-
.../org/apache/ranger/db/XXAuthSessionDao.java | 6 +-
.../ranger/db/XXContextEnricherDefDao.java | 4 +-
.../apache/ranger/db/XXCredentialStoreDao.java | 4 +-
.../java/org/apache/ranger/db/XXDBBaseDao.java | 4 +-
.../java/org/apache/ranger/db/XXGroupDao.java | 4 +-
.../org/apache/ranger/db/XXGroupGroupDao.java | 4 +-
.../org/apache/ranger/db/XXGroupUserDao.java | 4 +-
.../java/org/apache/ranger/db/XXPermMapDao.java | 4 +-
.../ranger/db/XXPolicyExportAuditDao.java | 4 +-
.../org/apache/ranger/db/XXPortalUserDao.java | 6 +-
.../apache/ranger/db/XXPortalUserRoleDao.java | 4 +-
.../org/apache/ranger/db/XXResourceDao.java | 4 +-
.../apache/ranger/db/XXServiceResourceDao.java | 4 +-
.../ranger/db/XXServiceResourceElementDao.java | 4 +-
.../db/XXServiceResourceElementValueDao.java | 4 +-
.../org/apache/ranger/db/XXTagAttributeDao.java | 4 +-
.../apache/ranger/db/XXTagAttributeDefDao.java | 4 +-
.../java/org/apache/ranger/db/XXTagDao.java | 4 +-
.../java/org/apache/ranger/db/XXTagDefDao.java | 4 +-
.../apache/ranger/db/XXTagResourceMapDao.java | 4 +-
.../java/org/apache/ranger/db/XXTrxLogDao.java | 6 +-
.../java/org/apache/ranger/db/XXUserDao.java | 4 +-
.../org/apache/ranger/entity/XXAccessAudit.java | 6 +-
.../apache/ranger/entity/XXAccessAuditBase.java | 6 +-
.../apache/ranger/entity/XXAccessAuditV4.java | 4 +-
.../apache/ranger/entity/XXAccessAuditV5.java | 6 +-
.../apache/ranger/entity/XXAccessTypeDef.java | 36 ++--
.../ranger/entity/XXAccessTypeDefGrants.java | 20 +-
.../java/org/apache/ranger/entity/XXAsset.java | 6 +-
.../org/apache/ranger/entity/XXAuditMap.java | 6 +-
.../org/apache/ranger/entity/XXAuthSession.java | 6 +-
.../ranger/entity/XXContextEnricherDef.java | 36 ++--
.../apache/ranger/entity/XXCredentialStore.java | 6 +-
.../java/org/apache/ranger/entity/XXDBBase.java | 6 +-
.../org/apache/ranger/entity/XXDataHist.java | 40 ++--
.../apache/ranger/entity/XXDataMaskTypeDef.java | 36 ++--
.../org/apache/ranger/entity/XXEnumDef.java | 28 +--
.../apache/ranger/entity/XXEnumElementDef.java | 36 ++--
.../java/org/apache/ranger/entity/XXGroup.java | 6 +-
.../org/apache/ranger/entity/XXGroupGroup.java | 6 +-
.../org/apache/ranger/entity/XXGroupUser.java | 6 +-
.../org/apache/ranger/entity/XXPermMap.java | 6 +-
.../java/org/apache/ranger/entity/XXPolicy.java | 4 +-
.../org/apache/ranger/entity/XXPolicyBase.java | 28 +--
.../ranger/entity/XXPolicyConditionDef.java | 52 +++---
.../ranger/entity/XXPolicyExportAudit.java | 4 +-
.../org/apache/ranger/entity/XXPolicyItem.java | 36 ++--
.../ranger/entity/XXPolicyItemAccess.java | 28 +--
.../ranger/entity/XXPolicyItemCondition.java | 28 +--
.../ranger/entity/XXPolicyItemDataMaskInfo.java | 26 +--
.../ranger/entity/XXPolicyItemGroupPerm.java | 24 +--
.../entity/XXPolicyItemRowFilterInfo.java | 18 +-
.../ranger/entity/XXPolicyItemUserPerm.java | 24 +--
.../apache/ranger/entity/XXPolicyResource.java | 28 +--
.../ranger/entity/XXPolicyResourceMap.java | 24 +--
.../org/apache/ranger/entity/XXPortalUser.java | 6 +-
.../apache/ranger/entity/XXPortalUserRole.java | 6 +-
.../org/apache/ranger/entity/XXResource.java | 6 +-
.../org/apache/ranger/entity/XXResourceDef.java | 80 ++++----
.../org/apache/ranger/entity/XXService.java | 4 +-
.../org/apache/ranger/entity/XXServiceBase.java | 44 ++---
.../ranger/entity/XXServiceConfigDef.java | 60 +++---
.../ranger/entity/XXServiceConfigMap.java | 24 +--
.../org/apache/ranger/entity/XXServiceDef.java | 8 +-
.../apache/ranger/entity/XXServiceDefBase.java | 36 ++--
.../apache/ranger/entity/XXServiceResource.java | 10 +-
.../ranger/entity/XXServiceResourceElement.java | 10 +-
.../entity/XXServiceResourceElementValue.java | 10 +-
.../ranger/entity/XXServiceVersionInfo.java | 4 +-
.../java/org/apache/ranger/entity/XXTag.java | 10 +-
.../apache/ranger/entity/XXTagAttribute.java | 10 +-
.../apache/ranger/entity/XXTagAttributeDef.java | 10 +-
.../java/org/apache/ranger/entity/XXTagDef.java | 10 +-
.../apache/ranger/entity/XXTagResourceMap.java | 10 +-
.../java/org/apache/ranger/entity/XXTrxLog.java | 6 +-
.../java/org/apache/ranger/entity/XXUser.java | 6 +-
.../apache/ranger/entity/view/VXXTrxLog.java | 4 +-
.../java/org/apache/ranger/json/Folder.java | 4 +-
.../apache/ranger/json/JsonDateSerializer.java | 6 +-
.../org/apache/ranger/patch/BaseLoader.java | 6 +-
.../patch/cliutil/DbToSolrMigrationUtil.java | 2 +-
.../java/org/apache/ranger/rest/AssetREST.java | 34 ++--
.../java/org/apache/ranger/rest/PublicAPIs.java | 4 +-
.../org/apache/ranger/rest/ServiceREST.java | 14 +-
.../java/org/apache/ranger/rest/TagREST.java | 4 +-
.../java/org/apache/ranger/rest/UserREST.java | 18 +-
.../java/org/apache/ranger/rest/XAuditREST.java | 4 +-
.../java/org/apache/ranger/rest/XKeyREST.java | 8 +-
.../java/org/apache/ranger/rest/XUserREST.java | 22 +--
.../ranger/security/context/RangerAPIList.java | 2 +-
.../security/context/RangerAPIMapping.java | 2 +-
.../security/context/RangerContextHolder.java | 4 +-
.../context/RangerPreAuthSecurityHandler.java | 4 +-
.../security/context/RangerSecurityContext.java | 4 +-
.../ranger/security/handler/Permission.java | 4 +-
.../handler/RangerAuthenticationProvider.java | 2 +-
.../RangerDomainObjectSecurityHandler.java | 4 +-
.../listener/RangerHttpSessionListener.java | 4 +-
.../security/listener/SpringEventListener.java | 4 +-
.../standalone/StandaloneSecurityHandler.java | 4 +-
.../CustomLogoutSuccessHandler.java | 4 +-
.../RangerAuthFailureHandler.java | 8 +-
.../RangerAuthSuccessHandler.java | 10 +-
.../RangerAuthenticationEntryPoint.java | 6 +-
...RangerSessionFixationProtectionStrategy.java | 4 +-
.../security/web/filter/MyRememberMeFilter.java | 6 +-
.../web/filter/RangerCSRFPreventionFilter.java | 10 +-
.../filter/RangerKRBAuthenticationFilter.java | 8 +-
.../security/web/filter/RangerKrbFilter.java | 8 +-
.../filter/RangerSSOAuthenticationFilter.java | 12 +-
...gerUsernamePasswordAuthenticationFilter.java | 4 +-
.../security/web/filter/SSOAuthentication.java | 2 +-
.../web/filter/SSOAuthenticationProperties.java | 2 +-
.../service/AbstractBaseResourceService.java | 4 +-
.../ranger/service/AuthSessionService.java | 4 +-
.../ranger/service/PublicAPIServiceBase.java | 4 +-
.../ranger/service/RangerBaseModelService.java | 8 +-
.../service/RangerServiceResourceService.java | 4 +-
.../RangerServiceResourceServiceBase.java | 4 +-
.../ranger/service/RangerServiceService.java | 2 +-
.../service/RangerServiceServiceBase.java | 2 +-
.../ranger/service/RangerTagDefService.java | 4 +-
.../ranger/service/RangerTagDefServiceBase.java | 4 +-
.../service/RangerTagResourceMapService.java | 4 +-
.../RangerTagResourceMapServiceBase.java | 4 +-
.../ranger/service/RangerTagServiceBase.java | 4 +-
.../org/apache/ranger/service/UserService.java | 4 +-
.../apache/ranger/service/UserServiceBase.java | 4 +-
.../ranger/service/XAccessAuditService.java | 8 +-
.../ranger/service/XAccessAuditServiceBase.java | 6 +-
.../apache/ranger/service/XAgentService.java | 6 +-
.../apache/ranger/service/XAssetService.java | 4 +-
.../ranger/service/XAssetServiceBase.java | 6 +-
.../apache/ranger/service/XAuditMapService.java | 4 +-
.../ranger/service/XAuditMapServiceBase.java | 6 +-
.../ranger/service/XCredentialStoreService.java | 4 +-
.../service/XCredentialStoreServiceBase.java | 6 +-
.../ranger/service/XGroupGroupService.java | 4 +-
.../ranger/service/XGroupGroupServiceBase.java | 6 +-
.../apache/ranger/service/XGroupService.java | 4 +-
.../ranger/service/XGroupServiceBase.java | 6 +-
.../ranger/service/XGroupUserService.java | 4 +-
.../ranger/service/XGroupUserServiceBase.java | 6 +-
.../apache/ranger/service/XPermMapService.java | 8 +-
.../ranger/service/XPermMapServiceBase.java | 6 +-
.../service/XPolicyExportAuditService.java | 8 +-
.../service/XPolicyExportAuditServiceBase.java | 6 +-
.../apache/ranger/service/XPolicyService.java | 6 +-
.../ranger/service/XPortalUserService.java | 4 +-
.../ranger/service/XPortalUserServiceBase.java | 6 +-
.../ranger/service/XRepositoryService.java | 4 +-
.../apache/ranger/service/XResourceService.java | 48 ++---
.../ranger/service/XResourceServiceBase.java | 6 +-
.../apache/ranger/service/XTrxLogService.java | 18 +-
.../ranger/service/XTrxLogServiceBase.java | 6 +-
.../org/apache/ranger/service/XUserService.java | 6 +-
.../apache/ranger/service/XUserServiceBase.java | 6 +-
.../service/filter/RangerRESTAPIFilter.java | 8 +-
.../ranger/solr/SolrAccessAuditsService.java | 4 +-
.../java/org/apache/ranger/solr/SolrMgr.java | 4 +-
.../java/org/apache/ranger/solr/SolrUtil.java | 4 +-
.../java/org/apache/ranger/util/CLIUtil.java | 6 +-
.../org/apache/ranger/util/RangerEnumUtil.java | 6 +-
.../org/apache/ranger/util/RangerRestUtil.java | 6 +-
.../java/org/apache/ranger/util/RestUtil.java | 4 +-
.../org/apache/ranger/view/VXAccessAudit.java | 6 +-
.../apache/ranger/view/VXAccessAuditList.java | 6 +-
.../java/org/apache/ranger/view/VXAsset.java | 4 +-
.../org/apache/ranger/view/VXAssetList.java | 6 +-
.../java/org/apache/ranger/view/VXAuditMap.java | 6 +-
.../org/apache/ranger/view/VXAuditMapList.java | 6 +-
.../org/apache/ranger/view/VXAuditRecord.java | 6 +-
.../apache/ranger/view/VXAuditRecordList.java | 6 +-
.../org/apache/ranger/view/VXAuthSession.java | 6 +-
.../apache/ranger/view/VXAuthSessionList.java | 6 +-
.../apache/ranger/view/VXCredentialStore.java | 6 +-
.../ranger/view/VXCredentialStoreList.java | 4 +-
.../org/apache/ranger/view/VXDataObject.java | 6 +-
.../java/org/apache/ranger/view/VXGroup.java | 4 +-
.../org/apache/ranger/view/VXGroupGroup.java | 6 +-
.../apache/ranger/view/VXGroupGroupList.java | 4 +-
.../org/apache/ranger/view/VXGroupList.java | 6 +-
.../org/apache/ranger/view/VXGroupUser.java | 4 +-
.../org/apache/ranger/view/VXGroupUserList.java | 4 +-
.../java/org/apache/ranger/view/VXKmsKey.java | 6 +-
.../org/apache/ranger/view/VXKmsKeyList.java | 6 +-
.../java/org/apache/ranger/view/VXLong.java | 6 +-
.../java/org/apache/ranger/view/VXMessage.java | 6 +-
.../apache/ranger/view/VXPasswordChange.java | 6 +-
.../java/org/apache/ranger/view/VXPermMap.java | 6 +-
.../org/apache/ranger/view/VXPermMapList.java | 6 +-
.../java/org/apache/ranger/view/VXPermObj.java | 6 +-
.../org/apache/ranger/view/VXPermObjList.java | 4 +-
.../java/org/apache/ranger/view/VXPolicy.java | 84 ++++-----
.../apache/ranger/view/VXPolicyExportAudit.java | 6 +-
.../ranger/view/VXPolicyExportAuditList.java | 4 +-
.../org/apache/ranger/view/VXPolicyList.java | 4 +-
.../org/apache/ranger/view/VXPortalUser.java | 4 +-
.../apache/ranger/view/VXPortalUserList.java | 6 +-
.../org/apache/ranger/view/VXRepository.java | 30 +--
.../apache/ranger/view/VXRepositoryList.java | 4 +-
.../java/org/apache/ranger/view/VXResource.java | 18 +-
.../org/apache/ranger/view/VXResourceList.java | 6 +-
.../java/org/apache/ranger/view/VXResponse.java | 6 +-
.../java/org/apache/ranger/view/VXString.java | 6 +-
.../org/apache/ranger/view/VXStringList.java | 6 +-
.../java/org/apache/ranger/view/VXTrxLog.java | 6 +-
.../org/apache/ranger/view/VXTrxLogList.java | 4 +-
.../java/org/apache/ranger/view/VXUser.java | 6 +-
.../org/apache/ranger/view/VXUserGroupInfo.java | 6 +-
.../java/org/apache/ranger/view/VXUserList.java | 6 +-
.../org/apache/ranger/audit/TestAuditQueue.java | 4 +-
.../org/apache/ranger/audit/TestConsumer.java | 22 +--
.../apache/ranger/biz/TestRangerBizUtil.java | 4 +-
.../apache/ranger/common/TestStringUtil.java | 6 +-
.../apache/ranger/common/TestTimedExecutor.java | 8 +-
.../org/apache/ranger/rest/TestServiceREST.java | 2 +-
.../filter/TestRangerCSRFPreventionFilter.java | 4 +-
.../java/org/apache/ranger/util/BaseTest.java | 4 +-
.../storm/authorizer/RangerStormAuthorizer.java | 14 +-
.../services/storm/RangerServiceStorm.java | 4 +-
.../services/storm/client/StormClient.java | 8 +-
.../storm/client/StormConnectionMgr.java | 10 +-
.../services/storm/client/StormResourceMgr.java | 8 +-
.../storm/client/json/model/Topology.java | 4 +-
.../client/json/model/TopologyListResponse.java | 4 +-
.../storm/RangerAdminClientImpl.java | 8 +-
.../storm/StormRangerAuthorizerTest.java | 66 +++----
.../authorization/storm/WordCounterBolt.java | 10 +-
.../ranger/authorization/storm/WordSpout.java | 6 +-
.../apache/ranger/tagsync/model/TagSink.java | 4 +-
.../apache/ranger/tagsync/model/TagSource.java | 4 +-
.../ranger/tagsync/process/TagSyncConfig.java | 6 +-
.../ranger/tagsync/process/TagSynchronizer.java | 4 +-
.../tagsync/sink/tagadmin/TagAdminRESTSink.java | 4 +-
.../tagsync/source/atlas/AtlasTagSource.java | 4 +-
.../source/atlasrest/AtlasRESTTagSource.java | 4 +-
.../tagsync/source/file/FileTagSource.java | 4 +-
.../tagsync/process/TestHdfsResourceMapper.java | 4 +-
.../tagsync/process/TestHiveResourceMapper.java | 4 +-
.../tagsync/process/TestTagSynchronizer.java | 4 +-
.../ldapconfigcheck/AuthenticationCheck.java | 4 +-
.../ldapconfigcheck/CommandLineOptions.java | 12 +-
.../ranger/ldapconfigcheck/LdapConfig.java | 6 +-
.../ldapconfigcheck/LdapConfigCheckMain.java | 4 +-
.../apache/ranger/ldapconfigcheck/UserSync.java | 10 +-
.../process/CustomSSLSocketFactory.java | 8 +-
.../process/LdapUserGroupBuilder.java | 26 +--
.../process/PolicyMgrUserGroupBuilder.java | 4 +-
.../config/UserGroupSyncConfig.java | 40 ++--
.../model/GetXGroupListResponse.java | 4 +-
.../model/GetXUserGroupListResponse.java | 4 +-
.../model/GetXUserListResponse.java | 4 +-
.../ranger/unixusersync/model/MUserInfo.java | 12 +-
.../unixusersync/model/UserGroupInfo.java | 6 +-
.../unixusersync/model/UserGroupList.java | 6 +-
.../ranger/unixusersync/model/XGroupInfo.java | 4 +-
.../unixusersync/model/XUserGroupInfo.java | 6 +-
.../ranger/unixusersync/model/XUserInfo.java | 4 +-
.../unixusersync/poc/InvalidGroupException.java | 4 +-
.../unixusersync/poc/InvalidUserException.java | 4 +-
.../ranger/unixusersync/poc/ListRangerUser.java | 4 +-
.../unixusersync/poc/ListRangerUserGroup.java | 4 +-
.../unixusersync/poc/ListUserGroupTest.java | 4 +-
.../unixusersync/poc/RangerJSONParser.java | 4 +-
.../poc/RangerUpdateUserGroupMapping.java | 4 +-
.../poc/RangerUserGroupMapping.java | 4 +-
.../ranger/unixusersync/poc/RestClientPost.java | 4 +-
.../process/FileSourceUserGroupBuilder.java | 14 +-
.../process/PolicyMgrUserGroupBuilder.java | 80 ++++----
.../process/UnixUserGroupBuilder.java | 8 +-
.../ranger/usergroupsync/AbstractMapper.java | 4 +-
.../org/apache/ranger/usergroupsync/Mapper.java | 4 +-
.../org/apache/ranger/usergroupsync/RegEx.java | 4 +-
.../ranger/usergroupsync/UserGroupSink.java | 4 +-
.../ranger/usergroupsync/UserGroupSource.java | 4 +-
.../ranger/usergroupsync/UserGroupSync.java | 4 +-
.../ranger/usersync/util/UserSyncUtil.java | 4 +-
.../ranger/usergroupsync/LdapUserGroupTest.java | 10 +-
.../PolicyMgrUserGroupBuilderTest.java | 6 +-
.../apache/ranger/usergroupsync/RegExTest.java | 4 +-
.../unix/jaas/ConsolePromptCallbackHandler.java | 4 +-
.../unix/jaas/RemoteUnixLoginModule.java | 4 +-
.../unix/jaas/UnixGroupPrincipal.java | 4 +-
.../unix/jaas/UnixUserPrincipal.java | 4 +-
.../UnixAuthenticationTester.java | 8 +-
.../authentication/PasswordValidator.java | 12 +-
.../UnixAuthenticationService.java | 22 +--
620 files changed, 2830 insertions(+), 2830 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/dao/AuthzAuditEventDao.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/dao/AuthzAuditEventDao.java b/agents-audit/src/main/java/org/apache/ranger/audit/dao/AuthzAuditEventDao.java
index ee4c211..35794b8 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/dao/AuthzAuditEventDao.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/dao/AuthzAuditEventDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/dao/BaseDao.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/dao/BaseDao.java b/agents-audit/src/main/java/org/apache/ranger/audit/dao/BaseDao.java
index 0cb7c39..75593d2 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/dao/BaseDao.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/dao/BaseDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/dao/DaoManager.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/dao/DaoManager.java b/agents-audit/src/main/java/org/apache/ranger/audit/dao/DaoManager.java
index fd4d096..b2f68ef 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/dao/DaoManager.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/dao/DaoManager.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/destination/AuditDestination.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/AuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/AuditDestination.java
index 9db8937..41d0e82 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/destination/AuditDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/destination/AuditDestination.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -38,7 +38,7 @@ public abstract class AuditDestination extends BaseAuditHandler {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditProvider#init(java.util.Properties,
* java.lang.String)
@@ -50,7 +50,7 @@ public abstract class AuditDestination extends BaseAuditHandler {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#flush()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/destination/DBAuditDestination.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/DBAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/DBAuditDestination.java
index 376e724..79f07d7 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/destination/DBAuditDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/destination/DBAuditDestination.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -73,7 +73,7 @@ public class DBAuditDestination extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditHandler#logger(java.util.Collection
* )
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/destination/FileAuditDestination.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/FileAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/FileAuditDestination.java
index c6cd8b2..609b985 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/destination/FileAuditDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/destination/FileAuditDestination.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -132,7 +132,7 @@ public class FileAuditDestination extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditProvider#log(java.util.Collection)
*/
@@ -161,7 +161,7 @@ public class FileAuditDestination extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#start()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java
index 07023ba..ebe6ab9 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -192,7 +192,7 @@ public class HDFSAuditDestination extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditProvider#log(java.util.Collection)
*/
@@ -222,7 +222,7 @@ public class HDFSAuditDestination extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#start()
*/
@Override
@@ -343,7 +343,7 @@ public class HDFSAuditDestination extends AuditDestination {
if (!rollOverByDuration) {
try {
- if(StringUtils.isEmpty(rolloverPeriod) ) {
+ if(StringUtils.isEmpty(rolloverPeriod) ) {
rolloverPeriod = rollingTimeUtil.convertRolloverSecondsToRolloverPeriod(fileRolloverSec);
}
nextRollOverTime = rollingTimeUtil.computeNextRollingTime(rolloverPeriod);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/destination/Log4JAuditDestination.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/Log4JAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/Log4JAuditDestination.java
index 9521a4a..4e3338e 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/destination/Log4JAuditDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/destination/Log4JAuditDestination.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
index 5502b10..57f2f6d 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -270,7 +270,7 @@ public class SolrAuditDestination extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#flush()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java b/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java
index ae50137..8735fc6 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/model/AuditEventBase.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/model/AuditEventBase.java b/agents-audit/src/main/java/org/apache/ranger/audit/model/AuditEventBase.java
index 09e92b8..b579146 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/model/AuditEventBase.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/model/AuditEventBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/model/AuthzAuditEvent.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/model/AuthzAuditEvent.java b/agents-audit/src/main/java/org/apache/ranger/audit/model/AuthzAuditEvent.java
index b3f80cb..b547c43 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/model/AuthzAuditEvent.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/model/AuthzAuditEvent.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java b/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java
index 92456a2..eb3e288 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -33,5 +33,5 @@ public final class EnumRepositoryType {
public static final int STORM = 6 ;
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/provider/AsyncAuditProvider.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AsyncAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AsyncAuditProvider.java
index 446ef95..c74a3ea 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AsyncAuditProvider.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AsyncAuditProvider.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditMessageException.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditMessageException.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditMessageException.java
index 3ef3e30..3ff04ee 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditMessageException.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditMessageException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java
index fe6d973..b095000 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java
@@ -131,7 +131,7 @@ public abstract class BaseAuditHandler implements AuditHandler {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditProvider#log(org.apache.ranger.
* audit.model.AuditEventBase)
@@ -143,7 +143,7 @@ public abstract class BaseAuditHandler implements AuditHandler {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditProvider#logJSON(java.lang.String)
*/
@@ -156,7 +156,7 @@ public abstract class BaseAuditHandler implements AuditHandler {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditProvider#logJSON(java.util.Collection
* )
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java
index a671165..56a24ed 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogBuffer.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogBuffer.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogBuffer.java
index 204002d..d664692 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogBuffer.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogBuffer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogDestination.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogDestination.java
index 22b3d05..a9c3af9 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LogDestination.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -39,7 +39,7 @@ public interface LogDestination<T> {
/**
* Name for the destination
- *
+ *
* @return
*/
String getName();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
index d046822..edb1c63 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
@@ -518,7 +518,7 @@ public class MiscUtil {
return KerberosName.getRules();
}
/**
- *
+ *
* @param principal
* This could be in the format abc/host@domain.com
* @return
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java
index f15b57a..c09abb5 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -51,7 +51,7 @@ public class HdfsLogDestination<T> implements LogDestination<T> {
private DebugTracer mLogger = null;
private FSDataOutputStream mFsDataOutStream = null;
- private OutputStreamWriter mWriter = null;
+ private OutputStreamWriter mWriter = null;
private String mHdfsFilename = null;
private long mNextRolloverTime = 0;
private long mNextFlushTime = 0;
@@ -439,7 +439,7 @@ public class HdfsLogDestination<T> implements LogDestination<T> {
ret = ret.substring(0, extnPos) + strToAppend + extn;
}
-
+
if(fileSystem != null && fileExists(ret, fileSystem)) {
continue;
} else {
@@ -447,7 +447,7 @@ public class HdfsLogDestination<T> implements LogDestination<T> {
}
}
}
-
+
private boolean fileExists(String fileName, FileSystem fileSystem) {
boolean ret = false;
@@ -460,7 +460,7 @@ public class HdfsLogDestination<T> implements LogDestination<T> {
// ignore
}
}
-
+
return ret;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
index 376865e..8a2bfb6 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -125,7 +125,7 @@ public class SolrAuditProvider extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditProvider#log(org.apache.ranger.
* audit.model.AuditEventBase)
@@ -232,7 +232,7 @@ public class SolrAuditProvider extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#start()
*/
@Override
@@ -242,7 +242,7 @@ public class SolrAuditProvider extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#stop()
*/
@Override
@@ -253,7 +253,7 @@ public class SolrAuditProvider extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#waitToComplete()
*/
@Override
@@ -269,7 +269,7 @@ public class SolrAuditProvider extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#flush()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditAsyncQueue.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditAsyncQueue.java b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditAsyncQueue.java
index 34712bf..f31772a 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditAsyncQueue.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditAsyncQueue.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -49,7 +49,7 @@ public class AuditAsyncQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditProvider#log(org.apache.ranger.
* audit.model.AuditEventBase)
@@ -78,7 +78,7 @@ public class AuditAsyncQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#start()
*/
@Override
@@ -98,7 +98,7 @@ public class AuditAsyncQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#stop()
*/
@Override
@@ -120,7 +120,7 @@ public class AuditAsyncQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Runnable#run()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditBatchQueue.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditBatchQueue.java b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditBatchQueue.java
index 95938f8..a4da4a9 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditBatchQueue.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditBatchQueue.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -49,7 +49,7 @@ public class AuditBatchQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditProvider#log(org.apache.ranger.
* audit.model.AuditEventBase)
@@ -86,7 +86,7 @@ public class AuditBatchQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#start()
*/
@Override
@@ -117,7 +117,7 @@ public class AuditBatchQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#stop()
*/
@Override
@@ -141,7 +141,7 @@ public class AuditBatchQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#waitToComplete()
*/
@Override
@@ -191,7 +191,7 @@ public class AuditBatchQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#flush()
*/
@Override
@@ -204,7 +204,7 @@ public class AuditBatchQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Runnable#run()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileSpool.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileSpool.java b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileSpool.java
index c0a05ec..9abd99f 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileSpool.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileSpool.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -375,7 +375,7 @@ public class AuditFileSpool implements Runnable {
/**
* If any files are still not processed. Also, if the destination is not
* reachable
- *
+ *
* @return
*/
public boolean isPending() {
@@ -390,7 +390,7 @@ public class AuditFileSpool implements Runnable {
/**
* Milliseconds from last attempt time
- *
+ *
* @return
*/
public long getLastAttemptTimeDelta() {
@@ -458,7 +458,7 @@ public class AuditFileSpool implements Runnable {
/**
* This return the current file. If there are not current open output file,
* then it will return null
- *
+ *
* @return
* @throws Exception
*/
@@ -567,7 +567,7 @@ public class AuditFileSpool implements Runnable {
/**
* Load the index file
- *
+ *
* @throws IOException
*/
void loadIndexFile() throws IOException {
@@ -747,7 +747,7 @@ public class AuditFileSpool implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Runnable#run()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditQueue.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditQueue.java b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditQueue.java
index c5eb3da..e1667a4 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditQueue.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditQueue.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -198,7 +198,7 @@ public abstract class AuditQueue extends BaseAuditHandler {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#waitToComplete()
*/
@Override
@@ -217,7 +217,7 @@ public abstract class AuditQueue extends BaseAuditHandler {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#flush()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditSummaryQueue.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditSummaryQueue.java b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditSummaryQueue.java
index b4505f1..4c25033 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditSummaryQueue.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditSummaryQueue.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -72,7 +72,7 @@ public class AuditSummaryQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditProvider#log(org.apache.ranger.
* audit.model.AuditEventBase)
@@ -101,7 +101,7 @@ public class AuditSummaryQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#start()
*/
@Override
@@ -118,7 +118,7 @@ public class AuditSummaryQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#stop()
*/
@Override
@@ -141,7 +141,7 @@ public class AuditSummaryQueue extends AuditQueue implements Runnable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Runnable#run()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/test/TestEvents.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/test/TestEvents.java b/agents-audit/src/main/java/org/apache/ranger/audit/test/TestEvents.java
index e84d6fb..7bfb3bf 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/test/TestEvents.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/test/TestEvents.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-audit/src/main/java/org/apache/ranger/audit/utils/InMemoryJAASConfiguration.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/utils/InMemoryJAASConfiguration.java b/agents-audit/src/main/java/org/apache/ranger/audit/utils/InMemoryJAASConfiguration.java
index 7f08b8f..0f29138 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/utils/InMemoryJAASConfiguration.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/utils/InMemoryJAASConfiguration.java
@@ -42,13 +42,13 @@ import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
/**
- * InMemoryJAASConfiguration
- *
+ * InMemoryJAASConfiguration
+ *
* An utility class - which has a static method init to load all JAAS configuration from Application properties file (eg: kafka.properties) and
* set it as part of the default lookup configuration for all JAAS configuration lookup.
- *
+ *
* Example settings in application.properties:
- *
+ *
* xasecure.audit.jaas.KafkaClient.loginModuleName = com.sun.security.auth.module.Krb5LoginModule
* xasecure.audit.jaas.KafkaClient.loginModuleControlFlag = required
* xasecure.audit.jaas.KafkaClient.option.useKeyTab = true
@@ -64,7 +64,7 @@ import javax.security.auth.login.Configuration;
* xasecure.audit.jaas.MyClient.0.option.serviceName = kafka
* xasecure.audit.jaas.MyClient.0.option.keyTab = /etc/security/keytabs/kafka_client.keytab
* xasecure.audit.jaas.MyClient.0.option.principal = kafka-client-1@EXAMPLE.COM
- *
+ *
* xasecure.audit.jaas.MyClient.1.loginModuleName = com.sun.security.auth.module.Krb5LoginModule
* xasecure.audit.jaas.MyClient.1.loginModuleControlFlag = optional
* xasecure.audit.jaas.MyClient.1.option.useKeyTab = true
@@ -176,27 +176,27 @@ public final class InMemoryJAASConfiguration extends Configuration {
} else {
throw new Exception("Failed to load JAAS application properties: configuration NULL or empty!");
}
-
+
LOG.debug("<== InMemoryJAASConfiguration.init()");
}
public static void init(Properties properties) throws Exception {
LOG.debug("==> InMemoryJAASConfiguration.init()");
-
+
if (properties != null && MapUtils.isNotEmpty(properties)) {
InMemoryJAASConfiguration conf = new InMemoryJAASConfiguration(properties);
Configuration.setConfiguration(conf);
} else {
throw new Exception("Failed to load JAAS application properties: properties NULL or empty!");
}
-
+
LOG.debug("<== InMemoryJAASConfiguration.init()");
}
@Override
public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
LOG.trace("==> InMemoryJAASConfiguration.getAppConfigurationEntry( {} )", name);
-
+
AppConfigurationEntry[] ret = null;
if (parent != null) {
ret = parent.getAppConfigurationEntry(name);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java b/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
index 6dbbb13..e4f00f0 100644
--- a/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
+++ b/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java b/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java
index ce78cbe..a9f4da6 100644
--- a/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java
+++ b/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -123,7 +123,7 @@ public class SecureClientLogin {
isValid = true;
}
} else {
- LOG.warn("Can't find keyTab Path : "+keytabPath);
+ LOG.warn("Can't find keyTab Path : "+keytabPath);
}
if (!(principal != null && !principal.isEmpty() && isValid)) {
isValid = false;
@@ -143,13 +143,13 @@ public class SecureClientLogin {
return replacePattern(components, hostName);
}
}
-
+
private static String[] getComponents(String principalConfig) {
if (principalConfig == null)
return null;
return principalConfig.split("[/@]");
}
-
+
private static String replacePattern(String[] components, String hostname)
throws IOException {
String fqdn = hostname;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminClient.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminClient.java b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminClient.java
index a2fce08..5ae9854 100644
--- a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminClient.java
+++ b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java
index 5f8acfe..6ec44c4 100644
--- a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java
+++ b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -40,7 +40,7 @@ import java.util.List;
public class RangerAdminRESTClient implements RangerAdminClient {
private static final Log LOG = LogFactory.getLog(RangerAdminRESTClient.class);
-
+
private String serviceName = null;
private String pluginId = null;
private RangerRESTClient restClient = null;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/GrantRevokeData.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/GrantRevokeData.java b/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/GrantRevokeData.java
index b9496be..e13a6bb 100644
--- a/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/GrantRevokeData.java
+++ b/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/GrantRevokeData.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfigConstants.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfigConstants.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfigConstants.java
index 69b030c..1ad34ef 100644
--- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfigConstants.java
+++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfigConstants.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,7 +41,7 @@ public class RangerConfigConstants {
public static final String XASECURE_AUDIT_FILE = "xasecure-audit.xml";
public static final String XASECURE_SECURITY_FILE = "xasecure-<ServiceType>-security.xml";
public static final String XASECURE_POLICYMGR_SSL_FILE = "/etc/<ServiceType>/conf/xasecure-policymgr-ssl.xml";
-
+
//KNOX
public static final String RANGER_KNOX_PLUGIN_POLICY_SOURCE_IMPL_DEFAULT = "org.apache.ranger.admin.client.RangerAdminJersey2RESTClient";
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
index 2a4241c..ffe352e 100644
--- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
+++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[18/19] incubator-ranger git commit: Removing spaces before semicolons
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java
----------------------------------------------------------------------
diff --git a/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java b/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java
index 711e730..f583655 100644
--- a/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java
+++ b/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java
@@ -68,16 +68,16 @@ public class RangerCredentialProviderTest {
try {
if (ksFile != null) {
if (ksFile.exists()) {
- System.out.println("Keystore File [" + ksFile.getAbsolutePath() + "] is available - and deleting") ;
- ksFile.delete() ;
- System.out.println("Keystore File [" + ksFile.getAbsolutePath() + "] is deleted.") ;
+ System.out.println("Keystore File [" + ksFile.getAbsolutePath() + "] is available - and deleting");
+ ksFile.delete();
+ System.out.println("Keystore File [" + ksFile.getAbsolutePath() + "] is deleted.");
}
else {
- System.out.println("Keystore File [" + ksFile.getAbsolutePath() + "] is not available") ;
+ System.out.println("Keystore File [" + ksFile.getAbsolutePath() + "] is not available");
}
}
else {
- System.out.println("Keystore File is NULL") ;
+ System.out.println("Keystore File is NULL");
}
}
catch(Throwable t) {
@@ -93,14 +93,14 @@ public class RangerCredentialProviderTest {
throw e;
}
assertEquals(0,ret);
- System.out.println("(1) Number of active Threads : " + Thread.activeCount() ) ;
- listThreads() ;
+ System.out.println("(1) Number of active Threads : " + Thread.activeCount() );
+ listThreads();
}
@After
public void cleanup() throws Exception {
if (ksFile != null && ksFile.exists()) {
- ksFile.delete() ;
+ ksFile.delete();
}
}
@@ -112,8 +112,8 @@ public class RangerCredentialProviderTest {
if (providers != null) {
assertTrue(url.equals(providers.get(0).toString()));
}
- System.out.println("(2) Number of active Threads : " + Thread.activeCount() ) ;
- listThreads() ;
+ System.out.println("(2) Number of active Threads : " + Thread.activeCount() );
+ listThreads();
}
@Test
@@ -124,14 +124,14 @@ public class RangerCredentialProviderTest {
if (providers != null) {
assertTrue("PassworD123".equals(new String(cp.getCredentialString(url,"TestCredential001"))));
}
- System.out.println("(3) Number of active Threads : " + Thread.activeCount() ) ;
- listThreads() ;
+ System.out.println("(3) Number of active Threads : " + Thread.activeCount() );
+ listThreads();
}
@After
public void teardown() throws Exception {
- System.out.println("In teardown : Number of active Threads : " + Thread.activeCount() ) ;
+ System.out.println("In teardown : Number of active Threads : " + Thread.activeCount() );
int ret;
Configuration conf = new Configuration();
CredentialShell cs = new CredentialShell();
@@ -142,42 +142,42 @@ public class RangerCredentialProviderTest {
throw e;
}
assertEquals(0,ret);
- listThreads() ;
+ listThreads();
}
private static void listThreads() {
- int ac = Thread.activeCount() ;
+ int ac = Thread.activeCount();
if (ac > 0) {
- Thread[] tlist = new Thread[ac] ;
- Thread.enumerate(tlist) ;
+ Thread[] tlist = new Thread[ac];
+ Thread.enumerate(tlist);
for(Thread t : tlist) {
- System.out.println("Thread [" + t + "] => {" + t.getClass().getName() + "}") ;
+ System.out.println("Thread [" + t + "] => {" + t.getClass().getName() + "}");
}
}
}
private static boolean isCredentialShellInteractiveEnabled() {
- boolean ret = false ;
+ boolean ret = false;
- String fieldName = "interactive" ;
+ String fieldName = "interactive";
- CredentialShell cs = new CredentialShell() ;
+ CredentialShell cs = new CredentialShell();
try {
- Field interactiveField = cs.getClass().getDeclaredField(fieldName) ;
+ Field interactiveField = cs.getClass().getDeclaredField(fieldName);
if (interactiveField != null) {
interactiveField.setAccessible(true);
- ret = interactiveField.getBoolean(cs) ;
- System.out.println("FOUND value of [" + fieldName + "] field in the Class [" + cs.getClass().getName() + "] = [" + ret + "]") ;
+ ret = interactiveField.getBoolean(cs);
+ System.out.println("FOUND value of [" + fieldName + "] field in the Class [" + cs.getClass().getName() + "] = [" + ret + "]");
}
} catch (Throwable e) {
- System.out.println("Unable to find the value of [" + fieldName + "] field in the Class [" + cs.getClass().getName() + "]. Skiping -f option") ;
+ System.out.println("Unable to find the value of [" + fieldName + "] field in the Class [" + cs.getClass().getName() + "]. Skiping -f option");
e.printStackTrace();
ret = false;
}
- return ret ;
+ return ret;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-installer/src/main/java/org/apache/ranger/utils/install/PasswordGenerator.java
----------------------------------------------------------------------
diff --git a/agents-installer/src/main/java/org/apache/ranger/utils/install/PasswordGenerator.java b/agents-installer/src/main/java/org/apache/ranger/utils/install/PasswordGenerator.java
index 0b1bd51..a2c5193 100644
--- a/agents-installer/src/main/java/org/apache/ranger/utils/install/PasswordGenerator.java
+++ b/agents-installer/src/main/java/org/apache/ranger/utils/install/PasswordGenerator.java
@@ -23,37 +23,37 @@ import java.util.Random;
public class PasswordGenerator {
- private int minimumPasswordLength = 8 ;
+ private int minimumPasswordLength = 8;
- private int maximumPasswordLength = 12 ;
+ private int maximumPasswordLength = 12;
- private boolean isExpectedNumberic = true ;
+ private boolean isExpectedNumberic = true;
- private boolean isExpectedBothCase = true ;
+ private boolean isExpectedBothCase = true;
- private static final ArrayList<Character> alphaLetters = new ArrayList<Character>() ;
+ private static final ArrayList<Character> alphaLetters = new ArrayList<Character>();
- private static final ArrayList<Character> alphaUpperLetters = new ArrayList<Character>() ;
+ private static final ArrayList<Character> alphaUpperLetters = new ArrayList<Character>();
- private static final ArrayList<Character> numericLetters = new ArrayList<Character>() ;
+ private static final ArrayList<Character> numericLetters = new ArrayList<Character>();
static {
- for(int x = 'a' ; x <= 'z' ; x++) {
- char v = (char)x ;
- alphaLetters.add(Character.toLowerCase(v)) ;
- alphaUpperLetters.add(Character.toUpperCase(v)) ;
+ for(int x = 'a'; x <= 'z' ; x++) {
+ char v = (char)x;
+ alphaLetters.add(Character.toLowerCase(v));
+ alphaUpperLetters.add(Character.toUpperCase(v));
}
- for(int i = 0 ; i < 10 ; i++) {
- numericLetters.add(Character.forDigit(i,10)) ;
+ for(int i = 0; i < 10 ; i++) {
+ numericLetters.add(Character.forDigit(i,10));
}
}
public static void main(String[] args) {
- PasswordGenerator pg = new PasswordGenerator() ;
- System.out.println(pg.generatorPassword()) ;
+ PasswordGenerator pg = new PasswordGenerator();
+ System.out.println(pg.generatorPassword());
}
@@ -61,30 +61,30 @@ public class PasswordGenerator {
int ret = 0;
if (minimumPasswordLength == maximumPasswordLength) {
- ret = minimumPasswordLength ;
+ ret = minimumPasswordLength;
}
else {
- int diff = Math.abs(maximumPasswordLength - minimumPasswordLength) + 1 ;
- ret = minimumPasswordLength + new Random().nextInt(diff) ;
+ int diff = Math.abs(maximumPasswordLength - minimumPasswordLength) + 1;
+ ret = minimumPasswordLength + new Random().nextInt(diff);
}
- return (ret) ;
+ return (ret);
}
public String generatorPassword() {
- String password = null ;
+ String password = null;
- ArrayList<Character> all = new ArrayList<Character>() ;
+ ArrayList<Character> all = new ArrayList<Character>();
- all.addAll(alphaLetters) ;
- all.addAll(alphaUpperLetters) ;
- all.addAll(numericLetters) ;
+ all.addAll(alphaLetters);
+ all.addAll(alphaUpperLetters);
+ all.addAll(numericLetters);
- int len = getPasswordLength() ;
+ int len = getPasswordLength();
- SecureRandom random = new SecureRandom() ;
+ SecureRandom random = new SecureRandom();
int setSz = all.size();
@@ -92,51 +92,51 @@ public class PasswordGenerator {
{
StringBuilder sb = new StringBuilder();
- for(int i = 0 ; i < len ; i++) {
- int index = random.nextInt(setSz) ;
- Character c = all.get(index) ;
+ for(int i = 0; i < len ; i++) {
+ int index = random.nextInt(setSz);
+ Character c = all.get(index);
while ((i == 0) && Character.isDigit(c)) {
- index = random.nextInt(setSz) ;
- c = all.get(index) ;
+ index = random.nextInt(setSz);
+ c = all.get(index);
}
- sb.append(all.get(index)) ;
+ sb.append(all.get(index));
}
- password = sb.toString() ;
- } while (! isValidPassword(password)) ;
+ password = sb.toString();
+ } while (! isValidPassword(password));
- return password ;
+ return password;
}
private boolean isValidPassword(String pass) {
- boolean ret = true ;
+ boolean ret = true;
if (isExpectedNumberic || isExpectedBothCase) {
- boolean lowerCaseFound = false ;
- boolean digitFound = false ;
- boolean upperCaseFound = false ;
+ boolean lowerCaseFound = false;
+ boolean digitFound = false;
+ boolean upperCaseFound = false;
for(char c : pass.toCharArray()) {
if (!digitFound && Character.isDigit(c)) {
- digitFound = true ;
+ digitFound = true;
}
else if (!lowerCaseFound && Character.isLowerCase(c)) {
- lowerCaseFound = true ;
+ lowerCaseFound = true;
}
else if (!upperCaseFound && Character.isUpperCase(c) ) {
- upperCaseFound = true ;
+ upperCaseFound = true;
}
}
if (isExpectedNumberic && !digitFound) {
- ret = false ;
+ ret = false ;
}
if (isExpectedBothCase && (!lowerCaseFound || !upperCaseFound)) {
- ret = false ;
+ ret = false;
}
}
- return ret ;
+ return ret;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
----------------------------------------------------------------------
diff --git a/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java b/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
index 1d56bea..8fee099 100644
--- a/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
+++ b/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
@@ -54,34 +54,34 @@ import org.xml.sax.SAXException;
public class XmlConfigChanger {
- private static final String EMPTY_TOKEN = "%EMPTY%" ;
- private static final String EMPTY_TOKEN_VALUE = "" ;
+ private static final String EMPTY_TOKEN = "%EMPTY%";
+ private static final String EMPTY_TOKEN_VALUE = "";
- public static final String ROOT_NODE_NAME = "configuration" ;
- public static final String NAME_NODE_NAME = "name" ;
- public static final String PROPERTY_NODE_NAME = "property" ;
- public static final String VALUE_NODE_NAME = "value" ;
+ public static final String ROOT_NODE_NAME = "configuration";
+ public static final String NAME_NODE_NAME = "name";
+ public static final String PROPERTY_NODE_NAME = "property";
+ public static final String VALUE_NODE_NAME = "value";
- private File inpFile ;
- private File outFile ;
- private File confFile ;
- private File propFile ;
+ private File inpFile;
+ private File outFile;
+ private File confFile;
+ private File propFile;
- private Document doc ;
+ private Document doc;
public static void main(String[] args) {
- XmlConfigChanger xmlConfigChanger = new XmlConfigChanger() ;
+ XmlConfigChanger xmlConfigChanger = new XmlConfigChanger();
xmlConfigChanger.parseConfig(args);
try {
xmlConfigChanger.run();
}
catch(Throwable t) {
- System.err.println("*************************************************************************") ;
- System.err.println("******* ERROR: unable to process xml configuration changes due to error:" + t.getMessage()) ;
+ System.err.println("*************************************************************************");
+ System.err.println("******* ERROR: unable to process xml configuration changes due to error:" + t.getMessage());
t.printStackTrace();
- System.err.println("*************************************************************************") ;
+ System.err.println("*************************************************************************");
System.exit(1);
}
}
@@ -108,18 +108,18 @@ public class XmlConfigChanger {
options.addOption(installPropOption);
CommandLineParser parser = new BasicParser();
- CommandLine cmd = null ;
+ CommandLine cmd = null;
try {
cmd = parser.parse(options, args);
} catch (ParseException e) {
- String header = "ERROR: " + e ;
+ String header = "ERROR: " + e;
HelpFormatter helpFormatter = new HelpFormatter();
helpFormatter.printHelp("java " + XmlConfigChanger.class.getName(), header, options, null, true);
throw new RuntimeException(e);
}
- String inputFileName = cmd.getOptionValue('i') ;
- this.inpFile = new File(inputFileName) ;
+ String inputFileName = cmd.getOptionValue('i');
+ this.inpFile = new File(inputFileName);
if (! this.inpFile.canRead()) {
String header = "ERROR: Input file [" + this.inpFile.getAbsolutePath() + "] can not be read.";
HelpFormatter helpFormatter = new HelpFormatter();
@@ -127,8 +127,8 @@ public class XmlConfigChanger {
throw new RuntimeException(header);
}
- String outputFileName = cmd.getOptionValue('o') ;
- this.outFile = new File(outputFileName) ;
+ String outputFileName = cmd.getOptionValue('o');
+ this.outFile = new File(outputFileName);
if (this.outFile.exists()) {
String header = "ERROR: Output file [" + this.outFile.getAbsolutePath() + "] already exists. Specify a filepath for creating new output file for the input [" + this.inpFile.getAbsolutePath() + "]";
HelpFormatter helpFormatter = new HelpFormatter();
@@ -136,8 +136,8 @@ public class XmlConfigChanger {
throw new RuntimeException(header);
}
- String configFileName = cmd.getOptionValue('c') ;
- this.confFile = new File(configFileName) ;
+ String configFileName = cmd.getOptionValue('c');
+ this.confFile = new File(configFileName);
if (! this.confFile.canRead()) {
String header = "ERROR: Config file [" + this.confFile.getAbsolutePath() + "] can not be read.";
HelpFormatter helpFormatter = new HelpFormatter();
@@ -145,9 +145,9 @@ public class XmlConfigChanger {
throw new RuntimeException(header);
}
- String installPropFileName = (cmd.hasOption('p') ? cmd.getOptionValue('p') : null ) ;
+ String installPropFileName = (cmd.hasOption('p') ? cmd.getOptionValue('p') : null );
if (installPropFileName != null) {
- this.propFile = new File(installPropFileName) ;
+ this.propFile = new File(installPropFileName);
if (! this.propFile.canRead()) {
String header = "ERROR: Install Property file [" + this.propFile.getAbsolutePath() + "] can not be read.";
HelpFormatter helpFormatter = new HelpFormatter();
@@ -164,60 +164,60 @@ public class XmlConfigChanger {
public void run() throws ParserConfigurationException, SAXException, IOException, TransformerException {
- loadInstallProperties() ;
+ loadInstallProperties();
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance() ;
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
- DocumentBuilder builder = factory.newDocumentBuilder() ;
- doc = builder.parse(inpFile) ;
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ doc = builder.parse(inpFile);
- BufferedReader reader = null ;
+ BufferedReader reader = null;
try {
- reader = new BufferedReader(new FileReader(confFile)) ;
+ reader = new BufferedReader(new FileReader(confFile));
- String line = null ;
+ String line = null;
@SuppressWarnings("unused")
- int lineNo = 0 ;
+ int lineNo = 0;
Properties variables = new Properties();
while ((line = reader.readLine()) != null) {
- lineNo++ ;
+ lineNo++;
- line = line.trim() ;
+ line = line.trim();
if (line.isEmpty() )
- continue ;
+ continue;
if (line.startsWith("#")) {
- continue ;
+ continue;
}
if (line.contains("#")) {
- int len = line.indexOf("#") ;
- line = line.substring(0,len) ;
+ int len = line.indexOf("#");
+ line = line.substring(0,len);
}
- String[] tokens = line.split("\\s+") ;
+ String[] tokens = line.split("\\s+");
- String propName = tokens[0] ;
+ String propName = tokens[0];
- String propValue = null ;
+ String propValue = null;
try {
if (propnameContainsVariables(propName)) {
propName = replaceProp(propName, variables);
}
- propValue = replaceProp(tokens[1],installProperties) ;
+ propValue = replaceProp(tokens[1],installProperties);
} catch (ValidationException e) {
- // throw new RuntimeException("Unable to replace tokens in the line: \n[" + line + "]\n in file [" + confFile.getAbsolutePath() + "] line number:[" + lineNo + "]" ) ;
- throw new RuntimeException(e) ;
+ // throw new RuntimeException("Unable to replace tokens in the line: \n[" + line + "]\n in file [" + confFile.getAbsolutePath() + "] line number:[" + lineNo + "]" );
+ throw new RuntimeException(e);
}
- String actionType = tokens[2] ;
- String options = (tokens.length > 3 ? tokens[3] : null) ;
- boolean createIfNotExists = (options != null && options.contains("create-if-not-exists")) ;
+ String actionType = tokens[2];
+ String options = (tokens.length > 3 ? tokens[3] : null);
+ boolean createIfNotExists = (options != null && options.contains("create-if-not-exists"));
if ("add".equals(actionType)) {
@@ -230,43 +230,43 @@ public class XmlConfigChanger {
delProperty(propName);
}
else if ("append".equals(actionType)) {
- String curVal = getProperty(propName) ;
+ String curVal = getProperty(propName);
if (curVal == null) {
if (createIfNotExists) {
addProperty(propName, propValue);
}
}
else {
- String appendDelimitor = (tokens.length > 4 ? tokens[4] : " ") ;
+ String appendDelimitor = (tokens.length > 4 ? tokens[4] : " ");
if (! curVal.contains(propValue)) {
- String newVal = null ;
+ String newVal = null;
if (curVal.length() == 0) {
- newVal = propValue ;
+ newVal = propValue;
}
else {
- newVal = curVal + appendDelimitor + propValue ;
+ newVal = curVal + appendDelimitor + propValue;
}
- modProperty(propName, newVal,createIfNotExists) ;
+ modProperty(propName, newVal,createIfNotExists);
}
}
}
else if ("delval".equals(actionType)) {
- String curVal = getProperty(propName) ;
+ String curVal = getProperty(propName);
if (curVal != null) {
- String appendDelimitor = (tokens.length > 4 ? tokens[4] : " ") ;
+ String appendDelimitor = (tokens.length > 4 ? tokens[4] : " ");
if (curVal.contains(propValue)) {
- String[] valTokens = curVal.split(appendDelimitor) ;
- StringBuilder sb = new StringBuilder() ;
+ String[] valTokens = curVal.split(appendDelimitor);
+ StringBuilder sb = new StringBuilder();
for(String v : valTokens) {
if (! v.equals(propValue)) {
if (sb.length() > 0) {
- sb.append(appendDelimitor) ;
+ sb.append(appendDelimitor);
}
sb.append(v);
}
}
- String newVal = sb.toString() ;
- modProperty(propName, newVal,createIfNotExists) ;
+ String newVal = sb.toString();
+ modProperty(propName, newVal,createIfNotExists);
}
}
}
@@ -274,19 +274,19 @@ public class XmlConfigChanger {
variables.put(propName, propValue);
}
else {
- throw new RuntimeException("Unknown Command Found: [" + actionType + "], Supported Types: add modify del append") ;
+ throw new RuntimeException("Unknown Command Found: [" + actionType + "], Supported Types: add modify del append");
}
}
- TransformerFactory tfactory = TransformerFactory.newInstance() ;
- Transformer transformer = tfactory.newTransformer() ;
+ TransformerFactory tfactory = TransformerFactory.newInstance();
+ Transformer transformer = tfactory.newTransformer();
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
- DOMSource source = new DOMSource(doc) ;
- FileOutputStream out = new FileOutputStream(outFile) ;
- StreamResult result = new StreamResult(out) ;
+ DOMSource source = new DOMSource(doc);
+ FileOutputStream out = new FileOutputStream(outFile);
+ StreamResult result = new StreamResult(out);
transformer.transform(source, result);
out.close();
@@ -321,28 +321,28 @@ public class XmlConfigChanger {
private void addProperty(String propName, String val) {
- NodeList nl = doc.getElementsByTagName(ROOT_NODE_NAME) ;
- Node rootConfig = nl.item(0) ;
- rootConfig.appendChild(createNewElement(propName,val)) ;
+ NodeList nl = doc.getElementsByTagName(ROOT_NODE_NAME);
+ Node rootConfig = nl.item(0);
+ rootConfig.appendChild(createNewElement(propName,val));
}
private void modProperty(String propName, String val, boolean createIfNotExists) {
- Node node = findProperty(propName) ;
+ Node node = findProperty(propName);
if (node != null) {
- NodeList cnl = node.getChildNodes() ;
- for (int j = 0 ; j < cnl.getLength() ; j++) {
- String nodeName = cnl.item(j).getNodeName() ;
+ NodeList cnl = node.getChildNodes();
+ for (int j = 0; j < cnl.getLength() ; j++) {
+ String nodeName = cnl.item(j).getNodeName();
if (nodeName.equals(VALUE_NODE_NAME)) {
if (cnl.item(j).hasChildNodes()) {
cnl.item(j).getChildNodes().item(0).setNodeValue(val);
}
else {
- Node propValueNode = cnl.item(j) ;
- Node txtNode = doc.createTextNode(val) ;
- propValueNode.appendChild(txtNode) ;
+ Node propValueNode = cnl.item(j);
+ Node txtNode = doc.createTextNode(val);
+ propValueNode.appendChild(txtNode);
txtNode.setNodeValue(val);
}
- return ;
+ return;
}
}
}
@@ -354,38 +354,38 @@ public class XmlConfigChanger {
private String getProperty(String propName) {
String ret = null;
try {
- Node node = findProperty(propName) ;
+ Node node = findProperty(propName);
if (node != null) {
- NodeList cnl = node.getChildNodes() ;
- for (int j = 0 ; j < cnl.getLength() ; j++) {
- String nodeName = cnl.item(j).getNodeName() ;
+ NodeList cnl = node.getChildNodes();
+ for (int j = 0; j < cnl.getLength() ; j++) {
+ String nodeName = cnl.item(j).getNodeName();
if (nodeName.equals(VALUE_NODE_NAME)) {
- Node valueNode = null ;
+ Node valueNode = null;
if (cnl.item(j).hasChildNodes()) {
- valueNode = cnl.item(j).getChildNodes().item(0) ;
+ valueNode = cnl.item(j).getChildNodes().item(0);
}
if (valueNode == null) { // Value Node is defined with
- ret = "" ;
+ ret = "";
}
else {
- ret = valueNode.getNodeValue() ;
+ ret = valueNode.getNodeValue();
}
- break ;
+ break;
}
}
}
}
catch(Throwable t) {
- throw new RuntimeException("getProperty(" + propName + ") failed.", t) ;
+ throw new RuntimeException("getProperty(" + propName + ") failed.", t);
}
- return ret ;
+ return ret;
}
private void delProperty(String propName) {
- Node node = findProperty(propName) ;
+ Node node = findProperty(propName);
if (node != null) {
- node.getParentNode().removeChild(node) ;
+ node.getParentNode().removeChild(node);
}
}
@@ -393,66 +393,66 @@ public class XmlConfigChanger {
private Node findProperty(String propName) {
Node ret = null;
try {
- NodeList nl = doc.getElementsByTagName(PROPERTY_NODE_NAME) ;
+ NodeList nl = doc.getElementsByTagName(PROPERTY_NODE_NAME);
- for(int i = 0 ; i < nl.getLength() ; i++) {
+ for(int i = 0; i < nl.getLength() ; i++) {
NodeList cnl = nl.item(i).getChildNodes();
- boolean found = false ;
- for (int j = 0 ; j < cnl.getLength() ; j++) {
- String nodeName = cnl.item(j).getNodeName() ;
+ boolean found = false;
+ for (int j = 0; j < cnl.getLength() ; j++) {
+ String nodeName = cnl.item(j).getNodeName();
if (nodeName.equals(NAME_NODE_NAME)) {
- String pName = cnl.item(j).getChildNodes().item(0).getNodeValue() ;
- found = pName.equals(propName) ;
+ String pName = cnl.item(j).getChildNodes().item(0).getNodeValue();
+ found = pName.equals(propName);
if (found)
- break ;
+ break;
}
}
if (found) {
- ret = nl.item(i) ;
+ ret = nl.item(i);
break;
}
}
}
catch(Throwable t) {
- throw new RuntimeException("findProperty(" + propName + ") failed.", t) ;
+ throw new RuntimeException("findProperty(" + propName + ") failed.", t);
}
- return ret ;
+ return ret;
}
private Element createNewElement(String propName, String val) {
- Element ret = null ;
+ Element ret = null;
try {
if (doc != null) {
- ret = doc.createElement(PROPERTY_NODE_NAME) ;
- Node propNameNode = doc.createElement(NAME_NODE_NAME) ;
- Node txtNode = doc.createTextNode(propName) ;
- propNameNode.appendChild(txtNode) ;
+ ret = doc.createElement(PROPERTY_NODE_NAME);
+ Node propNameNode = doc.createElement(NAME_NODE_NAME);
+ Node txtNode = doc.createTextNode(propName);
+ propNameNode.appendChild(txtNode);
propNameNode.setNodeValue(propName);
ret.appendChild(propNameNode);
- Node propValueNode = doc.createElement(VALUE_NODE_NAME) ;
- txtNode = doc.createTextNode(val) ;
- propValueNode.appendChild(txtNode) ;
+ Node propValueNode = doc.createElement(VALUE_NODE_NAME);
+ txtNode = doc.createTextNode(val);
+ propValueNode.appendChild(txtNode);
propValueNode.setNodeValue(propName);
ret.appendChild(propValueNode);
}
}
catch(Throwable t) {
- throw new RuntimeException("createNewElement(" + propName + ") with value [" + val + "] failed.", t) ;
+ throw new RuntimeException("createNewElement(" + propName + ") with value [" + val + "] failed.", t);
}
- return ret ;
+ return ret;
}
- Properties installProperties = new Properties() ;
+ Properties installProperties = new Properties();
private void loadInstallProperties() throws IOException {
if (propFile != null) {
- FileInputStream in = new FileInputStream(propFile) ;
+ FileInputStream in = new FileInputStream(propFile);
try {
installProperties.load(in);
}
@@ -474,43 +474,43 @@ public class XmlConfigChanger {
private String replaceProp(String propValue, Properties prop) throws ValidationException {
- StringBuilder tokensb = new StringBuilder() ;
- StringBuilder retsb = new StringBuilder() ;
- boolean isToken = false ;
+ StringBuilder tokensb = new StringBuilder();
+ StringBuilder retsb = new StringBuilder();
+ boolean isToken = false;
for(char c : propValue.toCharArray()) {
if (c == '%') {
if (isToken) {
String token = tokensb.toString();
- String tokenValue = (token.length() == 0 ? "%" : prop.getProperty(token) ) ;
+ String tokenValue = (token.length() == 0 ? "%" : prop.getProperty(token) );
if (tokenValue == null || tokenValue.trim().isEmpty()) {
- throw new ValidationException("ERROR: configuration token [" + token + "] is not defined in the file: [" + (propFile != null ? propFile.getAbsolutePath() : "{no install.properties file specified using -p option}") + "]") ;
+ throw new ValidationException("ERROR: configuration token [" + token + "] is not defined in the file: [" + (propFile != null ? propFile.getAbsolutePath() : "{no install.properties file specified using -p option}") + "]");
}
else {
if (EMPTY_TOKEN.equals(tokenValue)) {
- retsb.append(EMPTY_TOKEN_VALUE) ;
+ retsb.append(EMPTY_TOKEN_VALUE);
}
else {
- retsb.append(tokenValue) ;
+ retsb.append(tokenValue);
}
}
isToken = false;
}
else {
- isToken = true ;
+ isToken = true;
tokensb.setLength(0);
}
}
else if (isToken) {
- tokensb.append(String.valueOf(c)) ;
+ tokensb.append(String.valueOf(c));
}
else {
- retsb.append(String.valueOf(c)) ;
+ retsb.append(String.valueOf(c));
}
}
if (isToken) {
- throw new ValidationException("ERROR: configuration has a token defined without end-token [" + propValue + "] in the file: [" + (propFile != null ? propFile.getAbsolutePath() : "{no install.properties file specified using -p option}") + "]") ;
+ throw new ValidationException("ERROR: configuration has a token defined without end-token [" + propValue + "] in the file: [" + (propFile != null ? propFile.getAbsolutePath() : "{no install.properties file specified using -p option}") + "]");
}
return retsb.toString();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java
----------------------------------------------------------------------
diff --git a/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java b/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java
index ed7a1fa..e21d01e 100644
--- a/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java
+++ b/credentialbuilder/src/main/java/org/apache/ranger/credentialapi/buildks.java
@@ -147,10 +147,10 @@ public class buildks {
//get valid and remaining argument
String[] toolArgs = parser.getRemainingArgs();
//execute command in CredentialShell
- // int i = 0 ;
+ // int i = 0;
// for(String s : toolArgs) {
- // System.out.println("TooArgs [" + i + "] = [" + s + "]") ;
- // i++ ;
+ // System.out.println("TooArgs [" + i + "] = [" + s + "]");
+ // i++;
// }
returnCode= cs.run(toolArgs);
//if response code is zero then success else failure
@@ -401,7 +401,7 @@ public class buildks {
public static void displayCommand(String args[])
{
- String debugOption = System.getProperty("debug") ;
+ String debugOption = System.getProperty("debug");
if (debugOption != null && "TRUE".equalsIgnoreCase(debugOption)) {
StringBuilder tempBuffer=new StringBuilder("");
if(args!=null && args.length>0){
@@ -497,27 +497,27 @@ public class buildks {
}
private static boolean isCredentialShellInteractiveEnabled() {
- boolean ret = false ;
+ boolean ret = false;
- String fieldName = "interactive" ;
+ String fieldName = "interactive";
- CredentialShell cs = new CredentialShell() ;
+ CredentialShell cs = new CredentialShell();
try {
- Field interactiveField = cs.getClass().getDeclaredField(fieldName) ;
+ Field interactiveField = cs.getClass().getDeclaredField(fieldName);
if (interactiveField != null) {
interactiveField.setAccessible(true);
- ret = interactiveField.getBoolean(cs) ;
- System.out.println("FOUND value of [" + fieldName + "] field in the Class [" + cs.getClass().getName() + "] = [" + ret + "]") ;
+ ret = interactiveField.getBoolean(cs);
+ System.out.println("FOUND value of [" + fieldName + "] field in the Class [" + cs.getClass().getName() + "] = [" + ret + "]");
}
} catch (Throwable e) {
- System.out.println("Unable to find the value of [" + fieldName + "] field in the Class [" + cs.getClass().getName() + "]. Skiping -f option") ;
+ System.out.println("Unable to find the value of [" + fieldName + "] field in the Class [" + cs.getClass().getName() + "]. Skiping -f option");
e.printStackTrace();
ret = false;
}
- return ret ;
+ return ret;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
----------------------------------------------------------------------
diff --git a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
index aec41f5..7ebba8a 100644
--- a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
+++ b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
@@ -227,7 +227,7 @@ public class EmbeddedServer {
if(getConfig(AUTHENTICATION_TYPE) != null && getConfig(AUTHENTICATION_TYPE).trim().equalsIgnoreCase(AUTH_TYPE_KERBEROS) && SecureClientLogin.isKerberosCredentialExists(principal, keytab)){
try{
LOG.info("Provided Kerberos Credential : Principal = "+principal+" and Keytab = "+keytab);
- Subject sub = SecureClientLogin.loginUserFromKeytab(principal, keytab, nameRules) ;
+ Subject sub = SecureClientLogin.loginUserFromKeytab(principal, keytab, nameRules);
Subject.doAs(sub, new PrivilegedAction<Void>() {
@Override
public Void run() {
@@ -282,7 +282,7 @@ public class EmbeddedServer {
String keystoreFile=getConfig("ranger.service.https.attrib.keystore.file");
if (keystoreFile == null || keystoreFile.trim().isEmpty()) {
// new property not configured, lets use the old property
- keystoreFile = getConfig("ranger.https.attrib.keystore.file") ;
+ keystoreFile = getConfig("ranger.https.attrib.keystore.file");
}
return keystoreFile;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/StopEmbeddedServer.java
----------------------------------------------------------------------
diff --git a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/StopEmbeddedServer.java b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/StopEmbeddedServer.java
index fa30598..0aedd99 100644
--- a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/StopEmbeddedServer.java
+++ b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/StopEmbeddedServer.java
@@ -24,7 +24,7 @@ import java.net.Socket;
public class StopEmbeddedServer extends EmbeddedServer {
- private static final String SHUTDOWN_HOSTNAME = "localhost" ;
+ private static final String SHUTDOWN_HOSTNAME = "localhost";
public static void main(String[] args) {
new StopEmbeddedServer(args).stop();
@@ -38,21 +38,21 @@ public class StopEmbeddedServer extends EmbeddedServer {
try {
- int shutdownPort = getIntConfig("ranger.service.shutdown.port", DEFAULT_SHUTDOWN_PORT ) ;
- String shutdownCommand = getConfig("ranger.service.shutdown.command", DEFAULT_SHUTDOWN_COMMAND ) ;
+ int shutdownPort = getIntConfig("ranger.service.shutdown.port", DEFAULT_SHUTDOWN_PORT );
+ String shutdownCommand = getConfig("ranger.service.shutdown.command", DEFAULT_SHUTDOWN_COMMAND );
- Socket sock = new Socket(SHUTDOWN_HOSTNAME,shutdownPort) ;
+ Socket sock = new Socket(SHUTDOWN_HOSTNAME,shutdownPort);
- PrintWriter out = new PrintWriter(sock.getOutputStream(), true) ;
+ PrintWriter out = new PrintWriter(sock.getOutputStream(), true);
- out.println(shutdownCommand) ;
+ out.println(shutdownCommand);
out.flush();
out.close();
}
catch(Throwable t) {
- System.err.println("Server could not be shutdown due to exception:" + t) ;
+ System.err.println("Server could not be shutdown due to exception:" + t);
System.exit(1);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImpl.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImpl.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImpl.java
index 32d08fb..01e0af2 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImpl.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/HbaseAuthUtilsImpl.java
@@ -57,7 +57,7 @@ public class HbaseAuthUtilsImpl implements HbaseAuthUtils {
@Override
public String getTable(RegionCoprocessorEnvironment regionServerEnv) {
HRegionInfo hri = regionServerEnv.getRegion().getRegionInfo();
- byte[] tableName = hri.getTable().getName() ;
+ byte[] tableName = hri.getTable().getName();
String tableNameStr = Bytes.toString(tableName);
if (LOG.isDebugEnabled()) {
String message = String.format("getTable: Returning tablename[%s]", tableNameStr);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
index a422960..b28a10e 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
@@ -140,7 +140,7 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess
if (region != null) {
HRegionInfo regionInfo = region.getRegionInfo();
if (regionInfo != null) {
- tableName = regionInfo.getTable().getName() ;
+ tableName = regionInfo.getTable().getName();
}
}
return tableName;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java
index cafc8dc..3b9f986 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java
@@ -123,7 +123,7 @@ public class HBaseConnectionMgr {
new Throwable());
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HBaseConnectionMgr.getHBaseConnection() HbaseClient : "+ client ) ;
+ LOG.debug("<== HBaseConnectionMgr.getHBaseConnection() HbaseClient : "+ client );
}
return client;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java
index 32cfc25..c033b00 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java
@@ -41,17 +41,17 @@ public class HBaseResourceMgr {
public static HashMap<String, Object> connectionTest(String serviceName, Map<String, String> configs) throws Exception {
HashMap<String, Object> ret = null;
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HBaseResourceMgr.connectionTest() ServiceName: "+ serviceName + "Configs" + configs ) ;
+ LOG.debug("<== HBaseResourceMgr.connectionTest() ServiceName: "+ serviceName + "Configs" + configs );
}
try {
ret = HBaseClient.connectionTest(serviceName, configs);
} catch (HadoopException e) {
- LOG.error("<== HBaseResourceMgr.connectionTest() Error: " + e) ;
+ LOG.error("<== HBaseResourceMgr.connectionTest() Error: " + e);
throw e;
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HBaseResourceMgr.connectionTest() Result: "+ ret ) ;
+ LOG.debug("<== HBaseResourceMgr.connectionTest() Result: "+ ret );
}
return ret;
}
@@ -68,7 +68,7 @@ public class HBaseResourceMgr {
List<String> columnFamilyList = null;
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HBaseResourceMgr.getHBaseResource UserInput: \""+ userInput + "\" resource : " + resource + " resourceMap: " + resourceMap) ;
+ LOG.debug("<== HBaseResourceMgr.getHBaseResource UserInput: \""+ userInput + "\" resource : " + resource + " resourceMap: " + resourceMap);
}
if ( userInput != null && resource != null) {
@@ -94,7 +94,7 @@ public class HBaseResourceMgr {
try {
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HBaseResourceMgr.getHBaseResource UserInput: \""+ userInput + "\" configs: " + configs + " context: " + context) ;
+ LOG.debug("<== HBaseResourceMgr.getHBaseResource UserInput: \""+ userInput + "\" configs: " + configs + " context: " + context);
}
final HBaseClient hBaseClient = new HBaseConnectionMgr().getHBaseConnection(serviceName,serviceType,configs);
Callable<List<String>> callableObj = null;
@@ -151,7 +151,7 @@ public class HBaseResourceMgr {
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HBaseResourceMgr.getHBaseResource() Result :" + resultList) ;
+ LOG.debug("<== HBaseResourceMgr.getHBaseResource() Result :" + resultList);
}
return resultList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java
index b1ecbd2..3448de9 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/HDFSAccessVerifier.java
@@ -31,5 +31,5 @@ public interface HDFSAccessVerifier {
}
boolean isAccessGranted(String aPathName, String aPathOwnerName, String access, String username, Set<String> groups);
- boolean isAuditLogEnabled(String aPathName) ;
+ boolean isAuditLogEnabled(String aPathName);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
index 0932956..6f452da 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
@@ -356,7 +356,7 @@ public class RangerHdfsAuthorizer extends INodeAttributeProvider {
}
}
- throw new RangerAccessControlException("Permission denied: user=" + user + ", access=" + action + ", inode=\"" + path + "\"") ;
+ throw new RangerAccessControlException("Permission denied: user=" + user + ", access=" + action + ", inode=\"" + path + "\"");
}
} finally {
if(auditHandler != null) {
@@ -466,12 +466,12 @@ class RangerHdfsAccessRequest extends RangerAccessRequestImpl {
}
private static String getRemoteIp() {
- String ret = null ;
- InetAddress ip = Server.getRemoteIp() ;
+ String ret = null;
+ InetAddress ip = Server.getRemoteIp();
if (ip != null) {
ret = ip.getHostAddress();
}
- return ret ;
+ return ret;
}
}
@@ -483,19 +483,19 @@ class RangerHdfsAuditHandler extends RangerDefaultAuditHandler {
private final String pathToBeValidated;
private final boolean auditOnlyIfDenied;
- private static final String HadoopModuleName = RangerConfiguration.getInstance().get(RangerHadoopConstants.AUDITLOG_HADOOP_MODULE_ACL_NAME_PROP , RangerHadoopConstants.DEFAULT_HADOOP_MODULE_ACL_NAME) ;
- private static final String excludeUserList = RangerConfiguration.getInstance().get(RangerHadoopConstants.AUDITLOG_HDFS_EXCLUDE_LIST_PROP, RangerHadoopConstants.AUDITLOG_EMPTY_STRING) ;
- private static HashSet<String> excludeUsers = null ;
+ private static final String HadoopModuleName = RangerConfiguration.getInstance().get(RangerHadoopConstants.AUDITLOG_HADOOP_MODULE_ACL_NAME_PROP , RangerHadoopConstants.DEFAULT_HADOOP_MODULE_ACL_NAME);
+ private static final String excludeUserList = RangerConfiguration.getInstance().get(RangerHadoopConstants.AUDITLOG_HDFS_EXCLUDE_LIST_PROP, RangerHadoopConstants.AUDITLOG_EMPTY_STRING);
+ private static HashSet<String> excludeUsers = null;
static {
if (excludeUserList != null && excludeUserList.trim().length() > 0) {
- excludeUsers = new HashSet<String>() ;
+ excludeUsers = new HashSet<String>();
for(String excludeUser : excludeUserList.trim().split(",")) {
- excludeUser = excludeUser.trim() ;
+ excludeUser = excludeUser.trim();
if (LOG.isDebugEnabled()) {
LOG.debug("Adding exclude user [" + excludeUser + "]");
}
- excludeUsers.add(excludeUser) ;
+ excludeUsers.add(excludeUser);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/exceptions/RangerAccessControlException.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/exceptions/RangerAccessControlException.java b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/exceptions/RangerAccessControlException.java
index 3a66da3..e93f23c 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/exceptions/RangerAccessControlException.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/exceptions/RangerAccessControlException.java
@@ -26,7 +26,7 @@ public class RangerAccessControlException extends AccessControlException {
private static final long serialVersionUID = -4673975720243484927L;
public RangerAccessControlException(String aMsg) {
- super(aMsg) ;
+ super(aMsg);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
index 62db66f..15c1253 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
@@ -43,14 +43,14 @@ import org.apache.ranger.plugin.client.HadoopException;
public class HdfsClient extends BaseClient {
- private static final Log LOG = LogFactory.getLog(HdfsClient.class) ;
+ private static final Log LOG = LogFactory.getLog(HdfsClient.class);
private Configuration conf;
private static List<String> rangerInternalPropertyKeys = Arrays.asList("username",
"password", "keytabfile");
public HdfsClient(String serviceName, Map<String,String> connectionProperties) {
- super(serviceName,connectionProperties, "hdfs-client") ;
- conf = new Configuration() ;
+ super(serviceName,connectionProperties, "hdfs-client");
+ conf = new Configuration();
Set<String> rangerInternalPropertyKeys = getConfigHolder().getRangerInternalPropertyKeys();
for (Map.Entry<String, String> entry: connectionProperties.entrySet()) {
String key = entry.getKey();
@@ -63,47 +63,47 @@ public class HdfsClient extends BaseClient {
}
private List<String> listFilesInternal(String baseDir, String fileMatching, final List<String> pathList) throws HadoopException {
- List<String> fileList = new ArrayList<String>() ;
+ List<String> fileList = new ArrayList<String>();
String errMsg = " You can still save the repository and start creating "
+ "policies, but you would not be able to use autocomplete for "
+ "resource names. Check ranger_admin.log for more info.";
try {
- String dirPrefix = (baseDir.endsWith("/") ? baseDir : (baseDir + "/")) ;
+ String dirPrefix = (baseDir.endsWith("/") ? baseDir : (baseDir + "/"));
String filterRegEx = null;
if (fileMatching != null && fileMatching.trim().length() > 0) {
- filterRegEx = fileMatching.trim() ;
+ filterRegEx = fileMatching.trim();
}
UserGroupInformation.setConfiguration(conf);
- FileSystem fs = null ;
+ FileSystem fs = null;
try {
- fs = FileSystem.get(conf) ;
+ fs = FileSystem.get(conf);
Path basePath = new Path(baseDir);
- FileStatus[] fileStats = fs.listStatus(basePath) ;
+ FileStatus[] fileStats = fs.listStatus(basePath);
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HdfsClient fileStatus : " + fileStats.length + " PathList :" + pathList) ;
+ LOG.debug("<== HdfsClient fileStatus : " + fileStats.length + " PathList :" + pathList);
}
if (fileStats != null) {
if (fs.exists(basePath) && ArrayUtils.isEmpty(fileStats)) {
- fileList.add(basePath.toString()) ;
+ fileList.add(basePath.toString());
} else {
for(FileStatus stat : fileStats) {
- Path path = stat.getPath() ;
- String pathComponent = path.getName() ;
+ Path path = stat.getPath();
+ String pathComponent = path.getName();
String prefixedPath = dirPrefix + pathComponent;
if ( pathList != null && pathList.contains(prefixedPath)) {
continue;
}
if (filterRegEx == null) {
- fileList.add(prefixedPath) ;
+ fileList.add(prefixedPath);
}
else if (FilenameUtils.wildcardMatch(pathComponent, fileMatching)) {
- fileList.add(prefixedPath) ;
+ fileList.add(prefixedPath);
}
}
}
@@ -115,7 +115,7 @@ public class HdfsClient extends BaseClient {
hdpException.generateResponseDataMap(false, getMessage(uhe),
msgDesc + errMsg, null, null);
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HdfsClient listFilesInternal Error : " + uhe) ;
+ LOG.debug("<== HdfsClient listFilesInternal Error : " + uhe);
}
throw hdpException;
} catch (FileNotFoundException fne) {
@@ -126,7 +126,7 @@ public class HdfsClient extends BaseClient {
msgDesc + errMsg, null, null);
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HdfsClient listFilesInternal Error : " + fne) ;
+ LOG.debug("<== HdfsClient listFilesInternal Error : " + fne);
}
throw hdpException;
@@ -141,7 +141,7 @@ public class HdfsClient extends BaseClient {
hdpException.generateResponseDataMap(false, getMessage(ioe),
msgDesc + errMsg, null, null);
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HdfsClient listFilesInternal Error : " + ioe) ;
+ LOG.debug("<== HdfsClient listFilesInternal Error : " + ioe);
}
throw hdpException;
@@ -153,11 +153,11 @@ public class HdfsClient extends BaseClient {
hdpException.generateResponseDataMap(false, getMessage(iae),
msgDesc + errMsg, null, null);
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HdfsClient listFilesInternal Error : " + iae) ;
+ LOG.debug("<== HdfsClient listFilesInternal Error : " + iae);
}
throw hdpException;
}
- return fileList ;
+ return fileList;
}
@@ -166,24 +166,24 @@ public class HdfsClient extends BaseClient {
PrivilegedExceptionAction<List<String>> action = new PrivilegedExceptionAction<List<String>>() {
@Override
public List<String> run() throws Exception {
- return listFilesInternal(baseDir, fileMatching, pathList) ;
+ return listFilesInternal(baseDir, fileMatching, pathList);
}
};
- return Subject.doAs(getLoginSubject(),action) ;
+ return Subject.doAs(getLoginSubject(),action);
}
public static final void main(String[] args) {
if (args.length < 2) {
- System.err.println("USAGE: java " + HdfsClient.class.getName() + " repositoryName basedirectory [filenameToMatch]") ;
- System.exit(1) ;
+ System.err.println("USAGE: java " + HdfsClient.class.getName() + " repositoryName basedirectory [filenameToMatch]");
+ System.exit(1);
}
- String repositoryName = args[0] ;
- String baseDir = args[1] ;
- String fileNameToMatch = (args.length == 2 ? null : args[2]) ;
+ String repositoryName = args[0];
+ String baseDir = args[1];
+ String fileNameToMatch = (args.length == 2 ? null : args[2]);
- HdfsClient fs = new HdfsClient(repositoryName, new HashMap<String,String>()) ;
+ HdfsClient fs = new HdfsClient(repositoryName, new HashMap<String,String>());
List<String> fsList = null;
try {
fsList = fs.listFiles(baseDir, fileNameToMatch,null);
@@ -192,11 +192,11 @@ public class HdfsClient extends BaseClient {
}
if (fsList != null && fsList.size() > 0) {
for(String s : fsList) {
- System.out.println(s) ;
+ System.out.println(s);
}
}
else {
- System.err.println("Unable to get file listing for [" + baseDir + (baseDir.endsWith("/") ? "" : "/") + fileNameToMatch + "] in repository [" + repositoryName + "]") ;
+ System.err.println("Unable to get file listing for [" + baseDir + (baseDir.endsWith("/") ? "" : "/") + fileNameToMatch + "] in repository [" + repositoryName + "]");
}
}
@@ -261,25 +261,25 @@ public class HdfsClient extends BaseClient {
String lookupKeytab = configs.get("lookupkeytab");
if(StringUtils.isEmpty(lookupPrincipal) || StringUtils.isEmpty(lookupKeytab)){
// username
- String username = configs.get("username") ;
+ String username = configs.get("username");
if ((username == null || username.isEmpty())) {
throw new IllegalArgumentException("Value for username not specified");
}
// password
- String password = configs.get("password") ;
+ String password = configs.get("password");
if ((password == null || password.isEmpty())) {
throw new IllegalArgumentException("Value for password not specified");
}
}
// hadoop.security.authentication
- String authentication = configs.get("hadoop.security.authentication") ;
+ String authentication = configs.get("hadoop.security.authentication");
if ((authentication == null || authentication.isEmpty())) {
throw new IllegalArgumentException("Value for hadoop.security.authentication not specified");
}
- String fsDefaultName = configs.get("fs.default.name") ;
+ String fsDefaultName = configs.get("fs.default.name");
fsDefaultName = (fsDefaultName == null) ? "" : fsDefaultName.trim();
if (fsDefaultName.isEmpty()) {
throw new IllegalArgumentException("Value for neither fs.default.name is specified");
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java
index 0a2eba0..bb6aa496 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java
@@ -40,18 +40,18 @@ public class HdfsResourceMgr {
HashMap<String, Object> ret = null;
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HdfsResourceMgr.connectionTest ServiceName: "+ serviceName + "Configs" + configs ) ;
+ LOG.debug("<== HdfsResourceMgr.connectionTest ServiceName: "+ serviceName + "Configs" + configs );
}
try {
ret = HdfsClient.connectionTest(serviceName, configs);
} catch (HadoopException e) {
- LOG.error("<== HdfsResourceMgr.testConnection Error: " + e.getMessage(), e) ;
+ LOG.error("<== HdfsResourceMgr.testConnection Error: " + e.getMessage(), e);
throw e;
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HdfsResourceMgr.connectionTest Result : "+ ret ) ;
+ LOG.debug("<== HdfsResourceMgr.connectionTest Result : "+ ret );
}
return ret;
}
@@ -73,7 +73,7 @@ public class HdfsResourceMgr {
if (serviceName != null && userInput != null) {
try {
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HdfsResourceMgr.getHdfsResources() UserInput: "+ userInput + "configs: " + configs + "context: " + context) ;
+ LOG.debug("<== HdfsResourceMgr.getHdfsResources() UserInput: "+ userInput + "configs: " + configs + "context: " + context);
}
String wildCardToMatch;
@@ -124,7 +124,7 @@ public class HdfsResourceMgr {
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HdfsResourceMgr.getHdfsResources() Result : "+ resultList ) ;
+ LOG.debug("<== HdfsResourceMgr.getHdfsResources() Result : "+ resultList );
}
return resultList;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuditHandler.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuditHandler.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuditHandler.java
index 184a448..9dea37a 100644
--- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuditHandler.java
+++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuditHandler.java
@@ -168,7 +168,7 @@ public class RangerHiveAuditHandler extends RangerDefaultAuditHandler {
auditEvent.setAccessResult((short)(accessGranted ? 1 : 0));
auditEvent.setEventTime(new Date());
auditEvent.setRepositoryType(repositoryType);
- auditEvent.setRepositoryName(repositoryName) ;
+ auditEvent.setRepositoryName(repositoryName);
auditEvent.setRequestData(dfsCommand);
auditEvent.setResourcePath(dfsCommand);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
index 4b1cd09..92fc2e7 100644
--- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
+++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
@@ -69,13 +69,13 @@ import com.google.common.collect.Sets;
import org.apache.ranger.plugin.util.RangerRequestedResources;
public class RangerHiveAuthorizer extends RangerHiveAuthorizerBase {
- private static final Log LOG = LogFactory.getLog(RangerHiveAuthorizer.class) ;
+ private static final Log LOG = LogFactory.getLog(RangerHiveAuthorizer.class);
private static final char COLUMN_SEP = ',';
private static final String HIVE_CONF_VAR_QUERY_STRING = "hive.query.string";
- private static volatile RangerHivePlugin hivePlugin = null ;
+ private static volatile RangerHivePlugin hivePlugin = null;
public RangerHiveAuthorizer(HiveMetastoreClientFactory metastoreClientFactory,
HiveConf hiveConf,
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/constants/RangerHiveConstants.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/constants/RangerHiveConstants.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/constants/RangerHiveConstants.java
index cb7044c..e1b52ee 100644
--- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/constants/RangerHiveConstants.java
+++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/constants/RangerHiveConstants.java
@@ -20,9 +20,9 @@
package org.apache.ranger.authorization.hive.constants;
public final class RangerHiveConstants {
- public static final String WILDCARD_OBJECT = "*" ;
- public static final String HAS_ANY_PERMISSION = "any" ;
- public static final String SHOW_META_INFO_PERMISSION = "show" ;
- public static final String PUBLIC_ACCESS_ROLE = "public" ;
+ public static final String WILDCARD_OBJECT = "*";
+ public static final String HAS_ANY_PERMISSION = "any";
+ public static final String SHOW_META_INFO_PERMISSION = "show";
+ public static final String PUBLIC_ACCESS_ROLE = "public";
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
index 0bc4946..ec61458 100644
--- a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
+++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
@@ -46,19 +46,19 @@ import org.apache.ranger.plugin.client.HadoopException;
public class HiveClient extends BaseClient implements Closeable {
- private static final Log LOG = LogFactory.getLog(HiveClient.class) ;
+ private static final Log LOG = LogFactory.getLog(HiveClient.class);
- Connection con = null ;
+ Connection con = null;
boolean isKerberosAuth=false;
public HiveClient(String serviceName) throws Exception {
- super(serviceName, null) ;
- initHive() ;
+ super(serviceName, null);
+ initHive();
}
public HiveClient(String serviceName,Map<String,String> connectionProp) throws Exception{
- super(serviceName,connectionProp) ;
- initHive() ;
+ super(serviceName,connectionProp);
+ initHive();
}
public void initHive() throws Exception {
@@ -73,13 +73,13 @@ public class HiveClient extends BaseClient implements Closeable {
}
else {
LOG.info("Since Password is NOT provided, Trying to use UnSecure client with username and password");
- final String userName = getConfigHolder().getUserName() ;
- final String password = getConfigHolder().getPassword() ;
+ final String userName = getConfigHolder().getUserName();
+ final String password = getConfigHolder().getPassword();
Subject.doAs(getLoginSubject(), new PrivilegedExceptionAction<Void>() {
public Void run() throws Exception {
initConnection(userName,password);
return null;
- }}) ;
+ }});
}
}
@@ -97,35 +97,35 @@ public class HiveClient extends BaseClient implements Closeable {
}
return ret;
}
- }) ;
+ });
return dblist;
}
private List<String> getDBList(String databaseMatching, List<String>dbList) throws HadoopException {
if(LOG.isDebugEnabled()) {
- LOG.debug("==> HiveClient getDBList databaseMatching : " + databaseMatching + " ExcludedbList :" + dbList) ;
+ LOG.debug("==> HiveClient getDBList databaseMatching : " + databaseMatching + " ExcludedbList :" + dbList);
}
- List<String> ret = new ArrayList<String>() ;
+ List<String> ret = new ArrayList<String>();
String errMsg = " You can still save the repository and start creating "
+ "policies, but you would not be able to use autocomplete for "
+ "resource names. Check ranger_admin.log for more info.";
if (con != null) {
- Statement stat = null ;
- ResultSet rs = null ;
- String sql = "show databases" ;
+ Statement stat = null;
+ ResultSet rs = null;
+ String sql = "show databases";
if (databaseMatching != null && ! databaseMatching.isEmpty()) {
- sql = sql + " like \"" + databaseMatching + "\"" ;
+ sql = sql + " like \"" + databaseMatching + "\"";
}
try {
- stat = con.createStatement() ;
- rs = stat.executeQuery(sql) ;
+ stat = con.createStatement() ;
+ rs = stat.executeQuery(sql);
while (rs.next()) {
String dbName = rs.getString(1);
if ( dbList != null && dbList.contains(dbName)) {
continue;
}
- ret.add(rs.getString(1)) ;
+ ret.add(rs.getString(1));
}
} catch (SQLTimeoutException sqlt) {
String msgDesc = "Time Out, Unable to execute SQL [" + sql
@@ -135,7 +135,7 @@ public class HiveClient extends BaseClient implements Closeable {
hdpException.generateResponseDataMap(false, getMessage(sqlt),
msgDesc + errMsg, null, null);
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveClient.getDBList() Error : ", sqlt) ;
+ LOG.debug("<== HiveClient.getDBList() Error : ", sqlt);
}
throw hdpException;
} catch (SQLException sqle) {
@@ -145,12 +145,12 @@ public class HiveClient extends BaseClient implements Closeable {
hdpException.generateResponseDataMap(false, getMessage(sqle),
msgDesc + errMsg, null, null);
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveClient.getDBList() Error : " , sqle) ;
+ LOG.debug("<== HiveClient.getDBList() Error : " , sqle);
}
throw hdpException;
} finally {
- close(rs) ;
- close(stat) ;
+ close(rs);
+ close(stat);
}
}
@@ -159,7 +159,7 @@ public class HiveClient extends BaseClient implements Closeable {
LOG.debug("<== HiveClient.getDBList(): " + ret);
}
- return ret ;
+ return ret;
}
public List<String> getTableList(String tableNameMatching, List<String> databaseList, List<String> tblNameList) throws HadoopException {
@@ -178,25 +178,25 @@ public class HiveClient extends BaseClient implements Closeable {
}
return ret;
}
- }) ;
+ });
return tableList;
}
public List<String> getTblList(String tableNameMatching, List<String> dbList, List<String> tblList) throws HadoopException {
if(LOG.isDebugEnabled()) {
- LOG.debug("==> HiveClient getTableList() tableNameMatching : " + tableNameMatching + " ExcludedbList :" + dbList + "ExcludeTableList :" + tblList) ;
+ LOG.debug("==> HiveClient getTableList() tableNameMatching : " + tableNameMatching + " ExcludedbList :" + dbList + "ExcludeTableList :" + tblList);
}
- List<String> ret = new ArrayList<String>() ;
+ List<String> ret = new ArrayList<String>();
String errMsg = " You can still save the repository and start creating "
+ "policies, but you would not be able to use autocomplete for "
+ "resource names. Check ranger_admin.log for more info.";
if (con != null) {
- Statement stat = null ;
- ResultSet rs = null ;
+ Statement stat = null;
+ ResultSet rs = null;
- String sql = null ;
+ String sql = null;
try {
if (dbList != null && !dbList.isEmpty()) {
@@ -204,17 +204,17 @@ public class HiveClient extends BaseClient implements Closeable {
sql = "use " + db;
try {
- stat = con.createStatement() ;
- stat.execute(sql) ;
+ stat = con.createStatement();
+ stat.execute(sql);
}
finally {
- close(stat) ;
+ close(stat);
stat = null;
}
- sql = "show tables " ;
+ sql = "show tables ";
if (tableNameMatching != null && ! tableNameMatching.isEmpty()) {
- sql = sql + " like \"" + tableNameMatching + "\"" ;
+ sql = sql + " like \"" + tableNameMatching + "\"";
}
try {
stat = con.createStatement();
@@ -242,7 +242,7 @@ public class HiveClient extends BaseClient implements Closeable {
hdpException.generateResponseDataMap(false, getMessage(sqlt),
msgDesc + errMsg, null, null);
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveClient.getTblList() Error : " , sqlt) ;
+ LOG.debug("<== HiveClient.getTblList() Error : " , sqlt);
}
throw hdpException;
} catch (SQLException sqle) {
@@ -252,7 +252,7 @@ public class HiveClient extends BaseClient implements Closeable {
hdpException.generateResponseDataMap(false, getMessage(sqle),
msgDesc + errMsg, null, null);
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveClient.getTblList() Error : " , sqle) ;
+ LOG.debug("<== HiveClient.getTblList() Error : " , sqle);
}
throw hdpException;
}
@@ -260,20 +260,20 @@ public class HiveClient extends BaseClient implements Closeable {
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveClient getTableList() " + ret) ;
+ LOG.debug("<== HiveClient getTableList() " + ret);
}
- return ret ;
+ return ret;
}
public List<String> getViewList(String database, String viewNameMatching) {
- List<String> ret = null ;
- return ret ;
+ List<String> ret = null;
+ return ret;
}
public List<String> getUDFList(String database, String udfMatching) {
- List<String> ret = null ;
- return ret ;
+ List<String> ret = null;
+ return ret;
}
public List<String> getColumnList(String columnNameMatching, List<String> dbList, List<String> tblList, List<String> colList) throws HadoopException {
@@ -292,31 +292,31 @@ public class HiveClient extends BaseClient implements Closeable {
}
return ret;
}
- }) ;
+ });
return columnList;
}
public List<String> getClmList(String columnNameMatching,List<String> dbList, List<String> tblList, List<String> colList) throws HadoopException {
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveClient.getClmList() columnNameMatching: " + columnNameMatching + " dbList :" + dbList + " tblList: " + tblList + " colList: " + colList) ;
+ LOG.debug("<== HiveClient.getClmList() columnNameMatching: " + columnNameMatching + " dbList :" + dbList + " tblList: " + tblList + " colList: " + colList);
}
- List<String> ret = new ArrayList<String>() ;
+ List<String> ret = new ArrayList<String>();
String errMsg = " You can still save the repository and start creating "
+ "policies, but you would not be able to use autocomplete for "
+ "resource names. Check ranger_admin.log for more info.";
if (con != null) {
- String columnNameMatchingRegEx = null ;
+ String columnNameMatchingRegEx = null;
if (columnNameMatching != null && ! columnNameMatching.isEmpty()) {
- columnNameMatchingRegEx = columnNameMatching ;
+ columnNameMatchingRegEx = columnNameMatching;
}
- Statement stat = null ;
- ResultSet rs = null ;
+ Statement stat = null;
+ ResultSet rs = null;
- String sql = null ;
+ String sql = null;
if (dbList != null && !dbList.isEmpty() &&
tblList != null && !tblList.isEmpty()) {
@@ -326,26 +326,26 @@ public class HiveClient extends BaseClient implements Closeable {
sql = "use " + db;
try {
- stat = con.createStatement() ;
- stat.execute(sql) ;
+ stat = con.createStatement();
+ stat.execute(sql);
}
finally {
- close(stat) ;
+ close(stat);
}
- sql = "describe " + tbl ;
- stat = con.createStatement() ;
- rs = stat.executeQuery(sql) ;
+ sql = "describe " + tbl;
+ stat = con.createStatement() ;
+ rs = stat.executeQuery(sql);
while (rs.next()) {
- String columnName = rs.getString(1) ;
+ String columnName = rs.getString(1);
if (colList != null && colList.contains(columnName)) {
continue;
}
if (columnNameMatchingRegEx == null) {
- ret.add(columnName) ;
+ ret.add(columnName);
}
else if (FilenameUtils.wildcardMatch(columnName,columnNameMatchingRegEx)) {
- ret.add(columnName) ;
+ ret.add(columnName);
}
}
@@ -357,7 +357,7 @@ public class HiveClient extends BaseClient implements Closeable {
hdpException.generateResponseDataMap(false, getMessage(sqlt),
msgDesc + errMsg, null, null);
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveClient.getClmList() Error : " ,sqlt) ;
+ LOG.debug("<== HiveClient.getClmList() Error : " ,sqlt);
}
throw hdpException;
} catch (SQLException sqle) {
@@ -367,12 +367,12 @@ public class HiveClient extends BaseClient implements Closeable {
hdpException.generateResponseDataMap(false, getMessage(sqle),
msgDesc + errMsg, null, null);
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveClient.getClmList() Error : " ,sqle) ;
+ LOG.debug("<== HiveClient.getClmList() Error : " ,sqle);
}
throw hdpException;
} finally {
- close(rs) ;
- close(stat) ;
+ close(rs);
+ close(stat);
}
}
}
@@ -380,17 +380,17 @@ public class HiveClient extends BaseClient implements Closeable {
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveClient.getClmList() " + ret ) ;
+ LOG.debug("<== HiveClient.getClmList() " + ret );
}
- return ret ;
+ return ret;
}
public void close() {
Subject.doAs(getLoginSubject(), new PrivilegedAction<Void>(){
public Void run() {
- close(con) ;
+ close(con);
return null;
}
});
@@ -428,7 +428,7 @@ public class HiveClient extends BaseClient implements Closeable {
private void initConnection() throws HadoopException{
try {
- initConnection(null,null) ;
+ initConnection(null,null);
} catch (HadoopException he) {
LOG.error("Unable to Connect to Hive", he);
throw he;
@@ -438,16 +438,16 @@ public class HiveClient extends BaseClient implements Closeable {
private void initConnection(String userName, String password) throws HadoopException {
- Properties prop = getConfigHolder().getRangerSection() ;
- String driverClassName = prop.getProperty("jdbc.driverClassName") ;
- String url = prop.getProperty("jdbc.url") ;
+ Properties prop = getConfigHolder().getRangerSection();
+ String driverClassName = prop.getProperty("jdbc.driverClassName");
+ String url = prop.getProperty("jdbc.url");
String errMsg = " You can still save the repository and start creating "
+ "policies, but you would not be able to use autocomplete for "
+ "resource names. Check ranger_admin.log for more info.";
if (driverClassName != null) {
try {
- Driver driver = (Driver)Class.forName(driverClassName).newInstance() ;
+ Driver driver = (Driver)Class.forName(driverClassName).newInstance();
DriverManager.registerDriver(driver);
} catch (SQLException e) {
String msgDesc = "initConnection: Caught SQLException while registering "
@@ -520,10 +520,10 @@ public class HiveClient extends BaseClient implements Closeable {
try {
if (userName == null && password == null) {
- con = DriverManager.getConnection(url) ;
+ con = DriverManager.getConnection(url);
}
else {
- con = DriverManager.getConnection(url, userName, password) ;
+ con = DriverManager.getConnection(url, userName, password);
}
} catch (SQLException e) {
@@ -559,15 +559,15 @@ public class HiveClient extends BaseClient implements Closeable {
public static void main(String[] args) {
- HiveClient hc = null ;
+ HiveClient hc = null;
if (args.length == 0) {
- System.err.println("USAGE: java " + HiveClient.class.getName() + " dataSourceName <databaseName> <tableName> <columnName>") ;
- System.exit(1) ;
+ System.err.println("USAGE: java " + HiveClient.class.getName() + " dataSourceName <databaseName> <tableName> <columnName>");
+ System.exit(1);
}
try {
- hc = new HiveClient(args[0]) ;
+ hc = new HiveClient(args[0]);
if (args.length == 2) {
List<String> dbList = null;
@@ -577,35 +577,35 @@ public class HiveClient extends BaseClient implements Closeable {
e.printStackTrace();
}
if (CollectionUtils.isEmpty(dbList)) {
- System.out.println("No database found with db filter [" + args[1] + "]") ;
+ System.out.println("No database found with db filter [" + args[1] + "]");
}
else {
if (CollectionUtils.isNotEmpty(dbList)) {
for (String str : dbList ) {
- System.out.println("database: " + str ) ;
+ System.out.println("database: " + str );
}
}
}
}
else if (args.length == 3) {
- List<String> tableList = hc.getTableList(args[2],null,null) ;
+ List<String> tableList = hc.getTableList(args[2],null,null);
if (tableList.size() == 0) {
- System.out.println("No tables found under database[" + args[1] + "] with table filter [" + args[2] + "]") ;
+ System.out.println("No tables found under database[" + args[1] + "] with table filter [" + args[2] + "]");
}
else {
for(String str : tableList) {
- System.out.println("Table: " + str) ;
+ System.out.println("Table: " + str);
}
}
}
else if (args.length == 4) {
- List<String> columnList = hc.getColumnList(args[3],null,null,null) ;
+ List<String> columnList = hc.getColumnList(args[3],null,null,null);
if (columnList.size() == 0) {
- System.out.println("No columns found for db:" + args[1] + ", table: [" + args[2] + "], with column filter [" + args[3] + "]") ;
+ System.out.println("No columns found for db:" + args[1] + ", table: [" + args[2] + "], with column filter [" + args[3] + "]");
}
else {
for (String str : columnList ) {
- System.out.println("Column: " + str) ;
+ System.out.println("Column: " + str);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java
index ff13fcf..1a7b987 100644
--- a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java
+++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java
@@ -43,18 +43,18 @@ public class HiveResourceMgr {
HashMap<String, Object> ret = null;
if(LOG.isDebugEnabled()) {
- LOG.debug("==> HiveResourceMgr.connectionTest ServiceName: "+ serviceName + "Configs" + configs ) ;
+ LOG.debug("==> HiveResourceMgr.connectionTest ServiceName: "+ serviceName + "Configs" + configs );
}
try {
ret = HiveClient.connectionTest(serviceName, configs);
} catch (HadoopException e) {
- LOG.error("<== HiveResourceMgr.connectionTest Error: " + e) ;
+ LOG.error("<== HiveResourceMgr.connectionTest Error: " + e);
throw e;
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveResourceMgr.connectionTest Result : "+ ret ) ;
+ LOG.debug("<== HiveResourceMgr.connectionTest Result : "+ ret );
}
return ret;
@@ -75,7 +75,7 @@ public class HiveResourceMgr {
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveResourceMgr.getHiveResources() UserInput: \""+ userInput + "\" resource : " + resource + " resourceMap: " + resourceMap) ;
+ LOG.debug("<== HiveResourceMgr.getHiveResources() UserInput: \""+ userInput + "\" resource : " + resource + " resourceMap: " + resourceMap);
}
if ( userInput != null && resource != null) {
@@ -104,7 +104,7 @@ public class HiveResourceMgr {
if(LOG.isDebugEnabled()) {
LOG.debug("==> HiveResourceMgr.getHiveResources() UserInput: "+ userInput + " configs: " + configs + " databaseList: " + databaseList + " tableList: "
- + tableList + " columnList: " + columnList ) ;
+ + tableList + " columnList: " + columnList );
}
final HiveClient hiveClient = new HiveConnectionMgr().getHiveConnection(serviceName, serviceType, configs);
@@ -181,7 +181,7 @@ public class HiveResourceMgr {
if(LOG.isDebugEnabled()) {
LOG.debug("<== HiveResourceMgr.getHiveResources() UserInput: "+ userInput + " configs: " + configs + " databaseList: " + databaseList + " tableList: "
- + tableList + " columnList: " + columnList + "Result :" + resultList ) ;
+ + tableList + " columnList: " + columnList + "Result :" + resultList );
}
return resultList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/jisql/src/main/java/org/apache/util/sql/Jisql.java
----------------------------------------------------------------------
diff --git a/jisql/src/main/java/org/apache/util/sql/Jisql.java b/jisql/src/main/java/org/apache/util/sql/Jisql.java
index c168cf4..b613e80 100644
--- a/jisql/src/main/java/org/apache/util/sql/Jisql.java
+++ b/jisql/src/main/java/org/apache/util/sql/Jisql.java
@@ -296,7 +296,7 @@ public class Jisql {
if(connectString.toLowerCase().startsWith("jdbc:mysql") && inputFileName!=null){
MySQLPLRunner scriptRunner = new MySQLPLRunner(connection, false, true,printDebug);
scriptRunner.setDelimiter(commandTerminator,false);
- FileReader reader = new FileReader(inputFileName) ;
+ FileReader reader = new FileReader(inputFileName);
try {
scriptRunner.runScript(reader);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java
----------------------------------------------------------------------
diff --git a/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java b/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java
index ec21966..8b51972 100644
--- a/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java
+++ b/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java
@@ -305,7 +305,7 @@ public class MySQLPLRunner {
// Executing SQL Script
- FileReader reader = new FileReader(aSQLScriptFilePath) ;
+ FileReader reader = new FileReader(aSQLScriptFilePath);
try {
scriptRunner.runScript(reader);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java b/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java
index 2d9dd4f..edbb299 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java
@@ -28,50 +28,50 @@ import com.sun.org.apache.xml.internal.security.utils.Base64;
public class DB2HSMMKUtil {
- private static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password" ;
+ private static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password";
private static final String PARTITION_PASSWORD = "ranger.ks.hsm.partition.password";
private static final String PARTITION_NAME = "ranger.ks.hsm.partition.name";
private static final String HSM_TYPE = "ranger.ks.hsm.type";
public static void showUsage() {
- System.err.println("USAGE: java " + DB2HSMMKUtil.class.getName() + " <HSMType> <partitionName>") ;
+ System.err.println("USAGE: java " + DB2HSMMKUtil.class.getName() + " <HSMType> <partitionName>");
}
public static void main(String[] args) {
if (args.length < 2) {
- System.err.println("Invalid number of parameters found.") ;
- showUsage() ;
- System.exit(1) ;
+ System.err.println("Invalid number of parameters found.");
+ showUsage();
+ System.exit(1);
}
else {
String hsmType = args[0];
if (hsmType == null || hsmType.trim().isEmpty()) {
- System.err.println("HSM Type does not exists.") ;
- showUsage() ;
+ System.err.println("HSM Type does not exists.");
+ showUsage();
System.exit(1);
}
String partitionName = args[1];
if (partitionName == null || partitionName.trim().isEmpty()) {
- System.err.println("Partition name does not exists.") ;
- showUsage() ;
- System.exit(1) ;
+ System.err.println("Partition name does not exists.");
+ showUsage();
+ System.exit(1);
}
boolean result = new DB2HSMMKUtil().doExportMKToHSM(hsmType, partitionName);
if(result){
- System.out.println("Master Key from Ranger KMS DB has been successfully imported into HSM.") ;
+ System.out.println("Master Key from Ranger KMS DB has been successfully imported into HSM.");
}else{
- System.out.println("Import of Master Key from DB has been unsuccessful.") ;
+ System.out.println("Import of Master Key from DB has been unsuccessful.");
}
- System.exit(0) ;
+ System.exit(0);
}
}
private boolean doExportMKToHSM(String hsmType, String partitionName) {
try {
- String partitionPassword = getPasswordFromConsole("Enter Password for the Partition "+partitionName+" : ") ;
+ String partitionPassword = getPasswordFromConsole("Enter Password for the Partition "+partitionName+" : ");
Configuration conf = RangerKeyStoreProvider.getDBKSConf();
conf.set(HSM_TYPE, hsmType);
conf.set(PARTITION_NAME, partitionName);
@@ -92,12 +92,12 @@ public class DB2HSMMKUtil {
return rangerHSM.setMasterKey(password, key);
}
catch(Throwable t) {
- throw new RuntimeException("Unable to import Master key from Ranger DB to HSM ", t) ;
+ throw new RuntimeException("Unable to import Master key from Ranger DB to HSM ", t);
}
}
private String getPasswordFromConsole(String prompt) throws IOException {
- String ret = null ;
+ String ret = null;
Console c=System.console();
if (c == null) {
System.out.print(prompt + " ");
@@ -112,16 +112,16 @@ public class DB2HSMMKUtil {
ret = new String(e, Charset.defaultCharset());
}
} else {
- char[] pwd = c.readPassword(prompt + " ") ;
+ char[] pwd = c.readPassword(prompt + " ");
if (pwd == null) {
- ret = null ;
+ ret = null;
}
else {
ret = new String(pwd);
}
}
if (ret == null) {
- ret = "" ;
+ ret = "";
}
return ret;
}
[10/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/jisql/src/main/java/org/apache/util/outputformatter/XMLFormatter.java
----------------------------------------------------------------------
diff --git a/jisql/src/main/java/org/apache/util/outputformatter/XMLFormatter.java b/jisql/src/main/java/org/apache/util/outputformatter/XMLFormatter.java
index f6ddbb6..93aa26d 100644
--- a/jisql/src/main/java/org/apache/util/outputformatter/XMLFormatter.java
+++ b/jisql/src/main/java/org/apache/util/outputformatter/XMLFormatter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -37,14 +37,14 @@ public class XMLFormatter implements JisqlFormatter {
/**
* Sets a the option list for this formatter. This is a no-op in the
* XMLFormatter.
- *
+ *
* @param parser the OptionParser to use.
- *
+ *
*/
public void setSupportedOptions( OptionParser parser ) {
/* no options for the XMLFormatter */
}
-
+
/**
* Consumes any options that were specified on the command line. There are
* no options to set for the XMLFormatter so this method is a no-op.
@@ -57,7 +57,7 @@ public class XMLFormatter implements JisqlFormatter {
public void consumeOptions( OptionSet options ) throws Exception {
/* no options for the XMLFormatter */
}
-
+
/**
* Called to output a usage message to the command line window. This
* message should contain information on how to call the formatter.
@@ -68,7 +68,7 @@ public class XMLFormatter implements JisqlFormatter {
public void usage( PrintStream out ) {
/* no options for the XMLFormatter */
}
-
+
/**
* Outputs a header for a query. For the XMLFormater this outputs the XML
@@ -85,7 +85,7 @@ public class XMLFormatter implements JisqlFormatter {
out.println( "\" ?>" );
}
-
+
/**
* Called to output the data. Note that for the XMLFormatter null fields are
* just output as an empty field.
@@ -111,12 +111,12 @@ public class XMLFormatter implements JisqlFormatter {
out.print( metaData.getColumnName( i ).trim() );
out.print( ">" );
}
-
+
out.println();
}
}
-
+
/**
* Outputs a footer for a query. This method isn't used in the XMLFormatter.
*
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/jisql/src/main/java/org/apache/util/sql/Jisql.java
----------------------------------------------------------------------
diff --git a/jisql/src/main/java/org/apache/util/sql/Jisql.java b/jisql/src/main/java/org/apache/util/sql/Jisql.java
index 36c4340..c168cf4 100644
--- a/jisql/src/main/java/org/apache/util/sql/Jisql.java
+++ b/jisql/src/main/java/org/apache/util/sql/Jisql.java
@@ -1,11 +1,11 @@
/* Copyright (C) 2004-2011 Scott Dunbar (scott@xigole.com)
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -42,11 +42,11 @@ import org.apache.util.outputformatter.JisqlFormatter;
* obviously, strong similarities to Microsoft SQL/Server isql and osql (as
* Microsoft got SQL Server from Sybase).
* <p>
- *
+ *
* The program can act in a similar way to Oracle's sqlplus and PostgreSQL's
* psql.
* <p>
- *
+ *
* A simple command line might look like (this should be all on one line) is: <br>
* <code>
* java -classpath lib/jisql.jar:<file containing native driver>
@@ -54,7 +54,7 @@ import org.apache.util.outputformatter.JisqlFormatter;
* -cstring jdbc:postgresql://localhost:5432/scott -c \;
* </code>
* <p>
- *
+ *
* This logs into a PostgreSQL database as the user "scott", password "blah". It
* connects to the database named "scott". It uses the command terminator of
* ";", just like psql or sqlplus (which is escaped in the example so that it
@@ -65,8 +65,8 @@ import org.apache.util.outputformatter.JisqlFormatter;
* configuration. Additionally, if you are using the CSVFormatter then it is
* dependent on <a href="http://sourceforge.net/projects/javacsv/">Java CSV</a>.
* <p>
- *
- *
+ *
+ *
* Options:
* <ul>
* <li><b>-driver </b> This option allows you to specify the JDBC driver class
@@ -94,10 +94,10 @@ import org.apache.util.outputformatter.JisqlFormatter;
* <li><b>mysqlcaucho </b>- short for <code>com.caucho.jdbc.mysql.Driver</code>-
* the Caucho driver for MySQL</li>
* </ul>
- *
+ *
* Alternatively, any class name can be specified here. The shortcuts only exist
* for those of us who generate more typos than real text :)</li>
- *
+ *
* <li><b>-cstring </b> This option allows you to specify the connection string
* to the database. This string is driver specific but almost always starts with
* "jdbc:". Connection strings for the drivers I have tested look
@@ -124,13 +124,13 @@ import org.apache.util.outputformatter.JisqlFormatter;
* <li><b>mysqlcaucho </b>- The MySQL Cahcho driver connection string looks like
* "jdbc:mysql-caucho://[hostname]:[port]/[db_name]"</li>
* </ul>
- *
+ *
* <b>Important </b>- each JDBC vendor has other flags and parameters that can
* be passed on the connection string. You should look at the documentation for
* your JDBC driver for more information. The strings listed are just a sample
* and may change with a new release of the driver. None of these strings are
* coded within the application - the list is provided for reference only.</li>
- *
+ *
* <li><b>-user or -u </b> The user name to use to log into the database with.</li>
* <li><b>-password or -p </b> The password to use to log into the database
* with. If this option is missing then the program asks for the password.</li>
@@ -223,7 +223,7 @@ public class Jisql {
private static final String db2AppDriverName = "COM.ibm.db2.jdbc.app.DB2Driver";
private static final String db2NetDriverName = "COM.ibm.db2.jdbc.net.DB2Driver";
private static final String cloudscapeDriverName = "COM.cloudscape.core.JDBCDriver";
- private static final String msqlDriverName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+ private static final String msqlDriverName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
private static final String pointbaseDriverName = "com.pointbase.jdbc.jdbcUniversalDriver";
private static final String postgresqlDriverName = "org.postgresql.Driver";
private static final String mySQLConnectJDriverName = "com.mysql.jdbc.Driver";
@@ -253,7 +253,7 @@ public class Jisql {
/**
* Runs Jisql with the command line arguments provided.
- *
+ *
*/
public static void main(String argv[]) {
Jisql jisql = new Jisql();
@@ -354,10 +354,10 @@ public class Jisql {
* The main loop for the Jisql program. This method handles the input from
* either a command line or from a file. Output is handled through the
* Formatter.
- *
+ *
* @throws SQLException
* if an exception occurs.
- *
+ *
*/
public void doIsql() throws IOException, SQLException {
BufferedReader reader = null;
@@ -384,9 +384,9 @@ public class Jisql {
statement = connection.createStatement();
connection.clearWarnings();
String trimmedLine=null;
-
+
try {
-
+
while (true) {
int linecount = 1;
query = new StringBuilder();
@@ -422,7 +422,7 @@ public class Jisql {
trimmedLine=line.trim();
if (trimmedLine.startsWith("--") ||trimmedLine.length()<1) {
continue;
- }
+ }
if(connectString.toLowerCase().startsWith("jdbc:oracle") && inputFileName!=null){
if (trimmedLine.startsWith("/") ||trimmedLine.length()<2) {
commandTerminator=";";
@@ -547,10 +547,10 @@ public class Jisql {
/**
* Prints some information about the JDBC driver in use.
- *
+ *
* @throws SQLException
* if one of the methods called does.
- *
+ *
*/
private void printDriverInfo() throws SQLException {
System.out.println("driver.getMajorVersion() is " + driver.getMajorVersion());
@@ -583,11 +583,11 @@ public class Jisql {
/**
* Parse the command line arguments. This method parses what is needed for
* the Jisql driver program and lets the configured formatter do the same.
- *
+ *
* @param argv the command line arguments.
- *
+ *
* @throws Exception if there are any errors parsing the command line arguments.
- *
+ *
*/
public void parseArgs(String argv[]) throws Throwable {
//
@@ -760,9 +760,9 @@ public class Jisql {
/**
* Walks through a SQLException and prints out every exception.
- *
+ *
* @param sqle the Exception to print
- *
+ *
*/
private void printAllExceptions(SQLException sqle) {
while (sqle != null) {
@@ -775,7 +775,7 @@ public class Jisql {
/**
* Prints out the usage message for the Jisql driver and the configured
* formatter.
- *
+ *
*/
private void usage() {
System.err.println();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/jisql/src/main/java/org/apache/util/sql/MaskingThread.java
----------------------------------------------------------------------
diff --git a/jisql/src/main/java/org/apache/util/sql/MaskingThread.java b/jisql/src/main/java/org/apache/util/sql/MaskingThread.java
index e938e69..e4343d0 100644
--- a/jisql/src/main/java/org/apache/util/sql/MaskingThread.java
+++ b/jisql/src/main/java/org/apache/util/sql/MaskingThread.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java
----------------------------------------------------------------------
diff --git a/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java b/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java
index 58ab85b..ec21966 100644
--- a/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java
+++ b/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,7 @@
*/
package org.apache.util.sql;
-
+
import java.io.FileReader;
import java.io.IOException;
import java.io.LineNumberReader;
@@ -33,10 +33,10 @@ import java.sql.Statement;
import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
+
public class MySQLPLRunner {
-
+
private static final String DEFAULT_DELIMITER = ";";
private Connection connection;
private boolean stopOnError;
@@ -58,12 +58,12 @@ public class MySQLPLRunner {
this.stopOnError = stopOnError;
this.printDebug=printDebug;
}
-
+
public void setDelimiter(String delimiter, boolean fullLineDelimiter) {
this.delimiter = delimiter;
this.fullLineDelimiter = fullLineDelimiter;
}
-
+
/**
* Setter for logWriter property
*
@@ -73,7 +73,7 @@ public class MySQLPLRunner {
public void setLogWriter(PrintWriter logWriter) {
this.logWriter = logWriter;
}
-
+
/**
* Setter for errorLogWriter property
*
@@ -83,7 +83,7 @@ public class MySQLPLRunner {
public void setErrorLogWriter(PrintWriter errorLogWriter) {
this.errorLogWriter = errorLogWriter;
}
-
+
/**
* Runs an SQL script (read in using the Reader parameter)
*
@@ -109,7 +109,7 @@ public class MySQLPLRunner {
throw new RuntimeException("Error running script. Cause: " + e, e);
}
}
-
+
/**
* Runs an SQL script (read in using the Reader parameter) using the
* connection passed in
@@ -134,7 +134,7 @@ public class MySQLPLRunner {
command = new StringBuilder();
}
String trimmedLine = line.trim();
-
+
if (trimmedLine.length() < 1 || trimmedLine.startsWith("--")
|| trimmedLine.startsWith("//")) { //NOPMD
//println(trimmedLine);
@@ -143,8 +143,8 @@ public class MySQLPLRunner {
&& trimmedLine.endsWith(getDelimiter())
|| fullLineDelimiter
&& trimmedLine.equals(getDelimiter())) {
-
-
+
+
Pattern pattern = Pattern.compile(DELIMITER_LINE_REGEX);
Matcher matcher = pattern.matcher(trimmedLine);
if (matcher.matches()) {
@@ -156,13 +156,13 @@ public class MySQLPLRunner {
}
trimmedLine = line.trim();*/
}
-
+
if(line!=null && line.endsWith(getDelimiter()) && !DEFAULT_DELIMITER.equalsIgnoreCase(getDelimiter())){
command.append(line.substring(0, line.lastIndexOf(getDelimiter())));
}else{
command.append(line);
}
-
+
command.append(" ");
Statement statement = conn.createStatement();
if(printDebug)
@@ -180,11 +180,11 @@ public class MySQLPLRunner {
printlnError(e);
}
}
-
+
if (autoCommit && !conn.getAutoCommit()) {
conn.commit();
}
-
+
ResultSet rs = statement.getResultSet();
if (hasResults && rs != null) {
ResultSetMetaData md = rs.getMetaData();
@@ -202,7 +202,7 @@ public class MySQLPLRunner {
println("");
}
}
-
+
command = null;
try {
if(rs!=null){
@@ -252,29 +252,29 @@ public class MySQLPLRunner {
flush();
}
}
-
+
private String getDelimiter() {
return delimiter;
}
-
+
private void print(Object o) {
if (logWriter != null) {
System.out.print(o);
}
}
-
+
private void println(Object o) {
if (logWriter != null) {
logWriter.println(o);
}
}
-
+
private void printlnError(Object o) {
if (errorLogWriter != null) {
errorLogWriter.println(o);
}
}
-
+
private void flush() {
if (logWriter != null) {
logWriter.flush();
@@ -283,7 +283,7 @@ public class MySQLPLRunner {
errorLogWriter.flush();
}
}
-
+
public static void main(String args[]){
// Creating object of ScriptRunner class
Connection con = null;
@@ -294,12 +294,12 @@ public class MySQLPLRunner {
props = new Properties();
props.put("user", "root");
-
+
props.put("password", "root");
String connectString = "jdbc:mysql://localhost:3306/ranger";
con = DriverManager.getConnection(connectString, props);
-
-
+
+
MySQLPLRunner scriptRunner = new MySQLPLRunner(con, false, true,true);
String aSQLScriptFilePath = "/disk1/zero/jisql-2.0.11/xa_core_db.sql";
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java b/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java
index 9509b86..2d9dd4f 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java
@@ -110,8 +110,8 @@ public class DB2HSMMKUtil {
byte[] e=new byte[l];
System.arraycopy(b,0, e, 0, l);
ret = new String(e, Charset.defaultCharset());
- }
- } else {
+ }
+ } else {
char[] pwd = c.readPassword(prompt + " ") ;
if (pwd == null) {
ret = null ;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java b/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java
index 5671abe..b3697ab 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java
@@ -108,8 +108,8 @@ public class HSM2DBMKUtil {
byte[] e=new byte[l];
System.arraycopy(b,0, e, 0, l);
ret = new String(e, Charset.defaultCharset());
- }
- } else {
+ }
+ } else {
char[] pwd = c.readPassword(prompt + " ") ;
if (pwd == null) {
ret = null ;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java b/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java
index 68ac0ed..5b0a7da 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java
@@ -32,7 +32,7 @@ import org.apache.ranger.kms.dao.DaoManager;
public class JKS2RangerUtil {
private static final String DEFAULT_KEYSTORE_TYPE = "jceks" ;
- private static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password" ;
+ private static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password" ;
public static void showUsage() {
System.err.println("USAGE: java " + JKS2RangerUtil.class.getName() + " <KMS_FileName> [KeyStoreType]") ;
@@ -77,7 +77,7 @@ public class JKS2RangerUtil {
try {
char[] keyStorePassword = getPasswordFromConsole("Enter Password for the keystore FILE :") ;
char[] keyPassword = getPasswordFromConsole("Enter Password for the KEY(s) stored in the keystore:") ;
- Configuration conf = RangerKeyStoreProvider.getDBKSConf();
+ Configuration conf = RangerKeyStoreProvider.getDBKSConf();
RangerKMSDB rangerkmsDb = new RangerKMSDB(conf);
DaoManager daoManager = rangerkmsDb.getDaoManager();
RangerKeyStore dbStore = new RangerKeyStore(daoManager);
@@ -97,7 +97,7 @@ public class JKS2RangerUtil {
in.close();
} catch (Exception e) {
throw new RuntimeException("ERROR: Unable to close file stream for [" + keyStoreFileName + "]", e) ;
- }
+ }
}
}
}
@@ -121,8 +121,8 @@ public class JKS2RangerUtil {
byte[] e=new byte[l];
System.arraycopy(b,0, e, 0, l);
ret = new String(e, Charset.defaultCharset());
- }
- } else {
+ }
+ } else {
char[] pwd = c.readPassword(prompt + " ") ;
if (pwd == null) {
ret = null ;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/Ranger2JKSUtil.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/Ranger2JKSUtil.java b/kms/src/main/java/org/apache/hadoop/crypto/key/Ranger2JKSUtil.java
index e1ba611..3748a5b 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/Ranger2JKSUtil.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/Ranger2JKSUtil.java
@@ -32,7 +32,7 @@ import org.apache.ranger.kms.dao.DaoManager;
public class Ranger2JKSUtil {
private static final String DEFAULT_KEYSTORE_TYPE = "jceks" ;
- private static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password" ;
+ private static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password" ;
public static void showUsage() {
System.err.println("USAGE: java " + Ranger2JKSUtil.class.getName() + " <KMS_FileName> [KeyStoreType]") ;
@@ -78,7 +78,7 @@ public class Ranger2JKSUtil {
try {
char[] keyStorePassword = getPasswordFromConsole("Enter Password for the keystore FILE :") ;
char[] keyPassword = getPasswordFromConsole("Enter Password for the KEY(s) stored in the keystore:") ;
- Configuration conf = RangerKeyStoreProvider.getDBKSConf();
+ Configuration conf = RangerKeyStoreProvider.getDBKSConf();
RangerKMSDB rangerkmsDb = new RangerKMSDB(conf);
DaoManager daoManager = rangerkmsDb.getDaoManager();
RangerKeyStore dbStore = new RangerKeyStore(daoManager);
@@ -96,7 +96,7 @@ public class Ranger2JKSUtil {
out.close();
} catch (Exception e) {
throw new RuntimeException("ERROR: Unable to close file stream for [" + keyStoreFileName + "]", e) ;
- }
+ }
}
}
}
@@ -119,8 +119,8 @@ public class Ranger2JKSUtil {
byte[] e=new byte[l];
System.arraycopy(b,0, e, 0, l);
ret = new String(e, Charset.defaultCharset());
- }
- } else {
+ }
+ } else {
char[] pwd = c.readPassword(prompt + " ") ;
if (pwd == null) {
ret = null ;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java
index 32f14eb..34dc53e 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java
@@ -35,7 +35,7 @@ import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
/**
- * This Class is for HSM Keystore
+ * This Class is for HSM Keystore
*/
public class RangerHSM implements RangerKMSMKI {
@@ -67,11 +67,11 @@ public class RangerHSM implements RangerKMSMKI {
try {
ByteArrayInputStream is1 = new ByteArrayInputStream(("tokenlabel:" + partitionName).getBytes());
logger.debug("Loading HSM tokenlabel : "+partitionName);
- myStore = KeyStore.getInstance("Luna");
+ myStore = KeyStore.getInstance("Luna");
myStore.load(is1, passwd.toCharArray());
if(myStore == null){ logger.error("Luna not found. Please verify the Ranger KMS HSM configuration setup."); }
} catch (KeyStoreException kse) {
- logger.error("Unable to create keystore object : "+kse.getMessage());
+ logger.error("Unable to create keystore object : "+kse.getMessage());
} catch (NoSuchAlgorithmException nsae) {
logger.error("Unexpected NoSuchAlgorithmException while loading keystore : " + nsae.getMessage());
} catch (CertificateException e) {
@@ -80,7 +80,7 @@ public class RangerHSM implements RangerKMSMKI {
logger.error("Unexpected IOException while loading keystore : "+e.getMessage());
}
}
-
+
@Override
public boolean generateMasterKey(String password) throws Throwable {
if(myStore != null && myStore.size() < 1){
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
index b11a778..fb4404b 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
@@ -93,7 +93,7 @@ public class RangerKMSDB {
daoManager = new DaoManager();
daoManager.setEntityManagerFactory(entityManagerFactory);
daoManager.getEntityManager(); // this forces the connection to be made to DB
- logger.info("Connected to DB : "+isDbConnected());
+ logger.info("Connected to DB : "+isDbConnected());
} catch(Exception excp) {
excp.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
index 6bd2954..0778b1a 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
@@ -85,7 +85,7 @@ public class RangerKeyStore extends KeyStoreSpi {
private Hashtable<String, Object> keyEntries = new Hashtable<String, Object>();
private Hashtable<String, Object> deltaEntries = new Hashtable<String, Object>();
-
+
RangerKeyStore() {
}
@@ -107,21 +107,21 @@ public class RangerKeyStore extends KeyStoreSpi {
if (!(entry instanceof SecretKeyEntry)) {
return null;
}
-
+
Class<?> c = null;
Object o = null;
try {
c = Class.forName("com.sun.crypto.provider.KeyProtector");
Constructor<?> constructor = c.getDeclaredConstructor(char[].class);
constructor.setAccessible(true);
- o = constructor.newInstance(password);
+ o = constructor.newInstance(password);
Method m = c.getDeclaredMethod("unseal", SealedObject.class);
m.setAccessible(true);
key = (Key) m.invoke(o, ((SecretKeyEntry)entry).sealedKey);
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
logger.error(e.getMessage());
}
- return key;
+ return key;
}
@Override
@@ -150,7 +150,7 @@ public class RangerKeyStore extends KeyStoreSpi {
c = Class.forName("com.sun.crypto.provider.KeyProtector");
Constructor<?> constructor = c.getDeclaredConstructor(char[].class);
constructor.setAccessible(true);
- o = constructor.newInstance(password);
+ o = constructor.newInstance(password);
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
logger.error(e.getMessage());
throw new KeyStoreException(e.getMessage());
@@ -160,7 +160,7 @@ public class RangerKeyStore extends KeyStoreSpi {
Method m = c.getDeclaredMethod("seal", Key.class);
m.setAccessible(true);
entry.sealedKey = (SealedObject) m.invoke(o, key);
-
+
entry.cipher_field = cipher;
entry.bit_length = bitLength;
entry.description = description;
@@ -170,7 +170,7 @@ public class RangerKeyStore extends KeyStoreSpi {
} catch (Exception e) {
logger.error(e.getMessage());
throw new KeyStoreException(e.getMessage());
- }
+ }
}
synchronized(keyEntries) {
try {
@@ -178,7 +178,7 @@ public class RangerKeyStore extends KeyStoreSpi {
}catch (Exception e) {
logger.error(e.getMessage());
throw new KeyStoreException(e.getMessage());
- }
+ }
}
}
@@ -195,13 +195,13 @@ public class RangerKeyStore extends KeyStoreSpi {
}
}
-
+
private void dbOperationDelete(String alias) {
try{
if(daoManager != null){
- RangerKMSDao rangerKMSDao = new RangerKMSDao(daoManager);
+ RangerKMSDao rangerKMSDao = new RangerKMSDao(daoManager);
rangerKMSDao.deleteByAlias(alias);
- }
+ }
}catch(Exception e){
logger.error(e.getMessage());
e.printStackTrace();
@@ -235,12 +235,12 @@ public class RangerKeyStore extends KeyStoreSpi {
}
MessageDigest md = getKeyedMessageDigest(password);
-
- byte digest[] = md.digest();
+
+ byte digest[] = md.digest();
for (Enumeration<String> e = deltaEntries.keys(); e.hasMoreElements();) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(new DigestOutputStream(baos, md));
-
+
ObjectOutputStream oos = null;
try{
@@ -249,7 +249,7 @@ public class RangerKeyStore extends KeyStoreSpi {
oos = new ObjectOutputStream(dos);
oos.writeObject(((SecretKeyEntry)entry).sealedKey);
-
+
dos.write(digest);
dos.flush();
Long creationDate = ((SecretKeyEntry)entry).date.getTime();
@@ -262,7 +262,7 @@ public class RangerKeyStore extends KeyStoreSpi {
} else {
dos.close();
}
- }
+ }
}
clearDeltaEntires();
}
@@ -328,12 +328,12 @@ public class RangerKeyStore extends KeyStoreSpi {
DataInputStream dis;
MessageDigest md = null;
-
+
if(rangerKeyDetails == null || rangerKeyDetails.size() < 1){
return;
}
- keyEntries.clear();
+ keyEntries.clear();
if(password!=null){
md = getKeyedMessageDigest(password);
}
@@ -352,8 +352,8 @@ public class RangerKeyStore extends KeyStoreSpi {
logger.error("No Key found for alias "+rangerKey.getAlias());
}
- if (computed != null) {
- int counter = 0;
+ if (computed != null) {
+ int counter = 0;
for (int i = computed.length-1; i >= 0; i--) {
if (computed[i] != data[data.length-(1+counter)]) {
Throwable t = new UnrecoverableKeyException
@@ -398,7 +398,7 @@ public class RangerKeyStore extends KeyStoreSpi {
}
//Add the entry to the list
- keyEntries.put(alias, entry);
+ keyEntries.put(alias, entry);
}finally {
if (ois != null) {
ois.close();
@@ -415,7 +415,7 @@ public class RangerKeyStore extends KeyStoreSpi {
if(daoManager != null){
RangerKMSDao rangerKMSDao = new RangerKMSDao(daoManager);
return rangerKMSDao.getAllKeys();
- }
+ }
}catch(Exception e){
e.printStackTrace();
}
@@ -426,9 +426,9 @@ public class RangerKeyStore extends KeyStoreSpi {
* To guard against tampering with the keystore, we append a keyed
* hash with a bit of whitener.
*/
-
+
private final String SECRET_KEY_HASH_WORD = "Apache Ranger" ;
-
+
private MessageDigest getKeyedMessageDigest(char[] aKeyPassword)
throws NoSuchAlgorithmException, UnsupportedEncodingException
{
@@ -503,14 +503,14 @@ public class RangerKeyStore extends KeyStoreSpi {
try {
ks = KeyStore.getInstance(fileFormat);
ks.load(stream, storePass);
- deltaEntries.clear();
+ deltaEntries.clear();
for (Enumeration<String> name = ks.aliases(); name.hasMoreElements();){
SecretKeyEntry entry = new SecretKeyEntry();
String alias = (String) name.nextElement();
Key k = ks.getKey(alias, keyPass);
-
+
if (k instanceof JavaKeyStoreProvider.KeyMetadata) {
- JavaKeyStoreProvider.KeyMetadata keyMetadata = (JavaKeyStoreProvider.KeyMetadata)k ;
+ JavaKeyStoreProvider.KeyMetadata keyMetadata = (JavaKeyStoreProvider.KeyMetadata)k ;
Field f = JavaKeyStoreProvider.KeyMetadata.class.getDeclaredField(METADATA_FIELDNAME) ;
f.setAccessible(true);
Metadata metadata = (Metadata)f.get(keyMetadata) ;
@@ -533,7 +533,7 @@ public class RangerKeyStore extends KeyStoreSpi {
c = Class.forName("com.sun.crypto.provider.KeyProtector");
Constructor<?> constructor = c.getDeclaredConstructor(char[].class);
constructor.setAccessible(true);
- o = constructor.newInstance(masterKey);
+ o = constructor.newInstance(masterKey);
// seal and store the key
Method m = c.getDeclaredMethod("seal", Key.class);
m.setAccessible(true);
@@ -542,7 +542,7 @@ public class RangerKeyStore extends KeyStoreSpi {
logger.error(e.getMessage());
throw new IOException(e.getMessage());
}
-
+
entry.date = ks.getCreationDate(alias);
entry.version = (alias.split("@").length == 2)?(Integer.parseInt(alias.split("@")[1])):0;
entry.description = k.getFormat()+" - "+ks.getType();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
index 081e279..967839f 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
@@ -233,13 +233,13 @@ public class RangerKeyStoreProvider extends KeyProvider{
throw new IOException("No such algorithm storing key", e);
} catch (CertificateException e) {
throw new IOException("Certificate exception storing key", e);
- }
+ }
changed = false;
}catch (IOException ioe) {
cache.clear();
reloadKeys();
throw ioe;
- }
+ }
}
@Override
@@ -366,7 +366,7 @@ public class RangerKeyStoreProvider extends KeyProvider{
String aliasValue=conf.get(alias);
if(pathValue!=null && aliasValue!=null){
String xaDBPassword=CredentialReader.getDecryptedString(pathValue.trim(),aliasValue.trim());
- if(xaDBPassword!=null&& !xaDBPassword.trim().isEmpty() &&
+ if(xaDBPassword!=null&& !xaDBPassword.trim().isEmpty() &&
!xaDBPassword.trim().equalsIgnoreCase("none")){
conf.set(key, xaDBPassword);
}else{
@@ -375,16 +375,16 @@ public class RangerKeyStoreProvider extends KeyProvider{
}
}
}
-
+
private void reloadKeys() throws IOException {
try {
cache.clear();
- loadKeys(masterKey);
+ loadKeys(masterKey);
} catch (NoSuchAlgorithmException e) {
throw new IOException("Can't load Keys");
}catch(CertificateException e){
throw new IOException("Can't load Keys");
- }
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
index 337b82c..ae3c386 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
@@ -61,9 +61,9 @@ public class RangerMasterKey implements RangerKMSMKI{
/**
* To get Master Key
- * @param password password to be used for decryption
+ * @param password password to be used for decryption
* @return Decrypted Master Key
- * @throws Throwable
+ * @throws Throwable
*/
@Override
public String getMasterKey(String password) throws Throwable{
@@ -91,7 +91,7 @@ public class RangerMasterKey implements RangerKMSMKI{
* @param password password to be used for encryption
* @return true if the master key was successfully created
* false if master key generation was unsuccessful or the master key already exists
- * @throws Throwable
+ * @throws Throwable
*/
@Override
public boolean generateMasterKey(String password) throws Throwable{
@@ -146,7 +146,7 @@ public class RangerMasterKey implements RangerKMSMKI{
String masterKeyStr = rangerMasterKey.getMasterKey();
return Base64.decode(masterKeyStr) ;
}
- }
+ }
}catch(Exception e){
e.printStackTrace();
}
@@ -167,7 +167,7 @@ public class RangerMasterKey implements RangerKMSMKI{
XXRangerMasterKey rangerMasterKey = rangerKMSDao.create(xxRangerMasterKey);
return rangerMasterKey.getId().toString();
}
- }
+ }
}catch(Exception e){
e.printStackTrace();
}
@@ -197,11 +197,11 @@ public class RangerMasterKey implements RangerKMSMKI{
private PBEKeySpec getPBEParameterSpec(String password) throws Throwable {
MessageDigest md = MessageDigest.getInstance(MD_ALGO) ;
- byte[] saltGen = md.digest(password.getBytes()) ;
- byte[] salt = new byte[SALT_SIZE] ;
- System.arraycopy(saltGen, 0, salt, 0, SALT_SIZE);
+ byte[] saltGen = md.digest(password.getBytes()) ;
+ byte[] salt = new byte[SALT_SIZE] ;
+ System.arraycopy(saltGen, 0, salt, 0, SALT_SIZE);
int iteration = password.toCharArray().length + 1 ;
- return new PBEKeySpec(password.toCharArray(), salt, iteration) ;
+ return new PBEKeySpec(password.toCharArray(), salt, iteration) ;
}
private byte[] encryptKey(byte[] data, PBEKeySpec keyspec) throws Throwable {
SecretKey key = getPasswordKey(keyspec) ;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
index ae6d8f8..be3700f 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
@@ -83,7 +83,7 @@ public class KMS {
KMSOp operation, String clientIp) throws AccessControlException {
KMSWebApp.getACLs().assertAccess(aclType, ugi, operation, null, clientIp);
}
-
+
private void assertAccess(Type aclType, UserGroupInformation ugi,
KMSOp operation, String key, String clientIp) throws AccessControlException {
KMSWebApp.getACLs().assertAccess(aclType, ugi, operation, key, clientIp);
@@ -109,7 +109,7 @@ public class KMS {
KMSWebApp.getAdminCallsMeter().mark();
UserGroupInformation user = HttpUserGroupInformation.get();
final String name = (String) jsonKey.get(KMSRESTConstants.NAME_FIELD);
- KMSClientProvider.checkNotEmpty(name, KMSRESTConstants.NAME_FIELD);
+ KMSClientProvider.checkNotEmpty(name, KMSRESTConstants.NAME_FIELD);
validateKeyName(name);
assertAccess(Type.CREATE, user, KMSOp.CREATE_KEY, name, request.getRemoteAddr());
String cipher = (String) jsonKey.get(KMSRESTConstants.CIPHER_FIELD);
@@ -437,7 +437,7 @@ public class KMS {
final String keyName = (String) jsonPayload.get(
KMSRESTConstants.NAME_FIELD);
String ivStr = (String) jsonPayload.get(KMSRESTConstants.IV_FIELD);
- String encMaterialStr =
+ String encMaterialStr =
(String) jsonPayload.get(KMSRESTConstants.MATERIAL_FIELD);
Object retJSON;
if (eekOp.equals(KMSRESTConstants.EEK_DECRYPT)) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
index ac2b5d2..4bf2886 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
@@ -56,10 +56,10 @@ public class KMSConfiguration {
// Delay for Audit logs that need aggregation
public static final String KMS_AUDIT_AGGREGATION_WINDOW = CONFIG_PREFIX +
"audit.aggregation.window.ms";
-
+
//for authorizer
public static final String KMS_SECURITY_AUTHORIZER = CONFIG_PREFIX + "security.authorization.manager";
-
+
public static final boolean KEY_CACHE_ENABLE_DEFAULT = true;
// 10 mins
public static final long KEY_CACHE_TIMEOUT_DEFAULT = 10 * 60 * 1000;
@@ -70,7 +70,7 @@ public class KMSConfiguration {
// Property to Enable/Disable per Key authorization
public static final String KEY_AUTHORIZATION_ENABLE = CONFIG_PREFIX +
- "key.authorization.enable";
+ "key.authorization.enable";
public static final boolean KEY_AUTHORIZATION_ENABLE_DEFAULT = true;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
index b98b386..ccbb6a7 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
@@ -130,7 +130,7 @@ public class KMSWebApp implements ServletContextListener {
LOG.info(" KMS Hadoop Version: " + VersionInfo.getVersion());
LOG.info("-------------------------------------------------------------");
-
+
kmsAcls = getAcls(kmsConf.get(KMSConfiguration.KMS_SECURITY_AUTHORIZER));
kmsAcls.startReloader();
@@ -200,7 +200,7 @@ public class KMSWebApp implements ServletContextListener {
new KeyAuthorizationKeyProvider(
keyProviderCryptoExtension, kmsAcls);
}
-
+
LOG.info("Initialized KeyProviderCryptoExtension "
+ keyProviderCryptoExtension);
final int defaultBitlength = kmsConf
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
index 2753ac6..bd35a6b 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
@@ -65,23 +65,23 @@ public class KeyAuthorizationKeyProvider extends KeyProviderCryptoExtension {
* <code>KeyAuthorizationKeyProvider</code>.
*/
public interface KeyACLs {
-
+
/**
* This is called by the KeyProvider to check if the given user is
* authorized to perform the specified operation on the given acl name.
* @param aclName name of the key ACL
* @param ugi User's UserGroupInformation
- * @param opType Operation Type
+ * @param opType Operation Type
* @return true if user has access to the aclName and opType else false
*/
boolean hasAccessToKey(String aclName, UserGroupInformation ugi,
KeyOpType opType);
/**
- *
+ *
* @param aclName ACL name
* @param opType Operation Type
- * @return true if AclName exists else false
+ * @return true if AclName exists else false
*/
boolean isACLPresent(String aclName, KeyOpType opType);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java b/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java
index e64e142..f823f8e 100644
--- a/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java
+++ b/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java
@@ -19,7 +19,7 @@ package org.apache.ranger.entity;
/**
* Base JPA class with id, versionNumber and other common attributes
- *
+ *
*/
import java.util.Calendar;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/main/java/org/apache/ranger/kms/dao/BaseDao.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/ranger/kms/dao/BaseDao.java b/kms/src/main/java/org/apache/ranger/kms/dao/BaseDao.java
index dbaedd0..f2dc633 100644
--- a/kms/src/main/java/org/apache/ranger/kms/dao/BaseDao.java
+++ b/kms/src/main/java/org/apache/ranger/kms/dao/BaseDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/DerbyTestUtils.java
----------------------------------------------------------------------
diff --git a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/DerbyTestUtils.java b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/DerbyTestUtils.java
index b8d11dd..072c7f9 100644
--- a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/DerbyTestUtils.java
+++ b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/DerbyTestUtils.java
@@ -24,26 +24,26 @@ import java.sql.Statement;
import java.util.Properties;
public final class DerbyTestUtils {
-
+
public static void startDerby() throws Exception {
// Start Apache Derby
Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
-
+
Properties props = new Properties();
Connection conn = DriverManager.getConnection("jdbc:derby:memory:derbyDB;create=true", props);
-
+
Statement statement = conn.createStatement();
statement.execute("CREATE SCHEMA KMSADMIN");
-
+
statement.execute("SET SCHEMA KMSADMIN");
-
+
// Create masterkey table
statement.execute("CREATE SEQUENCE RANGER_MASTERKEY_SEQ START WITH 1 INCREMENT BY 1");
String tableCreationString = "CREATE TABLE ranger_masterkey (id VARCHAR(20) NOT NULL PRIMARY KEY, create_time DATE,"
+ "update_time DATE, added_by_id VARCHAR(20), upd_by_id VARCHAR(20),"
+ "cipher VARCHAR(255), bitlength VARCHAR(11), masterkey VARCHAR(2048))";
statement.execute(tableCreationString);
-
+
// Create keys table
statement.execute("CREATE SEQUENCE RANGER_KEYSTORE_SEQ START WITH 1 INCREMENT BY 1");
statement.execute("CREATE TABLE ranger_keystore(id VARCHAR(20) NOT NULL PRIMARY KEY, create_time DATE,"
@@ -54,7 +54,7 @@ public final class DerbyTestUtils {
conn.close();
}
-
+
public static void stopDerby() throws Exception {
try {
DriverManager.getConnection("jdbc:derby:memory:derbyDB;drop=true");
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerKeyStoreProviderTest.java
----------------------------------------------------------------------
diff --git a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerKeyStoreProviderTest.java b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerKeyStoreProviderTest.java
index ff2fb2a..5fde0af 100644
--- a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerKeyStoreProviderTest.java
+++ b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerKeyStoreProviderTest.java
@@ -60,7 +60,7 @@ public class RangerKeyStoreProviderTest {
}
UNRESTRICTED_POLICIES_INSTALLED = ok;
}
-
+
@BeforeClass
public static void startServers() throws Exception {
if (!UNRESTRICTED_POLICIES_INSTALLED) {
@@ -68,7 +68,7 @@ public class RangerKeyStoreProviderTest {
}
DerbyTestUtils.startDerby();
}
-
+
@AfterClass
public static void stopServers() throws Exception {
if (UNRESTRICTED_POLICIES_INSTALLED) {
@@ -84,10 +84,10 @@ public class RangerKeyStoreProviderTest {
Path configDir = Paths.get("src/test/resources/kms");
System.setProperty(KMSConfiguration.KMS_CONFIG_DIR, configDir.toFile().getAbsolutePath());
-
+
Configuration conf = new Configuration();
RangerKeyStoreProvider keyProvider = new RangerKeyStoreProvider(conf);
-
+
// Create a key
Options options = new Options(conf);
options.setBitLength(128);
@@ -96,14 +96,14 @@ public class RangerKeyStoreProviderTest {
Assert.assertEquals("newkey1", keyVersion.getName());
Assert.assertEquals(128 / 8, keyVersion.getMaterial().length);
Assert.assertEquals("newkey1@0", keyVersion.getVersionName());
-
+
keyProvider.flush();
Assert.assertEquals(1, keyProvider.getKeys().size());
keyProvider.deleteKey("newkey1");
-
+
keyProvider.flush();
Assert.assertEquals(0, keyProvider.getKeys().size());
-
+
// Try to delete a key that isn't there
try {
keyProvider.deleteKey("newkey2");
@@ -112,7 +112,7 @@ public class RangerKeyStoreProviderTest {
// expected
}
}
-
+
@Test
public void testRolloverKey() throws Throwable {
if (!UNRESTRICTED_POLICIES_INSTALLED) {
@@ -121,10 +121,10 @@ public class RangerKeyStoreProviderTest {
Path configDir = Paths.get("src/test/resources/kms");
System.setProperty(KMSConfiguration.KMS_CONFIG_DIR, configDir.toFile().getAbsolutePath());
-
+
Configuration conf = new Configuration();
RangerKeyStoreProvider keyProvider = new RangerKeyStoreProvider(conf);
-
+
// Create a key
Options options = new Options(conf);
options.setBitLength(192);
@@ -133,9 +133,9 @@ public class RangerKeyStoreProviderTest {
Assert.assertEquals("newkey1", keyVersion.getName());
Assert.assertEquals(192 / 8, keyVersion.getMaterial().length);
Assert.assertEquals("newkey1@0", keyVersion.getVersionName());
-
+
keyProvider.flush();
-
+
// Rollover a new key
byte[] oldKey = keyVersion.getMaterial();
keyVersion = keyProvider.rollNewVersion("newkey1");
@@ -143,12 +143,12 @@ public class RangerKeyStoreProviderTest {
Assert.assertEquals(192 / 8, keyVersion.getMaterial().length);
Assert.assertEquals("newkey1@1", keyVersion.getVersionName());
Assert.assertFalse(Arrays.equals(oldKey, keyVersion.getMaterial()));
-
+
keyProvider.deleteKey("newkey1");
-
+
keyProvider.flush();
Assert.assertEquals(0, keyProvider.getKeys().size());
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerMasterKeyTest.java
----------------------------------------------------------------------
diff --git a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerMasterKeyTest.java b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerMasterKeyTest.java
index 9e86b4b..cac2250 100644
--- a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerMasterKeyTest.java
+++ b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerMasterKeyTest.java
@@ -65,14 +65,14 @@ public class RangerMasterKeyTest {
}
DerbyTestUtils.startDerby();
}
-
+
@AfterClass
public static void stopServers() throws Exception {
if (UNRESTRICTED_POLICIES_INSTALLED) {
DerbyTestUtils.stopDerby();
}
}
-
+
@Test
public void testRangerMasterKey() throws Throwable {
if (!UNRESTRICTED_POLICIES_INSTALLED) {
@@ -82,26 +82,26 @@ public class RangerMasterKeyTest {
Path configDir = Paths.get("src/test/resources/kms");
System.setProperty(KMSConfiguration.KMS_CONFIG_DIR, configDir.toFile().getAbsolutePath());
- RangerKMSDB rangerkmsDb = new RangerKMSDB(RangerKeyStoreProvider.getDBKSConf());
+ RangerKMSDB rangerkmsDb = new RangerKMSDB(RangerKeyStoreProvider.getDBKSConf());
DaoManager daoManager = rangerkmsDb.getDaoManager();
-
+
String masterKeyPassword = "password0password0password0password0password0password0password0password0"
+ "password0password0password0password0password0password0password0password0password0password0"
+ "password0password0password0password0password0password0password0password0password0password0";
-
+
RangerMasterKey rangerMasterKey = new RangerMasterKey(daoManager);
Assert.assertTrue(rangerMasterKey.generateMasterKey(masterKeyPassword));
Assert.assertNotNull(rangerMasterKey.getMasterKey(masterKeyPassword));
-
+
try {
rangerMasterKey.getMasterKey("badpass");
Assert.fail("Failure expected on retrieving a key with the wrong password");
} catch (Throwable t) {
// expected
}
-
+
Assert.assertNotNull(rangerMasterKey.getMasterSecretKey(masterKeyPassword));
-
+
try {
rangerMasterKey.getMasterSecretKey("badpass");
Assert.fail("Failure expected on retrieving a key with the wrong password");
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSACLs.java
----------------------------------------------------------------------
diff --git a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSACLs.java b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSACLs.java
index 2e1cacc..3ff48d0 100644
--- a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSACLs.java
+++ b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSACLs.java
@@ -26,7 +26,7 @@ import org.junit.Test;
public class TestKMSACLs {
String ipAddress = "192.168.90.1";
-
+
@Test
public void testDefaults() {
KMSACLs acls = new KMSACLs(new Configuration(false));
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKeyAuthorizationKeyProvider.java
----------------------------------------------------------------------
diff --git a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKeyAuthorizationKeyProvider.java b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKeyAuthorizationKeyProvider.java
index bd4baae..d7988e7 100644
--- a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKeyAuthorizationKeyProvider.java
+++ b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKeyAuthorizationKeyProvider.java
@@ -48,7 +48,7 @@ public class TestKeyAuthorizationKeyProvider {
@Test
public void testCreateKey() throws Exception {
final Configuration conf = new Configuration();
- KeyProvider kp =
+ KeyProvider kp =
new UserProvider.Factory().createProvider(new URI("user:///"), conf);
KeyACLs mock = mock(KeyACLs.class);
when(mock.isACLPresent("foo", KeyOpType.MANAGEMENT)).thenReturn(true);
@@ -107,7 +107,7 @@ public class TestKeyAuthorizationKeyProvider {
@Test
public void testOpsWhenACLAttributeExists() throws Exception {
final Configuration conf = new Configuration();
- KeyProvider kp =
+ KeyProvider kp =
new UserProvider.Factory().createProvider(new URI("user:///"), conf);
KeyACLs mock = mock(KeyACLs.class);
when(mock.isACLPresent("testKey", KeyOpType.MANAGEMENT)).thenReturn(true);
@@ -138,7 +138,7 @@ public class TestKeyAuthorizationKeyProvider {
try {
byte[] seed = new byte[16];
SECURE_RANDOM.nextBytes(seed);
- KeyVersion kv =
+ KeyVersion kv =
kpExt.createKey("foo", seed, opt);
kpExt.rollNewVersion(kv.getName());
seed = new byte[16];
@@ -204,7 +204,7 @@ public class TestKeyAuthorizationKeyProvider {
try {
byte[] seed = new byte[16];
SECURE_RANDOM.nextBytes(seed);
- KeyVersion kv =
+ KeyVersion kv =
kpExt.createKey("foo", seed, opt);
kpExt.rollNewVersion(kv.getName());
seed = new byte[16];
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java b/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java
index 29a5026..d300c5d 100644
--- a/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java
+++ b/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -196,7 +196,7 @@ public class RangerAdminJersey2RESTClient implements RangerAdminClient {
throw new AccessControlException();
default:
String body = response.readEntity(String.class);
- String message = String.format("Unexpected: Received status[%d] with body[%s] form url[%s]", httpResponseCode, body, url);
+ String message = String.format("Unexpected: Received status[%d] with body[%s] form url[%s]", httpResponseCode, body, url);
LOG.warn(message);
throw new Exception("HTTP status: " + httpResponseCode);
}
@@ -231,7 +231,7 @@ public class RangerAdminJersey2RESTClient implements RangerAdminClient {
throw new AccessControlException();
default:
String body = response.readEntity(String.class);
- String message = String.format("Unexpected: Received status[%d] with body[%s] form url[%s]", httpResponseCode, body, url);
+ String message = String.format("Unexpected: Received status[%d] with body[%s] form url[%s]", httpResponseCode, body, url);
LOG.warn(message);
throw new Exception("HTTP status: " + httpResponseCode);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/knox-agent/src/main/java/org/apache/ranger/authorization/knox/KnoxRangerPlugin.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/main/java/org/apache/ranger/authorization/knox/KnoxRangerPlugin.java b/knox-agent/src/main/java/org/apache/ranger/authorization/knox/KnoxRangerPlugin.java
index 9f71574..4a1d747 100644
--- a/knox-agent/src/main/java/org/apache/ranger/authorization/knox/KnoxRangerPlugin.java
+++ b/knox-agent/src/main/java/org/apache/ranger/authorization/knox/KnoxRangerPlugin.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -37,7 +37,7 @@ public class KnoxRangerPlugin extends RangerBasePlugin {
super(PluginConfiguration.ServiceType, PluginConfiguration.AuditApplicationType);
}
- // must be synchroized so that accidental double init of plugin does not happen .. in case servlet instantiates multiple filters.
+ // must be synchroized so that accidental double init of plugin does not happen .. in case servlet instantiates multiple filters.
@Override
synchronized public void init() {
if (!initialized) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/knox-agent/src/main/java/org/apache/ranger/services/knox/RangerServiceKnox.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/RangerServiceKnox.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/RangerServiceKnox.java
index f019779..813b690 100644
--- a/knox-agent/src/main/java/org/apache/ranger/services/knox/RangerServiceKnox.java
+++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/RangerServiceKnox.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java
index 00ac2ef..3907b3a 100644
--- a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java
+++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -60,7 +60,7 @@ public class KnoxConnectionMgr {
return knoxClient;
}
- public KnoxClient getKnoxClient(String serviceName,
+ public KnoxClient getKnoxClient(String serviceName,
Map<String, String> configs) {
KnoxClient knoxClient = null;
LOG.debug("Getting knoxClient for datasource: " + serviceName +
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
index d57404e..af3fd49 100644
--- a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
+++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -59,15 +59,15 @@ public class KnoxResourceMgr {
String resource = context.getResourceName();
Map<String, List<String>> resourceMap = context.getResources();
List<String> resultList = null;
- List<String> knoxTopologyList = null;
+ List<String> knoxTopologyList = null;
List<String> knoxServiceList = null;
String knoxTopologyName = null;
String knoxServiceName = null;
if ( userInput != null && resource != null) {
if ( resourceMap != null && !resourceMap.isEmpty() ) {
- knoxTopologyList = resourceMap.get(TOPOLOGY);
- knoxServiceList = resourceMap.get(SERVICE);
+ knoxTopologyList = resourceMap.get(TOPOLOGY);
+ knoxServiceList = resourceMap.get(SERVICE);
}
switch (resource.trim().toLowerCase()) {
case TOPOLOGY:
@@ -78,7 +78,7 @@ public class KnoxResourceMgr {
break;
default:
break;
- }
+ }
}
String knoxUrl = configs.get("knox.url");
@@ -100,7 +100,7 @@ public class KnoxResourceMgr {
LOG.debug("<== KnoxResourceMgr.getKnoxResources() knoxUrl: "+ knoxUrl + " knoxAdminUser: " + knoxAdminUser + " topologyName: " + knoxTopologyName + " KnoxServiceName: " + knoxServiceName) ;
}
- final KnoxClient knoxClient = new KnoxConnectionMgr().getKnoxClient(knoxUrl, knoxAdminUser, knoxAdminPassword);
+ final KnoxClient knoxClient = new KnoxConnectionMgr().getKnoxClient(knoxUrl, knoxAdminUser, knoxAdminPassword);
if ( knoxClient != null) {
synchronized(knoxClient) {
resultList = KnoxClient.getKnoxResources(knoxClient, knoxTopologyName, knoxServiceName,knoxTopologyList,knoxServiceList);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java b/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java
index 11a5e74..c3690d4 100644
--- a/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java
+++ b/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -66,7 +66,7 @@ public class TestRangerServiceKnox {
HashMap<String,Object> ret = null;
String errorMessage = null;
- try {
+ try {
ret = svcKnox.validateConfig();
}catch (Exception e) {
errorMessage = e.getMessage();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java
----------------------------------------------------------------------
diff --git a/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java b/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java
index c735aa7..2038645 100644
--- a/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java
+++ b/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasResource.java
----------------------------------------------------------------------
diff --git a/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasResource.java b/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasResource.java
index 01b0f82..f056f3e 100644
--- a/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasResource.java
+++ b/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasResource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/RangerServiceAtlas.java
----------------------------------------------------------------------
diff --git a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/RangerServiceAtlas.java b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/RangerServiceAtlas.java
index 47616f4..cb5a7eb 100644
--- a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/RangerServiceAtlas.java
+++ b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/RangerServiceAtlas.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java
----------------------------------------------------------------------
diff --git a/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java b/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java
index 4c5280a..472b734 100644
--- a/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java
+++ b/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -68,7 +68,7 @@ public class RangerKafkaAuthorizer implements Authorizer {
/*
* (non-Javadoc)
- *
+ *
* @see kafka.security.auth.Authorizer#configure(Map<String, Object>)
*/
@Override
@@ -213,7 +213,7 @@ public class RangerKafkaAuthorizer implements Authorizer {
/*
* (non-Javadoc)
- *
+ *
* @see
* kafka.security.auth.Authorizer#addAcls(scala.collection.immutable.Set,
* kafka.security.auth.Resource)
@@ -225,7 +225,7 @@ public class RangerKafkaAuthorizer implements Authorizer {
/*
* (non-Javadoc)
- *
+ *
* @see
* kafka.security.auth.Authorizer#removeAcls(scala.collection.immutable.Set,
* kafka.security.auth.Resource)
@@ -238,7 +238,7 @@ public class RangerKafkaAuthorizer implements Authorizer {
/*
* (non-Javadoc)
- *
+ *
* @see
* kafka.security.auth.Authorizer#removeAcls(kafka.security.auth.Resource)
*/
@@ -250,7 +250,7 @@ public class RangerKafkaAuthorizer implements Authorizer {
/*
* (non-Javadoc)
- *
+ *
* @see kafka.security.auth.Authorizer#getAcls(kafka.security.auth.Resource)
*/
@Override
@@ -263,7 +263,7 @@ public class RangerKafkaAuthorizer implements Authorizer {
/*
* (non-Javadoc)
- *
+ *
* @see
* kafka.security.auth.Authorizer#getAcls(kafka.security.auth.KafkaPrincipal
* )
@@ -278,7 +278,7 @@ public class RangerKafkaAuthorizer implements Authorizer {
/*
* (non-Javadoc)
- *
+ *
* @see kafka.security.auth.Authorizer#getAcls()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/RangerServiceKafka.java
----------------------------------------------------------------------
diff --git a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/RangerServiceKafka.java b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/RangerServiceKafka.java
index f7fe3ed..2f031fa 100644
--- a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/RangerServiceKafka.java
+++ b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/RangerServiceKafka.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java
----------------------------------------------------------------------
diff --git a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java
index 3857b65..c908550 100644
--- a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java
+++ b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaConnectionMgr.java
----------------------------------------------------------------------
diff --git a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaConnectionMgr.java b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaConnectionMgr.java
index c234d09..e2832d8 100644
--- a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaConnectionMgr.java
+++ b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaConnectionMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-kms/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java
----------------------------------------------------------------------
diff --git a/plugin-kms/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java b/plugin-kms/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java
index 4d09a79..9bebafa 100755
--- a/plugin-kms/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java
+++ b/plugin-kms/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -66,15 +66,15 @@ public class RangerKmsAuthorizer implements Runnable, KeyACLs {
"User:%s not allowed to do '%s'";
public static final int RELOADER_SLEEP_MILLIS = 1000;
-
+
private static final Map<KMSACLsType.Type, String> ACCESS_TYPE_MAP = new HashMap<>();
-
+
private volatile Map<Type, AccessControlList> blacklistedAcls;
-
+
private long lastReload;
private ScheduledExecutorService executorService;
-
+
public static final String ACCESS_TYPE_DECRYPT_EEK = "decrypteek";
public static final String ACCESS_TYPE_GENERATE_EEK = "generateeek";
public static final String ACCESS_TYPE_GET_METADATA = "getmetadata";
@@ -83,7 +83,7 @@ public class RangerKmsAuthorizer implements Runnable, KeyACLs {
public static final String ACCESS_TYPE_SET_KEY_MATERIAL= "setkeymaterial";
public static final String ACCESS_TYPE_ROLLOVER = "rollover";
public static final String ACCESS_TYPE_CREATE = "create";
- public static final String ACCESS_TYPE_DELETE = "delete";
+ public static final String ACCESS_TYPE_DELETE = "delete";
private static volatile RangerKMSPlugin kmsPlugin = null;
@@ -101,7 +101,7 @@ public class RangerKmsAuthorizer implements Runnable, KeyACLs {
* Constant for the configuration property that indicates the keytab file path.
*/
public static final String KEYTAB = TYPE + ".keytab";
-
+
static {
ACCESS_TYPE_MAP.put(KMSACLsType.Type.CREATE, RangerKmsAuthorizer.ACCESS_TYPE_CREATE);
ACCESS_TYPE_MAP.put(KMSACLsType.Type.DELETE, RangerKmsAuthorizer.ACCESS_TYPE_DELETE);
@@ -117,7 +117,7 @@ public class RangerKmsAuthorizer implements Runnable, KeyACLs {
RangerKmsAuthorizer(Configuration conf) {
LOG.info("RangerKmsAuthorizer(conf)...");
if (conf == null) {
- conf = loadACLs();
+ conf = loadACLs();
}
authWithKerberos(conf);
setKMSACLs(conf);
@@ -149,7 +149,7 @@ public class RangerKmsAuthorizer implements Runnable, KeyACLs {
public RangerKmsAuthorizer() {
this(null);
}
-
+
@Override
public void run() {
try {
@@ -161,7 +161,7 @@ public class RangerKmsAuthorizer implements Runnable, KeyACLs {
String.format("Could not reload ACLs file: '%s'", ex.toString()), ex);
}
}
-
+
private Configuration loadACLs() {
LOG.debug("Loading ACLs file");
lastReload = System.currentTimeMillis();
@@ -208,7 +208,7 @@ public class RangerKmsAuthorizer implements Runnable, KeyACLs {
if(!ret){
LOG.debug("Operation "+rangerAccessType+" blocked in the blacklist for user "+ugi.getUserName());
}
-
+
if(plugin != null && ret) {
RangerKMSAccessRequest request = new RangerKMSAccessRequest("", rangerAccessType, ugi, clientIp);
RangerAccessResult result = plugin.isAccessAllowed(request);
@@ -221,7 +221,7 @@ public class RangerKmsAuthorizer implements Runnable, KeyACLs {
return ret;
}
-
+
public boolean hasAccess(Type type, UserGroupInformation ugi, String keyName, String clientIp) {
if(LOG.isDebugEnabled()) {
LOG.debug("==> RangerKmsAuthorizer.hasAccess(" + type + ", " + ugi + " , "+keyName+")");
@@ -234,7 +234,7 @@ public class RangerKmsAuthorizer implements Runnable, KeyACLs {
if(!ret){
LOG.debug("Operation "+rangerAccessType+" blocked in the blacklist for user "+ugi.getUserName());
}
-
+
if(plugin != null && ret) {
RangerKMSAccessRequest request = new RangerKMSAccessRequest(keyName, rangerAccessType, ugi, clientIp);
RangerAccessResult result = plugin.isAccessAllowed(request);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
----------------------------------------------------------------------
diff --git a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
index 5337ee3..016065d 100755
--- a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
+++ b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -193,7 +193,7 @@ public class KMSClient {
uri = uri.concat("?doAs="+shortName);
String decryptedPwd = PasswordUtils.decryptPassword(password);
sub = SecureClientLogin.loginUserWithPassword(username, decryptedPwd);
- }
+ }
}
final WebResource webResource = client.resource(uri);
response = Subject.doAs(sub, new PrivilegedAction<ClientResponse>() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSConnectionMgr.java
----------------------------------------------------------------------
diff --git a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSConnectionMgr.java b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSConnectionMgr.java
index 6e31f36..b81d7b8 100755
--- a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSConnectionMgr.java
+++ b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSConnectionMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,12 +26,12 @@ import org.apache.log4j.Logger;
public class KMSConnectionMgr {
private static final Logger LOG = Logger.getLogger(KMSConnectionMgr.class);
-
+
public static KMSClient getKMSClient(final String kmsURL, String userName, String password, String rangerPrincipal, String rangerKeytab, String nameRules, String authType) {
KMSClient kmsClient = null;
if (kmsURL == null || kmsURL.isEmpty()) {
LOG.error("Can not create KMSClient: kmsURL is empty");
- } else if(StringUtils.isEmpty(rangerPrincipal)){
+ } else if(StringUtils.isEmpty(rangerPrincipal)){
if(userName == null || userName.isEmpty()) {
LOG.error("Can not create KMSClient: kmsuserName is empty");
} else if (password == null || password.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
----------------------------------------------------------------------
diff --git a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
index bf1f493..346c225 100755
--- a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
+++ b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -59,7 +59,7 @@ public class KMSResourceMgr {
if ( resourceMap != null && !resourceMap.isEmpty() && resourceMap.get(KMSKEY) != null ) {
kmsKeyName = userInput;
- kmsKeyList = resourceMap.get(KMSKEY);
+ kmsKeyList = resourceMap.get(KMSKEY);
} else {
kmsKeyName = userInput;
}
@@ -68,7 +68,7 @@ public class KMSResourceMgr {
if (configs == null || configs.isEmpty()) {
LOG.error("Connection Config is empty");
} else {
-
+
String url = configs.get("provider");
String username = configs.get("username");
String password = configs.get("password");
[03/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXResource.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXResource.java b/security-admin/src/main/java/org/apache/ranger/view/VXResource.java
index 334c3c4..8ce0ebe 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXResource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Resource
- *
+ *
*/
import java.util.List;
@@ -527,7 +527,7 @@ public class VXResource extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>topologies</b>
- *
+ *
* @return String - value of member attribute <b>topologies</b>.
*/
public String getTopologies() {
@@ -537,7 +537,7 @@ public class VXResource extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>topologies</b>. You
* cannot set null to the attribute.
- *
+ *
* @param topologies
* Value to set member attribute <b>topologies</b>
*/
@@ -547,7 +547,7 @@ public class VXResource extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>services</b>
- *
+ *
* @return String - value of member attribute <b>services</b>.
*/
public String getServices() {
@@ -557,7 +557,7 @@ public class VXResource extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>services</b>. You
* cannot set null to the attribute.
- *
+ *
* @param services
* Value to set member attribute <b>services</b>
*/
@@ -589,7 +589,7 @@ public class VXResource extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>guid</b>
- *
+ *
* @return String - value of member attribute <b>guid</b>.
*/
public String getGuid() {
@@ -599,7 +599,7 @@ public class VXResource extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>guid</b>. You
* cannot set null to the attribute.
- *
+ *
* @param guid - Value to set member attribute <b>guid</b>
*/
public void setGuid(String guid) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java b/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java
index 7a49c0a..338eaf5 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* List wrapper class for VXResource
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java b/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java
index 2451afd..c690136 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Response
- *
+ *
*/
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXString.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXString.java b/security-admin/src/main/java/org/apache/ranger/view/VXString.java
index bd52ff7..22cf559 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXString.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXString.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* String
- *
+ *
*/
import javax.xml.bind.annotation.XmlRootElement;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java b/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java
index 4d830e2..903a0ab 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* List wrapper class for VXString
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java
index 6ee1394..911b133 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Logging table for all DB create and update queries
- *
+ *
*/
import javax.xml.bind.annotation.XmlRootElement;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java
index ab4ffd0..b28f61a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUser.java b/security-admin/src/main/java/org/apache/ranger/view/VXUser.java
index 5e188a9..85b7b2f 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUser.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* User
- *
+ *
*/
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXUserGroupInfo.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUserGroupInfo.java b/security-admin/src/main/java/org/apache/ranger/view/VXUserGroupInfo.java
index 09cc1aa..5c6e3e7 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUserGroupInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUserGroupInfo.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* UserGroupInfo
- *
+ *
*/
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java b/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java
index 2e5b9b1..8d5be6a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* List wrapper class for VXUser
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java b/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java
index 52c9cb9..dee3156 100644
--- a/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java
+++ b/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/test/java/org/apache/ranger/audit/TestConsumer.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/audit/TestConsumer.java b/security-admin/src/test/java/org/apache/ranger/audit/TestConsumer.java
index 136874d..f25405b 100644
--- a/security-admin/src/test/java/org/apache/ranger/audit/TestConsumer.java
+++ b/security-admin/src/test/java/org/apache/ranger/audit/TestConsumer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -44,7 +44,7 @@ public class TestConsumer extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#log(org.apache.ranger
* .audit.model.AuditEventBase)
*/
@@ -103,7 +103,7 @@ public class TestConsumer extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditProvider#init(java.util.Properties
* )
@@ -115,7 +115,7 @@ public class TestConsumer extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#start()
*/
@Override
@@ -125,7 +125,7 @@ public class TestConsumer extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#stop()
*/
@Override
@@ -135,7 +135,7 @@ public class TestConsumer extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#waitToComplete()
*/
@Override
@@ -144,7 +144,7 @@ public class TestConsumer extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#flush()
*/
@Override
@@ -166,7 +166,7 @@ public class TestConsumer extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.ranger.audit.provider.AuditProvider#init(java.util.Properties
* , java.lang.String)
@@ -178,7 +178,7 @@ public class TestConsumer extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#waitToComplete(long)
*/
@Override
@@ -188,7 +188,7 @@ public class TestConsumer extends AuditDestination {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.ranger.audit.provider.AuditProvider#getName()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java b/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
index b7bc416..2554a14 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
@@ -66,7 +66,7 @@ public class TestRangerBizUtil {
RangerDaoManager daoManager;
@Mock
- StringUtil stringUtil;
+ StringUtil stringUtil;
@Before
public void setup(){
@@ -98,7 +98,7 @@ public class TestRangerBizUtil {
XXPortalUser portalUser = new XXPortalUser();
XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
XXPortalUserDao userDao = Mockito.mock(XXPortalUserDao.class);
- XXUser xxUser = new XXUser();
+ XXUser xxUser = new XXUser();
XXAsset xxAsset = new XXAsset();
List<XXResource> lst = new ArrayList<XXResource>();
XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java b/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java
index 1dfedb4..f83f2c4 100644
--- a/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java
+++ b/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java
@@ -37,7 +37,7 @@ public class TestStringUtil {
@Test
public void testNullValidatePassword(){
- String password=null;
+ String password=null;
String[] invalidValues={"aa","bb","aa12345dd"};
boolean value=stringUtil.validatePassword(password, invalidValues);
Assert.assertFalse(value);
@@ -45,7 +45,7 @@ public class TestStringUtil {
@Test
public void testValidatePassword(){
- String password="aa1234ddas12";
+ String password="aa1234ddas12";
String[] invalidValues={"aa","bb","aa12345dd"};
boolean value=stringUtil.validatePassword(password, invalidValues);
Assert.assertTrue(password.length() >= 8);
@@ -54,7 +54,7 @@ public class TestStringUtil {
@Test
public void testNotValidatePassword(){
- String password="aassasavcvcvc";
+ String password="aassasavcvcvc";
String[] invalidValues={"aa","bb","aa12345dd"};
boolean value=stringUtil.validatePassword(password, invalidValues);
Assert.assertTrue(password.length() >= 8);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/test/java/org/apache/ranger/common/TestTimedExecutor.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestTimedExecutor.java b/security-admin/src/test/java/org/apache/ranger/common/TestTimedExecutor.java
index 39d8ecf..181de1e 100644
--- a/security-admin/src/test/java/org/apache/ranger/common/TestTimedExecutor.java
+++ b/security-admin/src/test/java/org/apache/ranger/common/TestTimedExecutor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -76,7 +76,7 @@ public class TestTimedExecutor {
*/
CountDownLatch latch = new CountDownLatch(10);
// Callables will record exception in this map
- final ConcurrentMap<String, AtomicInteger> results = new ConcurrentHashMap<String, AtomicInteger>();
+ final ConcurrentMap<String, AtomicInteger> results = new ConcurrentHashMap<String, AtomicInteger>();
for (int i = 0; i < 10; i++) {
LookupTask lookupTask = new LookupTask(i, semaphore);
TimedTask timedTask = new TimedTask(_executor, lookupTask, 1, TimeUnit.SECONDS, results, latch);
@@ -186,5 +186,5 @@ public class TestTimedExecutor {
}
private TimedExecutorConfigurator _configurator;
- private TimedExecutor _executor = new TimedExecutor();
+ private TimedExecutor _executor = new TimedExecutor();
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
index 6ab3011..e951549 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
@@ -998,7 +998,7 @@ public class TestServiceREST {
public void test30getPolicyFromEventTime() throws Exception {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
- String strdt = new Date().toString();
+ String strdt = new Date().toString();
String userName="Admin";
Set<String> userGroupsList = new HashSet<String>();
userGroupsList.add("group1");
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerCSRFPreventionFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerCSRFPreventionFilter.java b/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerCSRFPreventionFilter.java
index 36424b4..b05afb5 100644
--- a/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerCSRFPreventionFilter.java
+++ b/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerCSRFPreventionFilter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/test/java/org/apache/ranger/util/BaseTest.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/util/BaseTest.java b/security-admin/src/test/java/org/apache/ranger/util/BaseTest.java
index 7d56691..9a5a1a7 100644
--- a/security-admin/src/test/java/org/apache/ranger/util/BaseTest.java
+++ b/security-admin/src/test/java/org/apache/ranger/util/BaseTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
index e1516fb..9f83b62 100644
--- a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
+++ b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -53,9 +53,9 @@ public class RangerStormAuthorizer implements IAuthorizer {
/**
* permit() method is invoked for each incoming Thrift request.
- * @param context request context includes info about
+ * @param context request context includes info about
* @param operation operation name
- * @param topology_storm configuration of targeted topology
+ * @param topology_storm configuration of targeted topology
* @return true if the request is authorized, false if reject
*/
@@ -73,7 +73,7 @@ public class RangerStormAuthorizer implements IAuthorizer {
if (LOG.isDebugEnabled()) {
LOG.debug("[req "+ aRequestContext.requestID()+ "] Access "
+ " from: [" + aRequestContext.remoteAddress() + "]"
- + " user: [" + aRequestContext.principal() + "],"
+ + " user: [" + aRequestContext.principal() + "],"
+ " op: [" + aOperationName + "],"
+ "topology: [" + topologyName + "]") ;
@@ -134,7 +134,7 @@ public class RangerStormAuthorizer implements IAuthorizer {
if (LOG.isDebugEnabled()) {
LOG.debug("[req "+ aRequestContext.requestID()+ "] Access "
+ " from: [" + aRequestContext.remoteAddress() + "]"
- + " user: [" + aRequestContext.principal() + "],"
+ + " user: [" + aRequestContext.principal() + "],"
+ " op: [" + aOperationName + "],"
+ "topology: [" + topologyName + "] => returns [" + accessAllowed + "], Audit Enabled:" + isAuditEnabled) ;
}
@@ -145,7 +145,7 @@ public class RangerStormAuthorizer implements IAuthorizer {
/**
* Invoked once immediately after construction
- * @param conf Storm configuration
+ * @param conf Storm configuration
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java
index 96d8113..dccd311 100644
--- a/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java
+++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
index 3bbd102..9aaf647 100644
--- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
+++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -172,7 +172,7 @@ public class StormClient {
}
if (client != null) {
- client.destroy();
+ client.destroy();
}
}
@@ -241,7 +241,7 @@ public class StormClient {
null);
throw hdpException;
}
-
+
LOG.debug("getAppConfigurationEntry():" + kerberosOptions.get("principal"));
return new AppConfigurationEntry[] { KERBEROS_PWD_SAVER, KEYTAB_KERBEROS_LOGIN };
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormConnectionMgr.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormConnectionMgr.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormConnectionMgr.java
index ab9cd0d..ab1b409 100644
--- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormConnectionMgr.java
+++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormConnectionMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,17 +26,17 @@ import org.apache.log4j.Logger;
public class StormConnectionMgr {
private static final Logger LOG = Logger.getLogger(StormConnectionMgr.class);
-
+
public static StormClient getStormClient(final String stormUIURL, String userName, String password, String lookupPrincipal, String lookupKeytab, String nameRules) {
StormClient stormClient = null;
if (stormUIURL == null || stormUIURL.isEmpty()) {
LOG.error("Can not create StormClient: stormUIURL is empty");
- } else if(StringUtils.isEmpty(lookupPrincipal) || StringUtils.isEmpty(lookupKeytab)){
+ } else if(StringUtils.isEmpty(lookupPrincipal) || StringUtils.isEmpty(lookupKeytab)){
if (userName == null || userName.isEmpty()) {
LOG.error("Can not create StormClient: stormAdminUser is empty");
} else if (password == null || password.isEmpty()) {
LOG.error("Can not create StormClient: stormAdminPassword is empty");
- }
+ }
}else {
stormClient = new StormClient(stormUIURL, userName, password, lookupPrincipal, lookupKeytab, nameRules);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java
index f682251..f9ccebd 100644
--- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java
+++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -61,7 +61,7 @@ public class StormResourceMgr {
if ( resourceMap != null && !resourceMap.isEmpty() &&
resourceMap.get(TOPOLOGY) != null ) {
StromTopologyName = userInput;
- StormTopologyList = resourceMap.get(TOPOLOGY);
+ StormTopologyList = resourceMap.get(TOPOLOGY);
} else {
StromTopologyName = userInput;
}
@@ -94,5 +94,5 @@ public class StormResourceMgr {
}
return topologyList;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/Topology.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/Topology.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/Topology.java
index 581a843..f194359 100644
--- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/Topology.java
+++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/Topology.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/TopologyListResponse.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/TopologyListResponse.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/TopologyListResponse.java
index e8de8c9..a06ad08 100644
--- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/TopologyListResponse.java
+++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/TopologyListResponse.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/storm-agent/src/test/java/org/apache/ranger/authorization/storm/RangerAdminClientImpl.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/RangerAdminClientImpl.java b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/RangerAdminClientImpl.java
index e6c289a..e327435 100644
--- a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/RangerAdminClientImpl.java
+++ b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/RangerAdminClientImpl.java
@@ -64,21 +64,21 @@ public class RangerAdminClientImpl implements RangerAdminClient {
}
public void grantAccess(GrantRevokeRequest request) throws Exception {
-
+
}
public void revokeAccess(GrantRevokeRequest request) throws Exception {
-
+
}
public ServiceTags getServiceTagsIfUpdated(long lastKnownVersion) throws Exception {
return null;
-
+
}
public List<String> getTagTypes(String tagTypePattern) throws Exception {
return null;
}
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java
index 32bc403..fc648b3 100644
--- a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java
+++ b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java
@@ -32,23 +32,23 @@ import org.junit.Test;
/**
* A simple test that wires a WordSpout + WordCounterBolt into a topology and runs it. The "RangerStormAuthorizer" takes care of authorization.
* The policies state that "bob" can do anything with the "word-count" topology. In addition, "bob" can create/kill the "temp*" topologies, but do
- * nothing else.
+ * nothing else.
*/
public class StormRangerAuthorizerTest {
-
+
private static LocalCluster cluster;
-
+
@org.junit.BeforeClass
public static void setup() throws Exception {
cluster = new LocalCluster();
-
+
final Config conf = new Config();
conf.setDebug(true);
-
- final TopologyBuilder builder = new TopologyBuilder();
+
+ final TopologyBuilder builder = new TopologyBuilder();
builder.setSpout("words", new WordSpout());
builder.setBolt("counter", new WordCounterBolt()).shuffleGrouping("words");
-
+
// bob can create a new topology
final Subject subject = new Subject();
subject.getPrincipals().add(new SimplePrincipal("bob"));
@@ -58,9 +58,9 @@ public class StormRangerAuthorizerTest {
return null;
}
});
-
+
}
-
+
@org.junit.AfterClass
public static void cleanup() throws Exception {
final Subject subject = new Subject();
@@ -71,21 +71,21 @@ public class StormRangerAuthorizerTest {
return null;
}
});
-
+
cluster.shutdown();
System.clearProperty("storm.conf.file");
}
-
+
// "bob" can't create topologies other than "word-count" and "temp*"
@Test
public void testCreateTopologyBob() throws Exception {
final Config conf = new Config();
conf.setDebug(true);
-
- final TopologyBuilder builder = new TopologyBuilder();
+
+ final TopologyBuilder builder = new TopologyBuilder();
builder.setSpout("words", new WordSpout());
builder.setBolt("counter", new WordCounterBolt()).shuffleGrouping("words");
-
+
final Subject subject = new Subject();
subject.getPrincipals().add(new SimplePrincipal("bob"));
Subject.doAs(subject, new PrivilegedExceptionAction<Void>() {
@@ -96,7 +96,7 @@ public class StormRangerAuthorizerTest {
} catch (Throwable ex) {
// expected
}
-
+
return null;
}
});
@@ -108,19 +108,19 @@ public class StormRangerAuthorizerTest {
subject.getPrincipals().add(new SimplePrincipal("bob"));
Subject.doAs(subject, new PrivilegedExceptionAction<Void>() {
public Void run() throws Exception {
-
+
// Deactivate "word-count"
cluster.deactivate("word-count");
-
+
// Create a new topology called "temp1"
final Config conf = new Config();
conf.setDebug(true);
-
- final TopologyBuilder builder = new TopologyBuilder();
+
+ final TopologyBuilder builder = new TopologyBuilder();
builder.setSpout("words", new WordSpout());
builder.setBolt("counter", new WordCounterBolt()).shuffleGrouping("words");
cluster.submitTopology("temp1", conf, builder.createTopology());
-
+
// Try to deactivate "temp1"
try {
cluster.deactivate("temp1");
@@ -128,13 +128,13 @@ public class StormRangerAuthorizerTest {
} catch (Throwable ex) {
// expected
}
-
+
// Re-activate "word-count"
cluster.activate("word-count");
-
+
// Kill temp1
cluster.killTopology("temp1");
-
+
return null;
}
});
@@ -147,16 +147,16 @@ public class StormRangerAuthorizerTest {
Subject.doAs(subject, new PrivilegedExceptionAction<Void>() {
public Void run() throws Exception {
RebalanceOptions options = new RebalanceOptions();
-
+
// Create a new topology called "temp2"
final Config conf = new Config();
conf.setDebug(true);
-
- final TopologyBuilder builder = new TopologyBuilder();
+
+ final TopologyBuilder builder = new TopologyBuilder();
builder.setSpout("words", new WordSpout());
builder.setBolt("counter", new WordCounterBolt()).shuffleGrouping("words");
cluster.submitTopology("temp2", conf, builder.createTopology());
-
+
// Try to rebalance "temp2"
try {
cluster.rebalance("temp2", options);
@@ -164,20 +164,20 @@ public class StormRangerAuthorizerTest {
} catch (Throwable ex) {
// expected
}
-
+
// Kill temp2
cluster.killTopology("temp2");
-
+
return null;
}
});
}
-
+
private static class SimplePrincipal implements Principal {
-
+
private final String name;
-
+
public SimplePrincipal(String name) {
this.name = name;
}
@@ -186,6 +186,6 @@ public class StormRangerAuthorizerTest {
public String getName() {
return name;
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordCounterBolt.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordCounterBolt.java b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordCounterBolt.java
index 0e327c7..68d9de7 100644
--- a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordCounterBolt.java
+++ b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordCounterBolt.java
@@ -38,7 +38,7 @@ public class WordCounterBolt extends BaseRichBolt {
@Override
public void execute(Tuple tuple) {
String word = tuple.getString(0);
-
+
int count = 0;
if (countMap.containsKey(word)) {
count = countMap.get(word);
@@ -46,10 +46,10 @@ public class WordCounterBolt extends BaseRichBolt {
}
count++;
countMap.put(word, count);
-
+
outputCollector.emit(new Values(word, count));
outputCollector.ack(tuple);
-
+
}
@Override
@@ -61,6 +61,6 @@ public class WordCounterBolt extends BaseRichBolt {
public void declareOutputFields(OutputFieldsDeclarer declarer) {
declarer.declare(new Fields("word", "count"));
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordSpout.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordSpout.java b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordSpout.java
index 5f0b2cf..809c998 100644
--- a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordSpout.java
+++ b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordSpout.java
@@ -35,7 +35,7 @@ public class WordSpout extends BaseRichSpout {
private final List<String> words;
private SpoutOutputCollector collector;
private int line = 0;
-
+
public WordSpout() throws Exception {
java.io.File inputFile = new java.io.File(WordSpout.class.getResource("../../../../../words.txt").toURI());
words = IOUtils.readLines(new java.io.FileInputStream(inputFile));
@@ -63,6 +63,6 @@ public class WordSpout extends BaseRichSpout {
public void declareOutputFields(OutputFieldsDeclarer declarer) {
declarer.declare(new Fields("word"));
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSink.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSink.java b/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSink.java
index ae66e60..b5dcc75 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSink.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSink.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSource.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSource.java b/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSource.java
index 484add3..eb79814 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSource.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/model/TagSource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java b/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java
index d98379a..b665fd5 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -107,7 +107,7 @@ public class TagSyncConfig extends Configuration {
LOCAL_HOSTNAME = java.net.InetAddress.getLocalHost().getCanonicalHostName();
} catch (UnknownHostException e) {
LOCAL_HOSTNAME = "unknown" ;
- }
+ }
}
public static TagSyncConfig getInstance() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSynchronizer.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSynchronizer.java b/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSynchronizer.java
index 349f212..a9098be 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSynchronizer.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSynchronizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java b/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
index 885b44e..541c5aa 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java
index 910a8e6..12b02d9 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTTagSource.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTTagSource.java b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTTagSource.java
index 3f29de5..e0976cd 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTTagSource.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTTagSource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/tagsync/src/main/java/org/apache/ranger/tagsync/source/file/FileTagSource.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/source/file/FileTagSource.java b/tagsync/src/main/java/org/apache/ranger/tagsync/source/file/FileTagSource.java
index 5f444b8..f0a3fd0 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/source/file/FileTagSource.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/source/file/FileTagSource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestHdfsResourceMapper.java
----------------------------------------------------------------------
diff --git a/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestHdfsResourceMapper.java b/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestHdfsResourceMapper.java
index 0986331..392b096 100644
--- a/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestHdfsResourceMapper.java
+++ b/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestHdfsResourceMapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestHiveResourceMapper.java
----------------------------------------------------------------------
diff --git a/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestHiveResourceMapper.java b/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestHiveResourceMapper.java
index aaf9590..7fde91a 100644
--- a/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestHiveResourceMapper.java
+++ b/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestHiveResourceMapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestTagSynchronizer.java
----------------------------------------------------------------------
diff --git a/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestTagSynchronizer.java b/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestTagSynchronizer.java
index 13af2cb..8839969 100644
--- a/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestTagSynchronizer.java
+++ b/tagsync/src/test/java/org/apache/ranger/tagsync/process/TestTagSynchronizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/AuthenticationCheck.java
----------------------------------------------------------------------
diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/AuthenticationCheck.java b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/AuthenticationCheck.java
index f39f782..a94a955 100644
--- a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/AuthenticationCheck.java
+++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/AuthenticationCheck.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/CommandLineOptions.java
----------------------------------------------------------------------
diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/CommandLineOptions.java b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/CommandLineOptions.java
index 2aedbee..384ca23 100644
--- a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/CommandLineOptions.java
+++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/CommandLineOptions.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -56,7 +56,7 @@ public class CommandLineOptions {
CommandLine cmd = parser.parse(options, args);
// if (cmd.hasOption("h")) {
//}
-
+
if (cmd.hasOption("p")) {
bindPassword = cmd.getOptionValue("p");
if (bindPassword.trim().isEmpty()) {
@@ -97,14 +97,14 @@ public class CommandLineOptions {
if (cmd.hasOption("a") || discoverProperties == null || (discoverProperties != null && !discoverProperties.equalsIgnoreCase("all"))) {
isAuthEnabled = false;
}
-
+
if (cmd.hasOption("i")) {
input = cmd.getOptionValue("i");
if (input == null || input.isEmpty()) {
System.out.println("Please specify the input properties file name");
help();
}
-
+
if (bindPassword == null || bindPassword.trim().isEmpty()) {
System.out.println("Missing Ldap Bind Password!");
}
@@ -184,7 +184,7 @@ public class CommandLineOptions {
userSearchBase = console.readLine();
System.out.print("User Search Filter [cn=user1]: ");
userSearchFilter = console.readLine();
-
+
if (isAuthEnabled) {
do {
repeat = false;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java
----------------------------------------------------------------------
diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java
index 6cd2f83..0480b76 100644
--- a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java
+++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -153,7 +153,7 @@ public class LdapConfig {
return ret;
}*/
-
+
private InputStream getFileInputStream(String path) throws FileNotFoundException {
InputStream ret = null;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfigCheckMain.java
----------------------------------------------------------------------
diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfigCheckMain.java b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfigCheckMain.java
index 3bcb840..1e090cb 100644
--- a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfigCheckMain.java
+++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfigCheckMain.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java
----------------------------------------------------------------------
diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java
index 8c99b18..cab4072 100644
--- a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java
+++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -393,7 +393,7 @@ public class UserSync {
}
}
}
-
+
if (userSearchFilter == null || userSearchFilter.isEmpty()) {
userSearchFilter = userNameAttribute + "=*";
}
@@ -441,7 +441,7 @@ public class UserSync {
if (userGroupMemberName != null) {
userSearchAttributes.add(userGroupMemberName);
}
-
+
if (userSearchAttributes.size() > 0) {
userSearchControls.setReturningAttributes(userSearchAttributes.toArray(
new String[userSearchAttributes.size()]));
@@ -516,7 +516,7 @@ public class UserSync {
Set<String> groups = new HashSet<>();
groupMemberAttr = attributes.get(userGroupMemberName);
-
+
if (groupMemberAttr != null) {
NamingEnumeration<?> groupEnum = groupMemberAttr.getAll();
while (groupEnum.hasMore()) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java
index 65a4ebc..3ed35e7 100644
--- a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java
+++ b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java
@@ -49,7 +49,7 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
public CustomSSLSocketFactory() {
SSLContext sslContext = null;
String keyStoreFile = config.getSSLKeyStorePath() ;
- String keyStoreFilepwd = config.getSSLKeyStorePathPassword();
+ String keyStoreFilepwd = config.getSSLKeyStorePathPassword();
String trustStoreFile = config.getSSLTrustStorePath();
String trustStoreFilepwd = config.getSSLTrustStorePathPassword();
String keyStoreType = KeyStore.getDefaultType();
@@ -76,10 +76,10 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
}
finally {
if (in != null) {
- in.close();
+ in.close();
}
}
-
+
}
if (trustStoreFile != null && trustStoreFilepwd != null) {
@@ -152,7 +152,7 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
public Socket createSocket(InetAddress address, int port, InetAddress localHost, int localPort) throws IOException {
return sockFactory.createSocket(address, port, localHost, localPort);
}
-
+
private InputStream getFileInputStream(String path) throws FileNotFoundException {
InputStream ret = null;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
index c3adcd8..d7a0b36 100644
--- a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -99,7 +99,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
private boolean groupUserMapSyncEnabled = false;
private Map<String, UserInfo> userGroupMap;
-
+
public static void main(String[] args) throws Throwable {
LdapUserGroupBuilder ugBuilder = new LdapUserGroupBuilder();
ugBuilder.init();
@@ -137,7 +137,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
private void createLdapContext() throws Throwable {
Properties env = new Properties();
- env.put(Context.INITIAL_CONTEXT_FACTORY,
+ env.put(Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.ldap.LdapCtxFactory");
env.put(Context.PROVIDER_URL, ldapUrl);
if (ldapUrl.startsWith("ldaps") && (config.getSSLTrustStorePath() != null && !config.getSSLTrustStorePath().trim().isEmpty())) {
@@ -196,7 +196,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
Set<String> userSearchAttributes = new HashSet<String>();
userSearchAttributes.add(userNameAttribute);
// For Group based search, user's group name attribute should not be added to the user search attributes
- if (!groupSearchFirstEnabled && !groupSearchEnabled) {
+ if (!groupSearchFirstEnabled && !groupSearchEnabled) {
userGroupNameAttributeSet = config.getUserGroupNameAttributeSet();
for (String useGroupNameAttribute : userGroupNameAttributeSet) {
userSearchAttributes.add(useGroupNameAttribute);
@@ -234,7 +234,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
groupSearchControls = new SearchControls();
groupSearchControls.setSearchScope(groupSearchScope);
-
+
Set<String> groupSearchAttributes = new HashSet<String>();
groupSearchAttributes.add(groupNameAttribute);
groupSearchAttributes.add(groupMemberAttributeName);
@@ -244,9 +244,9 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
if (LOG.isInfoEnabled()) {
LOG.info("LdapUserGroupBuilder initialization completed with -- "
- + "ldapUrl: " + ldapUrl
+ + "ldapUrl: " + ldapUrl
+ ", ldapBindDn: " + ldapBindDn
- + ", ldapBindPassword: ***** "
+ + ", ldapBindPassword: ***** "
+ ", ldapAuthenticationMechanism: " + ldapAuthenticationMechanism
+ ", searchBase: " + searchBase
+ ", userSearchBase: " + Arrays.toString(userSearchBase)
@@ -462,7 +462,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
userInfo.addGroups(groups);
- //populate the userGroupMap with username, userInfo.
+ //populate the userGroupMap with username, userInfo.
//userInfo contains details of user that will be later used for
//group search to compute group membership as well as to call sink.addOrUpdateUser()
if (userGroupMap.containsKey(userName)) {
@@ -473,7 +473,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
//List<String> groupList = new ArrayList<String>(groups);
List<String> groupList = userInfo.getGroups();
counter++;
- if (counter <= 2000) {
+ if (counter <= 2000) {
if (LOG.isInfoEnabled()) {
LOG.info("Updating user count: " + counter
+ ", userName: " + userName + ", groupList: "
@@ -494,7 +494,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
}
}
} else {
- // If the user from the search result is present in the usersList,
+ // If the user from the search result is present in the usersList,
// then update user name in the userInfo map with the value from the search result
// and update ranger admin.
String userFullName = (userEntry.getNameInNamespace()).toLowerCase();
@@ -529,7 +529,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
+ ", for user: " + userName
+ ", groups: " + groupList);
}
- }
+ }
}
}
@@ -605,7 +605,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
new Object[]{userInfo.getUserFullName(), userInfo.getUserName()},
groupSearchControls);
} else {
- // If group based search is enabled, then first retrieve all the groups based on the group configuration.
+ // If group based search is enabled, then first retrieve all the groups based on the group configuration.
groupSearchResultEnum = ldapContext
.search(groupSearchBase[ou], extendedAllGroupsSearchFilter,
groupSearchControls);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java
index 4e211b5..987c6d1 100644
--- a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
index 9552041..9a906b1 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -63,7 +63,7 @@ public class UserGroupSyncConfig {
public static final String UGSYNC_MIN_GROUPID_PROP = "ranger.usersync.unix.minGroupId" ;
public static final String DEFAULT_UGSYNC_MIN_GROUPID = "0" ;
-
+
public static final String UGSYNC_MAX_RECORDS_PER_API_CALL_PROP = "ranger.usersync.policymanager.maxrecordsperapicall" ;
public static final String UGSYNC_MOCK_RUN_PROP = "ranger.usersync.policymanager.mockrun" ;
@@ -135,7 +135,7 @@ public class UserGroupSyncConfig {
public static final String UGSYNC_NONE_CASE_CONVERSION_VALUE = "none" ;
public static final String UGSYNC_LOWER_CASE_CONVERSION_VALUE = "lower" ;
public static final String UGSYNC_UPPER_CASE_CONVERSION_VALUE = "upper" ;
-
+
private static final String UGSYNC_USERNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.username.caseconversion" ;
private static final String DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE = UGSYNC_NONE_CASE_CONVERSION_VALUE;
@@ -152,12 +152,12 @@ public class UserGroupSyncConfig {
private static final String LGSYNC_GROUP_SEARCH_ENABLED = "ranger.usersync.group.searchenabled";
private static final boolean DEFAULT_LGSYNC_GROUP_SEARCH_ENABLED = false;
-
+
private static final String LGSYNC_GROUP_SEARCH_FIRST_ENABLED = "ranger.usersync.group.search.first.enabled";
private static final boolean DEFAULT_LGSYNC_GROUP_SEARCH_FIRST_ENABLED = false;
-
+
/*This flag (ranger.usersync.user.searchenabled) is used only when group search first is enabled to get username either -
- * from the group member attribute of the group or
+ * from the group member attribute of the group or
* from the additional user search based on the user attribute configuration
*/
private static final String LGSYNC_USER_SEARCH_ENABLED = "ranger.usersync.user.searchenabled";
@@ -215,7 +215,7 @@ public class UserGroupSyncConfig {
private static final String SYNC_MAPPING_GROUPNAME_HANDLER = "ranger.usersync.mapping.groupname.handler";
private static final String DEFAULT_SYNC_MAPPING_GROUPNAME_HANDLER = "org.apache.ranger.usergroupsync.RegEx";
-
+
private Properties prop = new Properties() ;
private static volatile UserGroupSyncConfig me = null ;
@@ -392,7 +392,7 @@ public class UserGroupSyncConfig {
return prop.getProperty(UGSYNC_MIN_USERID_PROP) ;
}
- public String getMinGroupId() {
+ public String getMinGroupId() {
String mgid = prop.getProperty(UGSYNC_MIN_GROUPID_PROP);
if (mgid == null) {
mgid = DEFAULT_UGSYNC_MIN_GROUPID;
@@ -630,7 +630,7 @@ public class UserGroupSyncConfig {
String ret = prop.getProperty(UGSYNC_USERNAME_CASE_CONVERSION_PARAM, DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE) ;
return ret.trim().toLowerCase() ;
}
-
+
public String getGroupNameCaseConversion() {
String ret = prop.getProperty(UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM, DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE) ;
return ret.trim().toLowerCase() ;
@@ -675,7 +675,7 @@ public class UserGroupSyncConfig {
}
return groupSearchEnabled;
}
-
+
public boolean isGroupSearchFirstEnabled() {
boolean groupSearchFirstEnabled;
String val = prop.getProperty(LGSYNC_GROUP_SEARCH_FIRST_ENABLED);
@@ -686,7 +686,7 @@ public class UserGroupSyncConfig {
}
return groupSearchFirstEnabled;
}
-
+
public boolean isUserSearchEnabled() {
boolean userSearchEnabled;
String val = prop.getProperty(LGSYNC_USER_SEARCH_ENABLED);
@@ -767,7 +767,7 @@ public class UserGroupSyncConfig {
public String getProperty(String aPropertyName) {
return prop.getProperty(aPropertyName) ;
}
-
+
public String getProperty(String aPropertyName, String aDefaultValue) {
return prop.getProperty(aPropertyName, aDefaultValue) ;
}
@@ -907,7 +907,7 @@ public class UserGroupSyncConfig {
public void setGroupSearchEnabled(boolean groupSearchEnabled) {
prop.setProperty(LGSYNC_GROUP_SEARCH_ENABLED, String.valueOf(groupSearchEnabled));
}
-
+
/* Used only for unit testing */
public void setPagedResultsEnabled(boolean pagedResultsEnabled) {
prop.setProperty(LGSYNC_PAGED_RESULTS_ENABLED, String.valueOf(pagedResultsEnabled));
@@ -922,32 +922,32 @@ public class UserGroupSyncConfig {
public void setUserSearchBase(String userSearchBase) throws Throwable {
prop.setProperty(LGSYNC_USER_SEARCH_BASE, userSearchBase);
}
-
+
/* Used only for unit testing */
public void setGroupSearchBase(String groupSearchBase) throws Throwable {
prop.setProperty(LGSYNC_GROUP_SEARCH_BASE, groupSearchBase);
}
-
+
/* Used only for unit testing */
public void setGroupSearchFirstEnabled(boolean groupSearchFirstEnabled) {
prop.setProperty(LGSYNC_GROUP_SEARCH_FIRST_ENABLED, String.valueOf(groupSearchFirstEnabled));
}
-
+
/* Used only for unit testing */
public void setUserSearchEnabled(boolean userSearchEnabled) {
prop.setProperty(LGSYNC_USER_SEARCH_ENABLED, String.valueOf(userSearchEnabled));
}
-
+
/* Used only for unit testing */
public void setUserGroupMemberAttributeName(String groupMemberAttrName) {
prop.setProperty(LGSYNC_GROUP_MEMBER_ATTRIBUTE_NAME, groupMemberAttrName);
}
-
+
/* Used only for unit testing */
public void setUserObjectClass(String userObjectClass) {
prop.setProperty(LGSYNC_USER_OBJECT_CLASS, userObjectClass);
}
-
+
/* Used only for unit testing */
public void setGroupObjectClass(String groupObjectClass) {
prop.setProperty(LGSYNC_GROUP_OBJECT_CLASS, groupObjectClass);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java
index 65a2e34..7377e07 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java
index 0606f77..adb80fb 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java
index bcb4543..c05c04b 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java
index 859871c..13c6eed 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,9 +22,9 @@
public class MUserInfo {
private String loginId ;
- private String firstName ;
- private String lastName ;
- private String emailAddress ;
+ private String firstName ;
+ private String lastName ;
+ private String emailAddress ;
private String[] userRoleList = { "ROLE_USER" } ;
@@ -57,6 +57,6 @@ public class MUserInfo {
}
public void setUserRoleList(String[] userRoleList) {
this.userRoleList = userRoleList;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/model/UserGroupInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/UserGroupInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/UserGroupInfo.java
index d720eae..936acca 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/UserGroupInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/UserGroupInfo.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -38,4 +38,4 @@ public class UserGroupInfo {
public void setXgroupInfo(List<XGroupInfo> xgroupInfo) {
this.xgroupInfo = xgroupInfo;
}
-}
\ No newline at end of file
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/model/UserGroupList.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/UserGroupList.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/UserGroupList.java
index 0eec94c..4553d02 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/UserGroupList.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/UserGroupList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -54,4 +54,4 @@ public class UserGroupList {
this.groups = groups;
}
-}
\ No newline at end of file
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java
index a351d35..9208343 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[17/19] incubator-ranger git commit: Removing spaces before semicolons
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java b/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java
index b3697ab..427e098 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java
@@ -28,49 +28,49 @@ import com.sun.org.apache.xml.internal.security.utils.Base64;
public class HSM2DBMKUtil {
- private static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password" ;
+ private static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password";
private static final String PARTITION_PASSWORD = "ranger.ks.hsm.partition.password";
private static final String PARTITION_NAME = "ranger.ks.hsm.partition.name";
private static final String HSM_TYPE = "ranger.ks.hsm.type";
public static void showUsage() {
- System.err.println("USAGE: java " + HSM2DBMKUtil.class.getName() + " <HSMType> <partitionName>") ;
+ System.err.println("USAGE: java " + HSM2DBMKUtil.class.getName() + " <HSMType> <partitionName>");
}
public static void main(String[] args) {
if (args.length < 2) {
- System.err.println("Invalid number of parameters found.") ;
- showUsage() ;
- System.exit(1) ;
+ System.err.println("Invalid number of parameters found.");
+ showUsage();
+ System.exit(1);
}
else {
String hsmType = args[0];
if (hsmType == null || hsmType.trim().isEmpty()) {
- System.err.println("HSM Type does not exists.") ;
- showUsage() ;
+ System.err.println("HSM Type does not exists.");
+ showUsage();
System.exit(1);
}
String partitionName = args[1];
if (partitionName == null || partitionName.trim().isEmpty()) {
- System.err.println("Partition name does not exists.") ;
- showUsage() ;
- System.exit(1) ;
+ System.err.println("Partition name does not exists.");
+ showUsage();
+ System.exit(1);
}
new HSM2DBMKUtil().doImportMKFromHSM(hsmType, partitionName);
- System.out.println("Master Key from HSM has been successfully imported into Ranger KMS DB.") ;
+ System.out.println("Master Key from HSM has been successfully imported into Ranger KMS DB.");
- System.exit(0) ;
+ System.exit(0);
}
}
private void doImportMKFromHSM(String hsmType, String partitionName) {
try {
- String partitionPassword = getPasswordFromConsole("Enter Password for the Partition "+partitionName+" : ") ;
+ String partitionPassword = getPasswordFromConsole("Enter Password for the Partition "+partitionName+" : ");
Configuration conf = RangerKeyStoreProvider.getDBKSConf();
conf.set(HSM_TYPE, hsmType);
conf.set(PARTITION_NAME, partitionName);
@@ -90,12 +90,12 @@ public class HSM2DBMKUtil {
rangerMasterKey.generateMKFromHSMMK(password, key);
}
catch(Throwable t) {
- throw new RuntimeException("Unable to import Master key from HSM to Ranger DB", t) ;
+ throw new RuntimeException("Unable to import Master key from HSM to Ranger DB", t);
}
}
private String getPasswordFromConsole(String prompt) throws IOException {
- String ret = null ;
+ String ret = null;
Console c=System.console();
if (c == null) {
System.out.print(prompt + " ");
@@ -110,16 +110,16 @@ public class HSM2DBMKUtil {
ret = new String(e, Charset.defaultCharset());
}
} else {
- char[] pwd = c.readPassword(prompt + " ") ;
+ char[] pwd = c.readPassword(prompt + " ");
if (pwd == null) {
- ret = null ;
+ ret = null;
}
else {
ret = new String(pwd);
}
}
if (ret == null) {
- ret = "" ;
+ ret = "";
}
return ret;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java b/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java
index 5b0a7da..22dce0f 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java
@@ -31,52 +31,52 @@ import org.apache.ranger.kms.dao.DaoManager;
public class JKS2RangerUtil {
- private static final String DEFAULT_KEYSTORE_TYPE = "jceks" ;
- private static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password" ;
+ private static final String DEFAULT_KEYSTORE_TYPE = "jceks";
+ private static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password";
public static void showUsage() {
- System.err.println("USAGE: java " + JKS2RangerUtil.class.getName() + " <KMS_FileName> [KeyStoreType]") ;
- System.err.println(" If KeyStoreType is not provided, it will be considered as " + DEFAULT_KEYSTORE_TYPE) ;
- System.err.println(" When execution of this utility, it will prompt for both keystore password and key password.") ;
+ System.err.println("USAGE: java " + JKS2RangerUtil.class.getName() + " <KMS_FileName> [KeyStoreType]");
+ System.err.println(" If KeyStoreType is not provided, it will be considered as " + DEFAULT_KEYSTORE_TYPE);
+ System.err.println(" When execution of this utility, it will prompt for both keystore password and key password.");
}
public static void main(String[] args) {
if (args.length == 0) {
- System.err.println("Invalid number of parameters found.") ;
- showUsage() ;
- System.exit(1) ;
+ System.err.println("Invalid number of parameters found.");
+ showUsage();
+ System.exit(1);
}
else {
- String keyStoreFileName = args[0] ;
- File f = new File(keyStoreFileName) ;
+ String keyStoreFileName = args[0];
+ File f = new File(keyStoreFileName);
if (! f.exists()) {
- System.err.println("File: [" + f.getAbsolutePath() + "] does not exists.") ;
- showUsage() ;
+ System.err.println("File: [" + f.getAbsolutePath() + "] does not exists.");
+ showUsage();
System.exit(1);
}
- String keyStoreType = (args.length == 2 ? args[1] : DEFAULT_KEYSTORE_TYPE) ;
+ String keyStoreType = (args.length == 2 ? args[1] : DEFAULT_KEYSTORE_TYPE);
try {
- KeyStore.getInstance(keyStoreType) ;
+ KeyStore.getInstance(keyStoreType);
} catch (KeyStoreException e) {
- System.err.println("ERROR: Unable to get valid keystore for the type [" + keyStoreType + "]") ;
- showUsage() ;
- System.exit(1) ;
+ System.err.println("ERROR: Unable to get valid keystore for the type [" + keyStoreType + "]");
+ showUsage();
+ System.exit(1);
}
new JKS2RangerUtil().doImportKeysFromJKS(keyStoreFileName, keyStoreType);
- System.out.println("Keys from " + keyStoreFileName + " has been successfully imported into RangerDB.") ;
+ System.out.println("Keys from " + keyStoreFileName + " has been successfully imported into RangerDB.");
- System.exit(0) ;
+ System.exit(0);
}
}
private void doImportKeysFromJKS(String keyStoreFileName, String keyStoreType) {
try {
- char[] keyStorePassword = getPasswordFromConsole("Enter Password for the keystore FILE :") ;
- char[] keyPassword = getPasswordFromConsole("Enter Password for the KEY(s) stored in the keystore:") ;
+ char[] keyStorePassword = getPasswordFromConsole("Enter Password for the keystore FILE :");
+ char[] keyPassword = getPasswordFromConsole("Enter Password for the KEY(s) stored in the keystore:");
Configuration conf = RangerKeyStoreProvider.getDBKSConf();
RangerKMSDB rangerkmsDb = new RangerKMSDB(conf);
DaoManager daoManager = rangerkmsDb.getDaoManager();
@@ -85,9 +85,9 @@ public class JKS2RangerUtil {
RangerMasterKey rangerMasterKey = new RangerMasterKey(daoManager);
rangerMasterKey.generateMasterKey(password);
char[] masterKey = rangerMasterKey.getMasterKey(password).toCharArray();
- InputStream in = null ;
+ InputStream in = null;
try {
- in = new FileInputStream(new File(keyStoreFileName)) ;
+ in = new FileInputStream(new File(keyStoreFileName));
dbStore.engineLoadKeyStoreFile(in, keyStorePassword, keyPassword, masterKey, keyStoreType);
dbStore.engineStore(null,masterKey);
}
@@ -96,19 +96,19 @@ public class JKS2RangerUtil {
try {
in.close();
} catch (Exception e) {
- throw new RuntimeException("ERROR: Unable to close file stream for [" + keyStoreFileName + "]", e) ;
+ throw new RuntimeException("ERROR: Unable to close file stream for [" + keyStoreFileName + "]", e);
}
}
}
}
catch(Throwable t) {
- throw new RuntimeException("Unable to import keys from [" + keyStoreFileName + "] due to exception.", t) ;
+ throw new RuntimeException("Unable to import keys from [" + keyStoreFileName + "] due to exception.", t);
}
}
private char[] getPasswordFromConsole(String prompt) throws IOException {
- String ret = null ;
+ String ret = null;
Console c=System.console();
if (c == null) {
System.out.print(prompt + " ");
@@ -123,18 +123,18 @@ public class JKS2RangerUtil {
ret = new String(e, Charset.defaultCharset());
}
} else {
- char[] pwd = c.readPassword(prompt + " ") ;
+ char[] pwd = c.readPassword(prompt + " ");
if (pwd == null) {
- ret = null ;
+ ret = null;
}
else {
ret = new String(pwd);
}
}
if (ret == null) {
- ret = "" ;
+ ret = "";
}
- return ret.toCharArray() ;
+ return ret.toCharArray();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/kms/src/main/java/org/apache/hadoop/crypto/key/Ranger2JKSUtil.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/Ranger2JKSUtil.java b/kms/src/main/java/org/apache/hadoop/crypto/key/Ranger2JKSUtil.java
index 3748a5b..1abbf8e 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/Ranger2JKSUtil.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/Ranger2JKSUtil.java
@@ -31,53 +31,53 @@ import org.apache.ranger.kms.dao.DaoManager;
public class Ranger2JKSUtil {
- private static final String DEFAULT_KEYSTORE_TYPE = "jceks" ;
- private static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password" ;
+ private static final String DEFAULT_KEYSTORE_TYPE = "jceks";
+ private static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password";
public static void showUsage() {
- System.err.println("USAGE: java " + Ranger2JKSUtil.class.getName() + " <KMS_FileName> [KeyStoreType]") ;
- System.err.println(" If KeyStoreType is not provided, it will be considered as " + DEFAULT_KEYSTORE_TYPE) ;
- System.err.println(" When execution of this utility, it will prompt for both keystore password and key password.") ;
+ System.err.println("USAGE: java " + Ranger2JKSUtil.class.getName() + " <KMS_FileName> [KeyStoreType]");
+ System.err.println(" If KeyStoreType is not provided, it will be considered as " + DEFAULT_KEYSTORE_TYPE);
+ System.err.println(" When execution of this utility, it will prompt for both keystore password and key password.");
}
public static void main(String[] args) throws IOException {
if (args.length == 0) {
- System.err.println("Invalid number of parameters found.") ;
- showUsage() ;
- System.exit(1) ;
+ System.err.println("Invalid number of parameters found.");
+ showUsage();
+ System.exit(1);
}
else {
- String keyStoreFileName = args[0] ;
- File f = new File(keyStoreFileName) ;
+ String keyStoreFileName = args[0];
+ File f = new File(keyStoreFileName);
if (! f.exists()) {
boolean ret = f.createNewFile();
if (!ret) {
System.err.println("Error creating new keystore file. fileName="+ args[0]);
}
}
- String keyStoreType = (args.length == 2 ? args[1] : DEFAULT_KEYSTORE_TYPE) ;
+ String keyStoreType = (args.length == 2 ? args[1] : DEFAULT_KEYSTORE_TYPE);
try {
- KeyStore.getInstance(keyStoreType) ;
+ KeyStore.getInstance(keyStoreType);
} catch (KeyStoreException e) {
- System.err.println("ERROR: Unable to get valid keystore for the type [" + keyStoreType + "]") ;
- showUsage() ;
- System.exit(1) ;
+ System.err.println("ERROR: Unable to get valid keystore for the type [" + keyStoreType + "]");
+ showUsage();
+ System.exit(1);
}
new Ranger2JKSUtil().doExportKeysFromJKS(keyStoreFileName, keyStoreType);
System.out.println("Keys from Ranger KMS Database has been successfully exported into " + keyStoreFileName);
- System.exit(0) ;
+ System.exit(0);
}
}
private void doExportKeysFromJKS(String keyStoreFileName, String keyStoreType) {
try {
- char[] keyStorePassword = getPasswordFromConsole("Enter Password for the keystore FILE :") ;
- char[] keyPassword = getPasswordFromConsole("Enter Password for the KEY(s) stored in the keystore:") ;
+ char[] keyStorePassword = getPasswordFromConsole("Enter Password for the keystore FILE :");
+ char[] keyPassword = getPasswordFromConsole("Enter Password for the KEY(s) stored in the keystore:");
Configuration conf = RangerKeyStoreProvider.getDBKSConf();
RangerKMSDB rangerkmsDb = new RangerKMSDB(conf);
DaoManager daoManager = rangerkmsDb.getDaoManager();
@@ -95,18 +95,18 @@ public class Ranger2JKSUtil {
try {
out.close();
} catch (Exception e) {
- throw new RuntimeException("ERROR: Unable to close file stream for [" + keyStoreFileName + "]", e) ;
+ throw new RuntimeException("ERROR: Unable to close file stream for [" + keyStoreFileName + "]", e);
}
}
}
}
catch(Throwable t) {
- throw new RuntimeException("Unable to export keys to [" + keyStoreFileName + "] due to exception.", t) ;
+ throw new RuntimeException("Unable to export keys to [" + keyStoreFileName + "] due to exception.", t);
}
}
private char[] getPasswordFromConsole(String prompt) throws IOException {
- String ret = null ;
+ String ret = null;
Console c=System.console();
if (c == null) {
System.out.print(prompt + " ");
@@ -121,17 +121,17 @@ public class Ranger2JKSUtil {
ret = new String(e, Charset.defaultCharset());
}
} else {
- char[] pwd = c.readPassword(prompt + " ") ;
+ char[] pwd = c.readPassword(prompt + " ");
if (pwd == null) {
- ret = null ;
+ ret = null;
}
else {
ret = new String(pwd);
}
}
if (ret == null) {
- ret = "" ;
+ ret = "";
}
- return ret.toCharArray() ;
+ return ret.toCharArray();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java
index 34dc53e..00dc069 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java
@@ -110,7 +110,7 @@ public class RangerHSM implements RangerKMSMKI {
if (result == true) {
logger.debug("Ranger Master Key is present in Keystore");
SecretKey key = (SecretKey)myStore.getKey(alias, password.toCharArray());
- return Base64.encode(key.getEncoded()) ;
+ return Base64.encode(key.getEncoded());
}
} catch (Exception e) {
logger.error("getMasterKey : Exception searching for Ranger Master Key - " + e.getMessage());
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
index fb4404b..f350dce 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
@@ -77,7 +77,7 @@ public class RangerKMSDB {
DB_PROPERTIES.put(JPA_DB_USER, conf.get(PROPERTY_PREFIX+DB_USER));
DB_PROPERTIES.put(JPA_DB_PASSWORD, conf.get(PROPERTY_PREFIX+DB_PASSWORD));
- //DB_PROPERTIES.list(System.out) ;
+ //DB_PROPERTIES.list(System.out);
/*
Set keys = DB_PROPERTIES.keySet();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
index 0778b1a..a001c08 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
@@ -427,7 +427,7 @@ public class RangerKeyStore extends KeyStoreSpi {
* hash with a bit of whitener.
*/
- private final String SECRET_KEY_HASH_WORD = "Apache Ranger" ;
+ private final String SECRET_KEY_HASH_WORD = "Apache Ranger";
private MessageDigest getKeyedMessageDigest(char[] aKeyPassword)
throws NoSuchAlgorithmException, UnsupportedEncodingException
@@ -491,8 +491,8 @@ public class RangerKeyStore extends KeyStoreSpi {
// The method is created to support JKS migration (from hadoop-common KMS keystore to RangerKMS keystore)
//
- private static final String METADATA_FIELDNAME = "metadata" ;
- private static final int NUMBER_OF_BITS_PER_BYTE = 8 ;
+ private static final String METADATA_FIELDNAME = "metadata";
+ private static final int NUMBER_OF_BITS_PER_BYTE = 8;
public void engineLoadKeyStoreFile(InputStream stream, char[] storePass, char[] keyPass, char[] masterKey, String fileFormat)
throws IOException, NoSuchAlgorithmException, CertificateException
@@ -510,23 +510,23 @@ public class RangerKeyStore extends KeyStoreSpi {
Key k = ks.getKey(alias, keyPass);
if (k instanceof JavaKeyStoreProvider.KeyMetadata) {
- JavaKeyStoreProvider.KeyMetadata keyMetadata = (JavaKeyStoreProvider.KeyMetadata)k ;
- Field f = JavaKeyStoreProvider.KeyMetadata.class.getDeclaredField(METADATA_FIELDNAME) ;
+ JavaKeyStoreProvider.KeyMetadata keyMetadata = (JavaKeyStoreProvider.KeyMetadata)k;
+ Field f = JavaKeyStoreProvider.KeyMetadata.class.getDeclaredField(METADATA_FIELDNAME);
f.setAccessible(true);
- Metadata metadata = (Metadata)f.get(keyMetadata) ;
- entry.bit_length = metadata.getBitLength() ;
- entry.cipher_field = metadata.getAlgorithm() ;
+ Metadata metadata = (Metadata)f.get(keyMetadata);
+ entry.bit_length = metadata.getBitLength();
+ entry.cipher_field = metadata.getAlgorithm();
Constructor<RangerKeyStoreProvider.KeyMetadata> constructor = RangerKeyStoreProvider.KeyMetadata.class.getDeclaredConstructor(Metadata.class);
constructor.setAccessible(true);
RangerKeyStoreProvider.KeyMetadata nk = constructor.newInstance(metadata);
- k = nk ;
+ k = nk;
}
else {
- entry.bit_length = (k.getEncoded().length * NUMBER_OF_BITS_PER_BYTE) ;
+ entry.bit_length = (k.getEncoded().length * NUMBER_OF_BITS_PER_BYTE);
entry.cipher_field = k.getAlgorithm();
}
- String keyName = alias.split("@")[0] ;
- entry.attributes = "{\"key.acl.name\":\"" + keyName + "\"}" ;
+ String keyName = alias.split("@")[0];
+ entry.attributes = "{\"key.acl.name\":\"" + keyName + "\"}";
Class<?> c = null;
Object o = null;
try {
@@ -550,7 +550,7 @@ public class RangerKeyStore extends KeyStoreSpi {
}
} catch (Throwable t) {
logger.error("Unable to load keystore file ", t);
- throw new IOException(t) ;
+ throw new IOException(t);
}
}
}
@@ -577,7 +577,7 @@ public class RangerKeyStore extends KeyStoreSpi {
}
} catch (Throwable t) {
logger.error("Unable to load keystore file ", t);
- throw new IOException(t) ;
+ throw new IOException(t);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
index 967839f..267fcf0 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
@@ -117,7 +117,7 @@ public class RangerKeyStoreProvider extends KeyProvider{
Configuration newConfig = getConfiguration(true, DBKS_SITE_XML);
getFromJceks(newConfig,CREDENTIAL_PATH, MK_CREDENTIAL_ALIAS, ENCRYPTION_KEY);
getFromJceks(newConfig,CREDENTIAL_PATH, DB_CREDENTIAL_ALIAS, DB_PASSWORD);
- return newConfig ;
+ return newConfig;
}
@@ -154,7 +154,7 @@ public class RangerKeyStoreProvider extends KeyProvider{
@Override
public KeyVersion createKey(String name, byte[] material, Options options)
throws IOException {
- reloadKeys() ;
+ reloadKeys();
if (dbStore.engineContainsAlias(name) || cache.containsKey(name)) {
throw new IOException("Key " + name + " already exists");
}
@@ -296,7 +296,7 @@ public class RangerKeyStoreProvider extends KeyProvider{
public List<String> getKeys() throws IOException {
ArrayList<String> list = new ArrayList<String>();
String alias = null;
- reloadKeys() ;
+ reloadKeys();
Enumeration<String> e = dbStore.engineAliases();
while (e.hasMoreElements()) {
alias = e.nextElement();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
index ae3c386..021685c 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
@@ -118,17 +118,17 @@ public class RangerMasterKey implements RangerKMSMKI{
private String decryptMasterKey(byte masterKey[], String password) throws Throwable {
logger.debug("Decrypting Master Key");
- PBEKeySpec pbeKeyspec = getPBEParameterSpec(password) ;
- byte[] masterKeyFromDBDecrypted = decryptKey(masterKey, pbeKeyspec) ;
- SecretKey masterKeyFromDB = getMasterKeyFromBytes(masterKeyFromDBDecrypted) ;
+ PBEKeySpec pbeKeyspec = getPBEParameterSpec(password);
+ byte[] masterKeyFromDBDecrypted = decryptKey(masterKey, pbeKeyspec);
+ SecretKey masterKeyFromDB = getMasterKeyFromBytes(masterKeyFromDBDecrypted);
return Base64.encode(masterKeyFromDB.getEncoded());
}
private SecretKey decryptMasterKeySK(byte masterKey[], String password) throws Throwable {
logger.debug("Decrypting Master Key");
- PBEKeySpec pbeKeyspec = getPBEParameterSpec(password) ;
- byte[] masterKeyFromDBDecrypted = decryptKey(masterKey, pbeKeyspec) ;
- return getMasterKeyFromBytes(masterKeyFromDBDecrypted) ;
+ PBEKeySpec pbeKeyspec = getPBEParameterSpec(password);
+ byte[] masterKeyFromDBDecrypted = decryptKey(masterKey, pbeKeyspec);
+ return getMasterKeyFromBytes(masterKeyFromDBDecrypted);
}
private byte[] getEncryptedMK() throws Base64DecodingException {
@@ -144,7 +144,7 @@ public class RangerMasterKey implements RangerKMSMKI{
}else {
XXRangerMasterKey rangerMasterKey = rangerKMSDao.getById(lstRangerMasterKey.get(0).getId());
String masterKeyStr = rangerMasterKey.getMasterKey();
- return Base64.decode(masterKeyStr) ;
+ return Base64.decode(masterKeyStr);
}
}
}catch(Exception e){
@@ -179,14 +179,14 @@ public class RangerMasterKey implements RangerKMSMKI{
Key secretKey = generateMasterKey();
PBEKeySpec pbeKeySpec = getPBEParameterSpec(password);
byte[] masterKeyToDB = encryptKey(secretKey.getEncoded(), pbeKeySpec);
- return Base64.encode(masterKeyToDB) ;
+ return Base64.encode(masterKeyToDB);
}
private String encryptMasterKey(String password, byte[] secretKey) throws Throwable {
logger.debug("Encrypting Master Key");
PBEKeySpec pbeKeySpec = getPBEParameterSpec(password);
byte[] masterKeyToDB = encryptKey(secretKey, pbeKeySpec);
- return Base64.encode(masterKeyToDB) ;
+ return Base64.encode(masterKeyToDB);
}
private Key generateMasterKey() throws NoSuchAlgorithmException{
@@ -196,33 +196,33 @@ public class RangerMasterKey implements RangerKMSMKI{
}
private PBEKeySpec getPBEParameterSpec(String password) throws Throwable {
- MessageDigest md = MessageDigest.getInstance(MD_ALGO) ;
- byte[] saltGen = md.digest(password.getBytes()) ;
- byte[] salt = new byte[SALT_SIZE] ;
+ MessageDigest md = MessageDigest.getInstance(MD_ALGO);
+ byte[] saltGen = md.digest(password.getBytes());
+ byte[] salt = new byte[SALT_SIZE];
System.arraycopy(saltGen, 0, salt, 0, SALT_SIZE);
- int iteration = password.toCharArray().length + 1 ;
- return new PBEKeySpec(password.toCharArray(), salt, iteration) ;
+ int iteration = password.toCharArray().length + 1;
+ return new PBEKeySpec(password.toCharArray(), salt, iteration);
}
private byte[] encryptKey(byte[] data, PBEKeySpec keyspec) throws Throwable {
- SecretKey key = getPasswordKey(keyspec) ;
- PBEParameterSpec paramSpec = new PBEParameterSpec(keyspec.getSalt(), keyspec.getIterationCount()) ;
- Cipher c = Cipher.getInstance(key.getAlgorithm()) ;
+ SecretKey key = getPasswordKey(keyspec);
+ PBEParameterSpec paramSpec = new PBEParameterSpec(keyspec.getSalt(), keyspec.getIterationCount());
+ Cipher c = Cipher.getInstance(key.getAlgorithm());
c.init(Cipher.ENCRYPT_MODE, key,paramSpec);
- return c.doFinal(data) ;
+ return c.doFinal(data);
}
private SecretKey getPasswordKey(PBEKeySpec keyspec) throws Throwable {
- SecretKeyFactory factory = SecretKeyFactory.getInstance(PBE_ALGO) ;
- return factory.generateSecret(keyspec) ;
+ SecretKeyFactory factory = SecretKeyFactory.getInstance(PBE_ALGO);
+ return factory.generateSecret(keyspec);
}
private byte[] decryptKey(byte[] encrypted, PBEKeySpec keyspec) throws Throwable {
- SecretKey key = getPasswordKey(keyspec) ;
- PBEParameterSpec paramSpec = new PBEParameterSpec(keyspec.getSalt(), keyspec.getIterationCount()) ;
- Cipher c = Cipher.getInstance(key.getAlgorithm()) ;
+ SecretKey key = getPasswordKey(keyspec);
+ PBEParameterSpec paramSpec = new PBEParameterSpec(keyspec.getSalt(), keyspec.getIterationCount());
+ Cipher c = Cipher.getInstance(key.getAlgorithm());
c.init(Cipher.DECRYPT_MODE, key, paramSpec);
- return c.doFinal(encrypted) ;
+ return c.doFinal(encrypted);
}
private SecretKey getMasterKeyFromBytes(byte[] keyData) throws Throwable {
- return new SecretKeySpec(keyData, MK_CIPHER) ;
+ return new SecretKeySpec(keyData, MK_CIPHER);
}
public Map<String, String> getPropertiesWithPrefix(Properties props, String prefix) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
index ccbb6a7..2ecaff5 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
@@ -241,7 +241,7 @@ public class KMSWebApp implements ServletContextListener {
keyAcl = ReflectionUtils.newInstance(cls, kmsConf);
}
} catch (Exception e) {
- LOG.error("Unable to getAcls with an exception", e) ;
+ LOG.error("Unable to getAcls with an exception", e);
throw new IOException(e.getMessage());
}
return keyAcl;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java b/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java
index f823f8e..4c78a95 100644
--- a/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java
+++ b/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java
@@ -99,7 +99,7 @@ public abstract class XXDBBase implements java.io.Serializable {
* You cannot set null to the attribute.
* @param id Value to set member attribute <b>id</b>
*/
- public abstract void setId( Long id ) ;
+ public abstract void setId( Long id );
/**
* Returns the value for the member attribute <b>id</b>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java
index b107459..34f1f86 100644
--- a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java
+++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java
@@ -413,7 +413,7 @@ public class KnoxClient {
throw hdpException;
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== KnoxClient.getKnoxResources() Result : "+ resultList ) ;
+ LOG.debug("<== KnoxClient.getKnoxResources() Result : "+ resultList );
}
return resultList;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
index af3fd49..1d086fb 100644
--- a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
+++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
@@ -37,17 +37,17 @@ public class KnoxResourceMgr {
public static HashMap<String, Object> validateConfig(String serviceName, Map<String, String> configs) throws Exception {
HashMap<String, Object> ret = null;
if (LOG.isDebugEnabled()) {
- LOG.debug("==> KnoxResourceMgr.testConnection ServiceName: "+ serviceName + "Configs" + configs ) ;
+ LOG.debug("==> KnoxResourceMgr.testConnection ServiceName: "+ serviceName + "Configs" + configs );
}
try {
ret = KnoxClient.connectionTest(serviceName, configs);
} catch (Exception e) {
- LOG.error("<== KnoxResourceMgr.connectionTest Error: " + e) ;
+ LOG.error("<== KnoxResourceMgr.connectionTest Error: " + e);
throw e;
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== KnoxResourceMgr.HdfsResourceMgr Result : "+ ret ) ;
+ LOG.debug("<== KnoxResourceMgr.HdfsResourceMgr Result : "+ ret );
}
return ret;
}
@@ -97,7 +97,7 @@ public class KnoxResourceMgr {
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== KnoxResourceMgr.getKnoxResources() knoxUrl: "+ knoxUrl + " knoxAdminUser: " + knoxAdminUser + " topologyName: " + knoxTopologyName + " KnoxServiceName: " + knoxServiceName) ;
+ LOG.debug("<== KnoxResourceMgr.getKnoxResources() knoxUrl: "+ knoxUrl + " knoxAdminUser: " + knoxAdminUser + " topologyName: " + knoxTopologyName + " KnoxServiceName: " + knoxServiceName);
}
final KnoxClient knoxClient = new KnoxConnectionMgr().getKnoxClient(knoxUrl, knoxAdminUser, knoxAdminPassword);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
----------------------------------------------------------------------
diff --git a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
index 346c225..bc1d829 100755
--- a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
+++ b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
@@ -34,18 +34,18 @@ public class KMSResourceMgr {
HashMap<String, Object> ret = null;
if(LOG.isDebugEnabled()) {
- LOG.debug("==> KMSResourceMgr.validateConfig ServiceName: "+ serviceName + "Configs" + configs ) ;
+ LOG.debug("==> KMSResourceMgr.validateConfig ServiceName: "+ serviceName + "Configs" + configs );
}
try {
ret = KMSClient.testConnection(serviceName, configs);
} catch (Exception e) {
- LOG.error("<== KMSResourceMgr.validateConfig Error: " + e) ;
+ LOG.error("<== KMSResourceMgr.validateConfig Error: " + e);
throw e;
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== KMSResourceMgr.validateConfig Result : "+ ret ) ;
+ LOG.debug("<== KMSResourceMgr.validateConfig Result : "+ ret );
}
return ret;
}
@@ -76,9 +76,9 @@ public class KMSResourceMgr {
String rangerKeytab = configs.get("rangerkeytab");
String nameRules = configs.get("namerules");
String authType = configs.get("authtype");
- resultList = getKMSResource(url, username, password, rangerPrincipal, rangerKeytab, nameRules, authType, kmsKeyName,kmsKeyList) ;
+ resultList = getKMSResource(url, username, password, rangerPrincipal, rangerKeytab, nameRules, authType, kmsKeyName,kmsKeyList);
}
- return resultList ;
+ return resultList;
}
public static List<String> getKMSResource(String url, String username, String password, String rangerPrincipal, String rangerKeytab, String nameRules, String authType, String kmsKeyName, List<String> kmsKeyList) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/plugin-nifi/src/main/java/org/apache/ranger/services/nifi/client/NiFiClient.java
----------------------------------------------------------------------
diff --git a/plugin-nifi/src/main/java/org/apache/ranger/services/nifi/client/NiFiClient.java b/plugin-nifi/src/main/java/org/apache/ranger/services/nifi/client/NiFiClient.java
index 1c21c0e..c03bc12 100644
--- a/plugin-nifi/src/main/java/org/apache/ranger/services/nifi/client/NiFiClient.java
+++ b/plugin-nifi/src/main/java/org/apache/ranger/services/nifi/client/NiFiClient.java
@@ -51,7 +51,7 @@ import java.util.List;
*/
public class NiFiClient {
- private static final Log LOG = LogFactory.getLog(NiFiClient.class) ;
+ private static final Log LOG = LogFactory.getLog(NiFiClient.class);
static final String SUCCESS_MSG = "ConnectionTest Successful";
static final String FAILURE_MSG = "Unable to retrieve any resources using given parameters. ";
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
----------------------------------------------------------------------
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java b/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
index a44cbe3..470c711 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
@@ -279,19 +279,19 @@ class RangerYarnAccessRequest extends RangerAccessRequestImpl {
}
private static String getRemoteIp() {
- String ret = null ;
- InetAddress ip = Server.getRemoteIp() ;
+ String ret = null;
+ InetAddress ip = Server.getRemoteIp();
if (ip != null) {
ret = ip.getHostAddress();
}
- return ret ;
+ return ret;
}
}
class RangerYarnAuditHandler extends RangerDefaultAuditHandler {
private static final Log LOG = LogFactory.getLog(RangerYarnAuditHandler.class);
- private static final String YarnModuleName = RangerConfiguration.getInstance().get(RangerHadoopConstants.AUDITLOG_YARN_MODULE_ACL_NAME_PROP , RangerHadoopConstants.DEFAULT_YARN_MODULE_ACL_NAME) ;
+ private static final String YarnModuleName = RangerConfiguration.getInstance().get(RangerHadoopConstants.AUDITLOG_YARN_MODULE_ACL_NAME_PROP , RangerHadoopConstants.DEFAULT_YARN_MODULE_ACL_NAME);
private boolean isAuditEnabled = false;
private AuthzAuditEvent auditEvent = null;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java
----------------------------------------------------------------------
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java
index 414bd87..9b283a2 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java
@@ -42,11 +42,11 @@ import com.sun.jersey.api.client.WebResource;
public class YarnClient extends BaseClient {
- private static final Logger LOG = Logger.getLogger(YarnClient.class) ;
+ private static final Logger LOG = Logger.getLogger(YarnClient.class);
private static final String EXPECTED_MIME_TYPE = "application/json";
- private static final String YARN_LIST_API_ENDPOINT = "/ws/v1/cluster/scheduler" ;
+ private static final String YARN_LIST_API_ENDPOINT = "/ws/v1/cluster/scheduler";
private static final String errMessage = " You can still save the repository and start creating "
+ "policies, but you would not be able to use autocomplete for "
@@ -59,7 +59,7 @@ public class YarnClient extends BaseClient {
public YarnClient(String serviceName, Map<String, String> configs) {
- super(serviceName,configs,"yarn-client") ;
+ super(serviceName,configs,"yarn-client");
this.yarnQUrl = configs.get("yarn.url");
this.userName = configs.get("username");
@@ -105,14 +105,14 @@ public class YarnClient extends BaseClient {
List<String> lret = new ArrayList<String>();
- String url = yarnQUrl + YARN_LIST_API_ENDPOINT ;
+ String url = yarnQUrl + YARN_LIST_API_ENDPOINT;
- Client client = null ;
+ Client client = null;
- ClientResponse response = null ;
+ ClientResponse response = null;
try {
- client = Client.create() ;
+ client = Client.create();
WebResource webResource = client.resource(url);
@@ -143,7 +143,7 @@ public class YarnClient extends BaseClient {
if (LOG.isDebugEnabled()) {
LOG.debug("getQueueList():Adding yarnQueue " + yarnQueueName);
}
- lret.add(yarnQueueName) ;
+ lret.add(yarnQueueName);
}
}
}
@@ -191,7 +191,7 @@ public class YarnClient extends BaseClient {
client.destroy();
}
}
- return lret ;
+ return lret;
}
} );
}
@@ -202,7 +202,7 @@ public class YarnClient extends BaseClient {
try {
ret = timedTask(callableYarnQListGetter, 5, TimeUnit.SECONDS);
} catch ( Throwable t) {
- LOG.error("Unable to get Yarn Queue list from [" + yarnQUrl + "]", t) ;
+ LOG.error("Unable to get Yarn Queue list from [" + yarnQUrl + "]", t);
String msgDesc = "Unable to get a valid response for "
+ "expected mime type : [" + EXPECTED_MIME_TYPE
+ "] URL : " + yarnQUrl;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java
----------------------------------------------------------------------
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java
index cc408ba..23bd9e9 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java
@@ -34,18 +34,18 @@ public class YarnResourceMgr {
HashMap<String, Object> ret = null;
if(LOG.isDebugEnabled()) {
- LOG.debug("==> YarnResourceMgr.validateConfig ServiceName: "+ serviceName + "Configs" + configs ) ;
+ LOG.debug("==> YarnResourceMgr.validateConfig ServiceName: "+ serviceName + "Configs" + configs );
}
try {
ret = YarnClient.connectionTest(serviceName, configs);
} catch (Exception e) {
- LOG.error("<== YarnResourceMgr.validateConfig Error: " + e) ;
+ LOG.error("<== YarnResourceMgr.validateConfig Error: " + e);
throw e;
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== YarnResourceMgr.validateConfig Result : "+ ret ) ;
+ LOG.debug("<== YarnResourceMgr.validateConfig Result : "+ ret );
}
return ret;
}
@@ -68,9 +68,9 @@ public class YarnResourceMgr {
if (configs == null || configs.isEmpty()) {
LOG.error("Connection Config is empty");
} else {
- resultList = getYarnResource(serviceName, configs, yarnQueueName,yarnQueueList) ;
+ resultList = getYarnResource(serviceName, configs, yarnQueueName,yarnQueueList);
}
- return resultList ;
+ return resultList;
}
public static List<String> getYarnResource(String serviceName, Map<String, String> configs, String yarnQueueName, List<String> yarnQueueList) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ranger-hbase-plugin-shim/src/main/java/org/apache/hadoop/hbase/security/access/RangerAccessControlLists.java
----------------------------------------------------------------------
diff --git a/ranger-hbase-plugin-shim/src/main/java/org/apache/hadoop/hbase/security/access/RangerAccessControlLists.java b/ranger-hbase-plugin-shim/src/main/java/org/apache/hadoop/hbase/security/access/RangerAccessControlLists.java
index 7f33b15..8da972a 100644
--- a/ranger-hbase-plugin-shim/src/main/java/org/apache/hadoop/hbase/security/access/RangerAccessControlLists.java
+++ b/ranger-hbase-plugin-shim/src/main/java/org/apache/hadoop/hbase/security/access/RangerAccessControlLists.java
@@ -29,50 +29,50 @@ import org.apache.log4j.Logger;
public class RangerAccessControlLists {
- private static final Logger LOG = Logger.getLogger(RangerAccessControlLists.class) ;
+ private static final Logger LOG = Logger.getLogger(RangerAccessControlLists.class);
public static void init(MasterServices master) throws IOException {
- Class<AccessControlLists> accessControlListsClass = AccessControlLists.class ;
- String cName = accessControlListsClass.getName() ;
+ Class<AccessControlLists> accessControlListsClass = AccessControlLists.class;
+ String cName = accessControlListsClass.getName();
- Class<?>[] params = new Class[1] ;
- params[0] = MasterServices.class ;
+ Class<?>[] params = new Class[1];
+ params[0] = MasterServices.class;
for (String mname : new String[] { "init", "createACLTable" } ) {
try {
try {
- Method m = accessControlListsClass.getDeclaredMethod(mname, params) ;
+ Method m = accessControlListsClass.getDeclaredMethod(mname, params);
if (m != null) {
try {
try {
- m.invoke(null, master) ;
+ m.invoke(null, master);
logInfo("Execute method name [" + mname + "] in Class [" + cName + "] is successful.");
} catch (InvocationTargetException e) {
- Throwable cause = e ;
- boolean tableExistsExceptionFound = false ;
+ Throwable cause = e;
+ boolean tableExistsExceptionFound = false;
if (e != null) {
- Throwable ecause = e.getTargetException() ;
+ Throwable ecause = e.getTargetException();
if (ecause != null) {
- cause = ecause ;
+ cause = ecause;
if (ecause instanceof TableExistsException) {
- tableExistsExceptionFound = true ;
+ tableExistsExceptionFound = true;
}
}
}
if (! tableExistsExceptionFound) {
- logError("Unable to execute the method [" + mname + "] on [" + cName + "] due to exception", cause) ;
- throw new IOException(cause) ;
+ logError("Unable to execute the method [" + mname + "] on [" + cName + "] due to exception", cause);
+ throw new IOException(cause);
}
}
- return ;
+ return;
} catch (IllegalArgumentException e) {
logError("Unable to execute method name [" + mname + "] in Class [" + cName + "].", e);
- throw new IOException(e) ;
+ throw new IOException(e);
} catch (IllegalAccessException e) {
logError("Unable to execute method name [" + mname + "] in Class [" + cName + "].", e);
- throw new IOException(e) ;
+ throw new IOException(e);
}
}
}
@@ -81,20 +81,20 @@ public class RangerAccessControlLists {
}
} catch (SecurityException e) {
logError("Unable to get method name [" + mname + "] in Class [" + cName + "].", e);
- throw new IOException(e) ;
+ throw new IOException(e);
}
}
- throw new IOException("Unable to initialize() [" + cName + "]") ;
+ throw new IOException("Unable to initialize() [" + cName + "]");
}
private static void logInfo(String msg) {
- // System.out.println(msg) ;
- LOG.info(msg) ;
+ // System.out.println(msg);
+ LOG.info(msg);
}
private static void logError(String msg, Throwable t) {
-// System.err.println(msg) ;
+// System.err.println(msg);
// if (t != null) {
// t.printStackTrace(System.err);
// }
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ranger-hbase-plugin-shim/src/main/test/org/apache/hadoop/hbase/security/access/RangerAccessControlListsTest.java
----------------------------------------------------------------------
diff --git a/ranger-hbase-plugin-shim/src/main/test/org/apache/hadoop/hbase/security/access/RangerAccessControlListsTest.java b/ranger-hbase-plugin-shim/src/main/test/org/apache/hadoop/hbase/security/access/RangerAccessControlListsTest.java
index b56f32d..3e2171d 100644
--- a/ranger-hbase-plugin-shim/src/main/test/org/apache/hadoop/hbase/security/access/RangerAccessControlListsTest.java
+++ b/ranger-hbase-plugin-shim/src/main/test/org/apache/hadoop/hbase/security/access/RangerAccessControlListsTest.java
@@ -48,14 +48,14 @@ public class RangerAccessControlListsTest {
@Test
public void testInit() {
- IOException exceptionFound = null ;
+ IOException exceptionFound = null;
try {
- MasterServices service = null ;
- RangerAccessControlLists.init(service) ;
+ MasterServices service = null;
+ RangerAccessControlLists.init(service);
} catch (IOException e) {
- exceptionFound = e ;
+ exceptionFound = e;
}
- Assert.assertFalse("Expected to get a NullPointerExecution after init method Execution - Found [" + exceptionFound + "]", (!(exceptionFound != null && exceptionFound.getCause() instanceof NullPointerException))) ;
+ Assert.assertFalse("Expected to get a NullPointerExecution after init method Execution - Found [" + exceptionFound + "]", (!(exceptionFound != null && exceptionFound.getCause() instanceof NullPointerException)));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoaderUtil.java
----------------------------------------------------------------------
diff --git a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoaderUtil.java b/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoaderUtil.java
index bd0a653..156fec9 100644
--- a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoaderUtil.java
+++ b/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoaderUtil.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
public class RangerPluginClassLoaderUtil {
- private static final Logger LOG = LoggerFactory.getLogger(RangerPluginClassLoaderUtil.class) ;
+ private static final Logger LOG = LoggerFactory.getLogger(RangerPluginClassLoaderUtil.class);
private static volatile RangerPluginClassLoaderUtil config = null;
private static String rangerPluginLibDir = "ranger-%-plugin-impl";
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPluginPerfTester.java
----------------------------------------------------------------------
diff --git a/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPluginPerfTester.java b/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPluginPerfTester.java
index 6a9bfb2..4fc6655 100644
--- a/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPluginPerfTester.java
+++ b/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPluginPerfTester.java
@@ -131,10 +131,10 @@ public class RangerPluginPerfTester {
try {
- File file = File.createTempFile("ranger-plugin-test-site", ".xml") ;
+ File file = File.createTempFile("ranger-plugin-test-site", ".xml");
file.deleteOnExit();
- String filePathStr = file.getAbsolutePath() ;
+ String filePathStr = file.getAbsolutePath();
Path filePath = new Path(filePathStr);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
index c41b6a5..931356e 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
@@ -295,7 +295,7 @@ public class AssetMgr extends AssetMgrBase {
long epochTime = epoch != null ? Long.parseLong(epoch) : 0;
if(epochTime == updatedTime) {
- int resourceListSz = xResourceList.size() ;
+ int resourceListSz = xResourceList.size();
if (policyCount == resourceListSz) {
policyExportAudit
@@ -401,8 +401,8 @@ public class AssetMgr extends AssetMgrBase {
HashMap<String, Object> resourceMap = new HashMap<String, Object>();
resourceMap.put("id", xResource.getId());
- resourceMap.put("topology_name", xResource.getTopologies()) ;
- resourceMap.put("service_name", xResource.getServices()) ;
+ resourceMap.put("topology_name", xResource.getTopologies());
+ resourceMap.put("service_name", xResource.getServices());
resourceMap.put("policyStatus", RangerCommonEnums
.getLabelFor_ActiveStatus(xResource
.getResourceStatus()));
@@ -429,7 +429,7 @@ public class AssetMgr extends AssetMgrBase {
HashMap<String, Object> resourceMap = new HashMap<String, Object>();
resourceMap.put("id", xResource.getId());
- resourceMap.put("topology_name", xResource.getTopologies()) ;
+ resourceMap.put("topology_name", xResource.getTopologies());
resourceMap.put("policyStatus", RangerCommonEnums
.getLabelFor_ActiveStatus(xResource
.getResourceStatus()));
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
index 98bb4f7..e026431 100755
--- a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
@@ -298,7 +298,7 @@ public class KmsKeyMgr {
try {
String response = null;
if(!isKerberos){
- response = r.delete(String.class) ;
+ response = r.delete(String.class);
}else{
Subject sub = getSubjectForKerberos(provider);
response = Subject.doAs(sub, new PrivilegedAction<String>() {
@@ -308,7 +308,7 @@ public class KmsKeyMgr {
}
});
}
- logger.debug("delete RESPONSE: [" + response + "]") ;
+ logger.debug("delete RESPONSE: [" + response + "]");
break;
} catch (Exception e) {
if (e instanceof UniformInterfaceException || i == providers.length - 1)
@@ -554,7 +554,7 @@ public class KmsKeyMgr {
String password = getKMSPassword(provider);
String nameRules = PropertiesUtil.getProperty(NAME_RULES);
if (StringUtils.isEmpty(nameRules)) {
- KerberosName.setRules("DEFAULT") ;
+ KerberosName.setRules("DEFAULT");
}else{
KerberosName.setRules(nameRules);
}
@@ -599,7 +599,7 @@ public class KmsKeyMgr {
ClientConfig cc = new DefaultClientConfig();
cc.getProperties().put(ClientConfig.PROPERTY_FOLLOW_REDIRECTS, true);
ret = Client.create(cc);
- return ret ;
+ return ret;
}
public VXKmsKeyList getFilteredKeyList(HttpServletRequest request, VXKmsKeyList vXKmsKeyList){
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java b/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java
index 4db8c20..7fa2292 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java
@@ -45,7 +45,7 @@ public class AppConstants extends RangerCommonEnums {
/**
* enum XAAGENT is reserved for internal use
*/
- public static final int XAAGENT = 4 ;
+ public static final int XAAGENT = 4;
/**
* ASSET_KNOX is an element of enum AssetType. Its value is "ASSET_KNOX".
*/
@@ -799,59 +799,59 @@ public class AppConstants extends RangerCommonEnums {
}
if( elementValue == 18 ) {
// return "Submit Topology"; //XA_PERM_TYPE_SUBMIT_TOPOLOGY
- return "submitTopology" ;
+ return "submitTopology";
}
if( elementValue == 19 ) {
// return "File Upload"; //XA_PERM_TYPE_FILE_UPLOAD
- return "fileUpload" ;
+ return "fileUpload";
}
if( elementValue == 20 ) {
// return "Get Nimbus Conf"; //XA_PERM_TYPE_GET_NIMBUS
- return "getNimbusConf" ;
+ return "getNimbusConf";
}
if( elementValue == 21 ) {
// return "Get Cluster Info"; //XA_PERM_TYPE_GET_CLUSTER_INFO
- return "getClusterInfo" ;
+ return "getClusterInfo";
}
if( elementValue == 22 ) {
// return "File Download"; //XA_PERM_TYPE_FILE_DOWNLOAD
- return "fileDownload" ;
+ return "fileDownload";
}
if( elementValue == 23 ) {
// return "Kill Topology"; //XA_PERM_TYPE_KILL_TOPOLOGY
- return "killTopology" ;
+ return "killTopology";
}
if( elementValue == 24 ) {
// return "Rebalance"; //XA_PERM_TYPE_REBALANCE
- return "rebalance" ;
+ return "rebalance";
}
if( elementValue == 25 ) {
// return "Activate"; //XA_PERM_TYPE_ACTIVATE
- return "activate" ;
+ return "activate";
}
if( elementValue == 26 ) {
// return "Deactivate"; //XA_PERM_TYPE_DEACTIVATE
- return "deactivate" ;
+ return "deactivate";
}
if( elementValue == 27 ) {
// return "Get Topology Conf"; //XA_PERM_TYPE_GET_TOPOLOGY_CONF
- return "getTopologyConf" ;
+ return "getTopologyConf";
}
if( elementValue == 28 ) {
// return "Get Topology"; //XA_PERM_TYPE_GET_TOPOLOGY
- return "getTopology" ;
+ return "getTopology";
}
if( elementValue == 29 ) {
// return "Get User Topology"; //XA_PERM_TYPE_GET_USER_TOPOLOGY
- return "getUserTopology" ;
+ return "getUserTopology";
}
if( elementValue == 30 ) {
// return "Get Topology Info"; //XA_PERM_TYPE_GET_TOPOLOGY_INFO
- return "getTopologyInfo" ;
+ return "getTopologyInfo";
}
if( elementValue == 31 ) {
// return "Upload New Credential"; //XA_PERM_TYPE_UPLOAD_NEW_CREDENTIAL
- return "uploadNewCredentials" ;
+ return "uploadNewCredentials";
}
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java b/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
index c307cf5..5636ed3 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
@@ -155,7 +155,7 @@ public class PropertiesUtil extends PropertyPlaceholderConfigurer {
propertiesMap.put("ranger.solr.audit.user.password", solrAuditPassword);
props.put("ranger.solr.audit.user.password", solrAuditPassword);
}else{
- logger.info("Credential keystore password not applied for Solr ; clear text password shall be applicable");
+ logger.info("Credential keystore password not applied for Solr; clear text password shall be applicable");
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java b/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
index de39693..cb8b825 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
@@ -39,12 +39,12 @@ public class RangerProperties extends HashMap<String,String> {
private static final long serialVersionUID = -4094378755892810987L;
- private final Logger LOG = Logger.getLogger(RangerProperties.class) ;
+ private final Logger LOG = Logger.getLogger(RangerProperties.class);
private final String XMLCONFIG_FILENAME_DELIMITOR = ",";
- private final String XMLCONFIG_PROPERTY_TAGNAME = "property" ;
- private final String XMLCONFIG_NAME_TAGNAME = "name" ;
- private final String XMLCONFIG_VALUE_TAGNAME = "value" ;
+ private final String XMLCONFIG_PROPERTY_TAGNAME = "property";
+ private final String XMLCONFIG_NAME_TAGNAME = "name";
+ private final String XMLCONFIG_VALUE_TAGNAME = "value";
private String xmlConfigFileNames = null;
@@ -63,7 +63,7 @@ public class RangerProperties extends HashMap<String,String> {
for (String fn : fnList) {
try {
- loadXMLConfig(fn) ;
+ loadXMLConfig(fn);
}
catch(IOException ioe) {
LOG.error("Unable to load configuration from file: [" + fn + "]", ioe);
@@ -112,7 +112,7 @@ public class RangerProperties extends HashMap<String,String> {
}
if (get(propertyName) != null)
- remove(propertyName) ;
+ remove(propertyName);
if (propertyValue != null)
put(propertyName, propertyValue);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
index f72823e..2d049a4 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
@@ -95,11 +95,11 @@ public class RangerSearchUtil extends SearchUtil {
ret.setParam(SearchFilter.SERVICE_NAME, request.getParameter("name"));
ret.setParam(SearchFilter.IS_ENABLED, request.getParameter("status"));
- String serviceType = request.getParameter("type") ;
+ String serviceType = request.getParameter("type");
if (serviceType != null) {
- serviceType = serviceType.toLowerCase() ;
+ serviceType = serviceType.toLowerCase();
}
- ret.setParam(SearchFilter.SERVICE_TYPE,serviceType) ;
+ ret.setParam(SearchFilter.SERVICE_TYPE,serviceType);
extractCommonCriteriasForFilter(request, ret, sortFields);
return ret;
@@ -117,10 +117,10 @@ public class RangerSearchUtil extends SearchUtil {
ret.setParams(new HashMap<String, String>());
}
- String repositoryType = request.getParameter("repositoryType") ;
+ String repositoryType = request.getParameter("repositoryType");
if (repositoryType != null) {
- repositoryType = repositoryType.toLowerCase() ;
+ repositoryType = repositoryType.toLowerCase();
}
String repositoryId = request.getParameter("repositoryId");
@@ -128,7 +128,7 @@ public class RangerSearchUtil extends SearchUtil {
repositoryId = request.getParameter("assetId");
}
- ret.setParam(SearchFilter.SERVICE_TYPE, repositoryType) ;
+ ret.setParam(SearchFilter.SERVICE_TYPE, repositoryType);
ret.setParam(SearchFilter.SERVICE_NAME, request.getParameter("repositoryName"));
ret.setParam(SearchFilter.SERVICE_ID, repositoryId);
ret.setParam(SearchFilter.POLICY_NAME, request.getParameter("policyName"));
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java b/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
index e244420..9e72f42 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
@@ -67,8 +67,8 @@ import org.springframework.stereotype.Component;
@Component
public class ServiceUtil {
static final Logger LOG = Logger.getLogger(ServiceUtil.class);
- private static final String REGEX_PREFIX_STR = "regex:" ;
- private static final int REGEX_PREFIX_STR_LENGTH = REGEX_PREFIX_STR.length() ;
+ private static final String REGEX_PREFIX_STR = "regex:";
+ private static final int REGEX_PREFIX_STR_LENGTH = REGEX_PREFIX_STR.length();
static Map<String, Integer> mapServiceTypeToAssetType = new HashMap<String, Integer>();
static Map<String, Integer> mapAccessTypeToPermType = new HashMap<String, Integer>();
@@ -1377,10 +1377,10 @@ public class ServiceUtil {
}
- String cnFromConfigForTest = cnFromConfig ;
- boolean isRegEx = cnFromConfig.toLowerCase().startsWith(REGEX_PREFIX_STR) ;
+ String cnFromConfigForTest = cnFromConfig;
+ boolean isRegEx = cnFromConfig.toLowerCase().startsWith(REGEX_PREFIX_STR);
if (isRegEx) {
- cnFromConfigForTest = cnFromConfig.substring(REGEX_PREFIX_STR_LENGTH) ;
+ cnFromConfigForTest = cnFromConfig.substring(REGEX_PREFIX_STR_LENGTH);
}
// Perform SAN validation
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
index e4e1622..8405eb3 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
@@ -111,7 +111,7 @@ public abstract class XXDBBase implements java.io.Serializable {
* You cannot set null to the attribute.
* @param id Value to set member attribute <b>id</b>
*/
- public abstract void setId( Long id ) ;
+ public abstract void setId( Long id );
/**
* Returns the value for the member attribute <b>id</b>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
index 318a813..04aedbd 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
@@ -95,7 +95,7 @@ public class XXGroup extends XXDBBase implements java.io.Serializable {
*
*/
@Column(name="IS_VISIBLE" , nullable=false )
- protected Integer isVisible ;
+ protected Integer isVisible;
/**
* Type of group
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
index 64b4d19..512c567 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
@@ -96,7 +96,7 @@ public class XXUser extends XXDBBase implements java.io.Serializable {
*
*/
@Column(name="IS_VISIBLE" , nullable=false )
- protected Integer isVisible ;
+ protected Integer isVisible;
/**
* Id of the credential store
* <ul>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java
index 3a3bed2..5453949 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java
@@ -164,7 +164,7 @@ public class PatchPersmissionModel_J10003 extends BaseLoader {
}
}
}
- return countUserPermissionUpdated ;
+ return countUserPermissionUpdated;
}
private List<String> readUserNamesFromFile(String aFileName) throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
index 84fcb54..be40bca 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
@@ -458,7 +458,7 @@ public class DbToSolrMigrationUtil extends BaseLoader {
// Acutal solrclient JAAS configs are read from the ranger-admin-site.xml in ranger admin config folder and set by InMemoryJAASConfiguration
// Refer InMemoryJAASConfiguration doc for JAAS Configuration
if ( System.getProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG) == null ) {
- System.setProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG, "/dev/null") ;
+ System.setProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG, "/dev/null");
}
logger.info("Loading SolrClient JAAS config from Ranger audit config if present...");
InMemoryJAASConfiguration.init(props);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java b/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java
index 692795a..f4f75b6 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java
@@ -53,34 +53,34 @@ public class XAgentService {
}
private boolean isHDFSLog(String loggerName, int fieldCount) {
- boolean ret = false ;
+ boolean ret = false;
if (loggerName != null) {
- ret = loggerName.startsWith("org.") ;
+ ret = loggerName.startsWith("org.");
}
else {
- ret = (fieldCount == 5) ;
+ ret = (fieldCount == 5);
}
return ret;
}
private boolean isHiveLog(String loggerName, int fieldCount) {
- boolean ret = false ;
+ boolean ret = false;
if (loggerName != null) {
- ret = loggerName.startsWith("org.apache.ranger.authorization.hive") || loggerName.startsWith("org.apache.ranger.pdp.hive.") ;
+ ret = loggerName.startsWith("org.apache.ranger.authorization.hive") || loggerName.startsWith("org.apache.ranger.pdp.hive.");
}
else {
- ret = (fieldCount == 11) ;
+ ret = (fieldCount == 11);
}
return ret;
}
private boolean isHBaseLog(String loggerName, int fieldCount) {
- boolean ret = false ;
+ boolean ret = false;
if (loggerName != null) {
- ret = loggerName.startsWith("org.apache.ranger.authorization.hbase") ;
+ ret = loggerName.startsWith("org.apache.ranger.authorization.hbase");
}
else {
- ret = ((fieldCount != 5) && (fieldCount != 11)) ;
+ ret = ((fieldCount != 5) && (fieldCount != 11));
}
return ret;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
index 66dc067..8042a37 100644
--- a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
@@ -173,7 +173,7 @@ public class SolrMgr {
// Acutal solrclient JAAS configs are read from the ranger-admin-site.xml in ranger admin config folder and set by InMemoryJAASConfiguration
// Refer InMemoryJAASConfiguration doc for JAAS Configuration
if ( System.getProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG) == null ) {
- System.setProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG, "/dev/null") ;
+ System.setProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG, "/dev/null");
}
logger.info("Loading SolrClient JAAS config from Ranger audit config if present...");
InMemoryJAASConfiguration.init(props);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java b/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java
index f83f2c4..7fed916 100644
--- a/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java
+++ b/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java
@@ -159,14 +159,14 @@ public class TestStringUtil {
@Test
public void testIsListEmpty(){
- List<String> list=new ArrayList<String>() ;
+ List<String> list=new ArrayList<String>();
boolean listValue = stringUtil.isEmpty(list);
Assert.assertTrue(listValue);
}
@Test
public void testIsListNotEmpty(){
- List<String> list=new ArrayList<String>() ;
+ List<String> list=new ArrayList<String>();
list.add("a");
list.add("b");
boolean listValue = stringUtil.isEmpty(list);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java
index 9d0ea32..111083c 100644
--- a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java
+++ b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java
@@ -74,7 +74,7 @@ public class StormRangerPlugin extends RangerBasePlugin {
super.setResultProcessor(new RangerDefaultAuditHandler());
// this needed to set things right in the nimbus process
if (KerberosName.getRules() == null) {
- KerberosName.setRules("DEFAULT") ;
+ KerberosName.setRules("DEFAULT");
}
initialized = true;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
index 9f83b62..c66b665 100644
--- a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
+++ b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
@@ -62,29 +62,29 @@ public class RangerStormAuthorizer implements IAuthorizer {
@Override
public boolean permit(ReqContext aRequestContext, String aOperationName, Map aTopologyConfigMap) {
- boolean accessAllowed = false ;
+ boolean accessAllowed = false;
boolean isAuditEnabled = false;
- String topologyName = null ;
+ String topologyName = null;
try {
- topologyName = (aTopologyConfigMap == null ? "" : (String)aTopologyConfigMap.get(Config.TOPOLOGY_NAME)) ;
+ topologyName = (aTopologyConfigMap == null ? "" : (String)aTopologyConfigMap.get(Config.TOPOLOGY_NAME));
if (LOG.isDebugEnabled()) {
LOG.debug("[req "+ aRequestContext.requestID()+ "] Access "
+ " from: [" + aRequestContext.remoteAddress() + "]"
+ " user: [" + aRequestContext.principal() + "],"
+ " op: [" + aOperationName + "],"
- + "topology: [" + topologyName + "]") ;
+ + "topology: [" + topologyName + "]");
if (aTopologyConfigMap != null) {
for(Object keyObj : aTopologyConfigMap.keySet()) {
- Object valObj = aTopologyConfigMap.get(keyObj) ;
+ Object valObj = aTopologyConfigMap.get(keyObj);
LOG.debug("TOPOLOGY CONFIG MAP [" + keyObj + "] => [" + valObj + "]");
}
}
else {
- LOG.debug("TOPOLOGY CONFIG MAP is passed as null.") ;
+ LOG.debug("TOPOLOGY CONFIG MAP is passed as null.");
}
}
@@ -93,26 +93,26 @@ public class RangerStormAuthorizer implements IAuthorizer {
} else if(plugin == null) {
LOG.info("Ranger plugin not initialized yet! Skipping authorization; allowedFlag => [" + accessAllowed + "], Audit Enabled:" + isAuditEnabled);
} else {
- String userName = null ;
- String[] groups = null ;
+ String userName = null;
+ String[] groups = null;
- Principal user = aRequestContext.principal() ;
+ Principal user = aRequestContext.principal();
if (user != null) {
- userName = user.getName() ;
+ userName = user.getName();
if (userName != null) {
- UserGroupInformation ugi = UserGroupInformation.createRemoteUser(userName) ;
- userName = ugi.getShortUserName() ;
- groups = ugi.getGroupNames() ;
+ UserGroupInformation ugi = UserGroupInformation.createRemoteUser(userName);
+ userName = ugi.getShortUserName();
+ groups = ugi.getGroupNames();
if (LOG.isDebugEnabled()) {
- LOG.debug("User found from principal [" + user.getName() + "] => user:[" + userName + "], groups:[" + StringUtil.toString(groups) + "]") ;
+ LOG.debug("User found from principal [" + user.getName() + "] => user:[" + userName + "], groups:[" + StringUtil.toString(groups) + "]");
}
}
}
if (userName != null) {
- String clientIp = (aRequestContext.remoteAddress() == null ? null : aRequestContext.remoteAddress().getHostAddress() ) ;
+ String clientIp = (aRequestContext.remoteAddress() == null ? null : aRequestContext.remoteAddress().getHostAddress() );
RangerAccessRequest accessRequest = plugin.buildAccessRequest(userName, groups, clientIp, topologyName, aOperationName);
RangerAccessResult result = plugin.isAccessAllowed(accessRequest);
accessAllowed = result != null && result.getIsAllowed();
@@ -136,11 +136,11 @@ public class RangerStormAuthorizer implements IAuthorizer {
+ " from: [" + aRequestContext.remoteAddress() + "]"
+ " user: [" + aRequestContext.principal() + "],"
+ " op: [" + aOperationName + "],"
- + "topology: [" + topologyName + "] => returns [" + accessAllowed + "], Audit Enabled:" + isAuditEnabled) ;
+ + "topology: [" + topologyName + "] => returns [" + accessAllowed + "], Audit Enabled:" + isAuditEnabled);
}
}
- return accessAllowed ;
+ return accessAllowed;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
index 9aaf647..d7415c5 100644
--- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
+++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
@@ -51,11 +51,11 @@ import com.sun.jersey.api.client.WebResource;
public class StormClient {
- private static final Logger LOG = Logger.getLogger(StormClient.class) ;
+ private static final Logger LOG = Logger.getLogger(StormClient.class);
private static final String EXPECTED_MIME_TYPE = "application/json";
- private static final String TOPOLOGY_LIST_API_ENDPOINT = "/api/v1/topology/summary" ;
+ private static final String TOPOLOGY_LIST_API_ENDPOINT = "/api/v1/topology/summary";
private static final String errMessage = " You can still save the repository and start creating "
+ "policies, but you would not be able to use autocomplete for "
@@ -71,7 +71,7 @@ public class StormClient {
public StormClient(String aStormUIUrl, String aUserName, String aPassword, String lookupPrincipal, String lookupKeytab, String nameRules) {
this.stormUIUrl = aStormUIUrl;
- this.userName = aUserName ;
+ this.userName = aUserName;
this.password = aPassword;
this.lookupPrincipal = lookupPrincipal;
this.lookupKeytab = lookupKeytab;
@@ -97,13 +97,13 @@ public class StormClient {
ArrayList<String> lret = new ArrayList<String>();
- String url = stormUIUrl + TOPOLOGY_LIST_API_ENDPOINT ;
+ String url = stormUIUrl + TOPOLOGY_LIST_API_ENDPOINT;
- Client client = null ;
- ClientResponse response = null ;
+ Client client = null;
+ ClientResponse response = null;
try {
- client = Client.create() ;
+ client = Client.create();
WebResource webResource = client.resource(url);
@@ -121,7 +121,7 @@ public class StormClient {
if (topologyListResponse != null) {
if (topologyListResponse.getTopologyList() != null) {
for(Topology topology : topologyListResponse.getTopologyList()) {
- String topologyName = topology.getName() ;
+ String topologyName = topology.getName();
if ( stormTopologyList != null && stormTopologyList.contains(topologyName)) {
continue;
}
@@ -130,7 +130,7 @@ public class StormClient {
if (topologyName != null) {
if (topologyNameMatching == null || topologyNameMatching.isEmpty() || FilenameUtils.wildcardMatch(topology.getName(), topologyNameMatching + "*")) {
LOG.debug("getTopologyList():Adding topology " + topologyName);
- lret.add(topologyName) ;
+ lret.add(topologyName);
}
}
}
@@ -176,14 +176,14 @@ public class StormClient {
}
}
- return lret ;
+ return lret;
}
- } ;
+ };
try {
- ret = executeUnderKerberos(this.userName, this.password, this.lookupPrincipal, this.lookupKeytab, this.nameRules, topologyListGetter) ;
+ ret = executeUnderKerberos(this.userName, this.password, this.lookupPrincipal, this.lookupKeytab, this.nameRules, topologyListGetter);
} catch (IOException e) {
- LOG.error("Unable to get Topology list from [" + stormUIUrl + "]", e) ;
+ LOG.error("Unable to get Topology list from [" + stormUIUrl + "]", e);
}
return ret;
@@ -197,7 +197,7 @@ public class StormClient {
javax.security.auth.login.Configuration {
private String userName;
- private String password ;
+ private String password;
MySecureClientLoginConfiguration(String aUserName,
String password) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java
index f9ccebd..b49c919 100644
--- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java
+++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java
@@ -35,18 +35,18 @@ public class StormResourceMgr {
HashMap<String, Object> ret = null;
if(LOG.isDebugEnabled()) {
- LOG.debug("==> StormResourceMgr.validateConfig ServiceName: "+ serviceName + "Configs" + configs ) ;
+ LOG.debug("==> StormResourceMgr.validateConfig ServiceName: "+ serviceName + "Configs" + configs );
}
try {
ret = StormClient.connectionTest(serviceName, configs);
} catch (Exception e) {
- LOG.error("<== StormResourceMgr.validateConfig Error: " + e) ;
+ LOG.error("<== StormResourceMgr.validateConfig Error: " + e);
throw e;
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== StormResourceMgr.validateConfig Result : "+ ret ) ;
+ LOG.debug("<== StormResourceMgr.validateConfig Result : "+ ret );
}
return ret;
}
@@ -77,9 +77,9 @@ public class StormResourceMgr {
String lookupPrincipal = configs.get("lookupprincipal");
String lookupKeytab = configs.get("lookupkeytab");
String nameRules = configs.get("namerules");
- resultList = getStormResources(url, username, password,lookupPrincipal, lookupKeytab, nameRules, StromTopologyName,StormTopologyList) ;
+ resultList = getStormResources(url, username, password,lookupPrincipal, lookupKeytab, nameRules, StromTopologyName,StormTopologyList);
}
- return resultList ;
+ return resultList;
}
public static List<String> getStormResources(String url, String username, String password, String lookupPrincipal, String lookupKeytab, String nameRules, String topologyName, List<String> StormTopologyList) {
@@ -90,7 +90,7 @@ public class StormResourceMgr {
return new ArrayList<String>();
}
synchronized(stormClient){
- topologyList = stormClient.getTopologyList(topologyName,StormTopologyList) ;
+ topologyList = stormClient.getTopologyList(topologyName,StormTopologyList);
}
return topologyList;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/Topology.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/Topology.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/Topology.java
index f194359..2d7f80b 100644
--- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/Topology.java
+++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/json/model/Topology.java
@@ -20,9 +20,9 @@
package org.apache.ranger.services.storm.client.json.model;
public class Topology {
- private String id ;
- private String name ;
- private String status ;
+ private String id;
+ private String name;
+ private String status;
public String getId() {
return id;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java b/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java
index b665fd5..3f35097 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java
@@ -37,7 +37,7 @@ import java.util.Properties;
import org.apache.ranger.credentialapi.CredentialReader;
public class TagSyncConfig extends Configuration {
- private static final Logger LOG = Logger.getLogger(TagSyncConfig.class) ;
+ private static final Logger LOG = Logger.getLogger(TagSyncConfig.class);
private static final String CONFIG_FILE = "ranger-tagsync-site.xml";
@@ -45,9 +45,9 @@ public class TagSyncConfig extends Configuration {
private static final String CORE_SITE_FILE = "core-site.xml";
- public static final String TAGSYNC_ENABLED_PROP = "ranger.tagsync.enabled" ;
+ public static final String TAGSYNC_ENABLED_PROP = "ranger.tagsync.enabled";
- public static final String TAGSYNC_LOGDIR_PROP = "ranger.tagsync.logdir" ;
+ public static final String TAGSYNC_LOGDIR_PROP = "ranger.tagsync.logdir";
private static final String TAGSYNC_TAGADMIN_REST_URL_PROP = "ranger.tagsync.dest.ranger.endpoint";
@@ -98,7 +98,7 @@ public class TagSyncConfig extends Configuration {
private static final String TAGSYNC_KERBEROS_PRICIPAL = "ranger.tagsync.kerberos.principal";
private static final String TAGSYNC_KERBEROS_KEYTAB = "ranger.tagsync.kerberos.keytab";
- private static String LOCAL_HOSTNAME = "unknown" ;
+ private static String LOCAL_HOSTNAME = "unknown";
private Properties props;
@@ -106,7 +106,7 @@ public class TagSyncConfig extends Configuration {
try {
LOCAL_HOSTNAME = java.net.InetAddress.getLocalHost().getCanonicalHostName();
} catch (UnknownHostException e) {
- LOCAL_HOSTNAME = "unknown" ;
+ LOCAL_HOSTNAME = "unknown";
}
}
@@ -136,7 +136,7 @@ public class TagSyncConfig extends Configuration {
}
if (ret == null) {
- ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path) ;
+ ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path);
if (ret == null) {
if (! path.startsWith("/")) {
ret = ClassLoader.getSystemResourceAsStream("/" + path);
@@ -401,7 +401,7 @@ public class TagSyncConfig extends Configuration {
private TagSyncConfig() {
super(false);
- init() ;
+ init();
}
private void init() {
[08/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
index c27f357..f99addf 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -696,7 +696,7 @@ public class UserMgr {
* Translates XXPortalUser to VUserProfile. This method should be called in
* the same transaction in which the XXPortalUser was retrieved from the
* database
- *
+ *
* @param user
* @return
*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/UserMgrBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/UserMgrBase.java b/security-admin/src/main/java/org/apache/ranger/biz/UserMgrBase.java
index 6e3bb76..67f62cc 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/UserMgrBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/UserMgrBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgr.java
index 5b07620..3542da2 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgrBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgrBase.java b/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgrBase.java
index c1e3077..c90296c 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgrBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgrBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
index e0d3ba4..e3f7223 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -597,7 +597,7 @@ public class XUserMgr extends XUserMgrBase {
/**
* // public void createXGroupAndXUser(String groupName, String userName) {
- *
+ *
* // Long groupId; // Long userId; // XXGroup xxGroup = //
* appDaoManager.getXXGroup().findByGroupName(groupName); // VXGroup
* vxGroup; // if (xxGroup == null) { // vxGroup = new VXGroup(); //
@@ -616,7 +616,7 @@ public class XUserMgr extends XUserMgrBase {
* vxGroupUser.setUserId(userId); // vxGroupUser.setName(groupName); //
* vxGroupUser.setPriAcctId(1l); // vxGroupUser.setPriGrpId(1l); //
* vxGroupUser = xGroupUserService.createResource(vxGroupUser);
- *
+ *
* // }
*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/biz/XUserMgrBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgrBase.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgrBase.java
index a89bf8d..3ea4465 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgrBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgrBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java b/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java
index 23d3dbd..4db8c20 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -903,7 +903,7 @@ public class AppConstants extends RangerCommonEnums {
return "Trx Log Attribute"; //CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE
}
if( elementValue == 1015 ) {
- return "XA AccessType Def"; //CLASS_TYPE_XA_ACCESS_TYPE_DEF
+ return "XA AccessType Def"; //CLASS_TYPE_XA_ACCESS_TYPE_DEF
}
if( elementValue == 1016 ) {
return "XA AccessType Def Grants"; //CLASS_TYPE_XA_ACCESS_TYPE_DEF_GRANTS
@@ -936,7 +936,7 @@ public class AppConstants extends RangerCommonEnums {
return "RangerPolicy ItemGrp Map"; //CLASS_TYPE_RANGER_POLICY_ITEM_GRP_PERM
}
if( elementValue == 1026 ) {
- return "RangerPolicy ItemUser Map"; //CLASS_TYPE_RANGER_POLICY_ITEM_USER_PERM
+ return "RangerPolicy ItemUser Map"; //CLASS_TYPE_RANGER_POLICY_ITEM_USER_PERM
}
if( elementValue == 1027 ) {
return "RangerPolicy Resource"; //CLASS_TYPE_RANGER_POLICY_RESOURCE
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/ContextUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/ContextUtil.java b/security-admin/src/main/java/org/apache/ranger/common/ContextUtil.java
index eb1d573..18c8ba8 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/ContextUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/ContextUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/DateUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/DateUtil.java b/security-admin/src/main/java/org/apache/ranger/common/DateUtil.java
index ac29c07..7babd80 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/DateUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/DateUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,13 +32,13 @@ import org.springframework.stereotype.Component;
@Component
-public class DateUtil {
+public class DateUtil {
private static final TimeZone gmtTimeZone = TimeZone.getTimeZone("GMT+0");
public Date getDateFromNow(int days) {
return getDateFromNow(days, 0, 0);
- }
+ }
public Date getDateFromNow(int days, int hours, int minutes) {
Calendar cal = Calendar.getInstance();
@@ -47,7 +47,7 @@ public class DateUtil {
cal.add(Calendar.MINUTE, minutes);
return cal.getTime();
}
-
+
public static String dateToString(Date date, String dateFromat) {
SimpleDateFormat formatter = new SimpleDateFormat(dateFromat);
return formatter.format(date).toString();
@@ -63,7 +63,7 @@ public class DateUtil {
return cal.getTime();
}
/**
- * useful for converting client time zone Date to UTC Date
+ * useful for converting client time zone Date to UTC Date
* @param date
* @param mins
* @return
@@ -100,7 +100,7 @@ public class DateUtil {
int offset = local.getTimeZone().getOffset(epoh);
GregorianCalendar utc = new GregorianCalendar(gmtTimeZone);
utc.setTimeInMillis(epoh);
- utc.add(Calendar.MILLISECOND, -offset);
+ utc.add(Calendar.MILLISECOND, -offset);
return utc.getTime();
}catch(Exception ex){
return null;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/ErrorMessageUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/ErrorMessageUtil.java b/security-admin/src/main/java/org/apache/ranger/common/ErrorMessageUtil.java
index 582580c..a6c8fb7 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/ErrorMessageUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/ErrorMessageUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/GUIDUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/GUIDUtil.java b/security-admin/src/main/java/org/apache/ranger/common/GUIDUtil.java
index 9c725c8..2554a6c 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/GUIDUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/GUIDUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/HTTPUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/HTTPUtil.java b/security-admin/src/main/java/org/apache/ranger/common/HTTPUtil.java
index 6eba2e6..b4c632c 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/HTTPUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/HTTPUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -59,5 +59,5 @@ public class HTTPUtil {
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java b/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java
index ad89e8a..0e8b964 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java b/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java
index 4dd6020..93fc76b 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/MessageEnums.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/MessageEnums.java b/security-admin/src/main/java/org/apache/ranger/common/MessageEnums.java
index b0090ee..7be6042 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/MessageEnums.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/MessageEnums.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/MyCallBack.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/MyCallBack.java b/security-admin/src/main/java/org/apache/ranger/common/MyCallBack.java
index acbc3a7..2a5d37c 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/MyCallBack.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/MyCallBack.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java b/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
index e2d8d39..c307cf5 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java
index dae5f00..5c01e59 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -92,7 +92,7 @@ public class RESTErrorUtil {
return restException;
}
/**
- *
+ *
* @param logMessage
* This is optional
* @return
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java b/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java
index 701847f..5d0a665 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.common;
/**
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java
index afb434b..dc1aa68 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -23,8 +23,8 @@ import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
/**
- *
- *
+ *
+ *
*/
@Component
public class RangerConfigUtil {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/RangerConstants.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerConstants.java b/security-admin/src/main/java/org/apache/ranger/common/RangerConstants.java
index 666c8b1..4decbcb 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerConstants.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerConstants.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/RangerFactory.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerFactory.java b/security-admin/src/main/java/org/apache/ranger/common/RangerFactory.java
index 29d972e..136083b 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerFactory.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/RangerJAXBContextResolver.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerJAXBContextResolver.java b/security-admin/src/main/java/org/apache/ranger/common/RangerJAXBContextResolver.java
index 3b3260d..1373ecd 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerJAXBContextResolver.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerJAXBContextResolver.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,7 +27,7 @@ import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.api.json.JSONJAXBContext;
/**
- *
+ *
*
*/
@Provider
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java b/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
index 72fde46..de39693 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
@@ -111,7 +111,7 @@ public class RangerProperties extends HashMap<String,String> {
propertyValue = eElement.getElementsByTagName(XMLCONFIG_VALUE_TAGNAME).item(0).getTextContent().trim();
}
- if (get(propertyName) != null)
+ if (get(propertyName) != null)
remove(propertyName) ;
if (propertyValue != null)
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
index 2ad5795..f72823e 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -234,7 +234,7 @@ public class RangerSearchUtil extends SearchUtil {
for (SearchField searchField : searchFields) {
int startWhereLen = whereClause.length();
- if (searchField.getFieldName() == null && searchField.getCustomCondition() == null) {
+ if (searchField.getFieldName() == null && searchField.getCustomCondition() == null) {
continue;
}
@@ -284,8 +284,8 @@ public class RangerSearchUtil extends SearchUtil {
}
}
} else if (searchField.getDataType() == SearchField.DATA_TYPE.DATE) {
- Date fieldValue = restErrorUtil.parseDate(searchCriteria.getParam(searchField.getClientFieldName()),
- "Invalid value for " + searchField.getClientFieldName(), MessageEnums.INVALID_INPUT_DATA,
+ Date fieldValue = restErrorUtil.parseDate(searchCriteria.getParam(searchField.getClientFieldName()),
+ "Invalid value for " + searchField.getClientFieldName(), MessageEnums.INVALID_INPUT_DATA,
null, searchField.getClientFieldName(), null);
if (fieldValue != null) {
if (searchField.getCustomCondition() == null) {
@@ -353,8 +353,8 @@ public class RangerSearchUtil extends SearchUtil {
query.setParameter(searchField.getClientFieldName(), boolFieldValue);
}
} else if (searchField.getDataType() == SearchField.DATA_TYPE.DATE) {
- Date fieldValue = restErrorUtil.parseDate(searchCriteria.getParam(searchField.getClientFieldName()),
- "Invalid value for " + searchField.getClientFieldName(), MessageEnums.INVALID_INPUT_DATA,
+ Date fieldValue = restErrorUtil.parseDate(searchCriteria.getParam(searchField.getClientFieldName()),
+ "Invalid value for " + searchField.getClientFieldName(), MessageEnums.INVALID_INPUT_DATA,
null, searchField.getClientFieldName(), null);
if (fieldValue != null) {
query.setParameter(searchField.getClientFieldName(), fieldValue);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/RangerServicePoliciesCache.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerServicePoliciesCache.java b/security-admin/src/main/java/org/apache/ranger/common/RangerServicePoliciesCache.java
index 1cc9793..2788fd1 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerServicePoliciesCache.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerServicePoliciesCache.java
@@ -8,7 +8,7 @@
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/RangerServiceTagsCache.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerServiceTagsCache.java b/security-admin/src/main/java/org/apache/ranger/common/RangerServiceTagsCache.java
index 5521523..802f42a 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerServiceTagsCache.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerServiceTagsCache.java
@@ -8,7 +8,7 @@
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/RangerValidatorFactory.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerValidatorFactory.java b/security-admin/src/main/java/org/apache/ranger/common/RangerValidatorFactory.java
index ebe20b2..4b149e4 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerValidatorFactory.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerValidatorFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/RequestContext.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RequestContext.java b/security-admin/src/main/java/org/apache/ranger/common/RequestContext.java
index 62e63db..228b4b4 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RequestContext.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RequestContext.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -147,7 +147,7 @@ public class RequestContext implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/SearchCriteria.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchCriteria.java b/security-admin/src/main/java/org/apache/ranger/common/SearchCriteria.java
index 3dcd755..55179f9 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/SearchCriteria.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/SearchCriteria.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/SearchField.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchField.java b/security-admin/src/main/java/org/apache/ranger/common/SearchField.java
index 2d6ab14..279c1e4 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/SearchField.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/SearchField.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java b/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java
index b7f6601..77119b1 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
index df48d54..f4fcfb2 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -208,7 +208,7 @@ public class SearchUtil {
}
/**
- *
+ *
* @param request
* @param searchCriteria
* @param paramName
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/SearchValue.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchValue.java b/security-admin/src/main/java/org/apache/ranger/common/SearchValue.java
index 4a4d473..bb181c4 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/SearchValue.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/SearchValue.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,7 +27,7 @@ import java.util.List;
import org.apache.log4j.Logger;
/**
- *
+ *
*
*/
public class SearchValue {
@@ -52,7 +52,7 @@ public class SearchValue {
return value;
}
-
+
/**
* @return the valueList
@@ -68,7 +68,7 @@ public class SearchValue {
return searchField;
}
-
+
public boolean isList() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java b/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
index eb4ba2d..e244420 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -285,7 +285,7 @@ public class ServiceUtil {
if (! groupList.contains(groupName)) {
groupList.add(groupName);
}
- }
+ }
String accessType = toAccessType(permMap.getPermType());
@@ -385,7 +385,7 @@ public class ServiceUtil {
VXAsset ret = new VXAsset();
publicDataObjectTovXDataObject(vXRepository,ret);
- Integer assetType = toAssetType(vXRepository.getRepositoryType());
+ Integer assetType = toAssetType(vXRepository.getRepositoryType());
ret.setAssetType(assetType == null ? -1 : assetType.intValue());
ret.setName(vXRepository.getName());
@@ -777,7 +777,7 @@ public class ServiceUtil {
protected VXDataObject publicDataObjectTovXDataObject(VXDataObject publicDataObject,VXDataObject vXDataObject) {
- VXDataObject ret = vXDataObject;
+ VXDataObject ret = vXDataObject;
ret.setId(publicDataObject.getId());
ret.setCreateDate(publicDataObject.getCreateDate());
@@ -976,7 +976,7 @@ public class ServiceUtil {
if (!groupList.contains(permMap.getGroupName())) {
groupList.add(permMap.getGroupName());
}
- }
+ }
String perm = AppConstants.getLabelFor_XAPermType(permMap
.getPermType());
if (!permList.contains(perm)) {
@@ -1057,7 +1057,7 @@ public class ServiceUtil {
if (vXPolicy.getServices() != null) {
toRangerResourceList(vXPolicy.getServices(), "service", Boolean.FALSE, isRecursive, ret.getResources());
- }
+ }
if ( vXPolicy.getPermMapList() != null) {
List<VXPermObj> vXPermObjList = vXPolicy.getPermMapList();
@@ -1085,7 +1085,7 @@ public class ServiceUtil {
}
}
- if (vXPermObj.getPermList() != null) {
+ if (vXPermObj.getPermList() != null) {
for (String perm : vXPermObj.getPermList()) {
if ( AppConstants.getEnumFor_XAPermType(perm) != 0 ) {
if (perm.equalsIgnoreCase("Admin")) {
@@ -1130,7 +1130,7 @@ public class ServiceUtil {
private String getUserName(String userName) {
if(userName == null || userName.isEmpty()) {
-
+
XXUser xxUser = xaDaoMgr.getXXUser().findByUserName(userName);
if(xxUser != null) {
@@ -1204,14 +1204,14 @@ public class ServiceUtil {
try {
service = svcStore.getServiceByName(serviceName);
} catch (Exception e) {
- LOG.error( HttpServletResponse.SC_BAD_REQUEST + "No Service Found for ServiceName:" + serviceName );
+ LOG.error( HttpServletResponse.SC_BAD_REQUEST + "No Service Found for ServiceName:" + serviceName );
throw restErrorUtil.createRESTException(HttpServletResponse.SC_BAD_REQUEST, e.getMessage() + serviceName, true);
}
if ( service != null) {
serviceType = service.getType();
} else {
- LOG.error( HttpServletResponse.SC_BAD_REQUEST + "No Service Found for ServiceName" + serviceName );
+ LOG.error( HttpServletResponse.SC_BAD_REQUEST + "No Service Found for ServiceName" + serviceName );
throw restErrorUtil.createRESTException(HttpServletResponse.SC_BAD_REQUEST, "No Service Found for ServiceName" + serviceName, true);
}
@@ -1242,10 +1242,10 @@ public class ServiceUtil {
String tableName = vXPolicy.getTables();
tableName = StringUtil.isEmpty(tableName) ? "*" : tableName;
-
+
String colFamily = vXPolicy.getColumnFamilies();
colFamily = StringUtil.isEmpty(colFamily) ? "*": colFamily;
-
+
String qualifier = vXPolicy.getColumns();
qualifier = StringUtil.isEmpty(qualifier) ? "*" : qualifier;
@@ -1318,13 +1318,13 @@ public class ServiceUtil {
return ret;
}
-
- public boolean isValidateHttpsAuthentication( String serviceName, HttpServletRequest request) {
+
+ public boolean isValidateHttpsAuthentication( String serviceName, HttpServletRequest request) {
boolean isValidAuthentication=false;
boolean httpEnabled = PropertiesUtil.getBooleanProperty("ranger.service.http.enabled",true);
X509Certificate[] certchain = (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate");
- String ipAddress = request.getHeader("X-FORWARDED-FOR");
- if (ipAddress == null) {
+ String ipAddress = request.getHeader("X-FORWARDED-FOR");
+ if (ipAddress == null) {
ipAddress = request.getRemoteAddr();
}
boolean isSecure = request.isSecure();
@@ -1340,7 +1340,7 @@ public class ServiceUtil {
service = svcStore.getServiceByName(serviceName);
} catch (Exception e) {
LOG.error("Requested Service not found. serviceName=" + serviceName);
- throw restErrorUtil.createRESTException("Service:" + serviceName + " not found",
+ throw restErrorUtil.createRESTException("Service:" + serviceName + " not found",
MessageEnums.DATA_NOT_FOUND);
}
if(service==null){
@@ -1439,7 +1439,7 @@ public class ServiceUtil {
}
if (!isValidAuthentication) {
- LOG.error("Unauthorized access. expected [" + cnFromConfigForTest + "], found ["
+ LOG.error("Unauthorized access. expected [" + cnFromConfigForTest + "], found ["
+ commonName + "], serviceName=" + serviceName);
throw restErrorUtil.createRESTException(
"Unauthorized access. expected [" + cnFromConfigForTest
@@ -1449,7 +1449,7 @@ public class ServiceUtil {
}
}
} else {
- isValidAuthentication = true;
+ isValidAuthentication = true;
}
return isValidAuthentication;
}
@@ -1496,21 +1496,21 @@ public class ServiceUtil {
if(target != null && source != null) {
String names[] = (wildcardMatch ? new String[] { source } : source.split(","));
for (String n:names) {
-
+
if (wildcardMatch) {
if(LOG.isDebugEnabled()) LOG.debug("Wildcard Matching [" + target + "] with [" + n + "]");
if (wildcardMatch(target,n)) {
if(LOG.isDebugEnabled()) LOG.debug("Matched target:" + target + " with " + n);
matched = true;
break;
- }
+ }
} else {
if(LOG.isDebugEnabled()) LOG.debug("Matching [" + target + "] with [" + n + "]");
if (target.equalsIgnoreCase(n)) {
if(LOG.isDebugEnabled()) LOG.debug("Matched target:" + target + " with " + n);
matched = true;
break;
- }
+ }
}
}
} else {
@@ -1518,11 +1518,11 @@ public class ServiceUtil {
}
return matched;
}
-
+
private boolean matchNames(String target, String source) {
return matchNames(target,source,false);
- }
-
+ }
+
private boolean wildcardMatch(String target, String source) {
boolean matched = false;
if(target != null && source != null) {
@@ -1536,7 +1536,7 @@ public class ServiceUtil {
}
return matched;
}
-
+
private Boolean toBooleanReplacePerm(boolean isReplacePermission) {
@@ -1555,7 +1555,7 @@ public class ServiceUtil {
try {
service = svcStore.getServiceByName(serviceName);
} catch (Exception e) {
- LOG.info( HttpServletResponse.SC_BAD_REQUEST + "No Service Found for ServiceName:" + serviceName );
+ LOG.info( HttpServletResponse.SC_BAD_REQUEST + "No Service Found for ServiceName:" + serviceName );
throw restErrorUtil.createRESTException(HttpServletResponse.SC_BAD_REQUEST, e.getMessage() + serviceName, true);
}
}
@@ -1563,7 +1563,7 @@ public class ServiceUtil {
String serviceType = service != null ? service.getType() : null;
Integer assetType = toAssetType(serviceType);
-
+
return assetType;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/SortField.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/SortField.java b/security-admin/src/main/java/org/apache/ranger/common/SortField.java
index 7ffc188..abdfc16 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/SortField.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/SortField.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -66,7 +66,7 @@ public class SortField {
return paramName;
}
-
+
/**
* @return the fieldName
@@ -75,7 +75,7 @@ public class SortField {
return fieldName;
}
-
+
/**
* @return the isDefault
@@ -84,7 +84,7 @@ public class SortField {
return isDefault;
}
-
+
/**
* @return the defaultOrder
@@ -93,7 +93,7 @@ public class SortField {
return defaultOrder;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java b/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java
index 521d16e..a46858d 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -58,7 +58,7 @@ public class StringUtil implements Serializable {
/**
* Checks if the string is null or empty string.
- *
+ *
* @param str
* @return true if it is empty string or null
*/
@@ -234,7 +234,7 @@ public class StringUtil implements Serializable {
/**
* Checks if the list is null or empty list.
- *
+ *
* @param list
* @return true if it is empty list or null
*/
@@ -251,11 +251,11 @@ public class StringUtil implements Serializable {
* @return
*/
public String getValidUserName(String str) {
- return str.indexOf("/") >= 0 ?
+ return str.indexOf("/") >= 0 ?
str.substring(0,str.indexOf("/"))
- : str.indexOf("@") >= 0 ?
- str.substring(0,str.indexOf("@"))
- : str;
+ : str.indexOf("@") >= 0 ?
+ str.substring(0,str.indexOf("@"))
+ : str;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java b/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java
index f833242..d67c955 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -40,7 +40,7 @@ public class TimedEventUtil{
}, timeout, timeUnit);
}
- public static <T> T timedTask(Callable<T> callableObj, long timeout,
+ public static <T> T timedTask(Callable<T> callableObj, long timeout,
TimeUnit timeUnit) throws Exception{
return callableObj.call();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java b/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java
index 071948e..c497393 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -73,7 +73,7 @@ public class TimedExecutor {
final BlockingQueue<Runnable> blockingQueue = new ArrayBlockingQueue<>(configurator.getBlockingQueueSize());
_executorService = new LocalThreadPoolExecutor(configurator.getCoreThreadPoolSize(), configurator.getMaxThreadPoolSize(),
- configurator.getKeepAliveTime(), configurator.getKeepAliveTimeUnit(),
+ configurator.getKeepAliveTime(), configurator.getKeepAliveTimeUnit(),
blockingQueue, _ThreadFactory);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/TimedExecutorConfigurator.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/TimedExecutorConfigurator.java b/security-admin/src/main/java/org/apache/ranger/common/TimedExecutorConfigurator.java
index 1b43abe..6660297 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/TimedExecutorConfigurator.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/TimedExecutorConfigurator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/UserSessionBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/UserSessionBase.java b/security-admin/src/main/java/org/apache/ranger/common/UserSessionBase.java
index 520aa88..bcf9080 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/UserSessionBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/UserSessionBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationClassName.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationClassName.java b/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationClassName.java
index c85f3da..eead684 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationClassName.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationClassName.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationJSMgrName.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationJSMgrName.java b/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationJSMgrName.java
index 911b414..7354a77 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationJSMgrName.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationJSMgrName.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,7 +26,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
- *
+ *
*
*/
@Retention(RetentionPolicy.RUNTIME)
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationRestAPI.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationRestAPI.java b/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationRestAPI.java
index a91d9ec..25eccfe 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationRestAPI.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationRestAPI.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java b/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java
index f6b2a14..0916f26 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java b/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java
index ece3b6e..6151ec5 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java b/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java
index 3d5c252..630364a 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -48,7 +48,7 @@ public class VEnum extends ViewBaseBean implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>enumName</b>. You
* cannot set null to the attribute.
- *
+ *
* @param enumName
* Value to set member attribute <b>enumName</b>
*/
@@ -58,7 +58,7 @@ public class VEnum extends ViewBaseBean implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>enumName</b>
- *
+ *
* @return String - value of member attribute <b>enumName</b>.
*/
public String getEnumName() {
@@ -68,7 +68,7 @@ public class VEnum extends ViewBaseBean implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>elementList</b>.
* You cannot set null to the attribute.
- *
+ *
* @param elementList
* Value to set member attribute <b>elementList</b>
*/
@@ -78,7 +78,7 @@ public class VEnum extends ViewBaseBean implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>elementList</b>
- *
+ *
* @return List<VEnumElement> - value of member attribute
* <b>elementList</b>.
*/
@@ -93,7 +93,7 @@ public class VEnum extends ViewBaseBean implements java.io.Serializable {
/**
* This return the bean content in string format
- *
+ *
* @return formatedStr
*/
public String toString() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java b/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java
index 4a73ce7..bb063da 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/view/VList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/VList.java b/security-admin/src/main/java/org/apache/ranger/common/view/VList.java
index b159316..1f956a2 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/VList.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/VList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -122,7 +122,7 @@ public abstract class VList extends ViewBaseBean implements
}
public long getTotalCount() { return totalCount; }
-
+
/**
* This method sets the value to the member attribute <b>resultSize</b>. You
@@ -169,11 +169,11 @@ public abstract class VList extends ViewBaseBean implements
}
public String getSortBy() { return sortBy; }
-
-
-
+
+
+
/*
* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java b/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java
index eb2e0e3..c6ead4a 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java b/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java
index b93da50..9badaa1 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/credentialapi/CredentialReader.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/credentialapi/CredentialReader.java b/security-admin/src/main/java/org/apache/ranger/credentialapi/CredentialReader.java
index 429be27..f782396 100644
--- a/security-admin/src/main/java/org/apache/ranger/credentialapi/CredentialReader.java
+++ b/security-admin/src/main/java/org/apache/ranger/credentialapi/CredentialReader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -33,7 +33,7 @@ public class CredentialReader {
try{
if(CrendentialProviderPath==null || alias==null||CrendentialProviderPath.trim().isEmpty()||alias.trim().isEmpty()){
return null;
- }
+ }
char[] pass = null;
Configuration conf = new Configuration();
String crendentialProviderPrefixJceks=JavaKeyStoreProvider.SCHEME_NAME + "://file";
@@ -55,7 +55,7 @@ public class CredentialReader {
//UserProvider.SCHEME_NAME + ":///," +
JavaKeyStoreProvider.SCHEME_NAME + "://file/" + CrendentialProviderPath);
}
- }
+ }
List<CredentialProvider> providers = CredentialProviderFactory.getProviders(conf);
List<String> aliasesList=new ArrayList<String>();
CredentialProvider.CredentialEntry credEntry=null;
@@ -69,7 +69,7 @@ public class CredentialReader {
if(pass!=null && pass.length>0){
credential=String.valueOf(pass);
break;
- }
+ }
}
}
}catch(Exception ex){
@@ -78,10 +78,10 @@ public class CredentialReader {
}
return credential;
}
-
+
/*
public static void main(String args[]) throws Exception{
- String keystoreFile =new String("/tmp/mykey3.jceks");
+ String keystoreFile =new String("/tmp/mykey3.jceks");
String password=CredentialReader.getDecryptedString(keystoreFile, "mykey3");
System.out.println(password);
}*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java
index 4a11626..c21469d 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java
index 21efcf9..6cd5c9f 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.db;
/**
- *
+ *
*/
import javax.persistence.EntityManager;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java
index 7bd6a3e..cb22283 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java
index 7aea48c..686137e 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,7 +32,7 @@ public class XXAssetDao extends BaseDao<XXAsset> {
public XXAssetDao( RangerDaoManagerBase daoManager ) {
super(daoManager);
}
-
+
public XXAsset findByAssetName(String name){
if (daoManager.getStringUtil().isEmpty(name)) {
logger.debug("name is empty");
@@ -49,6 +49,6 @@ public class XXAssetDao extends BaseDao<XXAsset> {
}
return null;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java
index 481e486..4290d9b 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
index c05546f..475b278 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,7 +31,7 @@ public class XXAuthSessionDao extends BaseDao<XXAuthSession> {
public XXAuthSessionDao( RangerDaoManagerBase daoManager ) {
super(daoManager);
}
-
+
@SuppressWarnings("unchecked")
public List<Object[]> getUserLoggedIn(){
return getEntityManager()
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXContextEnricherDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXContextEnricherDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXContextEnricherDefDao.java
index 370ebeb..c3d322d 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXContextEnricherDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXContextEnricherDefDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java
index d95bfb4..1e6c443 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java
index d20fbff..2a64c89 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
index ee536c9..19e2e11 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java
index 0e0783d..cbe95f9 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java
index b437656..c844084 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java
index 23c5c48..6c866c3 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java
index 5f917cc..d2fc6e2 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java
index fe9b32b..9841131 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -69,7 +69,7 @@ public class XXPortalUserDao extends BaseDao<XXPortalUser> {
.setParameter("userRole", userRole.toUpperCase())
.getResultList();
}
-
+
@SuppressWarnings("unchecked")
public List<Object[]> getUserAddedReport(){
return getEntityManager()
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java
index 569814f..adf100a 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[04/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java
index e8b0c50..a07a524 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java b/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java
index 16e3fdf..f3f7c80 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -447,7 +447,7 @@ public class XPolicyService extends PublicAPIServiceBase<VXResource, VXPolicy> {
if (!groupList.contains(permMap.getGroupName())) {
groupList.add(permMap.getGroupName());
}
- }
+ }
String perm = AppConstants.getLabelFor_XAPermType(permMap
.getPermType());
if (!permList.contains(perm)) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java
index 019f0a5..bb12e3e 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java
index c5fdec9..ed4e18b 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java b/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java
index 6fa30fb..58b6d72 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
index 7de7210..817fdda 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -120,7 +120,7 @@ public class XResourceService extends
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
searchFields.add(new SearchField("fullPolicyName", "obj.policyName",
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.FULL));
- searchFields.add(new SearchField("columns", "obj.columns",
+ searchFields.add(new SearchField("columns", "obj.columns",
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
searchFields.add(new SearchField("columnFamilies",
"obj.columnFamilies", SearchField.DATA_TYPE.STRING,
@@ -162,7 +162,7 @@ public class XResourceService extends
SearchField.DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL,
"XXAsset xxAsset", "xxAsset.id = obj.assetId "));
- searchFields.add(new SearchField("id", "obj.id",
+ searchFields.add(new SearchField("id", "obj.id",
SearchField.DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL));
searchFields.add(new SearchField("topologies", "obj.topologies",
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
@@ -187,7 +187,7 @@ public class XResourceService extends
@Override
protected void validateForCreate(VXResource vObj) {
if(vObj == null){
- throw restErrorUtil.createRESTException("Policy not provided.",
+ throw restErrorUtil.createRESTException("Policy not provided.",
MessageEnums.DATA_NOT_FOUND);
}
Long assetId = vObj.getAssetId();
@@ -195,7 +195,7 @@ public class XResourceService extends
XXAsset xAsset = rangerDaoManager.getXXAsset().getById(assetId);
if(xAsset == null){
throw restErrorUtil.createRESTException("The repository for which "
- + "the policy is created, doesn't exist in the system.",
+ + "the policy is created, doesn't exist in the system.",
MessageEnums.OPER_NOT_ALLOWED_FOR_STATE);
}
} else {
@@ -221,7 +221,7 @@ public class XResourceService extends
// .findByResourceNameAndAssetIdAndRecursiveFlag(resName, assetId, isRecursive);
// } else {
// xXResourceList = appDaoManager.getXXResource()
-// .findByResourceNameAndAssetIdAndResourceType(vObj.getName(),
+// .findByResourceNameAndAssetIdAndResourceType(vObj.getName(),
// vObj.getAssetId(), vObj.getResourceType());
// }
//
@@ -229,7 +229,7 @@ public class XResourceService extends
// boolean similarPolicyFound = false;
// for(XXResource xxResource : xXResourceList){
// String dbResourceName = xxResource.getName();
-// // Not checking dbResourceName to be null or empty
+// // Not checking dbResourceName to be null or empty
// // as this should never be the case
// String[] resources = stringUtil.split(dbResourceName, ",");
// for(String dbResource: resources){
@@ -272,7 +272,7 @@ public class XResourceService extends
}
if ((vObj != null && mObj != null) &&
(!vObj.getName().equalsIgnoreCase(mObj.getName()) ||
- vObj.getIsRecursive()!=mObj.getIsRecursive() ||
+ vObj.getIsRecursive()!=mObj.getIsRecursive() ||
vObj.getResourceType() != mObj.getResourceType())) {
validateForCreate(vObj);
}
@@ -298,11 +298,11 @@ public class XResourceService extends
List<VXPermMap> vxPermMapList = vXResource.getPermMapList();
if (vxPermMapList != null) {
for (VXPermMap permMap : vxPermMapList) {
- if (permMap.getUserId() == null && permMap.getGroupId() == null
+ if (permMap.getUserId() == null && permMap.getGroupId() == null
&& vxAuditMapList == null){
if(vxAuditMapList == null){
throw restErrorUtil.createRESTException("Please provide"
- + " valid group/user permissions for policy.",
+ + " valid group/user permissions for policy.",
MessageEnums.INVALID_INPUT_DATA);
}
} else {
@@ -378,7 +378,7 @@ public class XResourceService extends
searchCriteria, searchFields, sortFields, returnList);
List<XXResource> adminPermResourceList = new ArrayList<XXResource>();
for (XXResource xXResource : resultList) {
- VXResponse vXResponse = xaBizUtil.hasPermission(populateViewBean(xXResource),
+ VXResponse vXResponse = xaBizUtil.hasPermission(populateViewBean(xXResource),
AppConstants.XA_PERM_TYPE_ADMIN);
if(vXResponse.getStatusCode() == VXResponse.STATUS_SUCCESS){
adminPermResourceList.add(xXResource);
@@ -520,12 +520,12 @@ public class XResourceService extends
if (pathList != null && pathList.size() != 0) {
List<VXPermMap> vxPermMaps = vXResource.getPermMapList();
- //update perm list and read and execute
+ //update perm list and read and execute
vxPermMaps=updatePermMaps(vxPermMaps);
for (VXPermMap vxPermMap : vxPermMaps) {
//check only read and execution permission
if (vxPermMap.getPermFor() == AppConstants.XA_PERM_FOR_USER
- &&(vxPermMap.getPermType()==AppConstants.XA_PERM_TYPE_READ ||
+ &&(vxPermMap.getPermType()==AppConstants.XA_PERM_TYPE_READ ||
vxPermMap.getPermType()==AppConstants.XA_PERM_TYPE_EXECUTE)) {
boolean access = checkUserAccess(vxPermMap, pathList,
vXResource.getAssetId(),
@@ -548,7 +548,7 @@ public class XResourceService extends
}
//check only read and execution permission
if (vxPermMap.getPermFor() == AppConstants.XA_PERM_FOR_GROUP
- &&(vxPermMap.getPermType()==AppConstants.XA_PERM_TYPE_READ ||
+ &&(vxPermMap.getPermType()==AppConstants.XA_PERM_TYPE_READ ||
vxPermMap.getPermType()==AppConstants.XA_PERM_TYPE_EXECUTE)) {
boolean access = checkGroupAccess(vxPermMap, pathList,
vXResource.getAssetId(),
@@ -562,7 +562,7 @@ public class XResourceService extends
.getLabelFor_XAPermType(vxPermMap.getPermType()).toLowerCase()
+ " permission on parent folder. Do you want to save this policy?"
,
- MessageEnums.OPER_NO_PERMISSION, null,
+ MessageEnums.OPER_NO_PERMISSION, null,
"parentPermission", null);
}
}
@@ -574,7 +574,7 @@ public class XResourceService extends
/**
* check user permission
- *
+ *
* @param vxPermMap
* @param pathList
* @return
@@ -611,7 +611,7 @@ public class XResourceService extends
/**
* check group permission on path
- *
+ *
* @param vxPermMap
* @param pathList
* @return
@@ -845,7 +845,7 @@ public class XResourceService extends
}
}
- HashMap<Long, HashMap<Integer, VXPermMap>> userPermMap =
+ HashMap<Long, HashMap<Integer, VXPermMap>> userPermMap =
new HashMap<Long, HashMap<Integer, VXPermMap>>();
for (Long userId : listOfUser) {
@@ -859,8 +859,8 @@ public class XResourceService extends
userPermMap.put(userId, userPerm);
}
- //[2] :
- HashMap<Long, HashMap<Integer, VXPermMap>> groupPermMap =
+ //[2] :
+ HashMap<Long, HashMap<Integer, VXPermMap>> groupPermMap =
new HashMap<Long, HashMap<Integer, VXPermMap>>();
for (Long groupId : listOfGroup) {
@@ -972,7 +972,7 @@ public class XResourceService extends
int policyType = vObj.getAssetType();
if(policyType == AppConstants.ASSET_HDFS){
- String[] ignoredAttribs = {"tableType", "columnType", "isEncrypt", "databases",
+ String[] ignoredAttribs = {"tableType", "columnType", "isEncrypt", "databases",
"tables", "columnFamilies", "columns", "udfs"};
if(ArrayUtils.contains(ignoredAttribs, fieldName)){
continue;
@@ -983,13 +983,13 @@ public class XResourceService extends
continue;
}
} else if(policyType == AppConstants.ASSET_HBASE){
- String[] ignoredAttribs = {"name", "tableType", "columnType", "isRecursive", "databases",
+ String[] ignoredAttribs = {"name", "tableType", "columnType", "isRecursive", "databases",
"udfs"};
if(ArrayUtils.contains(ignoredAttribs, fieldName)){
continue;
}
} else if(policyType == AppConstants.ASSET_KNOX || policyType == AppConstants.ASSET_STORM){
- String[] ignoredAttribs = {"name", "tableType", "columnType", "isEncrypt", "databases",
+ String[] ignoredAttribs = {"name", "tableType", "columnType", "isEncrypt", "databases",
"tables", "columnFamilies", "columns", "udfs"};
if(ArrayUtils.contains(ignoredAttribs, fieldName)){
continue;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java
index 4c123ef..1fb3750 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
index f28ccca..6f05d36 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -126,7 +126,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
predicate = criteriaBuilder.and(predicate, stringPredicate);
}
- } else if (searchField.getDataType() == SearchField.DATA_TYPE.INT_LIST ||
+ } else if (searchField.getDataType() == SearchField.DATA_TYPE.INT_LIST ||
isListValue && searchField.getDataType() == SearchField.DATA_TYPE.INTEGER) {
// build where clause for integer lists or integers datatypes
intValueList = null;
@@ -164,7 +164,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
datePredicate = criteriaBuilder.equal(rootEntityType.get(attr), fieldValue);
}
predicate = criteriaBuilder.and(predicate, datePredicate);
- }
+ }
}
}
@@ -251,7 +251,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
predicate = criteriaBuilder.and(predicate, stringPredicate);
}
- } else if (searchField.getDataType() == SearchField.DATA_TYPE.INT_LIST ||
+ } else if (searchField.getDataType() == SearchField.DATA_TYPE.INT_LIST ||
isListValue && searchField.getDataType() == SearchField.DATA_TYPE.INTEGER) {
// build where clause for integer lists or integers datatypes
intValueList = null;
@@ -289,7 +289,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
datePredicate = criteriaBuilder.equal(rootEntityType.get(attr), fieldValue);
}
predicate = criteriaBuilder.and(predicate, datePredicate);
- }
+ }
}
}
@@ -309,7 +309,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
}
@SuppressWarnings({ "rawtypes", "unchecked" })
- private Predicate buildWhereClause(Predicate predicate, Map<String, Object> paramList, EntityType<XXTrxLog> trxLogEntity,
+ private Predicate buildWhereClause(Predicate predicate, Map<String, Object> paramList, EntityType<XXTrxLog> trxLogEntity,
CriteriaBuilder criteriaBuilder, Root<XXTrxLog> root){
for(String key : paramList.keySet()) {
@@ -338,7 +338,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
Predicate stringPredicate = criteriaBuilder.equal(root.get(attr), paramValue);
predicate = criteriaBuilder.and(predicate, stringPredicate);
}
- } else if (searchField.getDataType() == SearchField.DATA_TYPE.INT_LIST ||
+ } else if (searchField.getDataType() == SearchField.DATA_TYPE.INT_LIST ||
isListValue && searchField.getDataType() == SearchField.DATA_TYPE.INTEGER) {
// build where clause for integer lists or integers datatypes
Collection<Number> intValueList = null;
@@ -375,7 +375,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
datePredicate = criteriaBuilder.equal(root.get(attr), fieldValue);
}
predicate = criteriaBuilder.and(predicate, datePredicate);
- }
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java
index e23ee6c..f778e14 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
index 8210650..8ba9ef6 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -104,7 +104,7 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> {
searchFields.add(new SearchField("userRoleList", "xXPortalUserRole.userRole",
SearchField.DATA_TYPE.STR_LIST, SearchField.SEARCH_TYPE.FULL,
- "XXPortalUser xXPortalUser, XXPortalUserRole xXPortalUserRole",
+ "XXPortalUser xXPortalUser, XXPortalUserRole xXPortalUserRole",
"xXPortalUser.id=xXPortalUserRole.userId and xXPortalUser.loginId = obj.name "));
searchFields.add(new SearchField("isVisible", "obj.isVisible",
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java
index 943e280..9669c0b 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.service;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java b/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java
index 2e7881e..5b78925 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -80,7 +80,7 @@ public class RangerRESTAPIFilter extends LoggingFilter {
/*
* (non-Javadoc)
- *
+ *
* @see
* com.sun.jersey.spi.container.ContainerRequestFilter#filter(com.sun.jersey
* .spi.container.ContainerRequest)
@@ -109,7 +109,7 @@ public class RangerRESTAPIFilter extends LoggingFilter {
/*
* (non-Javadoc)
- *
+ *
* @see
* com.sun.jersey.spi.container.ContainerResponseFilter#filter(com.sun.jersey
* .spi.container.ContainerRequest,
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java
index d2255f2..af7f30c 100644
--- a/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java
+++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
index b924646..66dc067 100644
--- a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
index b09a73b..632ef60 100644
--- a/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java b/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java
index 1ed340e..2c6c8a7 100644
--- a/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,7 +31,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.stereotype.Component;
/**
- *
+ *
*
*/
@Component
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java b/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java
index a0cb7ee..9667256 100644
--- a/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
package org.apache.ranger.util;
/**
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java b/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java
index 9d10d27..2603b51 100644
--- a/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -63,7 +63,7 @@ public class RangerRestUtil {
/**
* This method cleans up the data provided by the user for update
- *
+ *
* @param userProfile
* @return
*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/util/RestUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/util/RestUtil.java b/security-admin/src/main/java/org/apache/ranger/util/RestUtil.java
index cdb0a7d..b50d161 100644
--- a/security-admin/src/main/java/org/apache/ranger/util/RestUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/util/RestUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java
index e3a72cf..f99aa05 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Access Audit
- *
+ *
*/
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java
index 09f5120..04f881a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* List wrapper class for VXAccessAudit
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java b/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java
index 0d44f5e..d5135c1 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java
index 46d61ac..60393ae 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* List wrapper class for VXAsset
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java
index dc94e28..4ecb6ab 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Audi map
- *
+ *
*/
import javax.xml.bind.annotation.XmlRootElement;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java
index 499d8f4..fa34030 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* List wrapper class for VXAuditMap
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecord.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecord.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecord.java
index 680b59d..32b62b5 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecord.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecord.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -216,7 +216,7 @@ public class VXAuditRecord {
/**
* This return the bean content in string format
- *
+ *
* @return formatedStr
*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java
index 42ff4d1..a2c0fb3 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -38,7 +38,7 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
public class VXAuditRecordList extends VList {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
List<VXAuditRecord> vXAuditRecords = new ArrayList<VXAuditRecord>();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java
index e3eec59..174398d 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Authentication sessions
- *
+ *
*/
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java
index a20c07a..32a23b8 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* List wrapper class for VXAuthSession
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java b/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java
index 9a9aac2..adfb832 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Credential Store
-
+
*/
import javax.xml.bind.annotation.XmlRootElement;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java b/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java
index fe992a7..93dfd5c 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java b/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java
index 476b054..5c75f7f 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Base object class
- *
+ *
*/
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java
index 5c7e6fb..624dd5a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java
index 37ad010..d506117 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Group of groups
- *
+ *
*/
import javax.xml.bind.annotation.XmlRootElement;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java
index afc8470..74d3037 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java
index 28b541f..43650bf 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* List wrapper class for VXGroup
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java
index 1068f3f..b338ce6 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java
index 1741b19..4b5a5f9 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXKmsKey.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXKmsKey.java b/security-admin/src/main/java/org/apache/ranger/view/VXKmsKey.java
index dc71f13..d7a0b4d 100755
--- a/security-admin/src/main/java/org/apache/ranger/view/VXKmsKey.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXKmsKey.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Key
- *
+ *
*/
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXKmsKeyList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXKmsKeyList.java b/security-admin/src/main/java/org/apache/ranger/view/VXKmsKeyList.java
index 05e96f5..ad65e77 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXKmsKeyList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXKmsKeyList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* List wrapper class for VXKey
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXLong.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXLong.java b/security-admin/src/main/java/org/apache/ranger/view/VXLong.java
index 615371c..d324bc5 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXLong.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXLong.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Long
- *
+ *
*/
import javax.xml.bind.annotation.XmlRootElement;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java b/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java
index f516e95..5ee6b97 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Message class
- *
+ *
*/
import javax.xml.bind.annotation.XmlRootElement;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java b/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java
index 128c740..96f7117 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Change password structure
- *
+ *
*/
import javax.xml.bind.annotation.XmlRootElement;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java
index b273da0..b8ac46a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Permission map
- *
+ *
*/
import javax.xml.bind.annotation.XmlRootElement;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java
index 4bf5334..777045d 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* List wrapper class for VXPermMap
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java
index 8da18e3..d1de837 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -126,7 +126,7 @@ public class VXPermObj implements java.io.Serializable {
/**
* This return the bean content in string format
- *
+ *
* @return formatedStr
*/
public String toString() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java
index c60c2f2..b23b1c9 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java
index 1c96da2..c73d42b 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -103,7 +103,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
protected String services;
/**
* Resource/Policy Status, boolean values : true/false
- *
+ *
*/
protected boolean isEnabled;
/**
@@ -132,7 +132,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>policyName</b>
- *
+ *
* @return String - value of member attribute <b>policyName</b>.
*/
public String getPolicyName() {
@@ -142,7 +142,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>policyName</b>. You
* cannot set null to the attribute.
- *
+ *
* @param policyName
* Value to set member attribute <b>policyName</b>
*/
@@ -153,7 +153,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>resourceName</b>.
* You cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b>resourceName</b>
*/
@@ -163,7 +163,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>resourceName</b>
- *
+ *
* @return String - value of member attribute <b>resourceName</b>.
*/
public String getResourceName() {
@@ -173,7 +173,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>description</b>.
* You cannot set null to the attribute.
- *
+ *
* @param description
* Value to set member attribute <b>description</b>
*/
@@ -183,7 +183,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>description</b>
- *
+ *
* @return String - value of member attribute <b>description</b>.
*/
public String getDescription() {
@@ -193,7 +193,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>assetName</b>. You
* cannot set null to the attribute.
- *
+ *
* @param assetName
* Value to set member attribute <b>assetName</b>
*/
@@ -203,7 +203,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>repositoryName</b>
- *
+ *
* @return String - value of member attribute <b>repositoryName</b>.
*/
public String getRepositoryName() {
@@ -213,7 +213,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>assetType</b>. You
* cannot set null to the attribute.
- *
+ *
* @param assetType
* Value to set member attribute <b>assetType</b>
*/
@@ -223,7 +223,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>repositoryType</b>
- *
+ *
* @return String - value of member attribute <b>repositoryType</b>.
*/
public String getRepositoryType() {
@@ -233,7 +233,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>permMapList</b>.
* You cannot set null to the attribute.
- *
+ *
* @param permMapList
* Value to set member attribute <b>permMapList</b>
*/
@@ -243,7 +243,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>userPermList</b>
- *
+ *
* @return List<VXPermObj> - value of member attribute <b>permMapList</b>.
*/
public List<VXPermObj> getPermMapList() {
@@ -253,7 +253,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>tables</b>. You
* cannot set null to the attribute.
- *
+ *
* @param tables
* Value to set member attribute <b>tables</b>
*/
@@ -263,7 +263,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>tables</b>
- *
+ *
* @return String - value of member attribute <b>tables</b>.
*/
public String getTables() {
@@ -273,7 +273,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>columnFamilies</b>.
* You cannot set null to the attribute.
- *
+ *
* @param columnFamilies
* Value to set member attribute <b>columnFamilies</b>
*/
@@ -283,7 +283,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>columnFamilies</b>
- *
+ *
* @return String - value of member attribute <b>columnFamilies</b>.
*/
public String getColumnFamilies() {
@@ -293,7 +293,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>columns</b>. You
* cannot set null to the attribute.
- *
+ *
* @param columns
* Value to set member attribute <b>columns</b>
*/
@@ -303,7 +303,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>columns</b>
- *
+ *
* @return String - value of member attribute <b>columns</b>.
*/
public String getColumns() {
@@ -313,7 +313,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>databases</b>. You
* cannot set null to the attribute.
- *
+ *
* @param databases
* Value to set member attribute <b>databases</b>
*/
@@ -323,7 +323,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>databases</b>
- *
+ *
* @return String - value of member attribute <b>databases</b>.
*/
public String getDatabases() {
@@ -333,7 +333,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>udfs</b>. You
* cannot set null to the attribute.
- *
+ *
* @param udfs
* Value to set member attribute <b>udfs</b>
*/
@@ -343,7 +343,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>udfs</b>
- *
+ *
* @return String - value of member attribute <b>udfs</b>.
*/
public String getUdfs() {
@@ -352,7 +352,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>tableType</b>
- *
+ *
* @return String - value of member attribute <b>tableType</b>.
*/
public String getTableType() {
@@ -362,7 +362,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>tableType</b>. You
* cannot set null to the attribute.
- *
+ *
* @param tableType
* Value to set member attribute <b>tableType</b>
*/
@@ -372,7 +372,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>columnType</b>
- *
+ *
* @return String - value of member attribute <b>columnType</b>.
*/
public String getColumnType() {
@@ -382,7 +382,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>columnType</b>. You
* cannot set null to the attribute.
- *
+ *
* @param columnType
* Value to set member attribute <b>columnType</b>
*/
@@ -392,7 +392,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>topologies</b>
- *
+ *
* @return String - value of member attribute <b>topologies</b>.
*/
public String getTopologies() {
@@ -402,7 +402,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>topologies</b>. You
* cannot set null to the attribute.
- *
+ *
* @param topologies
* Value to set member attribute <b>topologies</b>
*/
@@ -412,7 +412,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>services</b>
- *
+ *
* @return String - value of member attribute <b>services</b>.
*/
public String getServices() {
@@ -422,7 +422,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>services</b>. You
* cannot set null to the attribute.
- *
+ *
* @param services
* Value to set member attribute <b>services</b>
*/
@@ -433,7 +433,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>resourceStatus</b>.
* You cannot set null to the attribute.
- *
+ *
* @param isEnabled
* Value to set member attribute <b>isEnable</b>
*/
@@ -443,7 +443,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>isEnable</b>
- *
+ *
* @return boolean - value of member attribute <b>isEnable</b>.
*/
public boolean getIsEnabled() {
@@ -453,7 +453,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>isRecursive</b>.
* You cannot set null to the attribute.
- *
+ *
* @param isRecursive
* Value to set member attribute <b>isRecursive</b>
*/
@@ -463,7 +463,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>isRecursive</b>
- *
+ *
* @return boolean - value of member attribute <b>isRecursive</b>.
*/
public Boolean getIsRecursive() {
@@ -473,7 +473,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>isAuditEnabled</b>.
* You cannot set null to the attribute.
- *
+ *
* @param isAuditEnabled
* Value to set member attribute <b>isAuditEnabled</b>
*/
@@ -483,7 +483,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>isAuditEnabled</b>
- *
+ *
* @return boolean - value of member attribute <b>isAuditEnabled</b>.
*/
public boolean getIsAuditEnabled() {
@@ -492,7 +492,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>version</b>
- *
+ *
* @return String - value of member attribute <b>version</b>.
*/
public String getVersion() {
@@ -502,7 +502,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>version</b>. You
* cannot set null to the attribute.
- *
+ *
* @param version
* Value to set member attribute <b>version</b>
*/
@@ -533,7 +533,7 @@ public class VXPolicy extends VXDataObject implements java.io.Serializable {
/**
* This return the bean content in string format
- *
+ *
* @return formatedStr
*/
public String toString() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java
index 6e34754..41322da 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Audit Log for Policy Export
- *
+ *
*/
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java
index ad740db..3e5b5f8 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java
index 2e5f55d..fc4849c 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java
index b08d518..ecdf756 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java
index b0840d6..b74463e 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* List wrapper class for VXPortalUser
- *
+ *
*/
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java b/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java
index dae717c..a4c456e 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -76,7 +76,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>name</b>. You
* cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b>name</b>
*/
@@ -86,7 +86,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return String - value of member attribute <b>name</b>.
*/
public String getName() {
@@ -96,7 +96,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>description</b>.
* You cannot set null to the attribute.
- *
+ *
* @param description
* Value to set member attribute <b>description</b>
*/
@@ -106,7 +106,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>description</b>
- *
+ *
* @return String - value of member attribute <b>description</b>.
*/
public String getDescription() {
@@ -116,7 +116,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>repositoryType</b>.
* You cannot set null to the attribute.
- *
+ *
* @param repositoryType
* Value to set member attribute <b>repositoryType</b>
*/
@@ -126,7 +126,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>repositoryType</b>
- *
+ *
* @return String - value of member attribute <b>repositoryType</b>.
*/
public String getRepositoryType() {
@@ -136,7 +136,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>config</b>. You
* cannot set null to the attribute.
- *
+ *
* @param config
* Value to set member attribute <b>config</b>
*/
@@ -146,7 +146,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>config</b>
- *
+ *
* @return String - value of member attribute <b>config</b>.
*/
public String getConfig() {
@@ -156,7 +156,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>isActive</b>. You
* cannot set null to the attribute.
- *
+ *
* @param isActive
* Value to set member attribute <b>isActive</b>
*/
@@ -166,7 +166,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>isActive</b>
- *
+ *
* @return boolean - value of member attribute <b>isActive</b>.
*/
public boolean getIsActive() {
@@ -175,7 +175,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>version</b>
- *
+ *
* @return String - value of member attribute <b>version</b>.
*/
public String getVersion() {
@@ -185,7 +185,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>version</b>. You
* cannot set null to the attribute.
- *
+ *
* @param version
* Value to set member attribute <b>version</b>
*/
@@ -200,7 +200,7 @@ public class VXRepository extends VXDataObject implements java.io.Serializable {
/**
* This return the bean content in string format
- *
+ *
* @return formatedStr
*/
public String toString() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java b/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java
index 987587a..5e9c99b 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[16/19] incubator-ranger git commit: Removing spaces before semicolons
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java b/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
index 541c5aa..b1225c2 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
@@ -49,7 +49,7 @@ public class TagAdminRESTSink implements TagSink, Runnable {
private static final String REST_PREFIX = "/service";
private static final String MODULE_PREFIX = "/tags";
- private static final String REST_MIME_TYPE_JSON = "application/json" ;
+ private static final String REST_MIME_TYPE_JSON = "application/json";
private static final String REST_URL_IMPORT_SERVICETAGS_RESOURCE = REST_PREFIX + MODULE_PREFIX + "/importservicetags/";
@@ -136,7 +136,7 @@ public class TagAdminRESTSink implements TagSink, Runnable {
private ServiceTags doUpload(ServiceTags serviceTags) throws Exception {
if(!StringUtils.isEmpty(authenticationType) && authenticationType.trim().equalsIgnoreCase(AUTH_TYPE_KERBEROS) && SecureClientLogin.isKerberosCredentialExists(principal, keytab)){
try{
- Subject sub = SecureClientLogin.loginUserFromKeytab(principal, keytab, nameRules) ;
+ Subject sub = SecureClientLogin.loginUserFromKeytab(principal, keytab, nameRules);
if(LOG.isDebugEnabled()) {
LOG.debug("Using Principal = "+ principal + ", keytab = "+keytab);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTUtil.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTUtil.java b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTUtil.java
index 01aaec2..cca7caf 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTUtil.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTUtil.java
@@ -47,7 +47,7 @@ import java.util.Map;
public class AtlasRESTUtil {
private static final Logger LOG = Logger.getLogger(AtlasRESTUtil.class);
- private static final String REST_MIME_TYPE_JSON = "application/json" ;
+ private static final String REST_MIME_TYPE_JSON = "application/json";
private static final String API_ATLAS_TYPES = "api/atlas/types";
private static final String API_ATLAS_ENTITIES = "api/atlas/entities?type=";
private static final String API_ATLAS_ENTITY = "api/atlas/entities/";
@@ -251,7 +251,7 @@ public class AtlasRESTUtil {
try {
if (kerberized) {
LOG.debug("Using kerberos authentication");
- Subject sub = SecureClientLogin.loginUserFromKeytab(principal, keytab, nameRules) ;
+ Subject sub = SecureClientLogin.loginUserFromKeytab(principal, keytab, nameRules);
if(LOG.isDebugEnabled()) {
LOG.debug("Using Principal = "+ principal + ", keytab = "+keytab);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java
----------------------------------------------------------------------
diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java
index 0480b76..9689f25 100644
--- a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java
+++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java
@@ -61,7 +61,7 @@ public class LdapConfig {
private static final String LGSYNC_USER_GROUP_NAME_ATTRIBUTE = "ranger.usersync.ldap.user.groupnameattribute";
- public static final String UGSYNC_NONE_CASE_CONVERSION_VALUE = "none" ;
+ public static final String UGSYNC_NONE_CASE_CONVERSION_VALUE = "none";
public static final String UGSYNC_LOWER_CASE_CONVERSION_VALUE = "lower";
private static final String UGSYNC_USERNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.username.caseconversion";
@@ -172,7 +172,7 @@ public class LdapConfig {
}
if (ret == null) {
- ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path) ;
+ ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path);
if (ret == null) {
if (! path.startsWith("/")) {
ret = ClassLoader.getSystemResourceAsStream("/" + path);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java
index 3ed35e7..e97c477 100644
--- a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java
+++ b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java
@@ -48,7 +48,7 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
public CustomSSLSocketFactory() {
SSLContext sslContext = null;
- String keyStoreFile = config.getSSLKeyStorePath() ;
+ String keyStoreFile = config.getSSLKeyStorePath();
String keyStoreFilepwd = config.getSSLKeyStorePathPassword();
String trustStoreFile = config.getSSLTrustStorePath();
String trustStoreFilepwd = config.getSSLTrustStorePathPassword();
@@ -62,9 +62,9 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
if (keyStoreFile != null && keyStoreFilepwd != null) {
KeyStore keyStore = KeyStore.getInstance(keyStoreType);
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(keyStoreFile) ;
+ in = getFileInputStream(keyStoreFile);
if (in == null) {
LOG.error("Unable to obtain keystore from file [" + keyStoreFile + "]");
return;
@@ -85,9 +85,9 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
if (trustStoreFile != null && trustStoreFilepwd != null) {
KeyStore trustStore = KeyStore.getInstance(trustStoreType);
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(trustStoreFile) ;
+ in = getFileInputStream(trustStoreFile);
if (in == null) {
LOG.error("Unable to obtain keystore from file [" + trustStoreFile + "]");
return;
@@ -99,7 +99,7 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
}
finally {
if (in != null) {
- in.close() ;
+ in.close();
}
}
}
@@ -171,7 +171,7 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
}
if (ret == null) {
- ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path) ;
+ ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path);
if (ret == null) {
if (! path.startsWith("/")) {
ret = ClassLoader.getSystemResourceAsStream("/" + path);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
index d7a0b36..36246aa 100644
--- a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
@@ -91,10 +91,10 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
private LdapContext ldapContext;
StartTlsResponse tls;
- private boolean userNameCaseConversionFlag = false ;
- private boolean groupNameCaseConversionFlag = false ;
- private boolean userNameLowerCaseFlag = false ;
- private boolean groupNameLowerCaseFlag = false ;
+ private boolean userNameCaseConversionFlag = false;
+ private boolean groupNameCaseConversionFlag = false;
+ private boolean userNameLowerCaseFlag = false;
+ private boolean groupNameLowerCaseFlag = false;
private boolean groupUserMapSyncEnabled = false;
@@ -107,26 +107,26 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
public LdapUserGroupBuilder() {
super();
- LOG.info("LdapUserGroupBuilder created") ;
+ LOG.info("LdapUserGroupBuilder created");
- String userNameCaseConversion = config.getUserNameCaseConversion() ;
+ String userNameCaseConversion = config.getUserNameCaseConversion();
if (UserGroupSyncConfig.UGSYNC_NONE_CASE_CONVERSION_VALUE.equalsIgnoreCase(userNameCaseConversion)) {
- userNameCaseConversionFlag = false ;
+ userNameCaseConversionFlag = false;
}
else {
- userNameCaseConversionFlag = true ;
- userNameLowerCaseFlag = UserGroupSyncConfig.UGSYNC_LOWER_CASE_CONVERSION_VALUE.equalsIgnoreCase(userNameCaseConversion) ;
+ userNameCaseConversionFlag = true;
+ userNameLowerCaseFlag = UserGroupSyncConfig.UGSYNC_LOWER_CASE_CONVERSION_VALUE.equalsIgnoreCase(userNameCaseConversion);
}
- String groupNameCaseConversion = config.getGroupNameCaseConversion() ;
+ String groupNameCaseConversion = config.getGroupNameCaseConversion();
if (UserGroupSyncConfig.UGSYNC_NONE_CASE_CONVERSION_VALUE.equalsIgnoreCase(groupNameCaseConversion)) {
- groupNameCaseConversionFlag = false ;
+ groupNameCaseConversionFlag = false;
}
else {
- groupNameCaseConversionFlag = true ;
- groupNameLowerCaseFlag = UserGroupSyncConfig.UGSYNC_LOWER_CASE_CONVERSION_VALUE.equalsIgnoreCase(groupNameCaseConversion) ;
+ groupNameCaseConversionFlag = true;
+ groupNameLowerCaseFlag = UserGroupSyncConfig.UGSYNC_LOWER_CASE_CONVERSION_VALUE.equalsIgnoreCase(groupNameCaseConversion);
}
}
@@ -160,7 +160,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
ldapContext.addToEnvironment(Context.SECURITY_PRINCIPAL, ldapBindDn);
ldapContext.addToEnvironment(Context.SECURITY_CREDENTIALS, ldapBindPassword);
ldapContext.addToEnvironment(Context.SECURITY_AUTHENTICATION, ldapAuthenticationMechanism);
- ldapContext.addToEnvironment(Context.REFERRAL, ldapReferral) ;
+ ldapContext.addToEnvironment(Context.REFERRAL, ldapReferral);
}
private void setConfig() throws Throwable {
@@ -313,10 +313,10 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
List<String> groupList = userInfo.getGroups();
if (userNameCaseConversionFlag) {
if (userNameLowerCaseFlag) {
- userName = userName.toLowerCase() ;
+ userName = userName.toLowerCase();
}
else {
- userName = userName.toUpperCase() ;
+ userName = userName.toUpperCase();
}
}
@@ -346,10 +346,10 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
List<String> groupList = userInfo.getGroups();
if (userNameCaseConversionFlag) {
if (userNameLowerCaseFlag) {
- userName = userName.toLowerCase() ;
+ userName = userName.toLowerCase();
}
else {
- userName = userName.toUpperCase() ;
+ userName = userName.toUpperCase();
}
}
@@ -511,10 +511,10 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
List<String> groupList = userInfo.getGroups();
if (userNameCaseConversionFlag) {
if (userNameLowerCaseFlag) {
- userName = userName.toLowerCase() ;
+ userName = userName.toLowerCase();
}
else {
- userName = userName.toUpperCase() ;
+ userName = userName.toUpperCase();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java
index 987c6d1..d275181 100644
--- a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java
@@ -22,8 +22,8 @@ package org.apache.ranger.ldapusersync.process;
public class PolicyMgrUserGroupBuilder extends org.apache.ranger.unixusersync.process.PolicyMgrUserGroupBuilder {
public static void main(String[] args) throws Throwable {
- PolicyMgrUserGroupBuilder ugbuilder = new PolicyMgrUserGroupBuilder() ;
- ugbuilder.init() ;
+ PolicyMgrUserGroupBuilder ugbuilder = new PolicyMgrUserGroupBuilder();
+ ugbuilder.init();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
index 9a906b1..938f6f8 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
@@ -48,40 +48,40 @@ import org.apache.log4j.Logger;
public class UserGroupSyncConfig {
- public static final String CONFIG_FILE = "ranger-ugsync-site.xml" ;
- private static final Logger LOG = Logger.getLogger(UserGroupSyncConfig.class) ;
+ public static final String CONFIG_FILE = "ranger-ugsync-site.xml";
+ private static final Logger LOG = Logger.getLogger(UserGroupSyncConfig.class);
- public static final String DEFAULT_CONFIG_FILE = "ranger-ugsync-default-site.xml" ;
+ public static final String DEFAULT_CONFIG_FILE = "ranger-ugsync-default-site.xml";
private static final String CORE_SITE_CONFIG_FILE = "core-site.xml";
- public static final String UGSYNC_ENABLED_PROP = "ranger.usersync.enabled" ;
+ public static final String UGSYNC_ENABLED_PROP = "ranger.usersync.enabled";
- public static final String UGSYNC_PM_URL_PROP = "ranger.usersync.policymanager.baseURL" ;
+ public static final String UGSYNC_PM_URL_PROP = "ranger.usersync.policymanager.baseURL";
- public static final String UGSYNC_MIN_USERID_PROP = "ranger.usersync.unix.minUserId" ;
+ public static final String UGSYNC_MIN_USERID_PROP = "ranger.usersync.unix.minUserId";
- public static final String UGSYNC_MIN_GROUPID_PROP = "ranger.usersync.unix.minGroupId" ;
- public static final String DEFAULT_UGSYNC_MIN_GROUPID = "0" ;
+ public static final String UGSYNC_MIN_GROUPID_PROP = "ranger.usersync.unix.minGroupId";
+ public static final String DEFAULT_UGSYNC_MIN_GROUPID = "0";
- public static final String UGSYNC_MAX_RECORDS_PER_API_CALL_PROP = "ranger.usersync.policymanager.maxrecordsperapicall" ;
+ public static final String UGSYNC_MAX_RECORDS_PER_API_CALL_PROP = "ranger.usersync.policymanager.maxrecordsperapicall";
- public static final String UGSYNC_MOCK_RUN_PROP = "ranger.usersync.policymanager.mockrun" ;
+ public static final String UGSYNC_MOCK_RUN_PROP = "ranger.usersync.policymanager.mockrun";
public static final String UGSYNC_SOURCE_FILE_PROC = "ranger.usersync.filesource.file";
public static final String UGSYNC_SOURCE_FILE_DELIMITER = "ranger.usersync.filesource.text.delimiter";
public static final String UGSYNC_SOURCE_FILE_DELIMITERER = "ranger.usersync.filesource.text.delimiterer";
- private static final String SSL_KEYSTORE_PATH_PARAM = "ranger.usersync.keystore.file" ;
+ private static final String SSL_KEYSTORE_PATH_PARAM = "ranger.usersync.keystore.file";
- private static final String SSL_KEYSTORE_PATH_PASSWORD_PARAM = "ranger.usersync.keystore.password" ;
+ private static final String SSL_KEYSTORE_PATH_PASSWORD_PARAM = "ranger.usersync.keystore.password";
- private static final String SSL_TRUSTSTORE_PATH_PARAM = "ranger.usersync.truststore.file" ;
+ private static final String SSL_TRUSTSTORE_PATH_PARAM = "ranger.usersync.truststore.file";
- private static final String SSL_TRUSTSTORE_PATH_PASSWORD_PARAM = "ranger.usersync.truststore.password" ;
+ private static final String SSL_TRUSTSTORE_PATH_PASSWORD_PARAM = "ranger.usersync.truststore.password";
- private static final String UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_PARAM = "ranger.usersync.sleeptimeinmillisbetweensynccycle" ;
+ private static final String UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_PARAM = "ranger.usersync.sleeptimeinmillisbetweensynccycle";
private static final long UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_MIN_VALUE = 60000L;
@@ -132,14 +132,14 @@ public class UserGroupSyncConfig {
private static final String LGSYNC_USER_GROUP_NAME_ATTRIBUTE = "ranger.usersync.ldap.user.groupnameattribute";
private static final String DEFAULT_USER_GROUP_NAME_ATTRIBUTE = "memberof,ismemberof";
- public static final String UGSYNC_NONE_CASE_CONVERSION_VALUE = "none" ;
- public static final String UGSYNC_LOWER_CASE_CONVERSION_VALUE = "lower" ;
- public static final String UGSYNC_UPPER_CASE_CONVERSION_VALUE = "upper" ;
+ public static final String UGSYNC_NONE_CASE_CONVERSION_VALUE = "none";
+ public static final String UGSYNC_LOWER_CASE_CONVERSION_VALUE = "lower";
+ public static final String UGSYNC_UPPER_CASE_CONVERSION_VALUE = "upper";
- private static final String UGSYNC_USERNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.username.caseconversion" ;
+ private static final String UGSYNC_USERNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.username.caseconversion";
private static final String DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE = UGSYNC_NONE_CASE_CONVERSION_VALUE;
- private static final String UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.groupname.caseconversion" ;
+ private static final String UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.groupname.caseconversion";
private static final String DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE = UGSYNC_NONE_CASE_CONVERSION_VALUE;
private static final String DEFAULT_USER_GROUP_TEXTFILE_DELIMITER = ",";
@@ -216,21 +216,21 @@ public class UserGroupSyncConfig {
private static final String SYNC_MAPPING_GROUPNAME_HANDLER = "ranger.usersync.mapping.groupname.handler";
private static final String DEFAULT_SYNC_MAPPING_GROUPNAME_HANDLER = "org.apache.ranger.usergroupsync.RegEx";
- private Properties prop = new Properties() ;
+ private Properties prop = new Properties();
- private static volatile UserGroupSyncConfig me = null ;
+ private static volatile UserGroupSyncConfig me = null;
public static UserGroupSyncConfig getInstance() {
UserGroupSyncConfig result = me;
if (result == null) {
synchronized(UserGroupSyncConfig.class) {
- result = me ;
+ result = me;
if (result == null) {
- me = result = new UserGroupSyncConfig() ;
+ me = result = new UserGroupSyncConfig();
}
}
}
- return result ;
+ return result;
}
private UserGroupSyncConfig() {
@@ -248,7 +248,7 @@ public class UserGroupSyncConfig {
InputStream in = getFileInputStream(fileName);
if (in != null) {
try {
-// prop.load(in) ;
+// prop.load(in);
DocumentBuilderFactory xmlDocumentBuilderFactory = DocumentBuilderFactory
.newInstance();
xmlDocumentBuilderFactory.setIgnoringComments(true);
@@ -285,7 +285,7 @@ public class UserGroupSyncConfig {
}
if (prop.get(propertyName) != null) {
- prop.remove(propertyName) ;
+ prop.remove(propertyName);
}
prop.put(propertyName, propertyValue);
@@ -295,7 +295,7 @@ public class UserGroupSyncConfig {
}
finally {
try {
- in.close() ;
+ in.close();
}
catch(IOException ioe) {
// Ignore IOE when closing stream
@@ -303,7 +303,7 @@ public class UserGroupSyncConfig {
}
}
} catch (Throwable e) {
- throw new RuntimeException("Unable to load configuration file [" + CONFIG_FILE + "]", e) ;
+ throw new RuntimeException("Unable to load configuration file [" + CONFIG_FILE + "]", e);
}
}
@@ -326,7 +326,7 @@ public class UserGroupSyncConfig {
}
if (ret == null) {
- ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path) ;
+ ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path);
if (ret == null) {
if (! path.startsWith("/")) {
ret = ClassLoader.getSystemResourceAsStream("/" + path);
@@ -339,12 +339,12 @@ public class UserGroupSyncConfig {
}
public String getUserSyncFileSource(){
- String val = prop.getProperty(UGSYNC_SOURCE_FILE_PROC) ;
+ String val = prop.getProperty(UGSYNC_SOURCE_FILE_PROC);
return val;
}
public String getUserSyncFileSourceDelimiter(){
- String val = prop.getProperty(UGSYNC_SOURCE_FILE_DELIMITER) ;
+ String val = prop.getProperty(UGSYNC_SOURCE_FILE_DELIMITER);
if (val == null) {
val = prop.getProperty(UGSYNC_SOURCE_FILE_DELIMITERER);
}
@@ -365,8 +365,8 @@ public class UserGroupSyncConfig {
}
public boolean isUserSyncEnabled() {
- String val = prop.getProperty(UGSYNC_ENABLED_PROP) ;
- return (val != null && val.trim().equalsIgnoreCase("true")) ;
+ String val = prop.getProperty(UGSYNC_ENABLED_PROP);
+ return (val != null && val.trim().equalsIgnoreCase("true"));
}
public String getEnumerateGroups() {
@@ -374,22 +374,22 @@ public class UserGroupSyncConfig {
}
public boolean isGroupEnumerateEnabled() {
- String val = prop.getProperty(UGSYNC_GROUP_ENUMERATE_ENABLED) ;
- return (val != null && val.trim().equalsIgnoreCase("true")) ;
+ String val = prop.getProperty(UGSYNC_GROUP_ENUMERATE_ENABLED);
+ return (val != null && val.trim().equalsIgnoreCase("true"));
}
public boolean isMockRunEnabled() {
- String val = prop.getProperty(UGSYNC_MOCK_RUN_PROP) ;
- return (val != null && val.trim().equalsIgnoreCase("true")) ;
+ String val = prop.getProperty(UGSYNC_MOCK_RUN_PROP);
+ return (val != null && val.trim().equalsIgnoreCase("true"));
}
public String getPolicyManagerBaseURL() {
- return prop.getProperty(UGSYNC_PM_URL_PROP) ;
+ return prop.getProperty(UGSYNC_PM_URL_PROP);
}
public String getMinUserId() {
- return prop.getProperty(UGSYNC_MIN_USERID_PROP) ;
+ return prop.getProperty(UGSYNC_MIN_USERID_PROP);
}
public String getMinGroupId() {
@@ -401,35 +401,35 @@ public class UserGroupSyncConfig {
}
public String getMaxRecordsPerAPICall() {
- return prop.getProperty(UGSYNC_MAX_RECORDS_PER_API_CALL_PROP) ;
+ return prop.getProperty(UGSYNC_MAX_RECORDS_PER_API_CALL_PROP);
}
public String getSSLKeyStorePath() {
- return prop.getProperty(SSL_KEYSTORE_PATH_PARAM) ;
+ return prop.getProperty(SSL_KEYSTORE_PATH_PARAM);
}
public String getSSLKeyStorePathPassword() {
- return prop.getProperty(SSL_KEYSTORE_PATH_PASSWORD_PARAM) ;
+ return prop.getProperty(SSL_KEYSTORE_PATH_PASSWORD_PARAM);
}
public String getSSLTrustStorePath() {
- return prop.getProperty(SSL_TRUSTSTORE_PATH_PARAM) ;
+ return prop.getProperty(SSL_TRUSTSTORE_PATH_PARAM);
}
public String getSSLTrustStorePathPassword() {
- return prop.getProperty(SSL_TRUSTSTORE_PATH_PASSWORD_PARAM) ;
+ return prop.getProperty(SSL_TRUSTSTORE_PATH_PASSWORD_PARAM);
}
public long getUpdateMillisMin() {
- String val = prop.getProperty(UGSYNC_UPDATE_MILLIS_MIN) ;
+ String val = prop.getProperty(UGSYNC_UPDATE_MILLIS_MIN);
if (val == null) {
- return DEFAULT_UGSYNC_UPDATE_MILLIS_MIN ;
+ return DEFAULT_UGSYNC_UPDATE_MILLIS_MIN;
}
- long ret = Long.parseLong(val) ;
+ long ret = Long.parseLong(val);
if (ret < DEFAULT_UGSYNC_UPDATE_MILLIS_MIN) {
return DEFAULT_UGSYNC_UPDATE_MILLIS_MIN;
}
@@ -438,27 +438,27 @@ public class UserGroupSyncConfig {
}
public long getSleepTimeInMillisBetweenCycle() throws Throwable {
- String val = prop.getProperty(UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_PARAM) ;
+ String val = prop.getProperty(UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_PARAM);
if (val == null) {
if (LGSYNC_SOURCE_CLASS.equals(getUserGroupSource().getClass().getName())) {
- return UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_LDAP_DEFAULT_VALUE ;
+ return UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_LDAP_DEFAULT_VALUE;
} else {
- return UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_UNIX_DEFAULT_VALUE ;
+ return UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_UNIX_DEFAULT_VALUE;
}
}
else {
- long ret = Long.parseLong(val) ;
+ long ret = Long.parseLong(val);
long min_interval;
if (LGSYNC_SOURCE_CLASS.equals(getUserGroupSource().getClass().getName())) {
- min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_LDAP_DEFAULT_VALUE ;
+ min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_LDAP_DEFAULT_VALUE;
}else if(UGSYNC_SOURCE_CLASS.equals(getUserGroupSource().getClass().getName())){
min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_UNIX_DEFAULT_VALUE;
} else {
- min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_MIN_VALUE ;
+ min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_MIN_VALUE;
}
if(ret < min_interval)
{
- LOG.info("Sleep Time Between Cycle can not be lower than [" + min_interval + "] millisec. resetting to min value.") ;
+ LOG.info("Sleep Time Between Cycle can not be lower than [" + min_interval + "] millisec. resetting to min value.");
ret = min_interval;
}
return ret;
@@ -468,18 +468,18 @@ public class UserGroupSyncConfig {
public UserGroupSource getUserGroupSource() throws Throwable {
- String val = prop.getProperty(UGSYNC_SOURCE_CLASS_PARAM) ;
+ String val = prop.getProperty(UGSYNC_SOURCE_CLASS_PARAM);
- String syncSource = null ;
+ String syncSource = null;
if(val == null || val.trim().isEmpty()) {
syncSource=getSyncSource();
}
else {
- syncSource = val ;
+ syncSource = val;
}
- String className = val ;
+ String className = val;
if(syncSource!=null && syncSource.equalsIgnoreCase("UNIX")){
className = UGSYNC_SOURCE_CLASS;
@@ -496,7 +496,7 @@ public class UserGroupSyncConfig {
public UserGroupSink getUserGroupSink() throws Throwable {
- String val = prop.getProperty(UGSYNC_SINK_CLASS_PARAM) ;
+ String val = prop.getProperty(UGSYNC_SINK_CLASS_PARAM);
if(val == null || val.trim().isEmpty()) {
val = UGSYNC_SINK_CLASS;
@@ -627,13 +627,13 @@ public class UserGroupSyncConfig {
}
public String getUserNameCaseConversion() {
- String ret = prop.getProperty(UGSYNC_USERNAME_CASE_CONVERSION_PARAM, DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE) ;
- return ret.trim().toLowerCase() ;
+ String ret = prop.getProperty(UGSYNC_USERNAME_CASE_CONVERSION_PARAM, DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE);
+ return ret.trim().toLowerCase();
}
public String getGroupNameCaseConversion() {
- String ret = prop.getProperty(UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM, DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE) ;
- return ret.trim().toLowerCase() ;
+ String ret = prop.getProperty(UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM, DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE);
+ return ret.trim().toLowerCase();
}
public String getSearchBase() {
@@ -765,11 +765,11 @@ public class UserGroupSyncConfig {
}
public String getProperty(String aPropertyName) {
- return prop.getProperty(aPropertyName) ;
+ return prop.getProperty(aPropertyName);
}
public String getProperty(String aPropertyName, String aDefaultValue) {
- return prop.getProperty(aPropertyName, aDefaultValue) ;
+ return prop.getProperty(aPropertyName, aDefaultValue);
}
public String getPolicyMgrPassword(){
@@ -865,7 +865,7 @@ public class UserGroupSyncConfig {
}
public String getUserSyncMappingUserNameHandler() {
- String val = prop.getProperty(SYNC_MAPPING_USERNAME_HANDLER) ;
+ String val = prop.getProperty(SYNC_MAPPING_USERNAME_HANDLER);
if(val == null) {
val = DEFAULT_SYNC_MAPPING_USERNAME_HANDLER;
@@ -874,7 +874,7 @@ public class UserGroupSyncConfig {
}
public String getUserSyncMappingGroupNameHandler() {
- String val = prop.getProperty(SYNC_MAPPING_GROUPNAME_HANDLER) ;
+ String val = prop.getProperty(SYNC_MAPPING_GROUPNAME_HANDLER);
if(val == null) {
val = DEFAULT_SYNC_MAPPING_GROUPNAME_HANDLER;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java
index 7377e07..5f1e9af 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java
@@ -24,10 +24,10 @@ import java.util.List;
import com.google.gson.annotations.SerializedName;
public class GetXGroupListResponse {
- private int totalCount ;
+ private int totalCount;
@SerializedName("vXGroups")
- List<XGroupInfo> xgroupInfoList ;
+ List<XGroupInfo> xgroupInfoList;
public int getTotalCount() {
return totalCount;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java
index adb80fb..cf6957d 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java
@@ -24,10 +24,10 @@ import java.util.List;
import com.google.gson.annotations.SerializedName;
public class GetXUserGroupListResponse {
- private int totalCount ;
+ private int totalCount;
@SerializedName("vXGroupUsers")
- List<XUserGroupInfo> xusergroupInfoList ;
+ List<XUserGroupInfo> xusergroupInfoList;
public int getTotalCount() {
return totalCount;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java
index c05c04b..809a847 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java
@@ -25,10 +25,10 @@ import com.google.gson.annotations.SerializedName;
public class GetXUserListResponse {
- private int totalCount ;
+ private int totalCount;
@SerializedName("vXUsers")
- List<XUserInfo> xuserInfoList ;
+ List<XUserInfo> xuserInfoList;
public int getTotalCount() {
return totalCount;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java
index 13c6eed..841bac6 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java
@@ -21,11 +21,11 @@
public class MUserInfo {
- private String loginId ;
- private String firstName ;
- private String lastName ;
- private String emailAddress ;
- private String[] userRoleList = { "ROLE_USER" } ;
+ private String loginId;
+ private String firstName;
+ private String lastName;
+ private String emailAddress;
+ private String[] userRoleList = { "ROLE_USER" };
public String getLoginId() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java
index 9208343..b9e7191 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java
@@ -21,10 +21,10 @@
public class XGroupInfo {
- private String id ;
- private String name ;
- private String description ;
- private String groupType ;
+ private String id;
+ private String name;
+ private String description;
+ private String groupType;
private String groupSource;
public String getId() {
return id;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java
index 0efcb68..06b21e0 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java
@@ -23,10 +23,10 @@ import com.google.gson.annotations.SerializedName;
public class XUserGroupInfo {
- private String userId ;
+ private String userId;
@SerializedName("name")
- private String groupName ;
- private String parentGroupId ;
+ private String groupName;
+ private String parentGroupId;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java
index 732e35b..7d636fd 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java
@@ -23,11 +23,11 @@ import java.util.ArrayList;
import java.util.List;
public class XUserInfo {
- private String id ;
- private String name ;
- private String description ;
+ private String id;
+ private String name;
+ private String description;
- private List<String> groupNameList = new ArrayList<String>() ;
+ private List<String> groupNameList = new ArrayList<String>();
public String getId() {
return id;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java
index 94d569a..fae0870 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java
@@ -33,7 +33,7 @@ public class ListUserGroupTest {
public static void main(String[] args) {
- clientusergroupmapping = RangerClientUserGroupMapping.buildClientUserGroupMapping(passwdfile) ;
+ clientusergroupmapping = RangerClientUserGroupMapping.buildClientUserGroupMapping(passwdfile);
System.out.println(clientusergroupmapping);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java
index 2af4d5e..2edf683 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java
@@ -62,10 +62,10 @@ public class RangerUpdateUserGroupMapping {
/*
//get user group mapping from DB
- usergroupmapping = RangerUserGroupMapping.buildUserGroupMapping(url) ;
+ usergroupmapping = RangerUserGroupMapping.buildUserGroupMapping(url);
//get user group mapping from client system file
- clientusergroupmapping = RangerClientUserGroupMapping.buildClientUserGroupMapping(passwdfile) ;
+ clientusergroupmapping = RangerClientUserGroupMapping.buildClientUserGroupMapping(passwdfile);
compare_and_update(usergroupmapping,clientusergroupmapping);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java
index e9163e5..298941a 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java
@@ -41,15 +41,15 @@ import com.google.gson.GsonBuilder;
import com.google.gson.stream.JsonReader;
public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
- private static final Logger LOG = Logger.getLogger(FileSourceUserGroupBuilder.class) ;
+ private static final Logger LOG = Logger.getLogger(FileSourceUserGroupBuilder.class);
private Map<String,List<String>> user2GroupListMap = new HashMap<String,List<String>>();
private String userGroupFilename = null;
- private long usergroupFileModified = 0 ;
+ private long usergroupFileModified = 0;
public static void main(String[] args) throws Throwable {
- FileSourceUserGroupBuilder filesourceUGBuilder = new FileSourceUserGroupBuilder() ;
+ FileSourceUserGroupBuilder filesourceUGBuilder = new FileSourceUserGroupBuilder();
if (args.length > 0) {
filesourceUGBuilder.setUserGroupFilename(args[0]);
@@ -83,9 +83,9 @@ public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
@Override
public boolean isChanged() {
- long TempUserGroupFileModifedAt = new File(userGroupFilename).lastModified() ;
+ long TempUserGroupFileModifedAt = new File(userGroupFilename).lastModified();
if (usergroupFileModified != TempUserGroupFileModifedAt) {
- return true ;
+ return true;
}
return false;
}
@@ -124,11 +124,11 @@ public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
private void print() {
for(String user : user2GroupListMap.keySet()) {
- LOG.debug("USER:" + user) ;
- List<String> groups = user2GroupListMap.get(user) ;
+ LOG.debug("USER:" + user);
+ List<String> groups = user2GroupListMap.get(user);
if (groups != null) {
for(String group : groups) {
- LOG.debug("\tGROUP: " + group) ;
+ LOG.debug("\tGROUP: " + group);
}
}
}
@@ -160,7 +160,7 @@ public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
if(tmpUser2GroupListMap != null) {
user2GroupListMap = tmpUser2GroupListMap;
- usergroupFileModified = f.lastModified() ;
+ usergroupFileModified = f.lastModified();
} else {
LOG.info("No new UserGroup to sync at this time");
}
@@ -184,7 +184,7 @@ public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
JsonReader jsonReader = new JsonReader(new BufferedReader(new FileReader(jsonFile)));
- Gson gson = new GsonBuilder().create() ;
+ Gson gson = new GsonBuilder().create();
ret = gson.fromJson(jsonReader, ret.getClass());
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
index 13a99ee..098d353 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
@@ -71,7 +71,7 @@ import org.apache.ranger.usersync.util.UserSyncUtil;
public class PolicyMgrUserGroupBuilder implements UserGroupSink {
- private static final Logger LOG = Logger.getLogger(PolicyMgrUserGroupBuilder.class) ;
+ private static final Logger LOG = Logger.getLogger(PolicyMgrUserGroupBuilder.class);
private static final String AUTHENTICATION_TYPE = "hadoop.security.authentication";
private String AUTH_KERBEROS = "kerberos";
@@ -79,46 +79,46 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private static final String KEYTAB = "ranger.usersync.kerberos.keytab";
private static final String NAME_RULE = "hadoop.security.auth_to_local";
- public static final String PM_USER_LIST_URI = "/service/xusers/users/" ; // GET
- private static final String PM_ADD_USER_URI = "/service/xusers/users/" ; // POST
- private static final String PM_ADD_USER_GROUP_INFO_URI = "/service/xusers/users/userinfo" ; // POST
+ public static final String PM_USER_LIST_URI = "/service/xusers/users/"; // GET
+ private static final String PM_ADD_USER_URI = "/service/xusers/users/"; // POST
+ private static final String PM_ADD_USER_GROUP_INFO_URI = "/service/xusers/users/userinfo"; // POST
- public static final String PM_GROUP_LIST_URI = "/service/xusers/groups/" ; // GET
- private static final String PM_ADD_GROUP_URI = "/service/xusers/groups/" ; // POST
+ public static final String PM_GROUP_LIST_URI = "/service/xusers/groups/"; // GET
+ private static final String PM_ADD_GROUP_URI = "/service/xusers/groups/"; // POST
- public static final String PM_USER_GROUP_MAP_LIST_URI = "/service/xusers/groupusers/" ; // GET
- private static final String PM_ADD_USER_GROUP_LINK_URI = "/service/xusers/groupusers/" ; // POST
+ public static final String PM_USER_GROUP_MAP_LIST_URI = "/service/xusers/groupusers/"; // GET
+ private static final String PM_ADD_USER_GROUP_LINK_URI = "/service/xusers/groupusers/"; // POST
- private static final String PM_DEL_USER_GROUP_LINK_URI = "/service/xusers/group/${groupName}/user/${userName}" ; // DELETE
+ private static final String PM_DEL_USER_GROUP_LINK_URI = "/service/xusers/group/${groupName}/user/${userName}"; // DELETE
- private static final String PM_ADD_LOGIN_USER_URI = "/service/users/default" ; // POST
+ private static final String PM_ADD_LOGIN_USER_URI = "/service/users/default"; // POST
private static final String GROUP_SOURCE_EXTERNAL ="1";
- private static String LOCAL_HOSTNAME = "unknown" ;
- private String recordsToPullPerCall = "1000" ;
- private boolean isMockRun = false ;
- private String policyMgrBaseUrl ;
+ private static String LOCAL_HOSTNAME = "unknown";
+ private String recordsToPullPerCall = "1000";
+ private boolean isMockRun = false;
+ private String policyMgrBaseUrl;
- private UserGroupSyncConfig config = UserGroupSyncConfig.getInstance() ;
+ private UserGroupSyncConfig config = UserGroupSyncConfig.getInstance();
private UserGroupInfo usergroupInfo = new UserGroupInfo();
- private List<XGroupInfo> xgroupList = new ArrayList<XGroupInfo>() ;
- private List<XUserInfo> xuserList = new ArrayList<XUserInfo>() ;
- private List<XUserGroupInfo> xusergroupList = new ArrayList<XUserGroupInfo>() ;
- private HashMap<String,XUserInfo> userId2XUserInfoMap = new HashMap<String,XUserInfo>() ;
- private HashMap<String,XUserInfo> userName2XUserInfoMap = new HashMap<String,XUserInfo>() ;
- private HashMap<String,XGroupInfo> groupName2XGroupInfoMap = new HashMap<String,XGroupInfo>() ;
+ private List<XGroupInfo> xgroupList = new ArrayList<XGroupInfo>();
+ private List<XUserInfo> xuserList = new ArrayList<XUserInfo>();
+ private List<XUserGroupInfo> xusergroupList = new ArrayList<XUserGroupInfo>();
+ private HashMap<String,XUserInfo> userId2XUserInfoMap = new HashMap<String,XUserInfo>();
+ private HashMap<String,XUserInfo> userName2XUserInfoMap = new HashMap<String,XUserInfo>();
+ private HashMap<String,XGroupInfo> groupName2XGroupInfoMap = new HashMap<String,XGroupInfo>();
- private String keyStoreFile = null ;
+ private String keyStoreFile = null;
private String keyStoreFilepwd = null;
- private String trustStoreFile = null ;
- private String trustStoreFilepwd = null ;
- private String keyStoreType = null ;
- private String trustStoreType = null ;
- private HostnameVerifier hv = null ;
+ private String trustStoreFile = null;
+ private String trustStoreFilepwd = null;
+ private String keyStoreType = null;
+ private String trustStoreType = null;
+ private HostnameVerifier hv = null;
- private SSLContext sslContext = null ;
+ private SSLContext sslContext = null;
private String authenticationType = null;
String principal;
String keytab;
@@ -128,40 +128,40 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
try {
LOCAL_HOSTNAME = java.net.InetAddress.getLocalHost().getCanonicalHostName();
} catch (UnknownHostException e) {
- LOCAL_HOSTNAME = "unknown" ;
+ LOCAL_HOSTNAME = "unknown";
}
}
public static void main(String[] args) throws Throwable {
- PolicyMgrUserGroupBuilder ugbuilder = new PolicyMgrUserGroupBuilder() ;
- ugbuilder.init() ;
+ PolicyMgrUserGroupBuilder ugbuilder = new PolicyMgrUserGroupBuilder();
+ ugbuilder.init();
// ugbuilder.print();
-// ugbuilder.addMUser("testuser") ;
-// ugbuilder.addXUserInfo("testuser") ;
-// ugbuilder.addXGroupInfo("testgroup") ;
-// XUserInfo u = ugbuilder.addXUserInfo("testuser") ;
-// XGroupInfo g = ugbuilder.addXGroupInfo("testgroup") ;
-// ugbuilder.addXUserGroupInfo(u, g) ;
+// ugbuilder.addMUser("testuser");
+// ugbuilder.addXUserInfo("testuser");
+// ugbuilder.addXGroupInfo("testgroup");
+// XUserInfo u = ugbuilder.addXUserInfo("testuser");
+// XGroupInfo g = ugbuilder.addXGroupInfo("testgroup");
+// ugbuilder.addXUserGroupInfo(u, g);
}
synchronized public void init() throws Throwable {
- recordsToPullPerCall = config.getMaxRecordsPerAPICall() ;
- policyMgrBaseUrl = config.getPolicyManagerBaseURL() ;
- isMockRun = config.isMockRunEnabled() ;
+ recordsToPullPerCall = config.getMaxRecordsPerAPICall();
+ policyMgrBaseUrl = config.getPolicyManagerBaseURL();
+ isMockRun = config.isMockRunEnabled();
if (isMockRun) {
- LOG.setLevel(Level.DEBUG) ;
+ LOG.setLevel(Level.DEBUG);
}
- keyStoreFile = config.getSSLKeyStorePath() ;
- keyStoreFilepwd = config.getSSLKeyStorePathPassword() ;
- trustStoreFile = config.getSSLTrustStorePath() ;
- trustStoreFilepwd = config.getSSLTrustStorePathPassword() ;
- keyStoreType = KeyStore.getDefaultType() ;
- trustStoreType = KeyStore.getDefaultType() ;
+ keyStoreFile = config.getSSLKeyStorePath();
+ keyStoreFilepwd = config.getSSLKeyStorePathPassword();
+ trustStoreFile = config.getSSLTrustStorePath();
+ trustStoreFilepwd = config.getSSLTrustStorePathPassword();
+ keyStoreType = KeyStore.getDefaultType();
+ trustStoreType = KeyStore.getDefaultType();
authenticationType = config.getProperty(AUTHENTICATION_TYPE,"simple");
try {
principal = SecureClientLogin.getPrincipal(config.getProperty(PRINCIPAL,""), LOCAL_HOSTNAME);
@@ -170,7 +170,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
keytab = config.getProperty(KEYTAB,"");
nameRules = config.getProperty(NAME_RULE,"DEFAULT");
- buildUserGroupInfo() ;
+ buildUserGroupInfo();
}
private void buildUserGroupInfo() throws Throwable {
@@ -189,8 +189,8 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
try {
buildGroupList();
buildUserList();
- buildUserGroupLinkList() ;
- rebuildUserGroupMap() ;
+ buildUserGroupLinkList();
+ rebuildUserGroupMap();
} catch (Exception e) {
LOG.error("Failed to build Group List : ", e);
}
@@ -203,8 +203,8 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
} else {
buildGroupList();
buildUserList();
- buildUserGroupLinkList() ;
- rebuildUserGroupMap() ;
+ buildUserGroupLinkList();
+ rebuildUserGroupMap();
if (LOG.isDebugEnabled()) {
this.print();
}
@@ -212,8 +212,8 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
private String getURL(String uri) {
- String ret = null ;
- ret = policyMgrBaseUrl + (uri.startsWith("/") ? uri : ("/" + uri)) ;
+ String ret = null;
+ ret = policyMgrBaseUrl + (uri.startsWith("/") ? uri : ("/" + uri));
return ret;
}
@@ -239,19 +239,19 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private void addUserToList(XUserInfo aUserInfo) {
if (! xuserList.contains(aUserInfo)) {
- xuserList.add(aUserInfo) ;
+ xuserList.add(aUserInfo);
}
- String userId = aUserInfo.getId() ;
+ String userId = aUserInfo.getId();
if (userId != null) {
- userId2XUserInfoMap.put(userId, aUserInfo) ;
+ userId2XUserInfoMap.put(userId, aUserInfo);
}
String userName = aUserInfo.getName();
if (userName != null) {
- userName2XUserInfoMap.put(userName, aUserInfo) ;
+ userName2XUserInfoMap.put(userName, aUserInfo);
}
}
@@ -259,25 +259,25 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private void addGroupToList(XGroupInfo aGroupInfo) {
if (! xgroupList.contains(aGroupInfo) ) {
- xgroupList.add(aGroupInfo) ;
+ xgroupList.add(aGroupInfo);
}
if (aGroupInfo.getName() != null) {
- groupName2XGroupInfoMap.put(aGroupInfo.getName(), aGroupInfo) ;
+ groupName2XGroupInfoMap.put(aGroupInfo.getName(), aGroupInfo);
}
}
private void addUserGroupToList(XUserGroupInfo ugInfo) {
- String userId = ugInfo.getUserId() ;
+ String userId = ugInfo.getUserId();
if (userId != null) {
- XUserInfo user = userId2XUserInfoMap.get(userId) ;
+ XUserInfo user = userId2XUserInfoMap.get(userId);
if (user != null) {
- List<String> groups = user.getGroups() ;
+ List<String> groups = user.getGroups();
if (! groups.contains(ugInfo.getGroupName())) {
- groups.add(ugInfo.getGroupName()) ;
+ groups.add(ugInfo.getGroupName());
}
}
}
@@ -287,30 +287,30 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
String userId = userInfo.getId();
if (userId != null) {
- XUserInfo user = userId2XUserInfoMap.get(userId) ;
+ XUserInfo user = userId2XUserInfoMap.get(userId);
if (user != null) {
- List<String> groups = user.getGroups() ;
+ List<String> groups = user.getGroups();
if (! groups.contains(groupInfo.getName())) {
- groups.add(groupInfo.getName()) ;
+ groups.add(groupInfo.getName());
}
}
}
}
private void delUserGroupFromList(XUserInfo userInfo, XGroupInfo groupInfo) {
- List<String> groups = userInfo.getGroups() ;
+ List<String> groups = userInfo.getGroups();
if (groups.contains(groupInfo.getName())) {
- groups.remove(groupInfo.getName()) ;
+ groups.remove(groupInfo.getName());
}
}
private void print() {
LOG.debug("Number of users read [" + xuserList.size() + "]");
for(XUserInfo user : xuserList) {
- LOG.debug("USER: " + user.getName()) ;
+ LOG.debug("USER: " + user.getName());
for(String group : user.getGroups()) {
- LOG.debug("\tGROUP: " + group) ;
+ LOG.debug("\tGROUP: " + group);
}
}
}
@@ -319,17 +319,17 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
public void addOrUpdateUser(String userName, List<String> groups) {
UserGroupInfo ugInfo = new UserGroupInfo();
- XUserInfo user = userName2XUserInfoMap.get(userName) ;
+ XUserInfo user = userName2XUserInfoMap.get(userName);
if (groups == null) {
- groups = new ArrayList<String>() ;
+ groups = new ArrayList<String>();
}
if (user == null) { // Does not exists
- LOG.debug("INFO: addPMAccount(" + userName + ")" ) ;
+ LOG.debug("INFO: addPMAccount(" + userName + ")" );
if (! isMockRun) {
- addMUser(userName) ;
+ addMUser(userName);
}
//* Build the user group info object and do the rest call
@@ -339,14 +339,14 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
else { // Validate group memberships
- List<String> oldGroups = user.getGroups() ;
- List<String> addGroups = new ArrayList<String>() ;
- List<String> delGroups = new ArrayList<String>() ;
- List<String> updateGroups = new ArrayList<String>() ;
+ List<String> oldGroups = user.getGroups();
+ List<String> addGroups = new ArrayList<String>();
+ List<String> delGroups = new ArrayList<String>();
+ List<String> updateGroups = new ArrayList<String>();
XGroupInfo tempXGroupInfo=null;
for(String group : groups) {
if (! oldGroups.contains(group)) {
- addGroups.add(group) ;
+ addGroups.add(group);
}else{
tempXGroupInfo=groupName2XGroupInfoMap.get(group);
if(tempXGroupInfo!=null && ! GROUP_SOURCE_EXTERNAL.equals(tempXGroupInfo.getGroupSource())){
@@ -357,12 +357,12 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
for(String group : oldGroups) {
if (! groups.contains(group) ) {
- delGroups.add(group) ;
+ delGroups.add(group);
}
}
for(String g : addGroups) {
- LOG.debug("INFO: addPMXAGroupToUser(" + userName + "," + g + ")" ) ;
+ LOG.debug("INFO: addPMXAGroupToUser(" + userName + "," + g + ")" );
}
if (! isMockRun) {
if (!addGroups.isEmpty()){
@@ -375,15 +375,15 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
+ ", for user-group entry: " + ugInfo);
}
}
- addXUserGroupInfo(user, addGroups) ;
+ addXUserGroupInfo(user, addGroups);
}
for(String g : delGroups) {
- LOG.debug("INFO: delPMXAGroupFromUser(" + userName + "," + g + ")" ) ;
+ LOG.debug("INFO: delPMXAGroupFromUser(" + userName + "," + g + ")" );
}
if (! isMockRun ) {
- delXUserGroupInfo(user, delGroups) ;
+ delXUserGroupInfo(user, delGroups);
}
if (! isMockRun) {
if (!updateGroups.isEmpty()){
@@ -404,25 +404,25 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
if (LOG.isDebugEnabled()) {
LOG.debug("==> PolicyMgrUserGroupBuilder.buildGroupList");
}
- Client c = getClient() ;
+ Client c = getClient();
- int totalCount = 100 ;
- int retrievedCount = 0 ;
+ int totalCount = 100;
+ int retrievedCount = 0;
while (retrievedCount < totalCount) {
WebResource r = c.resource(getURL(PM_GROUP_LIST_URI))
.queryParam("pageSize", recordsToPullPerCall)
- .queryParam("startIndex", String.valueOf(retrievedCount)) ;
+ .queryParam("startIndex", String.valueOf(retrievedCount));
String response = r.accept(MediaType.APPLICATION_JSON_TYPE).get(String.class);
- LOG.debug("RESPONSE: [" + response + "]") ;
+ LOG.debug("RESPONSE: [" + response + "]");
- Gson gson = new GsonBuilder().create() ;
+ Gson gson = new GsonBuilder().create();
- GetXGroupListResponse groupList = gson.fromJson(response, GetXGroupListResponse.class) ;
+ GetXGroupListResponse groupList = gson.fromJson(response, GetXGroupListResponse.class);
- totalCount = groupList.getTotalCount() ;
+ totalCount = groupList.getTotalCount();
if (groupList.getXgroupInfoList() != null) {
xgroupList.addAll(groupList.getXgroupInfoList());
@@ -439,33 +439,33 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
if (LOG.isDebugEnabled()) {
LOG.debug("==> PolicyMgrUserGroupBuilder.buildUserList");
}
- Client c = getClient() ;
+ Client c = getClient();
- int totalCount = 100 ;
- int retrievedCount = 0 ;
+ int totalCount = 100;
+ int retrievedCount = 0;
while (retrievedCount < totalCount) {
WebResource r = c.resource(getURL(PM_USER_LIST_URI))
.queryParam("pageSize", recordsToPullPerCall)
- .queryParam("startIndex", String.valueOf(retrievedCount)) ;
+ .queryParam("startIndex", String.valueOf(retrievedCount));
String response = r.accept(MediaType.APPLICATION_JSON_TYPE).get(String.class);
- Gson gson = new GsonBuilder().create() ;
+ Gson gson = new GsonBuilder().create();
- LOG.debug("RESPONSE: [" + response + "]") ;
+ LOG.debug("RESPONSE: [" + response + "]");
- GetXUserListResponse userList = gson.fromJson(response, GetXUserListResponse.class) ;
+ GetXUserListResponse userList = gson.fromJson(response, GetXUserListResponse.class);
- totalCount = userList.getTotalCount() ;
+ totalCount = userList.getTotalCount();
if (userList.getXuserInfoList() != null) {
- xuserList.addAll(userList.getXuserInfoList()) ;
- retrievedCount = xuserList.size() ;
+ xuserList.addAll(userList.getXuserInfoList());
+ retrievedCount = xuserList.size();
for(XUserInfo u : userList.getXuserInfoList()) {
- LOG.debug("USER: Id:" + u.getId() + ", Name: " + u.getName() + ", Description: " + u.getDescription()) ;
+ LOG.debug("USER: Id:" + u.getId() + ", Name: " + u.getName() + ", Description: " + u.getDescription());
}
}
}
@@ -475,33 +475,33 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
if(LOG.isDebugEnabled()) {
LOG.debug("==> PolicyMgrUserGroupBuilder.buildUserGroupLinkList");
}
- Client c = getClient() ;
+ Client c = getClient();
- int totalCount = 100 ;
- int retrievedCount = 0 ;
+ int totalCount = 100;
+ int retrievedCount = 0;
while (retrievedCount < totalCount) {
WebResource r = c.resource(getURL(PM_USER_GROUP_MAP_LIST_URI))
.queryParam("pageSize", recordsToPullPerCall)
- .queryParam("startIndex", String.valueOf(retrievedCount)) ;
+ .queryParam("startIndex", String.valueOf(retrievedCount));
String response = r.accept(MediaType.APPLICATION_JSON_TYPE).get(String.class);
- LOG.debug("RESPONSE: [" + response + "]") ;
+ LOG.debug("RESPONSE: [" + response + "]");
- Gson gson = new GsonBuilder().create() ;
+ Gson gson = new GsonBuilder().create();
- GetXUserGroupListResponse usergroupList = gson.fromJson(response, GetXUserGroupListResponse.class) ;
+ GetXUserGroupListResponse usergroupList = gson.fromJson(response, GetXUserGroupListResponse.class);
- totalCount = usergroupList.getTotalCount() ;
+ totalCount = usergroupList.getTotalCount();
if (usergroupList.getXusergroupInfoList() != null) {
- xusergroupList.addAll(usergroupList.getXusergroupInfoList()) ;
- retrievedCount = xusergroupList.size() ;
+ xusergroupList.addAll(usergroupList.getXusergroupInfoList());
+ retrievedCount = xusergroupList.size();
for(XUserGroupInfo ug : usergroupList.getXusergroupInfoList()) {
- LOG.debug("USER_GROUP: UserId:" + ug.getUserId() + ", Name: " + ug.getGroupName()) ;
+ LOG.debug("USER_GROUP: UserId:" + ug.getUserId() + ", Name: " + ug.getGroupName());
}
}
}
@@ -514,16 +514,16 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
UserGroupInfo ret = null;
XUserInfo user = null;
- LOG.debug("INFO: addPMXAUser(" + userName + ")" ) ;
+ LOG.debug("INFO: addPMXAUser(" + userName + ")" );
if (! isMockRun) {
- user = addXUserInfo(userName) ;
+ user = addXUserInfo(userName);
}
for(String g : groups) {
- LOG.debug("INFO: addPMXAGroupToUser(" + userName + "," + g + ")" ) ;
+ LOG.debug("INFO: addPMXAGroupToUser(" + userName + "," + g + ")" );
}
if (! isMockRun ) {
- addXUserGroupInfo(user, groups) ;
+ addXUserGroupInfo(user, groups);
}
if (authenticationType != null && AUTH_KERBEROS.equalsIgnoreCase(authenticationType) && SecureClientLogin.isKerberosCredentialExists(principal, keytab)){
try {
@@ -561,9 +561,9 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
LOG.debug("USER GROUP MAPPING" + jsonString);
- String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString) ;
+ String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString);
- LOG.debug("RESPONSE: [" + response + "]") ;
+ LOG.debug("RESPONSE: [" + response + "]");
ret = gson.fromJson(response, UserGroupInfo.class);
@@ -595,12 +595,12 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
String response = null;
try{
- response=r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString) ;
+ response=r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString);
}catch(Throwable t){
LOG.error("Failed to communicate Ranger Admin : ", t);
}
if ( LOG.isDebugEnabled() ) {
- LOG.debug("RESPONSE: [" + response + "]") ;
+ LOG.debug("RESPONSE: [" + response + "]");
}
ret = gson.fromJson(response, UserGroupInfo.class);
@@ -651,31 +651,31 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private XUserInfo addXUserInfo(String aUserName) {
- XUserInfo xuserInfo = new XUserInfo() ;
+ XUserInfo xuserInfo = new XUserInfo();
xuserInfo.setName(aUserName);
- xuserInfo.setDescription(aUserName + " - add from Unix box") ;
+ xuserInfo.setDescription(aUserName + " - add from Unix box");
usergroupInfo.setXuserInfo(xuserInfo);
- return xuserInfo ;
+ return xuserInfo;
}
private XGroupInfo addXGroupInfo(String aGroupName) {
- XGroupInfo addGroup = new XGroupInfo() ;
+ XGroupInfo addGroup = new XGroupInfo();
addGroup.setName(aGroupName);
- addGroup.setDescription(aGroupName + " - add from Unix box") ;
+ addGroup.setDescription(aGroupName + " - add from Unix box");
- addGroup.setGroupType("1") ;
+ addGroup.setGroupType("1");
addGroup.setGroupSource(GROUP_SOURCE_EXTERNAL);
- return addGroup ;
+ return addGroup;
}
@@ -684,12 +684,12 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
List<XGroupInfo> xGroupInfoList = new ArrayList<XGroupInfo>();
for(String groupName : aGroupList) {
- XGroupInfo group = groupName2XGroupInfoMap.get(groupName) ;
+ XGroupInfo group = groupName2XGroupInfoMap.get(groupName);
if (group == null) {
- group = addXGroupInfo(groupName) ;
+ group = addXGroupInfo(groupName);
}
xGroupInfoList.add(group);
- addXUserGroupInfo(aUserInfo, group) ;
+ addXUserGroupInfo(aUserInfo, group);
}
usergroupInfo.setXgroupInfo(xGroupInfoList);
@@ -699,9 +699,9 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
List<XGroupInfo> xGroupInfoList = new ArrayList<XGroupInfo>();
for(String groupName : aGroupList) {
- XGroupInfo group = groupName2XGroupInfoMap.get(groupName) ;
+ XGroupInfo group = groupName2XGroupInfoMap.get(groupName);
if (group == null) {
- group = addXGroupInfo(groupName) ;
+ group = addXGroupInfo(groupName);
}else if(!GROUP_SOURCE_EXTERNAL.equals(group.getGroupSource())){
group.setGroupSource(GROUP_SOURCE_EXTERNAL);
}
@@ -715,11 +715,11 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private XUserGroupInfo addXUserGroupInfo(XUserInfo aUserInfo, XGroupInfo aGroupInfo) {
- XUserGroupInfo ugInfo = new XUserGroupInfo() ;
+ XUserGroupInfo ugInfo = new XUserGroupInfo();
ugInfo.setUserId(aUserInfo.getId());
- ugInfo.setGroupName(aGroupInfo.getName()) ;
+ ugInfo.setGroupName(aGroupInfo.getName());
// ugInfo.setParentGroupId("1");
@@ -729,7 +729,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private void delXUserGroupInfo(final XUserInfo aUserInfo, List<String> aGroupList) {
for(String groupName : aGroupList) {
- final XGroupInfo group = groupName2XGroupInfoMap.get(groupName) ;
+ final XGroupInfo group = groupName2XGroupInfoMap.get(groupName);
if (group != null) {
if (authenticationType != null && AUTH_KERBEROS.equalsIgnoreCase(authenticationType) && SecureClientLogin.isKerberosCredentialExists(principal, keytab)) {
try {
@@ -764,26 +764,26 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
try {
- Client c = getClient() ;
+ Client c = getClient();
String uri = PM_DEL_USER_GROUP_LINK_URI.replaceAll(Pattern.quote("${groupName}"),
UserSyncUtil.encodeURIParam(groupName)).replaceAll(Pattern.quote("${userName}"), UserSyncUtil.encodeURIParam(userName));
- WebResource r = c.resource(getURL(uri)) ;
+ WebResource r = c.resource(getURL(uri));
- ClientResponse response = r.delete(ClientResponse.class) ;
+ ClientResponse response = r.delete(ClientResponse.class);
if ( LOG.isDebugEnabled() ) {
- LOG.debug("RESPONSE: [" + response.toString() + "]") ;
+ LOG.debug("RESPONSE: [" + response.toString() + "]");
}
if (response.getStatus() == 200) {
- delUserGroupFromList(aUserInfo, aGroupInfo) ;
+ delUserGroupFromList(aUserInfo, aGroupInfo);
}
} catch (Exception e) {
- LOG.warn( "ERROR: Unable to delete GROUP: " + groupName + " from USER:" + userName , e) ;
+ LOG.warn( "ERROR: Unable to delete GROUP: " + groupName + " from USER:" + userName , e);
}
}
@@ -824,23 +824,23 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private MUserInfo getMUser(MUserInfo userInfo, MUserInfo ret) {
- Client c = getClient() ;
+ Client c = getClient();
- WebResource r = c.resource(getURL(PM_ADD_LOGIN_USER_URI)) ;
+ WebResource r = c.resource(getURL(PM_ADD_LOGIN_USER_URI));
- Gson gson = new GsonBuilder().create() ;
+ Gson gson = new GsonBuilder().create();
- String jsonString = gson.toJson(userInfo) ;
+ String jsonString = gson.toJson(userInfo);
- String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString) ;
+ String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString);
- LOG.debug("RESPONSE[" + response + "]") ;
+ LOG.debug("RESPONSE[" + response + "]");
- ret = gson.fromJson(response, MUserInfo.class) ;
+ ret = gson.fromJson(response, MUserInfo.class);
LOG.debug("MUser Creation successful " + ret);
- return ret ;
+ return ret;
}
private synchronized Client getClient() {
@@ -861,12 +861,12 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
if (keyStoreFile != null && keyStoreFilepwd != null) {
KeyStore keyStore = KeyStore.getInstance(keyStoreType);
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(keyStoreFile) ;
+ in = getFileInputStream(keyStoreFile);
if (in == null) {
LOG.error("Unable to obtain keystore from file [" + keyStoreFile + "]");
- return ret ;
+ return ret;
}
keyStore.load(in, keyStoreFilepwd.toCharArray());
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
@@ -884,12 +884,12 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
if (trustStoreFile != null && trustStoreFilepwd != null) {
KeyStore trustStore = KeyStore.getInstance(trustStoreType);
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(trustStoreFile) ;
+ in = getFileInputStream(trustStoreFile);
if (in == null) {
LOG.error("Unable to obtain keystore from file [" + trustStoreFile + "]");
- return ret ;
+ return ret;
}
trustStore.load(in, trustStoreFilepwd.toCharArray());
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
@@ -898,7 +898,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
finally {
if (in != null) {
- in.close() ;
+ in.close();
}
}
}
@@ -943,7 +943,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
}
}
- return ret ;
+ return ret;
}
private InputStream getFileInputStream(String path) throws FileNotFoundException {
@@ -964,7 +964,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
if (ret == null) {
- ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path) ;
+ ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path);
if (ret == null) {
if (! path.startsWith("/")) {
ret = ClassLoader.getSystemResourceAsStream("/" + path);
@@ -979,7 +979,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
@Override
public void addOrUpdateGroup(String groupName) {
- XGroupInfo group = groupName2XGroupInfoMap.get(groupName) ;
+ XGroupInfo group = groupName2XGroupInfoMap.get(groupName);
if (group == null) { // Does not exists
@@ -997,9 +997,9 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
XGroupInfo ret = null;
XGroupInfo group = null;
- LOG.debug("INFO: addPMXAGroup(" + groupName + ")" ) ;
+ LOG.debug("INFO: addPMXAGroup(" + groupName + ")" );
if (! isMockRun) {
- group = addXGroupInfo(groupName) ;
+ group = addXGroupInfo(groupName);
}
if (authenticationType != null && AUTH_KERBEROS.equalsIgnoreCase(authenticationType) && SecureClientLogin.isKerberosCredentialExists(principal,keytab)) {
try {
@@ -1040,9 +1040,9 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
LOG.debug("Group" + jsonString);
- String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString) ;
+ String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString);
- LOG.debug("RESPONSE: [" + response + "]") ;
+ LOG.debug("RESPONSE: [" + response + "]");
ret = gson.fromJson(response, XGroupInfo.class);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
index e5abd08..88aa266 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
@@ -38,17 +38,17 @@ import org.apache.ranger.usergroupsync.UserGroupSource;
public class UnixUserGroupBuilder implements UserGroupSource {
- private static final Logger LOG = Logger.getLogger(UnixUserGroupBuilder.class) ;
- private final static String OS = System.getProperty("os.name") ;
+ private static final Logger LOG = Logger.getLogger(UnixUserGroupBuilder.class);
+ private final static String OS = System.getProperty("os.name");
// kept for legacy support
- public static final String UNIX_USER_PASSWORD_FILE = "/etc/passwd" ;
- public static final String UNIX_GROUP_FILE = "/etc/group" ;
+ public static final String UNIX_USER_PASSWORD_FILE = "/etc/passwd";
+ public static final String UNIX_GROUP_FILE = "/etc/group";
/** Shell commands to get users and groups */
- static final String LINUX_GET_ALL_USERS_CMD = "getent passwd" ;
- static final String LINUX_GET_ALL_GROUPS_CMD = "getent group" ;
- static final String LINUX_GET_GROUP_CMD = "getent group %s" ;
+ static final String LINUX_GET_ALL_USERS_CMD = "getent passwd";
+ static final String LINUX_GET_ALL_GROUPS_CMD = "getent group";
+ static final String LINUX_GET_GROUP_CMD = "getent group %s";
// mainly for testing purposes
// there might be a better way
@@ -56,12 +56,12 @@ public class UnixUserGroupBuilder implements UserGroupSource {
"awk 'BEGIN { OFS = \":\"; ORS=\"\\n\"; i=0;}" +
"/RecordName: / {name = $2;i = 0;}/PrimaryGroupID: / {gid = $2;}" +
"/^ / {if (i == 0) { i++; name = $1;}}" +
- "/UniqueID: / {uid = $2;print name, \"*\", gid, uid;}'" ;
+ "/UniqueID: / {uid = $2;print name, \"*\", gid, uid;}'";
static final String MAC_GET_ALL_GROUPS_CMD = "dscl . -list /Groups PrimaryGroupID | " +
- "awk -v OFS=\":\" '{print $1, \"*\", $2, \"\"}'" ;
+ "awk -v OFS=\":\" '{print $1, \"*\", $2, \"\"}'";
static final String MAC_GET_GROUP_CMD = "dscl . -read /Groups/%1$s | paste -d, -s - | sed -e 's/:/|/g' | " +
"awk -v OFS=\":\" -v ORS=\"\\n\" -F, '{print \"%1$s\",\"*\",$6,$4}' | " +
- "sed -e 's/:[^:]*| /:/g' | sed -e 's/ /,/g'" ;
+ "sed -e 's/:[^:]*| /:/g' | sed -e 's/ /,/g'";
static final String BACKEND_PASSWD = "passwd";
@@ -71,29 +71,29 @@ public class UnixUserGroupBuilder implements UserGroupSource {
private long lastUpdateTime = 0; // Last time maps were updated
private long timeout = 0;
- private UserGroupSyncConfig config = UserGroupSyncConfig.getInstance() ;
+ private UserGroupSyncConfig config = UserGroupSyncConfig.getInstance();
private Map<String,List<String>> user2GroupListMap = new HashMap<String,List<String>>();
private Map<String,List<String>> internalUser2GroupListMap = new HashMap<String,List<String>>();
- private Map<String,String> groupId2groupNameMap = new HashMap<String,String>() ;
- private int minimumUserId = 0 ;
- private int minimumGroupId = 0 ;
+ private Map<String,String> groupId2groupNameMap = new HashMap<String,String>();
+ private int minimumUserId = 0;
+ private int minimumGroupId = 0;
- private long passwordFileModifiedAt = 0 ;
- private long groupFileModifiedAt = 0 ;
+ private long passwordFileModifiedAt = 0;
+ private long groupFileModifiedAt = 0;
public static void main(String[] args) throws Throwable {
- UnixUserGroupBuilder ugbuilder = new UnixUserGroupBuilder() ;
+ UnixUserGroupBuilder ugbuilder = new UnixUserGroupBuilder();
ugbuilder.init();
ugbuilder.print();
}
public UnixUserGroupBuilder() {
- minimumUserId = Integer.parseInt(config.getMinUserId()) ;
- minimumGroupId = Integer.parseInt(config.getMinGroupId()) ;
+ minimumUserId = Integer.parseInt(config.getMinUserId());
+ minimumGroupId = Integer.parseInt(config.getMinGroupId());
- LOG.debug("Minimum UserId: " + minimumUserId + ", minimum GroupId: " + minimumGroupId) ;
+ LOG.debug("Minimum UserId: " + minimumUserId + ", minimum GroupId: " + minimumGroupId);
- timeout = config.getUpdateMillisMin() ;
+ timeout = config.getUpdateMillisMin();
enumerateGroupMembers = config.isGroupEnumerateEnabled();
if (!config.getUnixBackend().equalsIgnoreCase(BACKEND_PASSWD)) {
@@ -106,31 +106,31 @@ public class UnixUserGroupBuilder implements UserGroupSource {
@Override
public void init() throws Throwable {
- buildUserGroupInfo() ;
+ buildUserGroupInfo();
}
@Override
public boolean isChanged() {
if (useNss)
- return System.currentTimeMillis() - lastUpdateTime > timeout ;
+ return System.currentTimeMillis() - lastUpdateTime > timeout;
- long TempPasswordFileModifiedAt = new File(UNIX_USER_PASSWORD_FILE).lastModified() ;
+ long TempPasswordFileModifiedAt = new File(UNIX_USER_PASSWORD_FILE).lastModified();
if (passwordFileModifiedAt != TempPasswordFileModifiedAt) {
- return true ;
+ return true;
}
- long TempGroupFileModifiedAt = new File(UNIX_GROUP_FILE).lastModified() ;
+ long TempGroupFileModifiedAt = new File(UNIX_GROUP_FILE).lastModified();
if (groupFileModifiedAt != TempGroupFileModifiedAt) {
- return true ;
+ return true;
}
- return false ;
+ return false;
}
@Override
public void updateSink(UserGroupSink sink) throws Throwable {
- buildUserGroupInfo() ;
+ buildUserGroupInfo();
for (Map.Entry<String, List<String>> entry : user2GroupListMap.entrySet()) {
String user = entry.getKey();
@@ -162,20 +162,20 @@ public class UnixUserGroupBuilder implements UserGroupSource {
buildUnixUserList(LINUX_GET_ALL_USERS_CMD);
}
- lastUpdateTime = System.currentTimeMillis() ;
+ lastUpdateTime = System.currentTimeMillis();
if (LOG.isDebugEnabled()) {
- print() ;
+ print();
}
}
private void print() {
for(String user : user2GroupListMap.keySet()) {
- LOG.debug("USER:" + user) ;
- List<String> groups = user2GroupListMap.get(user) ;
+ LOG.debug("USER:" + user);
+ List<String> groups = user2GroupListMap.get(user);
if (groups != null) {
for(String group : groups) {
- LOG.debug("\tGROUP: " + group) ;
+ LOG.debug("\tGROUP: " + group);
}
}
}
@@ -213,9 +213,9 @@ public class UnixUserGroupBuilder implements UserGroupSource {
continue;
}
- String userName = null ;
- String userId = null ;
- String groupId = null ;
+ String userName = null;
+ String userId = null;
+ String groupId = null;
try {
userName = tokens[0];
@@ -223,8 +223,8 @@ public class UnixUserGroupBuilder implements UserGroupSource {
groupId = tokens[3];
}
catch(ArrayIndexOutOfBoundsException aiobe) {
- LOG.warn("Ignoring line - [" + line + "]: Unable to parse line for getting user information", aiobe) ;
- continue ;
+ LOG.warn("Ignoring line - [" + line + "]: Unable to parse line for getting user information", aiobe);
+ continue;
}
int numUserId = -1;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java
index 30b891c..e57247a 100644
--- a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java
+++ b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java
@@ -25,24 +25,24 @@ import org.apache.ranger.unixusersync.config.UserGroupSyncConfig;
public class UserGroupSync implements Runnable {
- private static final Logger LOG = Logger.getLogger(UserGroupSync.class) ;
+ private static final Logger LOG = Logger.getLogger(UserGroupSync.class);
- private boolean shutdownFlag = false ;
- private UserGroupSink ugSink = null ;
- private UserGroupSource ugSource = null ;
+ private boolean shutdownFlag = false;
+ private UserGroupSink ugSink = null;
+ private UserGroupSource ugSource = null;
public static void main(String[] args) {
- UserGroupSync userGroupSync = new UserGroupSync() ;
- userGroupSync.run() ;
+ UserGroupSync userGroupSync = new UserGroupSync();
+ userGroupSync.run();
}
public void run() {
try {
- long sleepTimeBetweenCycleInMillis = UserGroupSyncConfig.getInstance().getSleepTimeInMillisBetweenCycle() ;
+ long sleepTimeBetweenCycleInMillis = UserGroupSyncConfig.getInstance().getSleepTimeInMillisBetweenCycle();
- boolean initDone = false ;
+ boolean initDone = false;
while (! initDone ) {
try {
@@ -58,17 +58,17 @@ public class UserGroupSync implements Runnable {
ugSource.updateSink(ugSink);
LOG.info("End: initial load of user/group from source==>sink");
- initDone = true ;
+ initDone = true;
- LOG.info("Done initializing user/group source and sink") ;
+ LOG.info("Done initializing user/group source and sink");
}
catch(Throwable t) {
- LOG.error("Failed to initialize UserGroup source/sink. Will retry after " + sleepTimeBetweenCycleInMillis + " milliseconds. Error details: ", t) ;
+ LOG.error("Failed to initialize UserGroup source/sink. Will retry after " + sleepTimeBetweenCycleInMillis + " milliseconds. Error details: ", t);
try {
- LOG.debug("Sleeping for [" + sleepTimeBetweenCycleInMillis + "] milliSeconds") ;
- Thread.sleep(sleepTimeBetweenCycleInMillis) ;
+ LOG.debug("Sleeping for [" + sleepTimeBetweenCycleInMillis + "] milliSeconds");
+ Thread.sleep(sleepTimeBetweenCycleInMillis);
} catch (Exception e) {
- LOG.error("Failed to wait for [" + sleepTimeBetweenCycleInMillis + "] milliseconds before attempting to initialize UserGroup source/sink", e) ;
+ LOG.error("Failed to wait for [" + sleepTimeBetweenCycleInMillis + "] milliseconds before attempting to initialize UserGroup source/sink", e);
}
}
}
@@ -77,19 +77,19 @@ public class UserGroupSync implements Runnable {
while (! shutdownFlag ) {
try {
- LOG.debug("Sleeping for [" + sleepTimeBetweenCycleInMillis + "] milliSeconds") ;
+ LOG.debug("Sleeping for [" + sleepTimeBetweenCycleInMillis + "] milliSeconds");
Thread.sleep(sleepTimeBetweenCycleInMillis);
} catch (InterruptedException e) {
- LOG.error("Failed to wait for [" + sleepTimeBetweenCycleInMillis + "] milliseconds before attempting to synchronize UserGroup information", e) ;
+ LOG.error("Failed to wait for [" + sleepTimeBetweenCycleInMillis + "] milliseconds before attempting to synchronize UserGroup information", e);
}
try {
- syncUserGroup(forceSync) ;
+ syncUserGroup(forceSync);
forceSync = false;
}
catch(Throwable t) {
- LOG.error("Failed to synchronize UserGroup information. Error details: ", t) ;
+ LOG.error("Failed to synchronize UserGroup information. Error details: ", t);
forceSync = true; // force sync to the destination in the next attempt
}
@@ -97,15 +97,15 @@ public class UserGroupSync implements Runnable {
}
catch(Throwable t) {
- LOG.error("UserGroupSync thread got an error", t) ;
+ LOG.error("UserGroupSync thread got an error", t);
}
finally {
- LOG.error("Shutting down the UserGroupSync thread") ;
+ LOG.error("Shutting down the UserGroupSync thread");
}
}
private void syncUserGroup(boolean forceSync) throws Throwable {
- UserGroupSyncConfig config = UserGroupSyncConfig.getInstance() ;
+ UserGroupSyncConfig config = UserGroupSyncConfig.getInstance();
try{
if (config.isUserSyncEnabled()) {
@@ -115,7 +115,7 @@ public class UserGroupSync implements Runnable {
LOG.info("End: update user/group from source==>sink");
}
else {
- LOG.debug("UserGroupSource: no change found for synchronization.") ;
+ LOG.debug("UserGroupSource: no change found for synchronization.");
}
}
}catch(Throwable t){
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java
----------------------------------------------------------------------
diff --git a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java
index e960fed..31e6ddb 100644
--- a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java
+++ b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java
@@ -35,11 +35,11 @@ public class ConsolePromptCallbackHandler implements CallbackHandler {
@Override
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)) ;
+ BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
for(Callback cb : callbacks) {
if (cb instanceof NameCallback) {
- NameCallback nc = (NameCallback)cb ;
+ NameCallback nc = (NameCallback)cb;
System.out.print(nc.getPrompt());
System.out.flush();
String line = null;
@@ -61,7 +61,7 @@ public class ConsolePromptCallbackHandler implements CallbackHandler {
pc.setPassword(line.toCharArray());
}
else {
- System.out.println("Unknown callbacl [" + cb.getClass().getName() + "]") ;
+ System.out.println("Unknown callbacl [" + cb.getClass().getName() + "]");
}
}
}
[06/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemDataMaskInfo.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemDataMaskInfo.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemDataMaskInfo.java
index 5561255..8a93730 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemDataMaskInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemDataMaskInfo.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -79,7 +79,7 @@ public class XXPolicyItemDataMaskInfo extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -89,7 +89,7 @@ public class XXPolicyItemDataMaskInfo extends XXDBBase implements
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -99,7 +99,7 @@ public class XXPolicyItemDataMaskInfo extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> policyItemId</b> .
* You cannot set null to the attribute.
- *
+ *
* @param policyItemId
* Value to set member attribute <b> policyItemId</b>
*/
@@ -109,7 +109,7 @@ public class XXPolicyItemDataMaskInfo extends XXDBBase implements
/**
* Returns the value for the member attribute <b>policyItemId</b>
- *
+ *
* @return Date - value of member attribute <b>policyItemId</b> .
*/
public Long getPolicyItemId() {
@@ -119,7 +119,7 @@ public class XXPolicyItemDataMaskInfo extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> type</b> . You
* cannot set null to the attribute.
- *
+ *
* @param type
* Value to set member attribute <b> type</b>
*/
@@ -129,7 +129,7 @@ public class XXPolicyItemDataMaskInfo extends XXDBBase implements
/**
* Returns the value for the member attribute <b>type</b>
- *
+ *
* @return Date - value of member attribute <b>type</b> .
*/
public Long getType() {
@@ -139,7 +139,7 @@ public class XXPolicyItemDataMaskInfo extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> conditionExpr</b> .
* You cannot set null to the attribute.
- *
+ *
* @param conditionExpr
* Value to set member attribute <b> conditionExpr</b>
*/
@@ -159,7 +159,7 @@ public class XXPolicyItemDataMaskInfo extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> valueExpr</b> . You
* cannot set null to the attribute.
- *
+ *
* @param valueExpr
* Value to set member attribute <b> valueExpr</b>
*/
@@ -169,7 +169,7 @@ public class XXPolicyItemDataMaskInfo extends XXDBBase implements
/**
* Returns the value for the member attribute <b>valueExpr</b>
- *
+ *
* @return String - value of member attribute <b>valueExpr</b> .
*/
public String getValueExpr() {
@@ -178,7 +178,7 @@ public class XXPolicyItemDataMaskInfo extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -236,7 +236,7 @@ public class XXPolicyItemDataMaskInfo extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemGroupPerm.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemGroupPerm.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemGroupPerm.java
index 0c42166..cae7200 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemGroupPerm.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemGroupPerm.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -70,7 +70,7 @@ public class XXPolicyItemGroupPerm extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -80,7 +80,7 @@ public class XXPolicyItemGroupPerm extends XXDBBase implements
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -90,7 +90,7 @@ public class XXPolicyItemGroupPerm extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> policyItemId</b> .
* You cannot set null to the attribute.
- *
+ *
* @param policyItemId
* Value to set member attribute <b> policyItemId</b>
*/
@@ -100,7 +100,7 @@ public class XXPolicyItemGroupPerm extends XXDBBase implements
/**
* Returns the value for the member attribute <b>policyItemId</b>
- *
+ *
* @return Date - value of member attribute <b>policyItemId</b> .
*/
public Long getPolicyitemid() {
@@ -110,7 +110,7 @@ public class XXPolicyItemGroupPerm extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> groupId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param groupId
* Value to set member attribute <b> groupId</b>
*/
@@ -120,7 +120,7 @@ public class XXPolicyItemGroupPerm extends XXDBBase implements
/**
* Returns the value for the member attribute <b>groupId</b>
- *
+ *
* @return Date - value of member attribute <b>groupId</b> .
*/
public Long getGroupid() {
@@ -130,7 +130,7 @@ public class XXPolicyItemGroupPerm extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -140,7 +140,7 @@ public class XXPolicyItemGroupPerm extends XXDBBase implements
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Date - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -149,7 +149,7 @@ public class XXPolicyItemGroupPerm extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -200,7 +200,7 @@ public class XXPolicyItemGroupPerm extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemRowFilterInfo.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemRowFilterInfo.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemRowFilterInfo.java
index 6a63ad1..4518818 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemRowFilterInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemRowFilterInfo.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -61,7 +61,7 @@ public class XXPolicyItemRowFilterInfo extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -71,7 +71,7 @@ public class XXPolicyItemRowFilterInfo extends XXDBBase implements
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Long - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -81,7 +81,7 @@ public class XXPolicyItemRowFilterInfo extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> policyItemId</b> .
* You cannot set null to the attribute.
- *
+ *
* @param policyItemId
* Value to set member attribute <b> policyItemId</b>
*/
@@ -91,7 +91,7 @@ public class XXPolicyItemRowFilterInfo extends XXDBBase implements
/**
* Returns the value for the member attribute <b>policyItemId</b>
- *
+ *
* @return Long - value of member attribute <b>policyItemId</b> .
*/
public Long getPolicyItemId() {
@@ -101,7 +101,7 @@ public class XXPolicyItemRowFilterInfo extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> filterExpr</b> .
* You cannot set null to the attribute.
- *
+ *
* @param filterExpr
* Value to set member attribute <b> filterExpr</b>
*/
@@ -120,7 +120,7 @@ public class XXPolicyItemRowFilterInfo extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -164,7 +164,7 @@ public class XXPolicyItemRowFilterInfo extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemUserPerm.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemUserPerm.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemUserPerm.java
index 69c47df..eb76885 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemUserPerm.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemUserPerm.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -70,7 +70,7 @@ public class XXPolicyItemUserPerm extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -80,7 +80,7 @@ public class XXPolicyItemUserPerm extends XXDBBase implements
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -90,7 +90,7 @@ public class XXPolicyItemUserPerm extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> policyItemId</b> .
* You cannot set null to the attribute.
- *
+ *
* @param policyItemId
* Value to set member attribute <b> policyItemId</b>
*/
@@ -100,7 +100,7 @@ public class XXPolicyItemUserPerm extends XXDBBase implements
/**
* Returns the value for the member attribute <b>policyItemId</b>
- *
+ *
* @return Date - value of member attribute <b>policyItemId</b> .
*/
public Long getPolicyitemid() {
@@ -110,7 +110,7 @@ public class XXPolicyItemUserPerm extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> userId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param userId
* Value to set member attribute <b> userId</b>
*/
@@ -120,7 +120,7 @@ public class XXPolicyItemUserPerm extends XXDBBase implements
/**
* Returns the value for the member attribute <b>userId</b>
- *
+ *
* @return Date - value of member attribute <b>userId</b> .
*/
public Long getUserid() {
@@ -130,7 +130,7 @@ public class XXPolicyItemUserPerm extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -140,7 +140,7 @@ public class XXPolicyItemUserPerm extends XXDBBase implements
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Date - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -149,7 +149,7 @@ public class XXPolicyItemUserPerm extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -200,7 +200,7 @@ public class XXPolicyItemUserPerm extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResource.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResource.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResource.java
index 3303e41..3c1fd3d 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -78,7 +78,7 @@ public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -88,7 +88,7 @@ public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -98,7 +98,7 @@ public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> policyId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param policyId
* Value to set member attribute <b> policyId</b>
*/
@@ -108,7 +108,7 @@ public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>policyId</b>
- *
+ *
* @return Date - value of member attribute <b>policyId</b> .
*/
public Long getPolicyid() {
@@ -118,7 +118,7 @@ public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> resDefId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param resDefId
* Value to set member attribute <b> resDefId</b>
*/
@@ -128,7 +128,7 @@ public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>resDefId</b>
- *
+ *
* @return Date - value of member attribute <b>resDefId</b> .
*/
public Long getResdefid() {
@@ -138,7 +138,7 @@ public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> isExcludes</b> .
* You cannot set null to the attribute.
- *
+ *
* @param isExcludes
* Value to set member attribute <b> isExcludes</b>
*/
@@ -148,7 +148,7 @@ public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>isExcludes</b>
- *
+ *
* @return Date - value of member attribute <b>isExcludes</b> .
*/
public boolean getIsexcludes() {
@@ -158,7 +158,7 @@ public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> isRecursive</b> .
* You cannot set null to the attribute.
- *
+ *
* @param isRecursive
* Value to set member attribute <b> isRecursive</b>
*/
@@ -168,7 +168,7 @@ public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>isRecursive</b>
- *
+ *
* @return Date - value of member attribute <b>isRecursive</b> .
*/
public boolean getIsrecursive() {
@@ -177,7 +177,7 @@ public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -227,7 +227,7 @@ public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResourceMap.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResourceMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResourceMap.java
index c000b39..8c692db 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResourceMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResourceMap.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -70,7 +70,7 @@ public class XXPolicyResourceMap extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -80,7 +80,7 @@ public class XXPolicyResourceMap extends XXDBBase implements
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -90,7 +90,7 @@ public class XXPolicyResourceMap extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> resourceId</b> .
* You cannot set null to the attribute.
- *
+ *
* @param resourceId
* Value to set member attribute <b> resourceId</b>
*/
@@ -100,7 +100,7 @@ public class XXPolicyResourceMap extends XXDBBase implements
/**
* Returns the value for the member attribute <b>resourceId</b>
- *
+ *
* @return Date - value of member attribute <b>resourceId</b> .
*/
public Long getResourceid() {
@@ -110,7 +110,7 @@ public class XXPolicyResourceMap extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> value</b> . You
* cannot set null to the attribute.
- *
+ *
* @param value
* Value to set member attribute <b> value</b>
*/
@@ -120,7 +120,7 @@ public class XXPolicyResourceMap extends XXDBBase implements
/**
* Returns the value for the member attribute <b>value</b>
- *
+ *
* @return Date - value of member attribute <b>value</b> .
*/
public String getValue() {
@@ -130,7 +130,7 @@ public class XXPolicyResourceMap extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -140,7 +140,7 @@ public class XXPolicyResourceMap extends XXDBBase implements
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Date - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -149,7 +149,7 @@ public class XXPolicyResourceMap extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -200,7 +200,7 @@ public class XXPolicyResourceMap extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java
index 71458d8..c9b907f 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* User details
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java
index d0fb38d..97f52c4 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Role of the user
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java b/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java
index c19f4df..e571a4f 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Resource
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java
index 28ee4e7..09df994 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -249,7 +249,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -259,7 +259,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -269,7 +269,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> defId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param defId
* Value to set member attribute <b> defId</b>
*/
@@ -279,7 +279,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>itemId</b>
- *
+ *
* @return Long - value of member attribute <b>itemId</b> .
*/
public Long getItemId() {
@@ -289,7 +289,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> itemId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param itemId
* Value to set member attribute <b> itemId</b>
*/
@@ -299,7 +299,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>defId</b>
- *
+ *
* @return Date - value of member attribute <b>defId</b> .
*/
public Long getDefid() {
@@ -309,7 +309,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> name</b> . You
* cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b> name</b>
*/
@@ -319,7 +319,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return Date - value of member attribute <b>name</b> .
*/
public String getName() {
@@ -329,7 +329,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> type</b> . You
* cannot set null to the attribute.
- *
+ *
* @param type
* Value to set member attribute <b> type</b>
*/
@@ -339,7 +339,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>type</b>
- *
+ *
* @return Date - value of member attribute <b>type</b> .
*/
public String getType() {
@@ -349,7 +349,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> level</b> . You
* cannot set null to the attribute.
- *
+ *
* @param level
* Value to set member attribute <b> level</b>
*/
@@ -359,7 +359,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>level</b>
- *
+ *
* @return Date - value of member attribute <b>level</b> .
*/
public Integer getLevel() {
@@ -369,7 +369,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> parent</b> . You
* cannot set null to the attribute.
- *
+ *
* @param parent
* Value to set member attribute <b> parent</b>
*/
@@ -379,7 +379,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>parent</b>
- *
+ *
* @return Date - value of member attribute <b>parent</b> .
*/
public Long getParent() {
@@ -389,7 +389,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> mandatory</b> .
* You cannot set null to the attribute.
- *
+ *
* @param mandatory
* Value to set member attribute <b> mandatory</b>
*/
@@ -399,7 +399,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>mandatory</b>
- *
+ *
* @return Date - value of member attribute <b>mandatory</b> .
*/
public boolean getMandatory() {
@@ -409,7 +409,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>
* lookUpSupported</b> . You cannot set null to the attribute.
- *
+ *
* @param lookUpSupported
* Value to set member attribute <b> lookUpSupported</b>
*/
@@ -419,7 +419,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>lookUpSupported</b>
- *
+ *
* @return Date - value of member attribute <b>lookUpSupported</b> .
*/
public boolean getLookupsupported() {
@@ -429,7 +429,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>
* recursiveSupported</b> . You cannot set null to the attribute.
- *
+ *
* @param recursiveSupported
* Value to set member attribute <b> recursiveSupported</b>
*/
@@ -439,7 +439,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>recursiveSupported</b>
- *
+ *
* @return Date - value of member attribute <b>recursiveSupported</b> .
*/
public boolean getRecursivesupported() {
@@ -449,7 +449,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>
* excludesSupported</b> . You cannot set null to the attribute.
- *
+ *
* @param excludesSupported
* Value to set member attribute <b> excludesSupported</b>
*/
@@ -459,7 +459,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>excludesSupported</b>
- *
+ *
* @return Date - value of member attribute <b>excludesSupported</b> .
*/
public boolean getExcludessupported() {
@@ -469,7 +469,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> matcher</b> . You
* cannot set null to the attribute.
- *
+ *
* @param matcher
* Value to set member attribute <b> matcher</b>
*/
@@ -479,7 +479,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>matcher</b>
- *
+ *
* @return Date - value of member attribute <b>matcher</b> .
*/
public String getMatcher() {
@@ -489,7 +489,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> matcherOptions</b>
* . You cannot set null to the attribute.
- *
+ *
* @param matcherOptions
* Value to set member attribute <b> matcherOptions</b>
*/
@@ -499,7 +499,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>matcherOptions</b>
- *
+ *
* @return Date - value of member attribute <b>matcherOptions</b> .
*/
public String getMatcheroptions() {
@@ -551,7 +551,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> label</b> . You
* cannot set null to the attribute.
- *
+ *
* @param label
* Value to set member attribute <b> label</b>
*/
@@ -561,7 +561,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>label</b>
- *
+ *
* @return Date - value of member attribute <b>label</b> .
*/
public String getLabel() {
@@ -571,7 +571,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> description</b> .
* You cannot set null to the attribute.
- *
+ *
* @param description
* Value to set member attribute <b> description</b>
*/
@@ -581,7 +581,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>description</b>
- *
+ *
* @return Date - value of member attribute <b>description</b> .
*/
public String getDescription() {
@@ -591,7 +591,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> rbKeyLabel</b> .
* You cannot set null to the attribute.
- *
+ *
* @param rbKeyLabel
* Value to set member attribute <b> rbKeyLabel</b>
*/
@@ -601,7 +601,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>rbKeyLabel</b>
- *
+ *
* @return Date - value of member attribute <b>rbKeyLabel</b> .
*/
public String getRbkeylabel() {
@@ -611,7 +611,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b>
* rbKeyDescription</b> . You cannot set null to the attribute.
- *
+ *
* @param rbKeyDescription
* Value to set member attribute <b> rbKeyDescription</b>
*/
@@ -621,7 +621,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>rbKeyDescription</b>
- *
+ *
* @return Date - value of member attribute <b>rbKeyDescription</b> .
*/
public String getRbkeydescription() {
@@ -645,7 +645,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -655,7 +655,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Date - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -676,7 +676,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -828,7 +828,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXService.java b/security-admin/src/main/java/org/apache/ranger/entity/XXService.java
index a1efc94..2d14d48 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXService.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceBase.java
index 396b6a2..366dc55 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceBase.java
@@ -152,7 +152,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> version</b> . You
* cannot set null to the attribute.
- *
+ *
* @param version
* Value to set member attribute <b> version</b>
*/
@@ -162,7 +162,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>version</b>
- *
+ *
* @return Date - value of member attribute <b>version</b> .
*/
public Long getVersion() {
@@ -172,7 +172,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> type</b> . You
* cannot set null to the attribute.
- *
+ *
* @param type
* Value to set member attribute <b> type</b>
*/
@@ -182,7 +182,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>type</b>
- *
+ *
* @return Date - value of member attribute <b>type</b> .
*/
public Long getType() {
@@ -192,7 +192,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> name</b> . You
* cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b> name</b>
*/
@@ -202,7 +202,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return Date - value of member attribute <b>name</b> .
*/
public String getName() {
@@ -211,7 +211,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> tagService</b> .
- *
+ *
* @param tagService
* Value to set member attribute <b> tagService</b>
*/
@@ -221,7 +221,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>tagService</b>
- *
+ *
* @return Long - value of member attribute <b>tagService</b> .
*/
public Long getTagService() {
@@ -231,7 +231,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> policyVersion</b>
* . You cannot set null to the attribute.
- *
+ *
* @param policyVersion
* Value to set member attribute <b> policyVersion</b>
*/
@@ -241,7 +241,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>policyVersion</b>
- *
+ *
* @return Date - value of member attribute <b>policyVersion</b> .
*/
public Long getPolicyVersion() {
@@ -251,7 +251,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b>
* policyUpdateTime</b> . You cannot set null to the attribute.
- *
+ *
* @param policyUpdateTime
* Value to set member attribute <b> policyUpdateTime</b>
*/
@@ -261,7 +261,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>policyUpdateTime</b>
- *
+ *
* @return Date - value of member attribute <b>policyUpdateTime</b> .
*/
public Date getPolicyUpdateTime() {
@@ -271,7 +271,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> tagVersion</b>
* . You cannot set null to the attribute.
- *
+ *
* @param tagVersion
* Value to set member attribute <b> tagVersion</b>
*/
@@ -281,7 +281,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>tagVersion</b>
- *
+ *
* @return Long - value of member attribute <b>tagVersion</b> .
*/
public Long getTagVersion() {
@@ -291,7 +291,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b>
* tagUpdateTime</b> . You cannot set null to the attribute.
- *
+ *
* @param tagUpdateTime
* Value to set member attribute <b> tagUpdateTime</b>
*/
@@ -301,7 +301,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>tagUpdateTime</b>
- *
+ *
* @return Date - value of member attribute <b>tagUpdateTime</b> .
*/
public Date getTagUpdateTime() {
@@ -311,7 +311,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> description</b> .
* You cannot set null to the attribute.
- *
+ *
* @param description
* Value to set member attribute <b> description</b>
*/
@@ -321,7 +321,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>description</b>
- *
+ *
* @return Date - value of member attribute <b>description</b> .
*/
public String getDescription() {
@@ -331,7 +331,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> isEnabled</b> .
* You cannot set null to the attribute.
- *
+ *
* @param isEnabled
* Value to set member attribute <b> isEnabled</b>
*/
@@ -341,7 +341,7 @@ public abstract class XXServiceBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>isEnabled</b>
- *
+ *
* @return Date - value of member attribute <b>isEnabled</b> .
*/
public Boolean getIsenabled() {
@@ -350,7 +350,7 @@ public abstract class XXServiceBase extends XXDBBase {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -447,7 +447,7 @@ public abstract class XXServiceBase extends XXDBBase {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java
index 825720c..acf1133 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -187,7 +187,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -197,7 +197,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -207,7 +207,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> defId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param defId
* Value to set member attribute <b> defId</b>
*/
@@ -217,7 +217,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>defId</b>
- *
+ *
* @return Date - value of member attribute <b>defId</b> .
*/
public Long getDefid() {
@@ -227,7 +227,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> itemId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param itemId
* Value to set member attribute <b> itemId</b>
*/
@@ -237,7 +237,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>itemId</b>
- *
+ *
* @return Long - value of member attribute <b>itemId</b> .
*/
public Long getItemId() {
@@ -247,7 +247,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> name</b> . You
* cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b> name</b>
*/
@@ -257,7 +257,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return Date - value of member attribute <b>name</b> .
*/
public String getName() {
@@ -267,7 +267,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> type</b> . You
* cannot set null to the attribute.
- *
+ *
* @param type
* Value to set member attribute <b> type</b>
*/
@@ -277,7 +277,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>type</b>
- *
+ *
* @return Date - value of member attribute <b>type</b> .
*/
public String getType() {
@@ -287,7 +287,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> subType</b> . You
* cannot set null to the attribute.
- *
+ *
* @param subType
* Value to set member attribute <b> subType</b>
*/
@@ -297,7 +297,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>subType</b>
- *
+ *
* @return Date - value of member attribute <b>subType</b> .
*/
public String getSubtype() {
@@ -307,7 +307,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> isMandatory</b> .
* You cannot set null to the attribute.
- *
+ *
* @param isMandatory
* Value to set member attribute <b> isMandatory</b>
*/
@@ -317,7 +317,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>isMandatory</b>
- *
+ *
* @return Date - value of member attribute <b>isMandatory</b> .
*/
public boolean getIsMandatory() {
@@ -327,7 +327,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> defaultValue</b> .
* You cannot set null to the attribute.
- *
+ *
* @param defaultValue
* Value to set member attribute <b> defaultValue</b>
*/
@@ -337,7 +337,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>defaultValue</b>
- *
+ *
* @return Date - value of member attribute <b>defaultValue</b> .
*/
public String getDefaultvalue() {
@@ -389,7 +389,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> label</b> . You
* cannot set null to the attribute.
- *
+ *
* @param label
* Value to set member attribute <b> label</b>
*/
@@ -399,7 +399,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>label</b>
- *
+ *
* @return Date - value of member attribute <b>label</b> .
*/
public String getLabel() {
@@ -409,7 +409,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> description</b> .
* You cannot set null to the attribute.
- *
+ *
* @param description
* Value to set member attribute <b> description</b>
*/
@@ -419,7 +419,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>description</b>
- *
+ *
* @return Date - value of member attribute <b>description</b> .
*/
public String getDescription() {
@@ -429,7 +429,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> rbKeyLabel</b> .
* You cannot set null to the attribute.
- *
+ *
* @param rbKeyLabel
* Value to set member attribute <b> rbKeyLabel</b>
*/
@@ -439,7 +439,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>rbKeyLabel</b>
- *
+ *
* @return Date - value of member attribute <b>rbKeyLabel</b> .
*/
public String getRbkeylabel() {
@@ -449,7 +449,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b>
* rbKeyDecription</b> . You cannot set null to the attribute.
- *
+ *
* @param rbKeyDescription
* Value to set member attribute <b> rbKeyDecription</b>
*/
@@ -459,7 +459,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>rbKeyDecription</b>
- *
+ *
* @return Date - value of member attribute <b>rbKeyDecription</b> .
*/
public String getRbkeydescription() {
@@ -483,7 +483,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -493,7 +493,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Date - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -502,7 +502,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -621,7 +621,7 @@ public class XXServiceConfigDef extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigMap.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigMap.java
index ff9a6f8..13f0964 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigMap.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -70,7 +70,7 @@ public class XXServiceConfigMap extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -80,7 +80,7 @@ public class XXServiceConfigMap extends XXDBBase implements
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -90,7 +90,7 @@ public class XXServiceConfigMap extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> service</b> . You
* cannot set null to the attribute.
- *
+ *
* @param service
* Value to set member attribute <b> service</b>
*/
@@ -100,7 +100,7 @@ public class XXServiceConfigMap extends XXDBBase implements
/**
* Returns the value for the member attribute <b>service</b>
- *
+ *
* @return Date - value of member attribute <b>service</b> .
*/
public Long getServiceId() {
@@ -110,7 +110,7 @@ public class XXServiceConfigMap extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> configKey</b> .
* You cannot set null to the attribute.
- *
+ *
* @param configKey
* Value to set member attribute <b> configKey</b>
*/
@@ -120,7 +120,7 @@ public class XXServiceConfigMap extends XXDBBase implements
/**
* Returns the value for the member attribute <b>configKey</b>
- *
+ *
* @return Date - value of member attribute <b>configKey</b> .
*/
public String getConfigkey() {
@@ -130,7 +130,7 @@ public class XXServiceConfigMap extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> configValue</b> .
* You cannot set null to the attribute.
- *
+ *
* @param configValue
* Value to set member attribute <b> configValue</b>
*/
@@ -140,7 +140,7 @@ public class XXServiceConfigMap extends XXDBBase implements
/**
* Returns the value for the member attribute <b>configValue</b>
- *
+ *
* @return Date - value of member attribute <b>configValue</b> .
*/
public String getConfigvalue() {
@@ -149,7 +149,7 @@ public class XXServiceConfigMap extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -200,7 +200,7 @@ public class XXServiceConfigMap extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDef.java
index bac5cba..3d49683 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDef.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -42,7 +42,7 @@ public class XXServiceDef extends XXServiceDefBase implements java.io.Serializab
/**
* This method sets the value to the member attribute <b> id</b> . You cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -53,7 +53,7 @@ public class XXServiceDef extends XXServiceDefBase implements java.io.Serializab
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefBase.java
index e704d98..9a35359 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefBase.java
@@ -136,7 +136,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* This method sets the value to the member attribute <b> version</b> . You cannot set null to the attribute.
- *
+ *
* @param version
* Value to set member attribute <b> version</b>
*/
@@ -146,7 +146,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* Returns the value for the member attribute <b>version</b>
- *
+ *
* @return Date - value of member attribute <b>version</b> .
*/
public Long getVersion() {
@@ -155,7 +155,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* This method sets the value to the member attribute <b> name</b> . You cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b> name</b>
*/
@@ -165,7 +165,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return Date - value of member attribute <b>name</b> .
*/
public String getName() {
@@ -174,7 +174,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* This method sets the value to the member attribute <b> implClassName</b> . You cannot set null to the attribute.
- *
+ *
* @param implClassName
* Value to set member attribute <b> implClassName</b>
*/
@@ -184,7 +184,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* Returns the value for the member attribute <b>implClassName</b>
- *
+ *
* @return Date - value of member attribute <b>implClassName</b> .
*/
public String getImplclassname() {
@@ -193,7 +193,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* This method sets the value to the member attribute <b> label</b> . You cannot set null to the attribute.
- *
+ *
* @param label
* Value to set member attribute <b> label</b>
*/
@@ -203,7 +203,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* Returns the value for the member attribute <b>label</b>
- *
+ *
* @return Date - value of member attribute <b>label</b> .
*/
public String getLabel() {
@@ -212,7 +212,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* This method sets the value to the member attribute <b> description</b> . You cannot set null to the attribute.
- *
+ *
* @param description
* Value to set member attribute <b> description</b>
*/
@@ -222,7 +222,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* Returns the value for the member attribute <b>description</b>
- *
+ *
* @return Date - value of member attribute <b>description</b> .
*/
public String getDescription() {
@@ -250,7 +250,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* This method sets the value to the member attribute <b> rbKeyLabel</b> . You cannot set null to the attribute.
- *
+ *
* @param rbKeyLabel
* Value to set member attribute <b> rbKeyLabel</b>
*/
@@ -260,7 +260,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* Returns the value for the member attribute <b>rbKeyLabel</b>
- *
+ *
* @return Date - value of member attribute <b>rbKeyLabel</b> .
*/
public String getRbkeylabel() {
@@ -270,7 +270,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* This method sets the value to the member attribute <b> rbKeyDescription</b> . You cannot set null to the
* attribute.
- *
+ *
* @param rbKeyDescription
* Value to set member attribute <b> rbKeyDescription</b>
*/
@@ -280,7 +280,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* Returns the value for the member attribute <b>rbKeyDescription</b>
- *
+ *
* @return Date - value of member attribute <b>rbKeyDescription</b> .
*/
public String getRbkeydescription() {
@@ -289,7 +289,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* This method sets the value to the member attribute <b> isEnabled</b> . You cannot set null to the attribute.
- *
+ *
* @param isEnabled
* Value to set member attribute <b> isEnabled</b>
*/
@@ -299,7 +299,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/**
* Returns the value for the member attribute <b>isEnabled</b>
- *
+ *
* @return Date - value of member attribute <b>isEnabled</b> .
*/
public boolean getIsEnabled() {
@@ -308,7 +308,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -391,7 +391,7 @@ public abstract class XXServiceDefBase extends XXDBBase implements Serializable
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResource.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResource.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResource.java
index 6d92679..961627a 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -155,7 +155,7 @@ public class XXServiceResource extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -173,7 +173,7 @@ public class XXServiceResource extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -220,7 +220,7 @@ public class XXServiceResource extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElement.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElement.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElement.java
index 48a079e..16dca97 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElement.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElement.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -135,7 +135,7 @@ public class XXServiceResourceElement extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -152,7 +152,7 @@ public class XXServiceResourceElement extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -194,7 +194,7 @@ public class XXServiceResourceElement extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElementValue.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElementValue.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElementValue.java
index 7e8ba36..82ce8a0 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElementValue.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElementValue.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -117,7 +117,7 @@ public class XXServiceResourceElementValue extends XXDBBase implements Serializa
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -133,7 +133,7 @@ public class XXServiceResourceElementValue extends XXDBBase implements Serializa
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -170,7 +170,7 @@ public class XXServiceResourceElementValue extends XXDBBase implements Serializa
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXServiceVersionInfo.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceVersionInfo.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceVersionInfo.java
index 691687f..cef3863 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceVersionInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceVersionInfo.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXTag.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTag.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTag.java
index 2ed6f73..9155385 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTag.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTag.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -125,7 +125,7 @@ public class XXTag extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -142,7 +142,7 @@ public class XXTag extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -184,7 +184,7 @@ public class XXTag extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttribute.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttribute.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttribute.java
index c878380..1c88288 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttribute.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttribute.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -117,7 +117,7 @@ public class XXTagAttribute extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -133,7 +133,7 @@ public class XXTagAttribute extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -170,7 +170,7 @@ public class XXTagAttribute extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java
index 6459128..5c6ff58 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -117,7 +117,7 @@ public class XXTagAttributeDef extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -133,7 +133,7 @@ public class XXTagAttributeDef extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -170,7 +170,7 @@ public class XXTagAttributeDef extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXTagDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTagDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTagDef.java
index 40d5afb..818908b 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTagDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTagDef.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -155,7 +155,7 @@ public class XXTagDef extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -173,7 +173,7 @@ public class XXTagDef extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -220,7 +220,7 @@ public class XXTagDef extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXTagResourceMap.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTagResourceMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTagResourceMap.java
index b637f7b..4b8b3ec 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTagResourceMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTagResourceMap.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -117,7 +117,7 @@ public class XXTagResourceMap extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -133,7 +133,7 @@ public class XXTagResourceMap extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -170,7 +170,7 @@ public class XXTagResourceMap extends XXDBBase implements Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java
index 117ab54..5995201 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Logging table for all DB create and update queries
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
index d6416ba..64b4d19 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* User
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java b/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java
index c38efad..28d6f03 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/json/Folder.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/json/Folder.java b/security-admin/src/main/java/org/apache/ranger/json/Folder.java
index 6eb2ceb..2717b33 100644
--- a/security-admin/src/main/java/org/apache/ranger/json/Folder.java
+++ b/security-admin/src/main/java/org/apache/ranger/json/Folder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/json/JsonDateSerializer.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/json/JsonDateSerializer.java b/security-admin/src/main/java/org/apache/ranger/json/JsonDateSerializer.java
index 1d7cfcf..1682310 100644
--- a/security-admin/src/main/java/org/apache/ranger/json/JsonDateSerializer.java
+++ b/security-admin/src/main/java/org/apache/ranger/json/JsonDateSerializer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
/**
* Used to serialize Java.util.Date, which is not a common JSON type, so we have
* to create a custom serialize method;.
- *
+ *
*/
@Component
public class JsonDateSerializer extends JsonSerializer<Date> {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java b/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java
index 014dedc..9feed65 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,7 +31,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
/**
- *
+ *
*
*/
public abstract class BaseLoader {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
index f25c3f7..84fcb54 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
@@ -417,7 +417,7 @@ public class DbToSolrMigrationUtil extends BaseLoader {
+ zkHosts + ", collection="
+ collectionName, e);
throw e;
- }
+ }
} else {
if (solrURL == null || solrURL.isEmpty()
|| solrURL.equalsIgnoreCase("none")) {
[15/19] incubator-ranger git commit: Removing spaces before semicolons
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
----------------------------------------------------------------------
diff --git a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
index c0f136c..4b47ea7 100644
--- a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
+++ b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
@@ -73,7 +73,7 @@ public class RemoteUnixLoginModule implements LoginModule {
private char[] password;
private Subject subject;
private CallbackHandler callbackHandler;
- private boolean debug = true ;
+ private boolean debug = true;
private String remoteHostName;
private int remoteHostAuthServicePort;
@@ -88,9 +88,9 @@ public class RemoteUnixLoginModule implements LoginModule {
private boolean SSLEnabled = false;
- private boolean serverCertValidation = true ;
+ private boolean serverCertValidation = true;
- private boolean remoteLoginEnabled = true ;
+ private boolean remoteLoginEnabled = true;
public RemoteUnixLoginModule() {
log("Created RemoteUnixLoginModule");
@@ -129,24 +129,24 @@ public class RemoteUnixLoginModule implements LoginModule {
this.subject = subject;
this.callbackHandler = callbackHandler;
- log("RemoteUnixLoginModule::initialize() has been called with callbackhandler: " + this.callbackHandler) ;
+ log("RemoteUnixLoginModule::initialize() has been called with callbackhandler: " + this.callbackHandler);
if (this.callbackHandler == null) {
this.callbackHandler = new ConsolePromptCallbackHandler();
}
/*
- Properties config = null ;
+ Properties config = null;
String val = (String) options.get(REMOTE_UNIX_AUTHENICATION_CONFIG_FILE_PARAM);
- log("Remote Unix Auth Configuration file [" + val + "]") ;
+ log("Remote Unix Auth Configuration file [" + val + "]");
if (val != null) {
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(val) ;
+ in = getFileInputStream(val);
if (in != null) {
try {
- config = new Properties() ;
+ config = new Properties();
// config.load(in);
DocumentBuilderFactory xmlDocumentBuilderFactory = DocumentBuilderFactory
.newInstance();
@@ -204,21 +204,21 @@ public class RemoteUnixLoginModule implements LoginModule {
}
catch(Throwable t) {
- logError("Unable to load REMOTE_UNIX_AUTHENICATION_CONFIG_FILE_PARAM [" + val + "]") ;
+ logError("Unable to load REMOTE_UNIX_AUTHENICATION_CONFIG_FILE_PARAM [" + val + "]");
}
}
if (config == null) {
- logError("Remote Unix Auth Configuration is being loaded from XML configuration - not Properties") ;
- config = new Properties() ;
+ logError("Remote Unix Auth Configuration is being loaded from XML configuration - not Properties");
+ config = new Properties();
config.putAll(options);
}
*/
- Properties config = new Properties() ;
- config.putAll(options) ;
- initParams(config) ;
+ Properties config = new Properties();
+ config.putAll(options);
+ initParams(config);
}
@@ -226,17 +226,17 @@ public class RemoteUnixLoginModule implements LoginModule {
public void initParams(Properties options) {
- String val = (String) options.get(JAAS_ENABLED_PARAM) ;
+ String val = (String) options.get(JAAS_ENABLED_PARAM);
if (val != null) {
- remoteLoginEnabled = val.trim().equalsIgnoreCase("true") ;
+ remoteLoginEnabled = val.trim().equalsIgnoreCase("true");
if (! remoteLoginEnabled) {
- System.err.println("Skipping RemoteLogin - [" + JAAS_ENABLED_PARAM + "] => [" + val + "]") ;
- return ;
+ System.err.println("Skipping RemoteLogin - [" + JAAS_ENABLED_PARAM + "] => [" + val + "]");
+ return;
}
}
else {
- remoteLoginEnabled = true ;
+ remoteLoginEnabled = true;
}
val = (String) options.get(DEBUG_PARAM);
@@ -244,7 +244,7 @@ public class RemoteUnixLoginModule implements LoginModule {
debug = true;
}
else {
- debug = false ;
+ debug = false;
}
remoteHostName = (String) options.get(REMOTE_LOGIN_HOST_PARAM);
@@ -257,8 +257,8 @@ public class RemoteUnixLoginModule implements LoginModule {
log("remoteHostAuthServicePort:" + remoteHostAuthServicePort);
- val = (String)options.get(SSL_ENABLED_PARAM) ;
- SSLEnabled = (val != null) && val.trim().equalsIgnoreCase("true") ;
+ val = (String)options.get(SSL_ENABLED_PARAM);
+ SSLEnabled = (val != null) && val.trim().equalsIgnoreCase("true");
log("SSLEnabled:" + SSLEnabled);
if (SSLEnabled) {
@@ -283,9 +283,9 @@ public class RemoteUnixLoginModule implements LoginModule {
log("keyStorePathPassword:*****");
}
- String certValidationFlag = (String) options.get(SERVER_CERT_VALIDATION_PARAM) ;
- serverCertValidation = (! (certValidationFlag != null && ("false".equalsIgnoreCase(certValidationFlag.trim().toLowerCase())))) ;
- log("Server Cert Validation : " + serverCertValidation) ;
+ String certValidationFlag = (String) options.get(SERVER_CERT_VALIDATION_PARAM);
+ serverCertValidation = (! (certValidationFlag != null && ("false".equalsIgnoreCase(certValidationFlag.trim().toLowerCase()))));
+ log("Server Cert Validation : " + serverCertValidation);
}
}
@@ -306,12 +306,12 @@ public class RemoteUnixLoginModule implements LoginModule {
userName = nameCallback.getName();
- String modifiedUserName = userName ;
+ String modifiedUserName = userName;
if (userName != null) {
- int atStartsAt = userName.indexOf("@") ;
+ int atStartsAt = userName.indexOf("@");
if ( atStartsAt > -1) {
- modifiedUserName = userName.substring(0, atStartsAt) ;
+ modifiedUserName = userName.substring(0, atStartsAt);
}
}
@@ -405,7 +405,7 @@ public class RemoteUnixLoginModule implements LoginModule {
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- TrustManager[] tm = null ;
+ TrustManager[] tm = null;
if (serverCertValidation) {
@@ -449,7 +449,7 @@ public class RemoteUnixLoginModule implements LoginModule {
}
};
- tm = new TrustManager[] {ignoreValidationTM} ;
+ tm = new TrustManager[] {ignoreValidationTM};
}
SecureRandom random = new SecureRandom();
@@ -510,7 +510,7 @@ public class RemoteUnixLoginModule implements LoginModule {
}
if (ret == null) {
- ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path) ;
+ ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path);
if (ret == null) {
if (! path.startsWith("/")) {
ret = ClassLoader.getSystemResourceAsStream("/" + path);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixGroupPrincipal.java
----------------------------------------------------------------------
diff --git a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixGroupPrincipal.java b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixGroupPrincipal.java
index 5c2e838..ecc416b 100644
--- a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixGroupPrincipal.java
+++ b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixGroupPrincipal.java
@@ -26,15 +26,15 @@ public class UnixGroupPrincipal implements Principal, Serializable {
private static final long serialVersionUID = 8137147441841439754L;
- private String groupName ;
+ private String groupName;
public UnixGroupPrincipal(String groupName) {
- this.groupName = groupName ;
+ this.groupName = groupName;
}
@Override
public String getName() {
- return groupName ;
+ return groupName;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixUserPrincipal.java
----------------------------------------------------------------------
diff --git a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixUserPrincipal.java b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixUserPrincipal.java
index e71a965..84cb6c3 100644
--- a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixUserPrincipal.java
+++ b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixUserPrincipal.java
@@ -26,15 +26,15 @@ public class UnixUserPrincipal implements Principal, Serializable {
private static final long serialVersionUID = -3568658536591178268L;
- private String userName ;
+ private String userName;
public UnixUserPrincipal(String userName) {
- this.userName = userName ;
+ this.userName = userName;
}
@Override
public String getName() {
- return userName ;
+ return userName;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/unixauthclient/src/test/com/xasecure/test/authentication/UnixAuthenticationTester.java
----------------------------------------------------------------------
diff --git a/unixauthclient/src/test/com/xasecure/test/authentication/UnixAuthenticationTester.java b/unixauthclient/src/test/com/xasecure/test/authentication/UnixAuthenticationTester.java
index 2dd2804..41317f6 100644
--- a/unixauthclient/src/test/com/xasecure/test/authentication/UnixAuthenticationTester.java
+++ b/unixauthclient/src/test/com/xasecure/test/authentication/UnixAuthenticationTester.java
@@ -28,10 +28,10 @@ public class UnixAuthenticationTester {
}
public void run() throws Throwable {
- LoginContext loginContext = new LoginContext("PolicyManager") ;
- System.err.println("After login ...") ;
+ LoginContext loginContext = new LoginContext("PolicyManager");
+ System.err.println("After login ...");
loginContext.login();
- System.err.println("Subject:" + loginContext.getSubject() ) ;
+ System.err.println("Subject:" + loginContext.getSubject() );
loginContext.logout();
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/unixauthservice/src/main/java/org/apache/ranger/authentication/PasswordValidator.java
----------------------------------------------------------------------
diff --git a/unixauthservice/src/main/java/org/apache/ranger/authentication/PasswordValidator.java b/unixauthservice/src/main/java/org/apache/ranger/authentication/PasswordValidator.java
index dd0e7d5..8801611 100644
--- a/unixauthservice/src/main/java/org/apache/ranger/authentication/PasswordValidator.java
+++ b/unixauthservice/src/main/java/org/apache/ranger/authentication/PasswordValidator.java
@@ -31,76 +31,76 @@ import org.apache.log4j.Logger;
public class PasswordValidator implements Runnable {
- private static final Logger LOG = Logger.getLogger(PasswordValidator.class) ;
+ private static final Logger LOG = Logger.getLogger(PasswordValidator.class);
- private static String validatorProgram = null ;
+ private static String validatorProgram = null;
- private static List<String> adminUserList ;
+ private static List<String> adminUserList;
- private static String adminRoleNames ;
+ private static String adminRoleNames;
- private Socket client ;
+ private Socket client;
public PasswordValidator(Socket client) {
- this.client = client ;
+ this.client = client;
}
@Override
public void run() {
- BufferedReader reader = null ;
+ BufferedReader reader = null;
PrintWriter writer = null;
- String userName = null ;
+ String userName = null;
try {
- reader = new BufferedReader(new InputStreamReader(client.getInputStream())) ;
- writer = new PrintWriter(new OutputStreamWriter(client.getOutputStream())) ;
- String request = reader.readLine() ;
+ reader = new BufferedReader(new InputStreamReader(client.getInputStream()));
+ writer = new PrintWriter(new OutputStreamWriter(client.getOutputStream()));
+ String request = reader.readLine();
if (request.startsWith("LOGIN:")) {
- String line = request.substring(6).trim() ;
- int passwordAt = line.indexOf(' ') ;
+ String line = request.substring(6).trim();
+ int passwordAt = line.indexOf(' ');
if (passwordAt != -1) {
- userName = line.substring(0,passwordAt).trim() ;
+ userName = line.substring(0,passwordAt).trim();
}
}
if (validatorProgram == null) {
- String res = "FAILED: Unable to validate credentials." ;
- writer.println(res) ;
+ String res = "FAILED: Unable to validate credentials.";
+ writer.println(res);
writer.flush();
- LOG.error("Response [" + res + "] for user: " + userName + " as ValidatorProgram is not defined in configuration.") ;
+ LOG.error("Response [" + res + "] for user: " + userName + " as ValidatorProgram is not defined in configuration.");
}
else {
- BufferedReader pReader = null ;
+ BufferedReader pReader = null;
PrintWriter pWriter = null;
Process p = null;
try {
- p = Runtime.getRuntime().exec(validatorProgram) ;
+ p = Runtime.getRuntime().exec(validatorProgram);
- pReader = new BufferedReader(new InputStreamReader(p.getInputStream())) ;
+ pReader = new BufferedReader(new InputStreamReader(p.getInputStream()));
- pWriter = new PrintWriter(new OutputStreamWriter(p.getOutputStream())) ;
+ pWriter = new PrintWriter(new OutputStreamWriter(p.getOutputStream()));
- pWriter.println(request) ; pWriter.flush();
+ pWriter.println(request); pWriter.flush();
- String res = pReader.readLine() ;
+ String res = pReader.readLine();
if (res != null && res.startsWith("OK")) {
if (adminRoleNames != null && adminUserList != null) {
if (adminUserList.contains(userName)) {
- res = res + " " + adminRoleNames ;
+ res = res + " " + adminRoleNames;
}
}
}
LOG.info("Response [" + res + "] for user: " + userName);
- writer.println(res) ; writer.flush();
+ writer.println(res); writer.flush();
}
finally {
if (p != null) {
@@ -112,8 +112,8 @@ public class PasswordValidator implements Runnable {
}
catch(Throwable t) {
if (userName != null && writer != null ) {
- String res = "FAILED: unable to validate due to error " + t ;
- writer.println(res) ;
+ String res = "FAILED: unable to validate due to error " + t;
+ writer.println(res);
LOG.error("Response [" + res + "] for user: " + userName, t);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
----------------------------------------------------------------------
diff --git a/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java b/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
index 86a56f3..99a38db 100644
--- a/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
+++ b/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
@@ -54,43 +54,43 @@ import org.w3c.dom.NodeList;
public class UnixAuthenticationService {
- private static final Logger LOG = Logger.getLogger(UnixAuthenticationService.class) ;
+ private static final Logger LOG = Logger.getLogger(UnixAuthenticationService.class);
- private static final String serviceName = "UnixAuthenticationService" ;
+ private static final String serviceName = "UnixAuthenticationService";
- private static final String SSL_ALGORITHM = "TLS" ;
- private static final String REMOTE_LOGIN_AUTH_SERVICE_PORT_PARAM = "ranger.usersync.port" ;
+ private static final String SSL_ALGORITHM = "TLS";
+ private static final String REMOTE_LOGIN_AUTH_SERVICE_PORT_PARAM = "ranger.usersync.port";
- private static final String SSL_KEYSTORE_PATH_PARAM = "ranger.usersync.keystore.file" ;
- private static final String SSL_TRUSTSTORE_PATH_PARAM = "ranger.usersync.truststore.file" ;
+ private static final String SSL_KEYSTORE_PATH_PARAM = "ranger.usersync.keystore.file";
+ private static final String SSL_TRUSTSTORE_PATH_PARAM = "ranger.usersync.truststore.file";
- private static final String SSL_KEYSTORE_PATH_PASSWORD_ALIAS = "usersync.ssl.key.password" ;
- private static final String SSL_TRUSTSTORE_PATH_PASSWORD_ALIAS = "usersync.ssl.truststore.password" ;
+ private static final String SSL_KEYSTORE_PATH_PASSWORD_ALIAS = "usersync.ssl.key.password";
+ private static final String SSL_TRUSTSTORE_PATH_PASSWORD_ALIAS = "usersync.ssl.truststore.password";
- private static final String CRED_VALIDATOR_PROG = "ranger.usersync.passwordvalidator.path" ;
- private static final String ADMIN_USER_LIST_PARAM = "admin.users" ;
- private static final String ADMIN_ROLE_LIST_PARAM = "admin.roleNames" ;
- private static final String SSL_ENABLED_PARAM = "ranger.usersync.ssl" ;
+ private static final String CRED_VALIDATOR_PROG = "ranger.usersync.passwordvalidator.path";
+ private static final String ADMIN_USER_LIST_PARAM = "admin.users";
+ private static final String ADMIN_ROLE_LIST_PARAM = "admin.roleNames";
+ private static final String SSL_ENABLED_PARAM = "ranger.usersync.ssl";
- private static final String CREDSTORE_FILENAME_PARAM = "ranger.usersync.credstore.filename" ;
+ private static final String CREDSTORE_FILENAME_PARAM = "ranger.usersync.credstore.filename";
- private String keyStorePath ;
- private String keyStorePathPassword ;
- private String trustStorePath ;
- private String trustStorePathPassword ;
- private List<String> adminUserList = new ArrayList<String>() ;
- private String adminRoleNames ;
+ private String keyStorePath;
+ private String keyStorePathPassword;
+ private String trustStorePath;
+ private String trustStorePathPassword;
+ private List<String> adminUserList = new ArrayList<String>();
+ private String adminRoleNames;
- private int portNum ;
+ private int portNum;
- private boolean SSLEnabled = false ;
+ private boolean SSLEnabled = false;
static private boolean enableUnixAuth = false;
- private static final String[] UGSYNC_CONFIG_XML_FILES = { "ranger-ugsync-default.xml", "ranger-ugsync-site.xml" } ;
- private static final String PROPERTY_ELEMENT_TAGNAME = "property" ;
- private static final String NAME_ELEMENT_TAGNAME = "name" ;
- private static final String VALUE_ELEMENT_TAGNAME = "value" ;
+ private static final String[] UGSYNC_CONFIG_XML_FILES = { "ranger-ugsync-default.xml", "ranger-ugsync-site.xml" };
+ private static final String PROPERTY_ELEMENT_TAGNAME = "property";
+ private static final String NAME_ELEMENT_TAGNAME = "name";
+ private static final String VALUE_ELEMENT_TAGNAME = "value";
public static void main(String[] args) {
if (args.length > 0) {
@@ -101,8 +101,8 @@ public class UnixAuthenticationService {
}
}
}
- UnixAuthenticationService service = new UnixAuthenticationService() ;
- service.run() ;
+ UnixAuthenticationService service = new UnixAuthenticationService();
+ service.run();
}
public UnixAuthenticationService() {
@@ -112,11 +112,11 @@ public class UnixAuthenticationService {
public void run() {
try {
LOG.info("Starting User Sync Service!");
- startUnixUserGroupSyncProcess() ;
+ startUnixUserGroupSyncProcess();
if (enableUnixAuth) {
LOG.info("Enabling Unix Auth Service!");
- init() ;
- startService() ;
+ init();
+ startService();
} else {
LOG.info("Unix Auth Service Disabled!");
}
@@ -133,8 +133,8 @@ public class UnixAuthenticationService {
//
// Start the synchronization service ...
//
- UserGroupSync syncProc = new UserGroupSync() ;
- Thread newSyncProcThread = new Thread(syncProc) ;
+ UserGroupSync syncProc = new UserGroupSync();
+ Thread newSyncProcThread = new Thread(syncProc);
newSyncProcThread.setName("UnixUserSyncThread");
newSyncProcThread.setDaemon(false);
newSyncProcThread.start();
@@ -143,11 +143,11 @@ public class UnixAuthenticationService {
//TODO: add more validation code
private void init() throws Throwable {
- Properties prop = new Properties() ;
+ Properties prop = new Properties();
for (String fn : UGSYNC_CONFIG_XML_FILES ) {
- InputStream in = getFileInputStream(fn) ;
+ InputStream in = getFileInputStream(fn);
if (in != null) {
try {
@@ -185,7 +185,7 @@ public class UnixAuthenticationService {
//LOG.info("Adding Property:[" + propertyName + "] Value:["+ propertyValue + "]");
if (prop.get(propertyName) != null ) {
- prop.remove(propertyName) ;
+ prop.remove(propertyName);
}
prop.put(propertyName, propertyValue);
}
@@ -202,15 +202,15 @@ public class UnixAuthenticationService {
}
}
- String credStoreFileName = prop.getProperty(CREDSTORE_FILENAME_PARAM) ;
+ String credStoreFileName = prop.getProperty(CREDSTORE_FILENAME_PARAM);
- keyStorePath = prop.getProperty(SSL_KEYSTORE_PATH_PARAM) ;
+ keyStorePath = prop.getProperty(SSL_KEYSTORE_PATH_PARAM);
if (credStoreFileName == null) {
- throw new RuntimeException("Credential file is not defined. param = [" + CREDSTORE_FILENAME_PARAM + "]") ;
+ throw new RuntimeException("Credential file is not defined. param = [" + CREDSTORE_FILENAME_PARAM + "]");
}
- File credFile = new File(credStoreFileName) ;
+ File credFile = new File(credStoreFileName);
if (! credFile.exists()) {
throw new RuntimeException("Credential file [" + credStoreFileName + "]: does not exists." );
@@ -220,37 +220,37 @@ public class UnixAuthenticationService {
throw new RuntimeException("Credential file [" + credStoreFileName + "]: can not be read." );
}
- keyStorePathPassword = CredentialReader.getDecryptedString(credStoreFileName, SSL_KEYSTORE_PATH_PASSWORD_ALIAS) ;
- trustStorePathPassword = CredentialReader.getDecryptedString(credStoreFileName,SSL_TRUSTSTORE_PATH_PASSWORD_ALIAS) ;
+ keyStorePathPassword = CredentialReader.getDecryptedString(credStoreFileName, SSL_KEYSTORE_PATH_PASSWORD_ALIAS);
+ trustStorePathPassword = CredentialReader.getDecryptedString(credStoreFileName,SSL_TRUSTSTORE_PATH_PASSWORD_ALIAS);
- trustStorePath = prop.getProperty(SSL_TRUSTSTORE_PATH_PARAM) ;
- portNum = Integer.parseInt(prop.getProperty(REMOTE_LOGIN_AUTH_SERVICE_PORT_PARAM)) ;
- String validatorProg = prop.getProperty(CRED_VALIDATOR_PROG) ;
+ trustStorePath = prop.getProperty(SSL_TRUSTSTORE_PATH_PARAM);
+ portNum = Integer.parseInt(prop.getProperty(REMOTE_LOGIN_AUTH_SERVICE_PORT_PARAM));
+ String validatorProg = prop.getProperty(CRED_VALIDATOR_PROG);
if (validatorProg != null) {
PasswordValidator.setValidatorProgram(validatorProg);
}
- String adminUsers = prop.getProperty(ADMIN_USER_LIST_PARAM) ;
+ String adminUsers = prop.getProperty(ADMIN_USER_LIST_PARAM);
if (adminUsers != null && adminUsers.trim().length() > 0) {
for(String u : adminUsers.split(",")) {
LOG.info("Adding Admin User:" + u.trim());
- adminUserList.add(u.trim()) ;
+ adminUserList.add(u.trim());
}
PasswordValidator.setAdminUserList(adminUserList);
}
- adminRoleNames = prop.getProperty(ADMIN_ROLE_LIST_PARAM) ;
+ adminRoleNames = prop.getProperty(ADMIN_ROLE_LIST_PARAM);
if (adminRoleNames != null) {
LOG.info("Adding Admin Group:" + adminRoleNames);
- PasswordValidator.setAdminRoleNames(adminRoleNames) ;
+ PasswordValidator.setAdminRoleNames(adminRoleNames);
}
- String SSLEnabledProp = prop.getProperty(SSL_ENABLED_PARAM) ;
+ String SSLEnabledProp = prop.getProperty(SSL_ENABLED_PARAM);
- SSLEnabled = (SSLEnabledProp != null && (SSLEnabledProp.equalsIgnoreCase("true"))) ;
+ SSLEnabled = (SSLEnabledProp != null && (SSLEnabledProp.equalsIgnoreCase("true")));
// LOG.info("Key:" + keyStorePath);
// LOG.info("KeyPassword:" + keyStorePathPassword);
@@ -264,20 +264,20 @@ public class UnixAuthenticationService {
public void startService() throws Throwable {
- SSLContext context = SSLContext.getInstance(SSL_ALGORITHM) ;
+ SSLContext context = SSLContext.getInstance(SSL_ALGORITHM);
- KeyManager[] km = null ;
+ KeyManager[] km = null;
if (keyStorePath != null && ! keyStorePath.isEmpty()) {
- KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()) ;
+ KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
- InputStream in = null ;
+ InputStream in = null;
- in = getFileInputStream(keyStorePath) ;
+ in = getFileInputStream(keyStorePath);
try {
if (keyStorePathPassword == null) {
- keyStorePathPassword = "" ;
+ keyStorePathPassword = "";
}
ks.load(in, keyStorePathPassword.toCharArray());
}
@@ -287,26 +287,26 @@ public class UnixAuthenticationService {
}
}
- KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()) ;
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(ks, keyStorePathPassword.toCharArray());
- km = kmf.getKeyManagers() ;
+ km = kmf.getKeyManagers();
}
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- KeyStore trustStoreKeyStore = null ;
+ KeyStore trustStoreKeyStore = null;
if (trustStorePath != null && ! trustStorePath.isEmpty()) {
- trustStoreKeyStore = KeyStore.getInstance(KeyStore.getDefaultType()) ;
+ trustStoreKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
- InputStream in = null ;
+ InputStream in = null;
- in = getFileInputStream(trustStorePath) ;
+ in = getFileInputStream(trustStorePath);
try {
if (trustStorePathPassword == null) {
- trustStorePathPassword = "" ;
+ trustStorePathPassword = "";
}
trustStoreKeyStore.load(in, trustStorePathPassword.toCharArray());
}
@@ -319,24 +319,24 @@ public class UnixAuthenticationService {
trustManagerFactory.init(trustStoreKeyStore);
- TrustManager[] tm = trustManagerFactory.getTrustManagers() ;
+ TrustManager[] tm = trustManagerFactory.getTrustManagers();
- SecureRandom random = new SecureRandom() ;
+ SecureRandom random = new SecureRandom();
context.init(km, tm, random);
- SSLServerSocketFactory sf = context.getServerSocketFactory() ;
+ SSLServerSocketFactory sf = context.getServerSocketFactory();
- ServerSocket socket = (SSLEnabled ? sf.createServerSocket(portNum) : new ServerSocket(portNum) ) ;
+ ServerSocket socket = (SSLEnabled ? sf.createServerSocket(portNum) : new ServerSocket(portNum) );
if (SSLEnabled) {
- SSLServerSocket secureSocket = (SSLServerSocket) socket ;
- String[] protocols = secureSocket.getEnabledProtocols() ;
- Set<String> allowedProtocols = new HashSet<String>() ;
+ SSLServerSocket secureSocket = (SSLServerSocket) socket;
+ String[] protocols = secureSocket.getEnabledProtocols();
+ Set<String> allowedProtocols = new HashSet<String>();
for(String ep : protocols) {
if (! ep.toUpperCase().startsWith("SSLV3")) {
LOG.info("Enabling Protocol: [" + ep + "]");
- allowedProtocols.add(ep) ;
+ allowedProtocols.add(ep);
}
else {
LOG.info("Disabling Protocol: [" + ep + "]");
@@ -349,12 +349,12 @@ public class UnixAuthenticationService {
}
- Socket client = null ;
+ Socket client = null;
try {
while ( (client = socket.accept()) != null ) {
- Thread clientValidatorThread = new Thread(new PasswordValidator(client)) ;
+ Thread clientValidatorThread = new Thread(new PasswordValidator(client));
clientValidatorThread.start();
}
} catch (IOException e) {
@@ -368,19 +368,19 @@ public class UnixAuthenticationService {
InputStream ret = null;
- File f = new File(path) ;
+ File f = new File(path);
if (f.exists()) {
- ret = new FileInputStream(f) ;
+ ret = new FileInputStream(f);
}
else {
- ret = getClass().getResourceAsStream(path) ;
+ ret = getClass().getResourceAsStream(path);
if (ret == null) {
- ret = getClass().getResourceAsStream("/" + path) ;
+ ret = getClass().getResourceAsStream("/" + path);
}
}
- return ret ;
+ return ret;
}
}
[07/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java
index 0ca4d42..8ebcb1b 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceDao.java
index 0907e2f..71bbfab 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementDao.java
index 60a95b1..240eb62 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementValueDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementValueDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementValueDao.java
index f58b93e..d324331 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementValueDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementValueDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDao.java
index a30e543..a24e3db 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDefDao.java
index 56b5d1a..294c222 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDefDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXTagDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTagDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTagDao.java
index a3fde2c..199a155 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTagDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTagDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXTagDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTagDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTagDefDao.java
index 010799f..86793ec 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTagDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTagDefDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXTagResourceMapDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTagResourceMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTagResourceMapDao.java
index 72e0cd9..40dbe86 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTagResourceMapDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTagResourceMapDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java
index f9ebafc..e2d67f2 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,7 +34,7 @@ public class XXTrxLogDao extends BaseDao<XXTrxLog> {
public XXTrxLogDao( RangerDaoManagerBase daoManager ) {
super(daoManager);
}
-
+
public List<XXTrxLog> findByTransactionId(String transactionId){
if(transactionId == null){
return null;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java
index 225e733..ede0deb 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
index 3043931..da9b526 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Access Audit
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java
index 8287d31..8f83f10 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Access Audit
- *
+ *
*/
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java
index 54e3cb3..5dd6861 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java
index ff0f4f1..b9b5c45 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Access Audit
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java
index 719ada1..db1878a 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -114,7 +114,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -124,7 +124,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -134,7 +134,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> defId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param defId
* Value to set member attribute <b> defId</b>
*/
@@ -144,7 +144,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>defId</b>
- *
+ *
* @return Date - value of member attribute <b>defId</b> .
*/
public Long getDefid() {
@@ -154,7 +154,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> itemId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param itemId
* Value to set member attribute <b> itemId</b>
*/
@@ -164,7 +164,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>itemId</b>
- *
+ *
* @return Long - value of member attribute <b>itemId</b> .
*/
public Long getItemId() {
@@ -174,7 +174,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> name</b> . You
* cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b> name</b>
*/
@@ -184,7 +184,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return Date - value of member attribute <b>name</b> .
*/
public String getName() {
@@ -194,7 +194,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> label</b> . You
* cannot set null to the attribute.
- *
+ *
* @param label
* Value to set member attribute <b> label</b>
*/
@@ -204,7 +204,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>label</b>
- *
+ *
* @return Date - value of member attribute <b>label</b> .
*/
public String getLabel() {
@@ -214,7 +214,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> rbKeyLabel</b> .
* You cannot set null to the attribute.
- *
+ *
* @param rbKeyLabel
* Value to set member attribute <b> rbKeyLabel</b>
*/
@@ -224,7 +224,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>rbKeyLabel</b>
- *
+ *
* @return Date - value of member attribute <b>rbKeyLabel</b> .
*/
public String getRbkeylabel() {
@@ -234,7 +234,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -244,7 +244,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Date - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -265,7 +265,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -351,7 +351,7 @@ public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java
index fa90d0b..258e8a9 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -61,7 +61,7 @@ public class XXAccessTypeDefGrants extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -71,7 +71,7 @@ public class XXAccessTypeDefGrants extends XXDBBase implements
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -81,7 +81,7 @@ public class XXAccessTypeDefGrants extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> atdId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param atdId
* Value to set member attribute <b> atdId</b>
*/
@@ -91,7 +91,7 @@ public class XXAccessTypeDefGrants extends XXDBBase implements
/**
* Returns the value for the member attribute <b>atdId</b>
- *
+ *
* @return Date - value of member attribute <b>atdId</b> .
*/
public Long getAtdId() {
@@ -101,7 +101,7 @@ public class XXAccessTypeDefGrants extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> impliedGrant</b> .
* You cannot set null to the attribute.
- *
+ *
* @param impliedGrant
* Value to set member attribute <b> impliedGrant</b>
*/
@@ -111,7 +111,7 @@ public class XXAccessTypeDefGrants extends XXDBBase implements
/**
* Returns the value for the member attribute <b>impliedGrant</b>
- *
+ *
* @return Date - value of member attribute <b>impliedGrant</b> .
*/
public String getImpliedGrant() {
@@ -120,7 +120,7 @@ public class XXAccessTypeDefGrants extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -164,7 +164,7 @@ public class XXAccessTypeDefGrants extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
index 3a40f01..158c966 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Asset
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
index 719d472..95c2bf6 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Audi map
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
index f5c44ad..a4f93f2 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Authentication session
- *
+ *
*/
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java
index 77eb061..be4faf5 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -97,7 +97,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -107,7 +107,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -117,7 +117,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> defId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param defId
* Value to set member attribute <b> defId</b>
*/
@@ -127,7 +127,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>itemId</b>
- *
+ *
* @return Long - value of member attribute <b>itemId</b> .
*/
public Long getItemId() {
@@ -137,7 +137,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> defId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param defId
* Value to set member attribute <b> defId</b>
*/
@@ -147,7 +147,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>defId</b>
- *
+ *
* @return Date - value of member attribute <b>defId</b> .
*/
public Long getDefid() {
@@ -157,7 +157,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> name</b> . You
* cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b> name</b>
*/
@@ -167,7 +167,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return Date - value of member attribute <b>name</b> .
*/
public String getName() {
@@ -177,7 +177,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> enricher</b> .
* You cannot set null to the attribute.
- *
+ *
* @param enricher
* Value to set member attribute <b> enricher</b>
*/
@@ -187,7 +187,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>enricher</b>
- *
+ *
* @return String - value of member attribute <b>enricher</b> .
*/
public String getEnricher() {
@@ -197,7 +197,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b>
* enricherOptions</b> . You cannot set null to the attribute.
- *
+ *
* @param enricherOptions
* Value to set member attribute <b> enricherOptions</b>
*/
@@ -207,7 +207,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>evaluatorOptions</b>
- *
+ *
* @return Date - value of member attribute <b>evaluatorOptions</b> .
*/
public String getEnricherOptions() {
@@ -217,7 +217,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -227,7 +227,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Integer - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -236,7 +236,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -308,7 +308,7 @@ public class XXContextEnricherDef extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java b/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
index 1b06d6e..596b7c2 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Credential Store
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
index bcb203d..e4e1622 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Base JPA class with id, versionNumber and other common attributes
- *
+ *
*/
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java b/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java
index 776eb74..57e0154 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -149,7 +149,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -159,7 +159,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -198,7 +198,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>version</b>
- *
+ *
* @return Date - value of member attribute <b>version</b> .
*/
public Long getVersion() {
@@ -208,7 +208,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> version</b> . You
* cannot set null to the attribute.
- *
+ *
* @param version
* Value to set member attribute <b> version</b>
*/
@@ -219,7 +219,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> action</b> . You
* cannot set null to the attribute.
- *
+ *
* @param action
* Value to set member attribute <b> action</b>
*/
@@ -258,7 +258,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> type</b> . You
* cannot set null to the attribute.
- *
+ *
* @param objectClassType
* Value to set member attribute <b> type</b>
*/
@@ -268,7 +268,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>type</b>
- *
+ *
* @return Date - value of member attribute <b>type</b> .
*/
public Integer getObjectClassType() {
@@ -278,7 +278,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> name</b> . You
* cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b> name</b>
*/
@@ -288,7 +288,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return Date - value of member attribute <b>name</b> .
*/
public String getObjectName() {
@@ -297,7 +297,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>action</b>
- *
+ *
* @return Date - value of member attribute <b>action</b> .
*/
public String getAction() {
@@ -307,7 +307,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> fromTime</b> . You
* cannot set null to the attribute.
- *
+ *
* @param fromTime
* Value to set member attribute <b> fromTime</b>
*/
@@ -317,7 +317,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>fromTime</b>
- *
+ *
* @return Date - value of member attribute <b>fromTime</b> .
*/
public Date getFromTime() {
@@ -327,7 +327,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> toTime</b> . You
* cannot set null to the attribute.
- *
+ *
* @param toTime
* Value to set member attribute <b> toTime</b>
*/
@@ -337,7 +337,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>toTime</b>
- *
+ *
* @return Date - value of member attribute <b>toTime</b> .
*/
public Date getToTime() {
@@ -347,7 +347,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> content</b> . You
* cannot set null to the attribute.
- *
+ *
* @param content
* Value to set member attribute <b> content</b>
*/
@@ -357,7 +357,7 @@ public class XXDataHist implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>content</b>
- *
+ *
* @return Date - value of member attribute <b>content</b> .
*/
public String getContent() {
@@ -366,7 +366,7 @@ public class XXDataHist implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -459,7 +459,7 @@ public class XXDataHist implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
index 9561e5e..47b4330 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -132,7 +132,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -142,7 +142,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -152,7 +152,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* This method sets the value to the member attribute <b> defId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param defId
* Value to set member attribute <b> defId</b>
*/
@@ -162,7 +162,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* Returns the value for the member attribute <b>defId</b>
- *
+ *
* @return Date - value of member attribute <b>defId</b> .
*/
public Long getDefid() {
@@ -172,7 +172,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* This method sets the value to the member attribute <b> itemId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param itemId
* Value to set member attribute <b> itemId</b>
*/
@@ -182,7 +182,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* Returns the value for the member attribute <b>itemId</b>
- *
+ *
* @return Long - value of member attribute <b>itemId</b> .
*/
public Long getItemId() {
@@ -192,7 +192,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* This method sets the value to the member attribute <b> name</b> . You
* cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b> name</b>
*/
@@ -202,7 +202,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return Date - value of member attribute <b>name</b> .
*/
public String getName() {
@@ -212,7 +212,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* This method sets the value to the member attribute <b> label</b> . You
* cannot set null to the attribute.
- *
+ *
* @param label
* Value to set member attribute <b> label</b>
*/
@@ -222,7 +222,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* Returns the value for the member attribute <b>label</b>
- *
+ *
* @return Date - value of member attribute <b>label</b> .
*/
public String getLabel() {
@@ -289,7 +289,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* This method sets the value to the member attribute <b> rbKeyLabel</b> .
* You cannot set null to the attribute.
- *
+ *
* @param rbKeyLabel
* Value to set member attribute <b> rbKeyLabel</b>
*/
@@ -299,7 +299,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* Returns the value for the member attribute <b>rbKeyLabel</b>
- *
+ *
* @return Date - value of member attribute <b>rbKeyLabel</b> .
*/
public String getRbkeylabel() {
@@ -327,7 +327,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -337,7 +337,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Date - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -346,7 +346,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -446,7 +446,7 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java
index 7deccd3..6b8c8b5 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -78,7 +78,7 @@ public class XXEnumDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -88,7 +88,7 @@ public class XXEnumDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -98,7 +98,7 @@ public class XXEnumDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> defId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param defId
* Value to set member attribute <b> defId</b>
*/
@@ -108,7 +108,7 @@ public class XXEnumDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>defId</b>
- *
+ *
* @return Date - value of member attribute <b>defId</b> .
*/
public Long getDefid() {
@@ -118,7 +118,7 @@ public class XXEnumDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> itemId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param defId
* Value to set member attribute <b> itemId</b>
*/
@@ -128,7 +128,7 @@ public class XXEnumDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>itemId</b>
- *
+ *
* @return Long - value of member attribute <b>itemId</b> .
*/
public Long getItemId() {
@@ -138,7 +138,7 @@ public class XXEnumDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> name</b> . You
* cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b> name</b>
*/
@@ -148,7 +148,7 @@ public class XXEnumDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return Date - value of member attribute <b>name</b> .
*/
public String getName() {
@@ -158,7 +158,7 @@ public class XXEnumDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> defaultIndex</b> .
* You cannot set null to the attribute.
- *
+ *
* @param defaultIndex
* Value to set member attribute <b> defaultIndex</b>
*/
@@ -168,7 +168,7 @@ public class XXEnumDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>defaultIndex</b>
- *
+ *
* @return Date - value of member attribute <b>defaultIndex</b> .
*/
public Integer getDefaultindex() {
@@ -177,7 +177,7 @@ public class XXEnumDef extends XXDBBase implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -235,7 +235,7 @@ public class XXEnumDef extends XXDBBase implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java
index 99dd689..a681cc4 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -96,7 +96,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -106,7 +106,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -116,7 +116,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> enumDefId</b> .
* You cannot set null to the attribute.
- *
+ *
* @param enumDefId
* Value to set member attribute <b> enumDefId</b>
*/
@@ -126,7 +126,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>enumDefId</b>
- *
+ *
* @return Date - value of member attribute <b>enumDefId</b> .
*/
public Long getEnumdefid() {
@@ -136,7 +136,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> itemId</b> .
* You cannot set null to the attribute.
- *
+ *
* @param itemId
* Value to set member attribute <b> itemId</b>
*/
@@ -146,7 +146,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>itemId</b>
- *
+ *
* @return Long - value of member attribute <b>itemId</b> .
*/
public Long getItemId() {
@@ -156,7 +156,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> name</b> . You
* cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b> name</b>
*/
@@ -166,7 +166,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return Date - value of member attribute <b>name</b> .
*/
public String getName() {
@@ -176,7 +176,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> label</b> . You
* cannot set null to the attribute.
- *
+ *
* @param label
* Value to set member attribute <b> label</b>
*/
@@ -186,7 +186,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>label</b>
- *
+ *
* @return Date - value of member attribute <b>label</b> .
*/
public String getLabel() {
@@ -196,7 +196,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> rbKeyLabel</b> .
* You cannot set null to the attribute.
- *
+ *
* @param rbKeyLabel
* Value to set member attribute <b> rbKeyLabel</b>
*/
@@ -206,7 +206,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>rbKeyLabel</b>
- *
+ *
* @return Date - value of member attribute <b>rbKeyLabel</b> .
*/
public String getRbkeylabel() {
@@ -216,7 +216,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -226,7 +226,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Date - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -235,7 +235,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -300,7 +300,7 @@ public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
index a31ea7b..318a813 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Group
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java
index f4e501b..9f76da7 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Group of groups
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java
index fef7caa..b2fbc64 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Group of users
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java
index d229f8c..7c6b96c 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
/**
* Permission map
- *
+ *
*/
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicy.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicy.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicy.java
index d24695a..154d7cb 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicy.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicy.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyBase.java
index aebe38c..69d28bb 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyBase.java
@@ -128,7 +128,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> version</b> . You
* cannot set null to the attribute.
- *
+ *
* @param version
* Value to set member attribute <b> version</b>
*/
@@ -138,7 +138,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>version</b>
- *
+ *
* @return Date - value of member attribute <b>version</b> .
*/
public Long getVersion() {
@@ -148,7 +148,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> service</b> . You
* cannot set null to the attribute.
- *
+ *
* @param service
* Value to set member attribute <b> service</b>
*/
@@ -158,7 +158,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>service</b>
- *
+ *
* @return Date - value of member attribute <b>service</b> .
*/
public Long getService() {
@@ -168,7 +168,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> name</b> . You
* cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b> name</b>
*/
@@ -178,7 +178,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return Date - value of member attribute <b>name</b> .
*/
public String getName() {
@@ -188,7 +188,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> description</b> .
* You cannot set null to the attribute.
- *
+ *
* @param description
* Value to set member attribute <b> description</b>
*/
@@ -198,7 +198,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>description</b>
- *
+ *
* @return Date - value of member attribute <b>description</b> .
*/
public String getDescription() {
@@ -222,7 +222,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> isEnabled</b> .
* You cannot set null to the attribute.
- *
+ *
* @param isEnabled
* Value to set member attribute <b> isEnabled</b>
*/
@@ -232,7 +232,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>isEnabled</b>
- *
+ *
* @return Date - value of member attribute <b>isEnabled</b> .
*/
public boolean getIsEnabled() {
@@ -242,7 +242,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/**
* This method sets the value to the member attribute <b> isAuditEnabled</b>
* . You cannot set null to the attribute.
- *
+ *
* @param isAuditEnabled
* Value to set member attribute <b> isAuditEnabled</b>
*/
@@ -252,7 +252,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/**
* Returns the value for the member attribute <b>isAuditEnabled</b>
- *
+ *
* @return Date - value of member attribute <b>isAuditEnabled</b> .
*/
public boolean getIsAuditEnabled() {
@@ -269,7 +269,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -347,7 +347,7 @@ public abstract class XXPolicyBase extends XXDBBase {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyConditionDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyConditionDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyConditionDef.java
index 6b12d94..bba35b1 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyConditionDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyConditionDef.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -170,7 +170,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -180,7 +180,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -190,7 +190,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> defId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param defId
* Value to set member attribute <b> defId</b>
*/
@@ -200,7 +200,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>itemId</b>
- *
+ *
* @return Long - value of member attribute <b>itemId</b> .
*/
public Long getItemId() {
@@ -210,7 +210,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> itemId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param itemId
* Value to set member attribute <b> itemId</b>
*/
@@ -220,7 +220,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>defId</b>
- *
+ *
* @return Date - value of member attribute <b>defId</b> .
*/
public Long getDefid() {
@@ -230,7 +230,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> name</b> . You
* cannot set null to the attribute.
- *
+ *
* @param name
* Value to set member attribute <b> name</b>
*/
@@ -240,7 +240,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>name</b>
- *
+ *
* @return Date - value of member attribute <b>name</b> .
*/
public String getName() {
@@ -250,7 +250,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> evaluator</b> .
* You cannot set null to the attribute.
- *
+ *
* @param evaluator
* Value to set member attribute <b> evaluator</b>
*/
@@ -260,7 +260,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>evaluator</b>
- *
+ *
* @return Date - value of member attribute <b>evaluator</b> .
*/
public String getEvaluator() {
@@ -270,7 +270,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b>
* evaluatorOptions</b> . You cannot set null to the attribute.
- *
+ *
* @param evaluatorOptions
* Value to set member attribute <b> evaluatorOptions</b>
*/
@@ -280,7 +280,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>evaluatorOptions</b>
- *
+ *
* @return Date - value of member attribute <b>evaluatorOptions</b> .
*/
public String getEvaluatoroptions() {
@@ -332,7 +332,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> label</b> . You
* cannot set null to the attribute.
- *
+ *
* @param label
* Value to set member attribute <b> label</b>
*/
@@ -342,7 +342,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>label</b>
- *
+ *
* @return Date - value of member attribute <b>label</b> .
*/
public String getLabel() {
@@ -352,7 +352,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> description</b> .
* You cannot set null to the attribute.
- *
+ *
* @param description
* Value to set member attribute <b> description</b>
*/
@@ -362,7 +362,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>description</b>
- *
+ *
* @return Date - value of member attribute <b>description</b> .
*/
public String getDescription() {
@@ -372,7 +372,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> rbKeyLabel</b> .
* You cannot set null to the attribute.
- *
+ *
* @param rbKeyLabel
* Value to set member attribute <b> rbKeyLabel</b>
*/
@@ -382,7 +382,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>rbKeyLabel</b>
- *
+ *
* @return Date - value of member attribute <b>rbKeyLabel</b> .
*/
public String getRbkeylabel() {
@@ -392,7 +392,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b>
* rbKeyDescription</b> . You cannot set null to the attribute.
- *
+ *
* @param rbKeyDescription
* Value to set member attribute <b> rbKeyDescription</b>
*/
@@ -402,7 +402,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>rbKeyDescription</b>
- *
+ *
* @return Date - value of member attribute <b>rbKeyDescription</b> .
*/
public String getRbkeydescription() {
@@ -426,7 +426,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -436,7 +436,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Date - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -445,7 +445,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -553,7 +553,7 @@ public class XXPolicyConditionDef extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java
index 6743b6a..4544614 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItem.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItem.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItem.java
index 3386fae..9f6e7f0 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItem.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItem.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -106,7 +106,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -116,7 +116,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -141,7 +141,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> policyId</b> . You
* cannot set null to the attribute.
- *
+ *
* @param policyId
* Value to set member attribute <b> policyId</b>
*/
@@ -151,7 +151,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>policyId</b>
- *
+ *
* @return Date - value of member attribute <b>policyId</b> .
*/
public Long getPolicyid() {
@@ -161,7 +161,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> delegateAdmin</b>
* . You cannot set null to the attribute.
- *
+ *
* @param delegateAdmin
* Value to set member attribute <b> delegateAdmin</b>
*/
@@ -171,7 +171,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>delegateAdmin</b>
- *
+ *
* @return Date - value of member attribute <b>delegateAdmin</b> .
*/
public Boolean getDelegateAdmin() {
@@ -181,7 +181,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> itemType</b> . You
* cannot set null to the attribute.
- *
+ *
* @param itemType
* Value to set member attribute <b> itemType</b>
*/
@@ -191,7 +191,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>itemType</b>
- *
+ *
* @return Integer - value of member attribute <b>itemType</b> .
*/
public Integer getItemType() {
@@ -201,7 +201,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> isEnabled</b> . You
* cannot set null to the attribute.
- *
+ *
* @param isEnabled
* Value to set member attribute <b> isEnabled</b>
*/
@@ -211,7 +211,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>isEnabled</b>
- *
+ *
* @return Boolean - value of member attribute <b>isEnabled</b> .
*/
public Boolean getIsEnabled() {
@@ -221,7 +221,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> comments</b> . You
* cannot set null to the attribute.
- *
+ *
* @param comments
* Value to set member attribute <b> comments</b>
*/
@@ -231,7 +231,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>comments</b>
- *
+ *
* @return Boolean - value of member attribute <b>comments</b> .
*/
public String getComments() {
@@ -241,7 +241,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -251,7 +251,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Date - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -260,7 +260,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -335,7 +335,7 @@ public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemAccess.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemAccess.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemAccess.java
index ba2226d..a6e1a21 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemAccess.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemAccess.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -89,7 +89,7 @@ public class XXPolicyItemAccess extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -99,7 +99,7 @@ public class XXPolicyItemAccess extends XXDBBase implements
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -124,7 +124,7 @@ public class XXPolicyItemAccess extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> policyItemId</b> .
* You cannot set null to the attribute.
- *
+ *
* @param policyItemId
* Value to set member attribute <b> policyItemId</b>
*/
@@ -134,7 +134,7 @@ public class XXPolicyItemAccess extends XXDBBase implements
/**
* Returns the value for the member attribute <b>policyItemId</b>
- *
+ *
* @return Date - value of member attribute <b>policyItemId</b> .
*/
public Long getPolicyitemid() {
@@ -144,7 +144,7 @@ public class XXPolicyItemAccess extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> type</b> . You
* cannot set null to the attribute.
- *
+ *
* @param type
* Value to set member attribute <b> type</b>
*/
@@ -154,7 +154,7 @@ public class XXPolicyItemAccess extends XXDBBase implements
/**
* Returns the value for the member attribute <b>type</b>
- *
+ *
* @return Date - value of member attribute <b>type</b> .
*/
public Long getType() {
@@ -164,7 +164,7 @@ public class XXPolicyItemAccess extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> isAllowed</b> .
* You cannot set null to the attribute.
- *
+ *
* @param isAllowed
* Value to set member attribute <b> isAllowed</b>
*/
@@ -174,7 +174,7 @@ public class XXPolicyItemAccess extends XXDBBase implements
/**
* Returns the value for the member attribute <b>isAllowed</b>
- *
+ *
* @return Date - value of member attribute <b>isAllowed</b> .
*/
public Boolean getIsallowed() {
@@ -184,7 +184,7 @@ public class XXPolicyItemAccess extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -194,7 +194,7 @@ public class XXPolicyItemAccess extends XXDBBase implements
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Date - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -203,7 +203,7 @@ public class XXPolicyItemAccess extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -268,7 +268,7 @@ public class XXPolicyItemAccess extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemCondition.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemCondition.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemCondition.java
index bc5275a..3ad5161 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemCondition.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemCondition.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -89,7 +89,7 @@ public class XXPolicyItemCondition extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> id</b> . You
* cannot set null to the attribute.
- *
+ *
* @param id
* Value to set member attribute <b> id</b>
*/
@@ -99,7 +99,7 @@ public class XXPolicyItemCondition extends XXDBBase implements
/**
* Returns the value for the member attribute <b>id</b>
- *
+ *
* @return Date - value of member attribute <b>id</b> .
*/
public Long getId() {
@@ -109,7 +109,7 @@ public class XXPolicyItemCondition extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> policyItemId</b> .
* You cannot set null to the attribute.
- *
+ *
* @param policyItemId
* Value to set member attribute <b> policyItemId</b>
*/
@@ -119,7 +119,7 @@ public class XXPolicyItemCondition extends XXDBBase implements
/**
* Returns the value for the member attribute <b>policyItemId</b>
- *
+ *
* @return Date - value of member attribute <b>policyItemId</b> .
*/
public Long getPolicyitemid() {
@@ -129,7 +129,7 @@ public class XXPolicyItemCondition extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> type</b> . You
* cannot set null to the attribute.
- *
+ *
* @param type
* Value to set member attribute <b> type</b>
*/
@@ -139,7 +139,7 @@ public class XXPolicyItemCondition extends XXDBBase implements
/**
* Returns the value for the member attribute <b>type</b>
- *
+ *
* @return Date - value of member attribute <b>type</b> .
*/
public Long getType() {
@@ -149,7 +149,7 @@ public class XXPolicyItemCondition extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> value</b> . You
* cannot set null to the attribute.
- *
+ *
* @param value
* Value to set member attribute <b> value</b>
*/
@@ -159,7 +159,7 @@ public class XXPolicyItemCondition extends XXDBBase implements
/**
* Returns the value for the member attribute <b>value</b>
- *
+ *
* @return Date - value of member attribute <b>value</b> .
*/
public String getValue() {
@@ -169,7 +169,7 @@ public class XXPolicyItemCondition extends XXDBBase implements
/**
* This method sets the value to the member attribute <b> order</b> . You
* cannot set null to the attribute.
- *
+ *
* @param order
* Value to set member attribute <b> order</b>
*/
@@ -179,7 +179,7 @@ public class XXPolicyItemCondition extends XXDBBase implements
/**
* Returns the value for the member attribute <b>order</b>
- *
+ *
* @return Date - value of member attribute <b>order</b> .
*/
public Integer getOrder() {
@@ -203,7 +203,7 @@ public class XXPolicyItemCondition extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -268,7 +268,7 @@ public class XXPolicyItemCondition extends XXDBBase implements
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
[13/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java
index b081c9f..89be842 100644
--- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java
+++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -76,13 +76,13 @@ public class RangerLegacyConfigBuilder {
}
private static Configuration mapLegacyConfigToRanger(Configuration rangerInConf, Configuration legacyConf) {
-
+
Configuration ret = rangerInConf;
-
+
HashMap<String,String> chgMap = getConfigChangeMap(serviceType);
if(LOG.isDebugEnabled()) {
LOG.debug("<== mapLegacyConfigToRanger() MAP Size: " + chgMap.size());
- }
+ }
for(Map.Entry<String, String> entry : chgMap.entrySet()) {
String legacyKey = entry.getKey();
String rangerKey = entry.getValue();
@@ -93,10 +93,10 @@ public class RangerLegacyConfigBuilder {
//For getting the service
String serviceURL = legacyConf.get(getPropertyName(RangerConfigConstants.XASECURE_POLICYMGR_URL,serviceType));
legacyConfVal = fetchLegacyValue(serviceURL,rangerKey);
- } else if ( rangerKey.equals(getPropertyName(RangerConfigConstants.RANGER_PLUGIN_POLICY_REST_URL,serviceType)) ||
+ } else if ( rangerKey.equals(getPropertyName(RangerConfigConstants.RANGER_PLUGIN_POLICY_REST_URL,serviceType)) ||
rangerKey.equals(getPropertyName(RangerConfigConstants.RANGER_PLUGIN_POLICY_CACHE_DIR,serviceType)) ) {
// For Getting Admin URL and CacheDir
- legacyConfVal = fetchLegacyValue(legacyConf.get(legacyKey),rangerKey);
+ legacyConfVal = fetchLegacyValue(legacyConf.get(legacyKey),rangerKey);
} else {
legacyConfVal = legacyConf.get(legacyKey);
}
@@ -108,9 +108,9 @@ public class RangerLegacyConfigBuilder {
ret.set(rangerKey, legacyConfVal);
}
return ret;
- }
-
-
+ }
+
+
public static URL getAuditResource(String fName) throws Throwable {
URL ret = null ;
@@ -254,11 +254,11 @@ public class RangerLegacyConfigBuilder {
ret = getServiceNameFromURL(legacyVal);
} else if ( rangerKey.equals(getPropertyName(RangerConfigConstants.RANGER_PLUGIN_POLICY_REST_URL,serviceType)) ) {
// To Fetch PolicyMgr URL
- ret = getPolicyMgrURL(legacyVal);
+ ret = getPolicyMgrURL(legacyVal);
} else if ( rangerKey.equals(getPropertyName(RangerConfigConstants.RANGER_PLUGIN_POLICY_CACHE_DIR,serviceType)) ) {
- ret = getCacheFileURL(legacyVal);
+ ret = getCacheFileURL(legacyVal);
}
-
+
return ret;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/authorization/utils/StringUtil.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/utils/StringUtil.java b/agents-common/src/main/java/org/apache/ranger/authorization/utils/StringUtil.java
index 765d65f..57570c2 100644
--- a/agents-common/src/main/java/org/apache/ranger/authorization/utils/StringUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/authorization/utils/StringUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
index 0cb8ab6..4fd0c6e 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerMultiResourceAuditHandler.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerMultiResourceAuditHandler.java b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerMultiResourceAuditHandler.java
index 17dcfdc..839618e 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerMultiResourceAuditHandler.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerMultiResourceAuditHandler.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
index cfef55e..eeec8ff 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -126,7 +126,7 @@ public abstract class BaseClient {
loginSubject = SecureClientLogin.loginUserFromKeytab(lookupPrincipal, lookupKeytab, nameRules) ;
}else{
LOG.info("Init Login: security not enabled, using username");
- loginSubject = SecureClientLogin.login(userName);
+ loginSubject = SecureClientLogin.login(userName);
}
}
} catch (IOException ioe) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java
index 37d7e6f..a728c19 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -223,10 +223,10 @@ public class HadoopConfigHolder {
in.close();
} catch (IOException e) {
// Ignored exception when the stream is closed.
- }
+ }
}
- if (prop.size() == 0)
+ if (prop.size() == 0)
return ;
for(Object keyobj : prop.keySet()) {
@@ -244,7 +244,7 @@ public class HadoopConfigHolder {
String propKey = key.substring(dotLocatedAt+1) ;
int resourceFoundAt = propKey.indexOf(".") ;
if (resourceFoundAt > -1) {
- String resourceName = propKey.substring(0, resourceFoundAt) + ".xml" ;
+ String resourceName = propKey.substring(0, resourceFoundAt) + ".xml" ;
propKey = propKey.substring(resourceFoundAt+1) ;
addConfiguration(dataSource, resourceName, propKey, val) ;
}
@@ -265,7 +265,7 @@ public class HadoopConfigHolder {
in.close();
} catch (IOException e) {
// Ignored exception when the stream is closed.
- }
+ }
}
globalLoginProp = tempLoginProp ;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopException.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopException.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopException.java
index 0f561d0..67e6cdf 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopException.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerAbstractConditionEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerAbstractConditionEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerAbstractConditionEvaluator.java
index 06263d1..fd91c41 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerAbstractConditionEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerAbstractConditionEvaluator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerConditionEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerConditionEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerConditionEvaluator.java
index 9515000..16f9a3c 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerConditionEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerConditionEvaluator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcher.java
index ba28e4a..b6dbb7e 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.ranger.plugin.policyengine.RangerAccessRequest;
/**
- * Credits: Large parts of this file have been lifted as is from org.apache.ranger.pdp.knox.URLBasedAuthDB. Credits for those are due to Dilli Arumugam.
+ * Credits: Large parts of this file have been lifted as is from org.apache.ranger.pdp.knox.URLBasedAuthDB. Credits for those are due to Dilli Arumugam.
* @author alal
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcher.java
index a1ea326..e663c46 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractContextEnricher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractContextEnricher.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractContextEnricher.java
index bd5aa5b..f6e462c 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractContextEnricher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractContextEnricher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerContextEnricher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerContextEnricher.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerContextEnricher.java
index e6d6ab0..9d0b985 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerContextEnricher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerContextEnricher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java
index b90d387..1f6676b 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -48,7 +48,7 @@ public class RangerBaseModelObject implements java.io.Serializable {
private Long version = null;
/**
- *
+ *
*/
public RangerBaseModelObject() {
setIsEnabled(null);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java
index 5e94bc7..140a59d 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
index c12d62d..c63b54d 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java
index a482cca..0c1c0ee 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
index 2d27961..ee309bd 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -218,7 +218,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public void setConfigs(List<RangerServiceConfigDef> configs) {
if(this.configs == null) {
this.configs = new ArrayList<RangerServiceConfigDef>();
- } else
+ } else
if(this.configs == configs) {
return;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java
index 62bd100..279489d 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -311,7 +311,7 @@ public class RangerPolicyValidator extends RangerValidator {
return valid;
}
- boolean isValidResources(RangerPolicy policy, final List<ValidationFailureDetails> failures, Action action,
+ boolean isValidResources(RangerPolicy policy, final List<ValidationFailureDetails> failures, Action action,
boolean isAdmin, final RangerServiceDef serviceDef) {
if(LOG.isDebugEnabled()) {
@@ -385,10 +385,10 @@ public class RangerPolicyValidator extends RangerValidator {
LOG.warn("RangerPolicyValidator.isValidResourceNames: serviceDef does not have any resource hierarchies, possibly due to a old/migrated service def! Skipping this check!");
} else {
/*
- * A policy is for a single hierarchy however, it doesn't specify which one. So we have to guess which hierarchy(s) it possibly be for. First, see if the policy could be for
+ * A policy is for a single hierarchy however, it doesn't specify which one. So we have to guess which hierarchy(s) it possibly be for. First, see if the policy could be for
* any of the known hierarchies? A candidate hierarchy is one whose resource levels are a superset of those in the policy.
* Why? What we want to catch at this stage is policies that straddles multiple hierarchies, e.g. db, udf and column for a hive policy.
- * This has the side effect of catch spurious levels specified on the policy, e.g. having a level "blah" on a hive policy.
+ * This has the side effect of catch spurious levels specified on the policy, e.g. having a level "blah" on a hive policy.
*/
Set<List<RangerResourceDef>> candidateHierarchies = filterHierarchies_hierarchyHasAllPolicyResources(policyResources, hierarchies, defHelper);
if (candidateHierarchies.isEmpty()) {
@@ -450,7 +450,7 @@ public class RangerPolicyValidator extends RangerValidator {
}
/**
- * String representation of mandatory resources of all the hierarchies suitable of showing to user. Mandatory resources within a hierarchy are not ordered per the hierarchy.
+ * String representation of mandatory resources of all the hierarchies suitable of showing to user. Mandatory resources within a hierarchy are not ordered per the hierarchy.
* @param hierarchies
* @param defHelper
* @return
@@ -483,7 +483,7 @@ public class RangerPolicyValidator extends RangerValidator {
return builder.toString();
}
/**
- * Returns the subset of all hierarchies that are a superset of the policy's resources.
+ * Returns the subset of all hierarchies that are a superset of the policy's resources.
* @param policyResources
* @param hierarchies
* @return
@@ -502,7 +502,7 @@ public class RangerPolicyValidator extends RangerValidator {
}
/**
- * Returns the subset of hierarchies all of whose mandatory resources were found in policy's resource set. candidate hierarchies are expected to have passed
+ * Returns the subset of hierarchies all of whose mandatory resources were found in policy's resource set. candidate hierarchies are expected to have passed
* <code>filterHierarchies_hierarchyHasAllPolicyResources</code> check first.
* @param policyResources
* @param hierarchies
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
index 273d61f..f952c57 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -52,7 +52,7 @@ public class RangerServiceDefHelper {
}
/**
- * Intended for use when serviceDef object is not-trusted, e.g. when service-def is being created or updated.
+ * Intended for use when serviceDef object is not-trusted, e.g. when service-def is being created or updated.
* @param serviceDef
* @param useCache
*/
@@ -89,14 +89,14 @@ public class RangerServiceDefHelper {
/**
* for a resource definition as follows:
- *
+ *
* /-> E -> F
* A -> B -> C -> D
* \-> G -> H
- *
+ *
* It would return a set with following ordered entries in it
* { [A B C D], [A E F], [A B G H] }
- *
+ *
* @return
*/
public Set<List<RangerResourceDef>> getResourceHierarchies(Integer policyType) {
@@ -179,8 +179,8 @@ public class RangerServiceDefHelper {
}
_valid = isValid;
if (LOG.isDebugEnabled()) {
- String message = String.format("Found [%d] resource hierarchies for service [%s] update-date[%s]: %s", _hierarchies.size(), _serviceName,
- _serviceDefFreshnessDate == null ? null : _serviceDefFreshnessDate.toString(), _hierarchies);
+ String message = String.format("Found [%d] resource hierarchies for service [%s] update-date[%s]: %s", _hierarchies.size(), _serviceName,
+ _serviceDefFreshnessDate == null ? null : _serviceDefFreshnessDate.toString(), _hierarchies);
LOG.debug(message);
}
}
@@ -212,7 +212,7 @@ public class RangerServiceDefHelper {
}
/**
* Builds a directed graph where each resource is node and arc goes from parent level to child level
- *
+ *
* @param resourceDefs
* @return
*/
@@ -263,15 +263,15 @@ public class RangerServiceDefHelper {
return resourceDefs;
}
/**
- * A valid resource graph is a forest, i.e. a disjoint union of trees. In our case, given that node can have only one "parent" node, we can detect this validity simply by ensuring that
+ * A valid resource graph is a forest, i.e. a disjoint union of trees. In our case, given that node can have only one "parent" node, we can detect this validity simply by ensuring that
* the resource graph has:
* - at least one sink AND
* - and least one source.
- *
- * A more direct method would have been ensure that the resulting graph does not have any cycles.
- *
+ *
+ * A more direct method would have been ensure that the resulting graph does not have any cycles.
+ *
* @param graph
- *
+ *
* @return
*/
boolean isValid(DirectedGraph graph) {
@@ -284,7 +284,7 @@ public class RangerServiceDefHelper {
/**
* Returns all valid resource hierarchies for the configured resource-defs. Behavior is undefined if it is called on and invalid graph. Use <code>isValid</code> to check validation first.
- *
+ *
* @param graph
* @return
*/
@@ -328,7 +328,7 @@ public class RangerServiceDefHelper {
/**
* Converts resource list to resource map for efficient querying
- *
+ *
* @param resourceList
* @return
*/
@@ -349,7 +349,7 @@ public class RangerServiceDefHelper {
/**
* Add a node to the graph
- *
+ *
* @param node
*/
void add(String node) {
@@ -362,7 +362,7 @@ public class RangerServiceDefHelper {
/**
* Connects node "from" to node "to". Being a directed graph, after this call "to" will be in the list of neighbor's of "from". While the converse need not be true.
- *
+ *
* @param from
* @param to
*/
@@ -379,7 +379,7 @@ public class RangerServiceDefHelper {
/**
* Returns true if "to" is in the list of neighbors of "from"
- *
+ *
* @param from
* @param to
* @return
@@ -402,7 +402,7 @@ public class RangerServiceDefHelper {
}
/**
* Return the set of nodes with in degree of 0, i.e. those that are not in any other nodes' list of neighbors
- *
+ *
* @return
*/
Set<String> getSources() {
@@ -419,7 +419,7 @@ public class RangerServiceDefHelper {
/**
* Returns the set of nodes with out-degree of 0, i.e. those nodes whose list of neighbors is empty
- *
+ *
* @return
*/
Set<String> getSinks() {
@@ -439,7 +439,7 @@ public class RangerServiceDefHelper {
/**
* Attempts to do a depth first traversal of a graph and returns the resulting path. Note that there could be several paths that connect node "from" to node "to".
- *
+ *
* @param from
* @param to
* @return
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java
index 0ed563a..79ac674 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -273,7 +273,7 @@ public class RangerServiceDefValidator extends RangerValidator {
.build());
valid = false;
}
- // implied grant should not imply itself!
+ // implied grant should not imply itself!
String name = def.getName(); // note: this name could be null/blank/empty!
if (impliedGrants.contains(name)) {
ValidationErrorCode error = ValidationErrorCode.SERVICE_DEF_VALIDATION_ERR_IMPLIED_GRANT_IMPLIES_ITSELF;
@@ -536,7 +536,7 @@ public class RangerServiceDefValidator extends RangerValidator {
valid = false;
} else {
// enum-names and ids must non-blank and be unique to a service definition
- String enumName = enumDef.getName();
+ String enumName = enumDef.getName();
valid = isUnique(enumName, names, "enum def name", "enum defs", failures) && valid;
valid = isUnique(enumDef.getItemId(), ids, "enum def itemId", "enum defs", failures) && valid;
// enum must contain at least one valid value and those values should be non-blank and distinct
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java
index 9169fd9..d3efdc9 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidator.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidator.java
index 381864d..3400d81 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -82,7 +82,7 @@ public abstract class RangerValidator {
}
/**
- * This method is expected to be overridden by sub-classes. Default implementation provided to not burden implementers from having to implement methods that they know would never be called.
+ * This method is expected to be overridden by sub-classes. Default implementation provided to not burden implementers from having to implement methods that they know would never be called.
* @param id
* @param action
* @param failures
@@ -347,7 +347,7 @@ public abstract class RangerValidator {
}
/**
- * Returns names of resource types set to lower-case to allow for case-insensitive comparison.
+ * Returns names of resource types set to lower-case to allow for case-insensitive comparison.
* @param serviceDef
* @return
*/
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/ValidationFailureDetails.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/ValidationFailureDetails.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/ValidationFailureDetails.java
index 9ea81a3..d53d52a 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/ValidationFailureDetails.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/ValidationFailureDetails.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -87,9 +87,9 @@ public class ValidationFailureDetails {
return false;
}
ValidationFailureDetails that = (ValidationFailureDetails)obj;
- return Objects.equals(_fieldName, that._fieldName) &&
- Objects.equals(_subFieldName, that._subFieldName) &&
- Objects.equals(_reason, that._reason) &&
+ return Objects.equals(_fieldName, that._fieldName) &&
+ Objects.equals(_subFieldName, that._subFieldName) &&
+ Objects.equals(_reason, that._reason) &&
_internalError == that._internalError &&
_missing == that._missing &&
_semanticError == that._semanticError &&
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/ValidationFailureDetailsBuilder.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/ValidationFailureDetailsBuilder.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/ValidationFailureDetailsBuilder.java
index b39e572..f3be686 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/ValidationFailureDetailsBuilder.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/ValidationFailureDetailsBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequest.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequest.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequest.java
index 749a1d4..0668d57 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequest.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequestImpl.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequestImpl.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequestImpl.java
index 3bc8585..17d1a71 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequestImpl.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequestImpl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResource.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResource.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResource.java
index 9ca7ddf..2ee616a 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResource.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceImpl.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceImpl.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceImpl.java
index 26f6b3d..a73f944 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceImpl.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceImpl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResult.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResult.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResult.java
index 5543848..501a7d1 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResult.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResult.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResultProcessor.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResultProcessor.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResultProcessor.java
index 770bd64..45d8b43 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResultProcessor.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResultProcessor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerMutableResource.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerMutableResource.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerMutableResource.java
index 5d9b509..9fcefbe 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerMutableResource.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerMutableResource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java
index 2898a13..e0a8a91 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java
index 03ea811..51f2142 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java
index 346453e..905262c 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyEvaluator.java
index 9b48dfe..81dbe0e 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyEvaluator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java
index b36bc1f..67fb09e 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
index 867cd20..899b216 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java
index b899dd1..84aac1e 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyEvaluator.java
index 92f1592..38072e1 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyEvaluator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyItemEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyItemEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyItemEvaluator.java
index 20b08c8..2458e9d 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyItemEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerPolicyItemEvaluator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerDefaultPolicyResourceMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerDefaultPolicyResourceMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerDefaultPolicyResourceMatcher.java
index 5444e2b..3b831c3 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerDefaultPolicyResourceMatcher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerDefaultPolicyResourceMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerPolicyResourceMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerPolicyResourceMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerPolicyResourceMatcher.java
index ea0f36c..00f8f9a 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerPolicyResourceMatcher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerPolicyResourceMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerAbstractResourceMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerAbstractResourceMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerAbstractResourceMatcher.java
index 864709c..38260ec 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerAbstractResourceMatcher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerAbstractResourceMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcher.java
index c1508bf..a7399ee 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java
index fec527f..07f21c4 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerResourceMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerResourceMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerResourceMatcher.java
index c1d8366..8183ded 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerResourceMatcher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerResourceMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
index 172cb2f..326d650 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java
index ca78cf9..73027a0 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/service/ResourceLookupContext.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/service/ResourceLookupContext.java b/agents-common/src/main/java/org/apache/ranger/plugin/service/ResourceLookupContext.java
index a8b8ac0..25b5521 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/service/ResourceLookupContext.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/service/ResourceLookupContext.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractPredicateUtil.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractPredicateUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractPredicateUtil.java
index 478ea0c..2c72811 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractPredicateUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractPredicateUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
index 81c74a5..adae311 100755
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -38,7 +38,7 @@ import com.google.gson.GsonBuilder;
* library (hdfs/hbase/hive/knox/storm/..). If any of these service-defs
* don't exist in the given service store, they will be created in the store
* using the embedded definitions.
- *
+ *
* init() method should be called from ServiceStore implementations to
* initialize embedded service-defs.
*/
@@ -115,7 +115,7 @@ public class EmbeddedServiceDefsUtil {
supportedServiceDefs =getSupportedServiceDef();
/*
- * Maintaining the following service-def create-order is critical for the
+ * Maintaining the following service-def create-order is critical for the
* the legacy service-defs (HDFS/HBase/Hive/Knox/Storm) to be assigned IDs
* that were used in earlier version (0.4) */
hdfsServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_HDFS_NAME);
@@ -128,7 +128,7 @@ public class EmbeddedServiceDefsUtil {
kafkaServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_KAFKA_NAME);
solrServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_SOLR_NAME);
nifiServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_NIFI_NAME);
- atlasServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_ATLAS_NAME);
+ atlasServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_ATLAS_NAME);
tagServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_TAG_NAME);
@@ -182,8 +182,8 @@ public class EmbeddedServiceDefsUtil {
}
public long getAtlasServiceDefId() {
- return getId(atlasServiceDef);
- }
+ return getId(atlasServiceDef);
+ }
public long getTagServiceDefId() { return getId(tagServiceDef); }
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/store/ServiceStore.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/ServiceStore.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/ServiceStore.java
index febe640..b30f2c8 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/ServiceStore.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/ServiceStore.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/store/file/FileStoreUtil.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/file/FileStoreUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/file/FileStoreUtil.java
index c5b2150..9d6f395 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/file/FileStoreUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/file/FileStoreUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/store/file/ServiceFileStore.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/file/ServiceFileStore.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/file/ServiceFileStore.java
index 3a37517..b2e06f9 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/file/ServiceFileStore.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/file/ServiceFileStore.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -645,7 +645,7 @@ public class ServiceFileStore extends AbstractServiceStore {
CollectionUtils.filter(ret, predicateUtil.createPredicateForResourceSignature(policySignature));
if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("<== ServiceFileStore.getPoliciesByResourceSignature(%s, %s, %s): count[%d]: %s",
+ LOG.debug(String.format("<== ServiceFileStore.getPoliciesByResourceSignature(%s, %s, %s): count[%d]: %s",
serviceName, policySignature, isPolicyEnabled, (ret == null ? 0 : ret.size()), ret));
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java
index 4a00d63..22329d0 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java
index bf4b6ef..c9b3481 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
index a408366..a546ebf 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
@@ -152,7 +152,7 @@ public class PasswordUtils {
}
}
catch(IOException ioe) {
- ioe.printStackTrace();
+ ioe.printStackTrace();
System.out.println("Password verification failed for password [" + password + "]:" + ioe) ;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java
index 38e05d9..014e866 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -214,7 +214,7 @@ public class PolicyRefresher extends Thread {
}
}
- private ServicePolicies loadPolicyfromPolicyAdmin() {
+ private ServicePolicies loadPolicyfromPolicyAdmin() {
if(LOG.isDebugEnabled()) {
LOG.debug("==> PolicyRefresher(serviceName=" + serviceName + ").loadPolicyfromPolicyAdmin()");
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerAccessRequestUtil.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerAccessRequestUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerAccessRequestUtil.java
index 2f3a39e..9219450 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerAccessRequestUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerAccessRequestUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerObjectFactory.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerObjectFactory.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerObjectFactory.java
index 4a570b6..1a48151 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerObjectFactory.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerObjectFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java
index 4b17110..a50a47c 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
index 8eb9b27..fa800fe 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -213,7 +213,7 @@ public class RangerRESTClient {
}
if(!StringUtils.isEmpty(mUsername) && !StringUtils.isEmpty(mPassword)) {
- client.addFilter(new HTTPBasicAuthFilter(mUsername, mPassword));
+ client.addFilter(new HTTPBasicAuthFilter(mUsername, mPassword));
}
// Set Connection Timeout and ReadTime for the PolicyRefresh
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
index 878d172..e622ad2 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.ranger.authorization.hadoop.config.RangerConfiguration;
/**
- * Since this class does not retain any state. It isn't a singleton for testability.
+ * Since this class does not retain any state. It isn't a singleton for testability.
*
*/
public class RangerRESTUtils {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
index 5dfa0be..a770183 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[02/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java
index fe56d26..0efcb68 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName;
public class XUserGroupInfo {
private String userId ;
- @SerializedName("name")
+ @SerializedName("name")
private String groupName ;
private String parentGroupId ;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java
index babaf46..732e35b 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/InvalidGroupException.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/InvalidGroupException.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/InvalidGroupException.java
index 8a9d7d4..f68541e 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/InvalidGroupException.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/InvalidGroupException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/InvalidUserException.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/InvalidUserException.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/InvalidUserException.java
index eccec31..225523e 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/InvalidUserException.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/InvalidUserException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListRangerUser.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListRangerUser.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListRangerUser.java
index 8637478..85af261 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListRangerUser.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListRangerUser.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListRangerUserGroup.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListRangerUserGroup.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListRangerUserGroup.java
index b14ae28..8eb9131 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListRangerUserGroup.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListRangerUserGroup.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java
index f691a44..94d569a 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerJSONParser.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerJSONParser.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerJSONParser.java
index 4ade872..6c8205e 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerJSONParser.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerJSONParser.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java
index 01541db..2af4d5e 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUserGroupMapping.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUserGroupMapping.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUserGroupMapping.java
index b222a4c..5aa60f0 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUserGroupMapping.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUserGroupMapping.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RestClientPost.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RestClientPost.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RestClientPost.java
index 0b2fc3b..bbe9f1a 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RestClientPost.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RestClientPost.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java
index e41bb68..e9163e5 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -64,7 +64,7 @@ public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
filesourceUGBuilder.updateSink(ugSink);
if ( LOG.isDebugEnabled()) {
- filesourceUGBuilder.print();
+ filesourceUGBuilder.print();
}
}
@@ -137,7 +137,7 @@ public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
public void buildUserGroupInfo() throws Throwable {
buildUserGroupList();
if ( LOG.isDebugEnabled()) {
- print();
+ print();
}
}
@@ -197,7 +197,7 @@ public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
Map<String, List<String>> ret = new HashMap<String, List<String>>();
String delimiter = config.getUserSyncFileSourceDelimiter();
-
+
CSVFormat csvFormat = CSVFormat.newFormat(delimiter.charAt(0));
CSVParser csvParser = new CSVParser(new BufferedReader(new FileReader(textFile)), csvFormat);
@@ -216,12 +216,12 @@ public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
for (int j = 1; j < i; j ++) {
String group = csvRecord.get(j);
if ( group != null && !group.isEmpty()) {
- group = group.replaceAll("^\"|\"$", "");
+ group = group.replaceAll("^\"|\"$", "");
groups.add(group);
}
}
ret.put(user,groups);
- }
+ }
}
csvParser.close();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
index 17faec1..13a99ee 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -111,7 +111,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private HashMap<String,XGroupInfo> groupName2XGroupInfoMap = new HashMap<String,XGroupInfo>() ;
private String keyStoreFile = null ;
- private String keyStoreFilepwd = null;
+ private String keyStoreFilepwd = null;
private String trustStoreFile = null ;
private String trustStoreFilepwd = null ;
private String keyStoreType = null ;
@@ -129,7 +129,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
LOCAL_HOSTNAME = java.net.InetAddress.getLocalHost().getCanonicalHostName();
} catch (UnknownHostException e) {
LOCAL_HOSTNAME = "unknown" ;
- }
+ }
}
@@ -157,7 +157,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
keyStoreFile = config.getSSLKeyStorePath() ;
- keyStoreFilepwd = config.getSSLKeyStorePathPassword() ;
+ keyStoreFilepwd = config.getSSLKeyStorePathPassword() ;
trustStoreFile = config.getSSLTrustStorePath() ;
trustStoreFilepwd = config.getSSLTrustStorePathPassword() ;
keyStoreType = KeyStore.getDefaultType() ;
@@ -187,7 +187,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
@Override
public Void run() {
try {
- buildGroupList();
+ buildGroupList();
buildUserList();
buildUserGroupLinkList() ;
rebuildUserGroupMap() ;
@@ -201,12 +201,12 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
LOG.error("Failed to Authenticate Using given Principal and Keytab : ",e);
}
} else {
- buildGroupList();
+ buildGroupList();
buildUserList();
buildUserGroupLinkList() ;
rebuildUserGroupMap() ;
if (LOG.isDebugEnabled()) {
- this.print();
+ this.print();
}
}
}
@@ -408,20 +408,20 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
int totalCount = 100 ;
int retrievedCount = 0 ;
-
+
while (retrievedCount < totalCount) {
WebResource r = c.resource(getURL(PM_GROUP_LIST_URI))
.queryParam("pageSize", recordsToPullPerCall)
.queryParam("startIndex", String.valueOf(retrievedCount)) ;
String response = r.accept(MediaType.APPLICATION_JSON_TYPE).get(String.class);
-
+
LOG.debug("RESPONSE: [" + response + "]") ;
-
+
Gson gson = new GsonBuilder().create() ;
GetXGroupListResponse groupList = gson.fromJson(response, GetXGroupListResponse.class) ;
-
+
totalCount = groupList.getTotalCount() ;
if (groupList.getXgroupInfoList() != null) {
@@ -440,26 +440,26 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
LOG.debug("==> PolicyMgrUserGroupBuilder.buildUserList");
}
Client c = getClient() ;
-
+
int totalCount = 100 ;
int retrievedCount = 0 ;
-
+
while (retrievedCount < totalCount) {
-
+
WebResource r = c.resource(getURL(PM_USER_LIST_URI))
.queryParam("pageSize", recordsToPullPerCall)
.queryParam("startIndex", String.valueOf(retrievedCount)) ;
-
+
String response = r.accept(MediaType.APPLICATION_JSON_TYPE).get(String.class);
-
+
Gson gson = new GsonBuilder().create() ;
LOG.debug("RESPONSE: [" + response + "]") ;
GetXUserListResponse userList = gson.fromJson(response, GetXUserListResponse.class) ;
-
+
totalCount = userList.getTotalCount() ;
-
+
if (userList.getXuserInfoList() != null) {
xuserList.addAll(userList.getXuserInfoList()) ;
retrievedCount = xuserList.size() ;
@@ -476,26 +476,26 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
LOG.debug("==> PolicyMgrUserGroupBuilder.buildUserGroupLinkList");
}
Client c = getClient() ;
-
+
int totalCount = 100 ;
int retrievedCount = 0 ;
-
+
while (retrievedCount < totalCount) {
-
+
WebResource r = c.resource(getURL(PM_USER_GROUP_MAP_LIST_URI))
.queryParam("pageSize", recordsToPullPerCall)
.queryParam("startIndex", String.valueOf(retrievedCount)) ;
-
+
String response = r.accept(MediaType.APPLICATION_JSON_TYPE).get(String.class);
-
+
LOG.debug("RESPONSE: [" + response + "]") ;
-
+
Gson gson = new GsonBuilder().create() ;
GetXUserGroupListResponse usergroupList = gson.fromJson(response, GetXUserGroupListResponse.class) ;
-
+
totalCount = usergroupList.getTotalCount() ;
-
+
if (usergroupList.getXusergroupInfoList() != null) {
xusergroupList.addAll(usergroupList.getXusergroupInfoList()) ;
retrievedCount = xusergroupList.size() ;
@@ -522,7 +522,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
for(String g : groups) {
LOG.debug("INFO: addPMXAGroupToUser(" + userName + "," + g + ")" ) ;
}
- if (! isMockRun ) {
+ if (! isMockRun ) {
addXUserGroupInfo(user, groups) ;
}
if (authenticationType != null && AUTH_KERBEROS.equalsIgnoreCase(authenticationType) && SecureClientLogin.isKerberosCredentialExists(principal, keytab)){
@@ -714,7 +714,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private XUserGroupInfo addXUserGroupInfo(XUserInfo aUserInfo, XGroupInfo aGroupInfo) {
-
+
XUserGroupInfo ugInfo = new XUserGroupInfo() ;
ugInfo.setUserId(aUserInfo.getId());
@@ -766,7 +766,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
Client c = getClient() ;
- String uri = PM_DEL_USER_GROUP_LINK_URI.replaceAll(Pattern.quote("${groupName}"),
+ String uri = PM_DEL_USER_GROUP_LINK_URI.replaceAll(Pattern.quote("${groupName}"),
UserSyncUtil.encodeURIParam(groupName)).replaceAll(Pattern.quote("${userName}"), UserSyncUtil.encodeURIParam(userName));
WebResource r = c.resource(getURL(uri)) ;
@@ -780,7 +780,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
if (response.getStatus() == 200) {
delUserGroupFromList(aUserInfo, aGroupInfo) ;
}
-
+
} catch (Exception e) {
LOG.warn( "ERROR: Unable to delete GROUP: " + groupName + " from USER:" + userName , e) ;
@@ -825,19 +825,19 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private MUserInfo getMUser(MUserInfo userInfo, MUserInfo ret) {
Client c = getClient() ;
-
+
WebResource r = c.resource(getURL(PM_ADD_LOGIN_USER_URI)) ;
-
+
Gson gson = new GsonBuilder().create() ;
String jsonString = gson.toJson(userInfo) ;
-
+
String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString) ;
-
+
LOG.debug("RESPONSE[" + response + "]") ;
-
+
ret = gson.fromJson(response, MUserInfo.class) ;
-
+
LOG.debug("MUser Creation successful " + ret);
return ret ;
@@ -845,7 +845,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private synchronized Client getClient() {
- Client ret = null;
+ Client ret = null;
if (policyMgrBaseUrl.startsWith("https://")) {
@@ -875,10 +875,10 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
finally {
if (in != null) {
- in.close();
+ in.close();
}
}
-
+
}
if (trustStoreFile != null && trustStoreFilepwd != null) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
index c71bc90..e5abd08 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -84,7 +84,7 @@ public class UnixUserGroupBuilder implements UserGroupSource {
public static void main(String[] args) throws Throwable {
UnixUserGroupBuilder ugbuilder = new UnixUserGroupBuilder() ;
ugbuilder.init();
- ugbuilder.print();
+ ugbuilder.print();
}
public UnixUserGroupBuilder() {
@@ -135,7 +135,7 @@ public class UnixUserGroupBuilder implements UserGroupSource {
for (Map.Entry<String, List<String>> entry : user2GroupListMap.entrySet()) {
String user = entry.getKey();
List<String> groups = entry.getValue();
-
+
try{
sink.addOrUpdateUser(user, groups);
}catch (Throwable t) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/usergroupsync/AbstractMapper.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/usergroupsync/AbstractMapper.java b/ugsync/src/main/java/org/apache/ranger/usergroupsync/AbstractMapper.java
index fc5d10b..86b621b 100644
--- a/ugsync/src/main/java/org/apache/ranger/usergroupsync/AbstractMapper.java
+++ b/ugsync/src/main/java/org/apache/ranger/usergroupsync/AbstractMapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/usergroupsync/Mapper.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/usergroupsync/Mapper.java b/ugsync/src/main/java/org/apache/ranger/usergroupsync/Mapper.java
index 94675da..696c665 100644
--- a/ugsync/src/main/java/org/apache/ranger/usergroupsync/Mapper.java
+++ b/ugsync/src/main/java/org/apache/ranger/usergroupsync/Mapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/usergroupsync/RegEx.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/usergroupsync/RegEx.java b/ugsync/src/main/java/org/apache/ranger/usergroupsync/RegEx.java
index 4bf452a..626df04 100644
--- a/ugsync/src/main/java/org/apache/ranger/usergroupsync/RegEx.java
+++ b/ugsync/src/main/java/org/apache/ranger/usergroupsync/RegEx.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSink.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSink.java b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSink.java
index 9ee6d95..6cce36f 100644
--- a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSink.java
+++ b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSink.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSource.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSource.java b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSource.java
index 776cdcb..81a546e 100644
--- a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSource.java
+++ b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java
index cd610a1..30b891c 100644
--- a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java
+++ b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/main/java/org/apache/ranger/usersync/util/UserSyncUtil.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/usersync/util/UserSyncUtil.java b/ugsync/src/main/java/org/apache/ranger/usersync/util/UserSyncUtil.java
index 1ac2da2..a33576b 100644
--- a/ugsync/src/main/java/org/apache/ranger/usersync/util/UserSyncUtil.java
+++ b/ugsync/src/main/java/org/apache/ranger/usersync/util/UserSyncUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java
----------------------------------------------------------------------
diff --git a/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java b/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java
index 673a88e..86ce40e 100644
--- a/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java
+++ b/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -77,12 +77,12 @@ public class LdapUserGroupTest extends AbstractLdapTestUnit{
@Before
public void setup() throws Exception {
- LdapServer ldapServer = new LdapServer();
+ LdapServer ldapServer = new LdapServer();
ldapServer.setSaslHost("127.0.0.1");
- ldapServer.setSearchBaseDn("DC=ranger,DC=qe,DC=hortonworks,DC=com");
+ ldapServer.setSearchBaseDn("DC=ranger,DC=qe,DC=hortonworks,DC=com");
String ldapPort = System.getProperty("ldap.port");
Assert.assertNotNull("Property 'ldap.port' null", ldapPort);
- ldapServer.setTransports(new TcpTransport("127.0.0.1", Integer.parseInt(ldapPort)));
+ ldapServer.setTransports(new TcpTransport("127.0.0.1", Integer.parseInt(ldapPort)));
ldapServer.setDirectoryService(getService());
ldapServer.setMaxSizeLimit( LdapServer.NO_SIZE_LIMIT );
setLdapServer(ldapServer);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/test/java/org/apache/ranger/usergroupsync/PolicyMgrUserGroupBuilderTest.java
----------------------------------------------------------------------
diff --git a/ugsync/src/test/java/org/apache/ranger/usergroupsync/PolicyMgrUserGroupBuilderTest.java b/ugsync/src/test/java/org/apache/ranger/usergroupsync/PolicyMgrUserGroupBuilderTest.java
index 2880bcb..312ea9b 100644
--- a/ugsync/src/test/java/org/apache/ranger/usergroupsync/PolicyMgrUserGroupBuilderTest.java
+++ b/ugsync/src/test/java/org/apache/ranger/usergroupsync/PolicyMgrUserGroupBuilderTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,7 +41,7 @@ public class PolicyMgrUserGroupBuilderTest extends PolicyMgrUserGroupBuilder {
allUsers.add(user);
//System.out.println("Username: " + user + " and associated groups: " + groups);
}
-
+
@Override
public void addOrUpdateGroup(String group) {
allGroups.add(group);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/ugsync/src/test/java/org/apache/ranger/usergroupsync/RegExTest.java
----------------------------------------------------------------------
diff --git a/ugsync/src/test/java/org/apache/ranger/usergroupsync/RegExTest.java b/ugsync/src/test/java/org/apache/ranger/usergroupsync/RegExTest.java
index 2c1e023..a93cfe7 100644
--- a/ugsync/src/test/java/org/apache/ranger/usergroupsync/RegExTest.java
+++ b/ugsync/src/test/java/org/apache/ranger/usergroupsync/RegExTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java
----------------------------------------------------------------------
diff --git a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java
index f1400b2..e960fed 100644
--- a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java
+++ b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
----------------------------------------------------------------------
diff --git a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
index fb52a02..c0f136c 100644
--- a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
+++ b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixGroupPrincipal.java
----------------------------------------------------------------------
diff --git a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixGroupPrincipal.java b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixGroupPrincipal.java
index a707a2a..5c2e838 100644
--- a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixGroupPrincipal.java
+++ b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixGroupPrincipal.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixUserPrincipal.java
----------------------------------------------------------------------
diff --git a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixUserPrincipal.java b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixUserPrincipal.java
index a690e5b..e71a965 100644
--- a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixUserPrincipal.java
+++ b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/UnixUserPrincipal.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/unixauthclient/src/test/com/xasecure/test/authentication/UnixAuthenticationTester.java
----------------------------------------------------------------------
diff --git a/unixauthclient/src/test/com/xasecure/test/authentication/UnixAuthenticationTester.java b/unixauthclient/src/test/com/xasecure/test/authentication/UnixAuthenticationTester.java
index 54032ba..2dd2804 100644
--- a/unixauthclient/src/test/com/xasecure/test/authentication/UnixAuthenticationTester.java
+++ b/unixauthclient/src/test/com/xasecure/test/authentication/UnixAuthenticationTester.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -30,9 +30,9 @@ public class UnixAuthenticationTester {
public void run() throws Throwable {
LoginContext loginContext = new LoginContext("PolicyManager") ;
System.err.println("After login ...") ;
- loginContext.login();
+ loginContext.login();
System.err.println("Subject:" + loginContext.getSubject() ) ;
- loginContext.logout();
+ loginContext.logout();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/unixauthservice/src/main/java/org/apache/ranger/authentication/PasswordValidator.java
----------------------------------------------------------------------
diff --git a/unixauthservice/src/main/java/org/apache/ranger/authentication/PasswordValidator.java b/unixauthservice/src/main/java/org/apache/ranger/authentication/PasswordValidator.java
index b8cfbcc..dd0e7d5 100644
--- a/unixauthservice/src/main/java/org/apache/ranger/authentication/PasswordValidator.java
+++ b/unixauthservice/src/main/java/org/apache/ranger/authentication/PasswordValidator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -68,7 +68,7 @@ public class PasswordValidator implements Runnable {
if (validatorProgram == null) {
String res = "FAILED: Unable to validate credentials." ;
writer.println(res) ;
- writer.flush();
+ writer.flush();
LOG.error("Response [" + res + "] for user: " + userName + " as ValidatorProgram is not defined in configuration.") ;
}
@@ -85,7 +85,7 @@ public class PasswordValidator implements Runnable {
pWriter = new PrintWriter(new OutputStreamWriter(p.getOutputStream())) ;
- pWriter.println(request) ; pWriter.flush();
+ pWriter.println(request) ; pWriter.flush();
String res = pReader.readLine() ;
@@ -100,7 +100,7 @@ public class PasswordValidator implements Runnable {
LOG.info("Response [" + res + "] for user: " + userName);
- writer.println(res) ; writer.flush();
+ writer.println(res) ; writer.flush();
}
finally {
if (p != null) {
@@ -120,7 +120,7 @@ public class PasswordValidator implements Runnable {
finally {
try {
if (client != null) {
- client.close();
+ client.close();
}
}
catch(IOException ioe){
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/09700f35/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
----------------------------------------------------------------------
diff --git a/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java b/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
index 863a56a..86a56f3 100644
--- a/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
+++ b/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -87,7 +87,7 @@ public class UnixAuthenticationService {
static private boolean enableUnixAuth = false;
- private static final String[] UGSYNC_CONFIG_XML_FILES = { "ranger-ugsync-default.xml", "ranger-ugsync-site.xml" } ;
+ private static final String[] UGSYNC_CONFIG_XML_FILES = { "ranger-ugsync-default.xml", "ranger-ugsync-site.xml" } ;
private static final String PROPERTY_ELEMENT_TAGNAME = "property" ;
private static final String NAME_ELEMENT_TAGNAME = "name" ;
private static final String VALUE_ELEMENT_TAGNAME = "value" ;
@@ -137,7 +137,7 @@ public class UnixAuthenticationService {
Thread newSyncProcThread = new Thread(syncProc) ;
newSyncProcThread.setName("UnixUserSyncThread");
newSyncProcThread.setDaemon(false);
- newSyncProcThread.start();
+ newSyncProcThread.start();
}
@@ -230,7 +230,7 @@ public class UnixAuthenticationService {
PasswordValidator.setValidatorProgram(validatorProg);
}
- String adminUsers = prop.getProperty(ADMIN_USER_LIST_PARAM) ;
+ String adminUsers = prop.getProperty(ADMIN_USER_LIST_PARAM) ;
if (adminUsers != null && adminUsers.trim().length() > 0) {
for(String u : adminUsers.split(",")) {
@@ -283,7 +283,7 @@ public class UnixAuthenticationService {
}
finally {
if (in != null) {
- in.close();
+ in.close();
}
}
@@ -293,7 +293,7 @@ public class UnixAuthenticationService {
}
- TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+ TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
KeyStore trustStoreKeyStore = null ;
@@ -312,12 +312,12 @@ public class UnixAuthenticationService {
}
finally {
if (in != null) {
- in.close();
+ in.close();
}
}
}
- trustManagerFactory.init(trustStoreKeyStore);
+ trustManagerFactory.init(trustStoreKeyStore);
TrustManager[] tm = trustManagerFactory.getTrustManagers() ;
@@ -325,7 +325,7 @@ public class UnixAuthenticationService {
context.init(km, tm, random);
- SSLServerSocketFactory sf = context.getServerSocketFactory() ;
+ SSLServerSocketFactory sf = context.getServerSocketFactory() ;
ServerSocket socket = (SSLEnabled ? sf.createServerSocket(portNum) : new ServerSocket(portNum) ) ;
@@ -355,7 +355,7 @@ public class UnixAuthenticationService {
while ( (client = socket.accept()) != null ) {
Thread clientValidatorThread = new Thread(new PasswordValidator(client)) ;
- clientValidatorThread.start();
+ clientValidatorThread.start();
}
} catch (IOException e) {
socket.close();