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:33:10 UTC
[17/19] incubator-ranger git commit: Removing spaces before semicolons
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() {