不使用硬编码包名字符串的方式，使用getPackage().getName()

lealone · Apr 25, 2015 · 62145a6 · 62145a6
1 parent 097241d
commit 62145a6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lealone-cluster/src/main/java/org/lealone/cluster/config/DatabaseDescriptor.java b/lealone-cluster/src/main/java/org/lealone/cluster/config/DatabaseDescriptor.java
@@ -234,7 +234,7 @@ private static void initDefaultReplicationStrategy() throws ConfigurationExcepti
 
     private static IEndpointSnitch createEndpointSnitch(String snitchClassName) throws ConfigurationException {
         if (!snitchClassName.contains("."))
-            snitchClassName = "org.lealone.cluster.locator." + snitchClassName;
+            snitchClassName = IEndpointSnitch.class.getPackage().getName() + "." + snitchClassName;
         IEndpointSnitch snitch = Utils.construct(snitchClassName, "snitch");
         return conf.dynamic_snitch ? new DynamicEndpointSnitch(snitch) : snitch;
     }

diff --git a/lealone-cluster/src/main/java/org/lealone/cluster/locator/AbstractReplicationStrategy.java b/lealone-cluster/src/main/java/org/lealone/cluster/locator/AbstractReplicationStrategy.java
@@ -250,7 +250,8 @@ public static void validateReplicationStrategy(String keyspaceName,
     }
 
     public static Class<AbstractReplicationStrategy> getClass(String cls) throws ConfigurationException {
-        String className = cls.contains(".") ? cls : "org.lealone.cluster.locator." + cls;
+        String className = cls.contains(".") ? cls : AbstractReplicationStrategy.class.getPackage().getName() + "."
+                + cls;
         Class<AbstractReplicationStrategy> strategyClass = Utils.classForName(className, "replication strategy");
         if (!AbstractReplicationStrategy.class.isAssignableFrom(strategyClass)) {
             throw new ConfigurationException(String.format(

diff --git a/lealone-cluster/src/main/java/org/lealone/cluster/utils/Utils.java b/lealone-cluster/src/main/java/org/lealone/cluster/utils/Utils.java
@@ -160,7 +160,7 @@ public static String getReleaseVersionString() {
 
     public static IPartitioner newPartitioner(String partitionerClassName) throws ConfigurationException {
         if (!partitionerClassName.contains("."))
-            partitionerClassName = "org.lealone.cluster.dht." + partitionerClassName;
+            partitionerClassName = IPartitioner.class.getPackage().getName() + "." + partitionerClassName;
         return Utils.instanceOrConstruct(partitionerClassName, "partitioner");
     }