Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/atlas

client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java

@@ -19,6 +19,7 @@ package org.apache.atlas;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 import com.google.common.annotations.VisibleForTesting;
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientHandlerException;
@@ -249,6 +250,7 @@ public abstract class AtlasBaseClient {
         DefaultClientConfig config = new DefaultClientConfig();
         // Enable POJO mapping feature
         config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
+        config.getClasses().add(JacksonJaxbJsonProvider.class);
         int readTimeout = configuration.getInt("atlas.client.readTimeoutMSecs", 60000);
         int connectTimeout = configuration.getInt("atlas.client.connectTimeoutMSecs", 60000);
         if (configuration.getBoolean(TLS_ENABLED, false)) {
@@ -264,7 +266,9 @@ public abstract class AtlasBaseClient {
 
         final URLConnectionClientHandler handler;
 
-        if ((AuthenticationUtil.isKerberosAuthenticationEnabled())) {
+        boolean isKerberosEnabled = AuthenticationUtil.isKerberosAuthenticationEnabled(ugi);
+
+        if (isKerberosEnabled) {
             handler = SecureClientUtils.getClientConnectionHandler(config, configuration, doAsUser, ugi);
         } else {
             if (configuration.getBoolean(TLS_ENABLED, false)) {

intg/src/main/java/org/apache/atlas/utils/AuthenticationUtil.java

@@ -20,6 +20,7 @@ package org.apache.atlas.utils;
 import org.apache.atlas.ApplicationProperties;
 import org.apache.atlas.AtlasException;
 import org.apache.commons.configuration.Configuration;
+import org.apache.hadoop.security.UserGroupInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.io.Console;
@@ -34,17 +35,27 @@ public final class AuthenticationUtil {
     }
 
     public static boolean isKerberosAuthenticationEnabled() {
-        boolean isKerberosAuthenticationEnabled = false;
+        return isKerberosAuthenticationEnabled((UserGroupInformation) null);
+    }
+
+    public static boolean isKerberosAuthenticationEnabled(UserGroupInformation ugi) {
+        boolean defaultValue = ugi != null && ugi.hasKerberosCredentials();
+
         try {
-            isKerberosAuthenticationEnabled = isKerberosAuthenticationEnabled(ApplicationProperties.get());
+            return isKerberosAuthenticationEnabled(ApplicationProperties.get(), defaultValue);
         } catch (AtlasException e) {
             LOG.error("Error while isKerberosAuthenticationEnabled ", e);
         }
-        return isKerberosAuthenticationEnabled;
+
+        return defaultValue;
     }
 
     public static boolean isKerberosAuthenticationEnabled(Configuration atlasConf) {
-        return atlasConf.getBoolean("atlas.authentication.method.kerberos", false);
+        return isKerberosAuthenticationEnabled(atlasConf, false);
+    }
+
+    public static boolean isKerberosAuthenticationEnabled(Configuration atlasConf, boolean defaultValue) {
+        return atlasConf.getBoolean("atlas.authentication.method.kerberos", defaultValue);
     }
 
     public static boolean includeHadoopGroups(){