[incubator-gobblin] branch master updated: [GOBBLIN-765] Remove a duplicate leading period character from the con…

[suvasude]

This is an automated email from the ASF dual-hosted git repository.

suvasude pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new 9c9e01a  [GOBBLIN-765] Remove a duplicate leading period character 
from the con…
9c9e01a is described below

commit 9c9e01a6b59aab9d89915eaa500ef5c264ffdd1d
Author: sv2000 <sudarsh...@gmail.com>
AuthorDate: Fri May 3 16:05:20 2019 -0700

    [GOBBLIN-765] Remove a duplicate leading period character from the con…
    
    Closes #2629 from sv2000/sqlDataNodeConfigKeyBug
---
 .../apache/gobblin/service/modules/dataset/EncryptionConfig.java    | 2 +-
 .../service/modules/flowgraph/{ => datanodes}/SqlDataNode.java      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/dataset/EncryptionConfig.java
 
b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/dataset/EncryptionConfig.java
index 85e5364..f9e4e35 100644
--- 
a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/dataset/EncryptionConfig.java
+++ 
b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/dataset/EncryptionConfig.java
@@ -80,7 +80,7 @@ public class EncryptionConfig {
 
   public EncryptionConfig(Config encryptionConfig) throws IOException {
     this.encryptionAlgorithm = ConfigUtils.getString(encryptionConfig, 
DatasetDescriptorConfigKeys.ENCRYPTION_ALGORITHM_KEY,
-        DatasetDescriptorConfigKeys.DATASET_DESCRIPTOR_CONFIG_ANY);
+        
DatasetDescriptorConfigKeys.DATASET_DESCRIPTOR_CONFIG_ANY).toLowerCase();
     if 
(this.encryptionAlgorithm.equalsIgnoreCase(DatasetDescriptorConfigKeys.DATASET_DESCRIPTOR_CONFIG_NONE))
 {
       this.keystoreType = 
DatasetDescriptorConfigKeys.DATASET_DESCRIPTOR_CONFIG_NONE;
       this.keystoreEncoding = 
DatasetDescriptorConfigKeys.DATASET_DESCRIPTOR_CONFIG_NONE;
diff --git 
a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flowgraph/SqlDataNode.java
 
b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flowgraph/datanodes/SqlDataNode.java
similarity index 89%
rename from 
gobblin-service/src/main/java/org/apache/gobblin/service/modules/flowgraph/SqlDataNode.java
rename to 
gobblin-service/src/main/java/org/apache/gobblin/service/modules/flowgraph/datanodes/SqlDataNode.java
index 4d90172..9e05409 100644
--- 
a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flowgraph/SqlDataNode.java
+++ 
b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flowgraph/datanodes/SqlDataNode.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gobblin.service.modules.flowgraph;
+package org.apache.gobblin.service.modules.flowgraph.datanodes;
 
 import com.google.common.base.Preconditions;
 import com.typesafe.config.Config;
@@ -23,13 +23,15 @@ import joptsimple.internal.Strings;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
+import org.apache.gobblin.service.modules.flowgraph.BaseDataNode;
+import org.apache.gobblin.service.modules.flowgraph.FlowGraphConfigurationKeys;
 import org.apache.gobblin.util.ConfigUtils;
 
 @EqualsAndHashCode (callSuper = true)
 public class SqlDataNode extends BaseDataNode {
   public static final String SQL_HOSTNAME = 
FlowGraphConfigurationKeys.DATA_NODE_PREFIX + "sql.hostname";
   public static final String SQL_PORT = 
FlowGraphConfigurationKeys.DATA_NODE_PREFIX + "sql.port";
-  public static final String SQL_DRIVER = 
FlowGraphConfigurationKeys.DATA_NODE_PREFIX + ".sql.driver";
+  public static final String SQL_DRIVER = 
FlowGraphConfigurationKeys.DATA_NODE_PREFIX + "sql.driver";
 
   @Getter
   private String hostName;