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:02 UTC
[09/19] incubator-ranger git commit: Removing trailing whitespace
(via sed)
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