honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11312 from rmuir/pkg_priv 

make some sec mgr / bootup classes package private and final.
This commit is contained in:
Robert Muir 2015-05-22 16:54:21 -04:00
parent 2e9f27a00c 6a32af1990
commit 2635bfdd89
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/bootstrap/ESPolicy.java
View File

@ -29,7 +29,7 @@ import java.security.ProtectionDomain;
import java.security.URIParameter; import java.security.URIParameter;
/** custom policy for union of static and dynamic permissions */ /** custom policy for union of static and dynamic permissions */
public class ESPolicy extends Policy { final class ESPolicy extends Policy {
/** template policy file, the one used in tests */ /** template policy file, the one used in tests */
static final String POLICY_RESOURCE = "security.policy"; static final String POLICY_RESOURCE = "security.policy";

9
src/main/java/org/elasticsearch/bootstrap/JVMCheck.java
View File

@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** Checks that the JVM is ok and won't cause index corruption */ /** Checks that the JVM is ok and won't cause index corruption */
public class JVMCheck { final class JVMCheck {
/** /**
* URL with latest JVM recommendations * URL with latest JVM recommendations
@ -43,7 +43,7 @@ public class JVMCheck {
/** /**
* Metadata and messaging for hotspot bugs. * Metadata and messaging for hotspot bugs.
*/ */
static class HotspotBug { static final class HotspotBug {
/** OpenJDK bug URL */ /** OpenJDK bug URL */
final String bugUrl; final String bugUrl;
@ -131,9 +131,4 @@ public class JVMCheck {
throw new RuntimeException(sb.toString()); throw new RuntimeException(sb.toString());
} }
} }
/** Command line driver for convenience */
public static void main(String args[]) {
check();
}
} }

2
src/main/java/org/elasticsearch/bootstrap/Security.java
View File

@ -37,7 +37,7 @@ import java.security.Policy;
* We use a template file (the one we test with), and add additional * We use a template file (the one we test with), and add additional
* permissions based on the environment (data paths, etc) * permissions based on the environment (data paths, etc)
*/ */
class Security { final class Security {
/** /**
* Initializes securitymanager for the environment * Initializes securitymanager for the environment