From 6a6e4e0e2f725bd0e145b9da12792bdddc327ee7 Mon Sep 17 00:00:00 2001 From: abhijitjaiswal Date: Fri, 11 Jan 2019 11:47:22 +0530 Subject: [PATCH 1/6] For doing a release --- README.md | 2 +- examples/pom.xml | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 36a637d5..726ed46d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The SDK is available in The Central Repository. To use the SDK, add the followin com.qubole.qds-sdk-java qds-sdk-java - 0.9.1 + 0.9.4 ``` diff --git a/examples/pom.xml b/examples/pom.xml index 5efdc719..b92d727d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -4,7 +4,7 @@ com.qubole.qds-sdk-java qds-sdk-java-examples - 0.9.3 + 0.9.4 UTF-8 @@ -16,7 +16,7 @@ com.qubole.qds-sdk-java qds-sdk-java - 0.9.3 + 0.9.4 diff --git a/pom.xml b/pom.xml index 64cdbd1e..499488a6 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.qubole.qds-sdk-java qds-sdk-java Qubole Data Service Java SDK - 0.9.2-SNAPSHOT + 0.9.4 A Java library that provides the tools you need to authenticate with, and use the Qubole Data Service API. From ede5ee207cf8e9792d440e4bc1b95078ec124a71 Mon Sep 17 00:00:00 2001 From: abhijitjaiswal Date: Mon, 14 Jan 2019 09:55:45 +0530 Subject: [PATCH 2/6] Fixed Doc issues --- .../qubole/qds/sdk/java/api/NotebookAPI.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/qubole/qds/sdk/java/api/NotebookAPI.java b/src/main/java/com/qubole/qds/sdk/java/api/NotebookAPI.java index e360d1eb..718ef09e 100644 --- a/src/main/java/com/qubole/qds/sdk/java/api/NotebookAPI.java +++ b/src/main/java/com/qubole/qds/sdk/java/api/NotebookAPI.java @@ -27,8 +27,8 @@ public interface NotebookAPI * * @param name name of the notebook * @param location location of the notebook - * @param note_type type of the notebook, available are "spark" and "presto" - * @param cluster_id cluster id of the cluster to associate notebook with + * @param noteType type of the notebook, available are "spark" and "presto" + * @param clusterId cluster id of the cluster to associate notebook with * @return new builder */ public InvokableBuilder create(String name, String location, String noteType, String clusterId); @@ -38,8 +38,8 @@ public interface NotebookAPI * * @param name name of the notebook * @param location location of the notebook - * @param cluster_id cluster id of the cluster to associate notebook with - * @param notebook_id notebook id to configure + * @param clusterId cluster id of the cluster to associate notebook with + * @param notebookId notebook id to configure * @return new builder */ public InvokableBuilder configure(String name, String location, String clusterId, String notebookId); @@ -49,23 +49,23 @@ public interface NotebookAPI * * @param name name of the notebook * @param location location of the notebook - * @param cluster_id cluster id of the cluster to associate notebook with - * @param cloned_from_notebook notebook id from which the new notebook is cloned + * @param clusterId cluster id of the cluster to associate notebook with + * @param clonedFromNotebook notebook id from which the new notebook is cloned * @return new builder */ public InvokableBuilder clone(String name, String location, String clusterId, String clonedFromNotebook); /** * Corresponds to http://docs.qubole.com/en/latest/rest-api/notebook_api/bind-notebook.html - * @param cluster_id cluster id of the cluster who needs to be associated with notebook - * @param notebook_id notebook id + * @param clusterId cluster id of the cluster who needs to be associated with notebook + * @param notebookId notebook id * @return new builder */ public InvokableBuilder bindNotebookToCluster(String clusterId, String notebookId); /** * Corresponds to http://docs.qubole.com/en/latest/rest-api/notebook_api/delete-notebook.html - * @param notebook_id notebook id + * @param notebookId notebook id * @return new builder */ public InvokableBuilder delete(String notebookId); From 673be13fba14c9e924a0f425d7dfbceb093b1f8e Mon Sep 17 00:00:00 2001 From: abhijitjaiswal Date: Mon, 14 Jan 2019 10:00:40 +0530 Subject: [PATCH 3/6] Updating version to snapshot --- examples/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index b92d727d..b4c70378 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -4,7 +4,7 @@ com.qubole.qds-sdk-java qds-sdk-java-examples - 0.9.4 + 0.9.4-snapshot UTF-8 diff --git a/pom.xml b/pom.xml index 499488a6..50736891 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.qubole.qds-sdk-java qds-sdk-java Qubole Data Service Java SDK - 0.9.4 + 0.9.4-snapshot A Java library that provides the tools you need to authenticate with, and use the Qubole Data Service API. From 1fb090e8802942a261ec600fcdaf1f61e45ffcff Mon Sep 17 00:00:00 2001 From: Sandy Date: Mon, 14 Jan 2019 12:42:18 +0530 Subject: [PATCH 4/6] Merged Security fixes for DemandBase to master (#94) * Upgraded Jersey and Jackson jars * Upgraded Jersey and Jackson jars * Removing unwanted files and changed spurious pom line * Removed checkstyle files and fixed test cases * Added checkstyle file * Removed .gitignore file * Upgraded guava, aws-java-sdk and testng versions --- pom.xml | 56 +++++++++++++++++-- .../qds/sdk/java/details/AppBuilderImpl.java | 2 +- .../qds/sdk/java/details/BaseCommandImpl.java | 2 +- .../details/ClusterConfigBuilderImpl.java | 2 +- .../qds/sdk/java/details/CommandApiImpl.java | 2 +- .../java/details/CommandBuilderImplBase.java | 2 +- .../details/CompositeCommandBuilderImpl.java | 2 +- .../CreateScheduleCommandBuilderImpl.java | 2 +- .../DbAdvancedExportCommandBuilderImpl.java | 2 +- .../DbAdvancedImportCommandBuilderImpl.java | 2 +- .../DbSimpleExportCommandBuilderImpl.java | 2 +- .../DbSimpleImportCommandBuilderImpl.java | 2 +- .../sdk/java/details/DbTapBuilderImpl.java | 2 +- .../details/HadoopCommandBuilderImpl.java | 2 +- .../java/details/HiveCommandBuilderImpl.java | 2 +- .../details/NotebookCommandBuilderImpl.java | 2 +- .../java/details/PigCommandBuilderImpl.java | 2 +- .../details/PrestoCommandBuilderImpl.java | 2 +- .../qds/sdk/java/details/QdsClientImpl.java | 6 +- .../java/details/ShellCommandBuilderImpl.java | 2 +- .../java/details/SparkCommandBuilderImpl.java | 2 +- .../StoreTablePropertiesBuilderImpl.java | 2 +- .../qubole/qds/sdk/java/entities/Account.java | 2 +- .../sdk/java/entities/AccountCredentials.java | 2 +- .../qubole/qds/sdk/java/entities/AddNode.java | 2 +- .../sdk/java/entities/AllCommandsReport.java | 2 +- .../entities/CanonicalHiveCommandsReport.java | 2 +- .../qds/sdk/java/entities/CanonicalQuery.java | 2 +- .../qubole/qds/sdk/java/entities/Cluster.java | 2 +- .../qds/sdk/java/entities/ClusterItem.java | 2 +- .../qds/sdk/java/entities/ClusterMetrics.java | 2 +- .../qds/sdk/java/entities/ClusterNode.java | 2 +- .../qds/sdk/java/entities/ClusterNodeOld.java | 2 +- .../qds/sdk/java/entities/ClusterState.java | 2 +- .../qubole/qds/sdk/java/entities/Command.java | 2 +- .../sdk/java/entities/CommandMetaData.java | 2 +- .../sdk/java/entities/CommandResponse.java | 2 +- .../qds/sdk/java/entities/Commands.java | 2 +- .../qubole/qds/sdk/java/entities/DbTap.java | 2 +- .../qds/sdk/java/entities/DbTapList.java | 2 +- .../qds/sdk/java/entities/DependencyInfo.java | 2 +- .../qds/sdk/java/entities/Ec2Settings.java | 2 +- .../java/entities/FairSchedulerSettings.java | 2 +- .../qds/sdk/java/entities/HadoopSettings.java | 2 +- .../qds/sdk/java/entities/HiveTable.java | 2 +- .../qds/sdk/java/entities/Interval.java | 2 +- .../qubole/qds/sdk/java/entities/Message.java | 2 +- .../qds/sdk/java/entities/NameAndType.java | 2 +- .../sdk/java/entities/NameTypePosition.java | 2 +- .../qds/sdk/java/entities/NodeOperation.java | 2 +- .../qds/sdk/java/entities/Notebook.java | 2 +- .../qds/sdk/java/entities/NotebookResult.java | 2 +- .../qds/sdk/java/entities/PagingInfo.java | 2 +- .../qds/sdk/java/entities/PrestoSettings.java | 2 +- .../qubole/qds/sdk/java/entities/Query.java | 2 +- .../qds/sdk/java/entities/ResultValue.java | 2 +- .../qds/sdk/java/entities/Schedule.java | 2 +- .../sdk/java/entities/ScheduleCommand.java | 2 +- .../sdk/java/entities/SchedulesResponse.java | 2 +- .../qubole/qds/sdk/java/entities/Schema.java | 4 +- .../java/entities/SchemaListDescribed.java | 2 +- .../qds/sdk/java/entities/SchemaOrdinal.java | 2 +- .../sdk/java/entities/SecuritySettings.java | 2 +- .../java/entities/SpotInstanceSettings.java | 2 +- .../qubole/qds/sdk/java/entities/State.java | 2 +- .../qubole/qds/sdk/java/entities/Status.java | 2 +- .../qds/sdk/java/entities/SubCommands.java | 4 +- .../entities/SubCommandsDeserializer.java | 16 +++--- .../sdk/java/entities/SuccessAndStatus.java | 2 +- .../sdk/java/entities/TableProperties.java | 2 +- .../sdk/java/entities/sparkjobserver/App.java | 2 +- .../java/entities/sparkjobserver/AppItem.java | 2 +- .../com/qubole/qds/sdk/java/TestClient.java | 5 +- .../qds/sdk/java/unittests/AbstractTest.java | 2 +- 74 files changed, 136 insertions(+), 91 deletions(-) diff --git a/pom.xml b/pom.xml index 50736891..a6fdefc0 100644 --- a/pom.xml +++ b/pom.xml @@ -57,10 +57,11 @@ UTF-8 UTF-8 - 2.5 - 16.0.1 - 6.8.8 - 1.7.9 + 2.26-b03 + 27.0-android + 2.9.7 + 6.14.3 + 1.10.77 @@ -76,6 +77,22 @@ ${jersey-version} + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + com.google.guava guava @@ -94,6 +111,13 @@ ${testng-version} test + + + org.apache.httpcomponents + httpclient + 4.5.6 + + @@ -103,10 +127,30 @@ maven-compiler-plugin 3.1 - 1.6 - 1.6 + 1.8 + 1.8 + + org.apache.maven.plugins + maven-assembly-plugin + 2.6 + + + jar-with-dependencies + + + + + + assemble-all + package + + single + + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/src/main/java/com/qubole/qds/sdk/java/details/AppBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/AppBuilderImpl.java index eea04156..ae0f85f7 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/AppBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/AppBuilderImpl.java @@ -17,7 +17,7 @@ import java.io.IOException; import java.util.Map; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.qubole.qds.sdk.java.api.sparkjobserver.AppBuilder; public class AppBuilderImpl implements AppBuilder diff --git a/src/main/java/com/qubole/qds/sdk/java/details/BaseCommandImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/BaseCommandImpl.java index 41d20139..ae230a3c 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/BaseCommandImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/BaseCommandImpl.java @@ -17,7 +17,7 @@ package com.qubole.qds.sdk.java.details; import com.qubole.qds.sdk.java.api.BaseCommand; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.io.IOException; diff --git a/src/main/java/com/qubole/qds/sdk/java/details/ClusterConfigBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/ClusterConfigBuilderImpl.java index a53f701b..c3412be8 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/ClusterConfigBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/ClusterConfigBuilderImpl.java @@ -22,7 +22,7 @@ import com.qubole.qds.sdk.java.api.ClusterPrestoConfigBuilder; import com.qubole.qds.sdk.java.api.ClusterSecurityConfigBuilder; import com.qubole.qds.sdk.java.api.ClusterSpotInstanceConfigBuilder; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/qubole/qds/sdk/java/details/CommandApiImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/CommandApiImpl.java index 71a544e3..6e663d1c 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/CommandApiImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/CommandApiImpl.java @@ -22,7 +22,7 @@ import com.qubole.qds.sdk.java.entities.CommandResponse; import com.qubole.qds.sdk.java.entities.Commands; import com.qubole.qds.sdk.java.entities.Status; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import javax.ws.rs.core.Response; diff --git a/src/main/java/com/qubole/qds/sdk/java/details/CommandBuilderImplBase.java b/src/main/java/com/qubole/qds/sdk/java/details/CommandBuilderImplBase.java index ac719705..248ffd08 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/CommandBuilderImplBase.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/CommandBuilderImplBase.java @@ -19,7 +19,7 @@ import com.qubole.qds.sdk.java.api.InvokableBuilder; import com.qubole.qds.sdk.java.client.QdsClient; import com.qubole.qds.sdk.java.entities.CommandResponse; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.io.IOException; abstract class CommandBuilderImplBase extends InvocationCallbackBase implements InvokableBuilder diff --git a/src/main/java/com/qubole/qds/sdk/java/details/CompositeCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/CompositeCommandBuilderImpl.java index 48d7016a..b41e0756 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/CompositeCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/CompositeCommandBuilderImpl.java @@ -19,7 +19,7 @@ import com.qubole.qds.sdk.java.api.CompositeCommandBuilder; import com.qubole.qds.sdk.java.api.BaseCommand; import com.qubole.qds.sdk.java.client.QdsClient; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.util.ArrayList; diff --git a/src/main/java/com/qubole/qds/sdk/java/details/CreateScheduleCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/CreateScheduleCommandBuilderImpl.java index dbbc1d0d..eb826f6b 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/CreateScheduleCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/CreateScheduleCommandBuilderImpl.java @@ -18,7 +18,7 @@ import com.qubole.qds.sdk.java.api.CreateScheduleCommandBuilder; import com.qubole.qds.sdk.java.entities.DependencyInfo; import com.qubole.qds.sdk.java.entities.ScheduleCommand; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/qubole/qds/sdk/java/details/DbAdvancedExportCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/DbAdvancedExportCommandBuilderImpl.java index d55371f7..a056114f 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/DbAdvancedExportCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/DbAdvancedExportCommandBuilderImpl.java @@ -18,7 +18,7 @@ import com.qubole.qds.sdk.java.api.BaseCommand; import com.qubole.qds.sdk.java.api.DbAdvancedExportCommandBuilder; import com.qubole.qds.sdk.java.client.QdsClient; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; class DbAdvancedExportCommandBuilderImpl extends CommandBuilderImplBase implements DbAdvancedExportCommandBuilder { diff --git a/src/main/java/com/qubole/qds/sdk/java/details/DbAdvancedImportCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/DbAdvancedImportCommandBuilderImpl.java index 9add1bda..ecf9c15b 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/DbAdvancedImportCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/DbAdvancedImportCommandBuilderImpl.java @@ -18,7 +18,7 @@ import com.qubole.qds.sdk.java.api.BaseCommand; import com.qubole.qds.sdk.java.api.DbAdvancedImportCommandBuilder; import com.qubole.qds.sdk.java.client.QdsClient; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; class DbAdvancedImportCommandBuilderImpl extends CommandBuilderImplBase implements DbAdvancedImportCommandBuilder { diff --git a/src/main/java/com/qubole/qds/sdk/java/details/DbSimpleExportCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/DbSimpleExportCommandBuilderImpl.java index e4b91fe7..24d375c4 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/DbSimpleExportCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/DbSimpleExportCommandBuilderImpl.java @@ -18,7 +18,7 @@ import com.qubole.qds.sdk.java.api.BaseCommand; import com.qubole.qds.sdk.java.api.DbSimpleExportCommandBuilder; import com.qubole.qds.sdk.java.client.QdsClient; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; class DbSimpleExportCommandBuilderImpl extends CommandBuilderImplBase implements DbSimpleExportCommandBuilder { diff --git a/src/main/java/com/qubole/qds/sdk/java/details/DbSimpleImportCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/DbSimpleImportCommandBuilderImpl.java index 222a0715..afa74ae4 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/DbSimpleImportCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/DbSimpleImportCommandBuilderImpl.java @@ -19,7 +19,7 @@ import com.qubole.qds.sdk.java.api.BaseCommand; import com.qubole.qds.sdk.java.api.DbSimpleImportCommandBuilder; import com.qubole.qds.sdk.java.client.QdsClient; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; class DbSimpleImportCommandBuilderImpl extends CommandBuilderImplBase implements DbSimpleImportCommandBuilder { diff --git a/src/main/java/com/qubole/qds/sdk/java/details/DbTapBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/DbTapBuilderImpl.java index 12db28f3..98a24886 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/DbTapBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/DbTapBuilderImpl.java @@ -16,7 +16,7 @@ package com.qubole.qds.sdk.java.details; import com.qubole.qds.sdk.java.api.DbTapBuilder; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.io.IOException; class DbTapBuilderImpl implements DbTapBuilder diff --git a/src/main/java/com/qubole/qds/sdk/java/details/HadoopCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/HadoopCommandBuilderImpl.java index c7ae1604..2ae279ca 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/HadoopCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/HadoopCommandBuilderImpl.java @@ -18,7 +18,7 @@ import com.qubole.qds.sdk.java.api.HadoopCommandBuilder; import com.qubole.qds.sdk.java.api.BaseCommand; import com.qubole.qds.sdk.java.client.QdsClient; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; class HadoopCommandBuilderImpl extends CommandBuilderImplBase implements HadoopCommandBuilder { diff --git a/src/main/java/com/qubole/qds/sdk/java/details/HiveCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/HiveCommandBuilderImpl.java index db87beaf..c7c3d54e 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/HiveCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/HiveCommandBuilderImpl.java @@ -18,7 +18,7 @@ import com.qubole.qds.sdk.java.api.HiveCommandBuilder; import com.qubole.qds.sdk.java.api.BaseCommand; import com.qubole.qds.sdk.java.client.QdsClient; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/qubole/qds/sdk/java/details/NotebookCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/NotebookCommandBuilderImpl.java index 584099b2..2fc21c09 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/NotebookCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/NotebookCommandBuilderImpl.java @@ -2,7 +2,7 @@ import java.util.Map; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.qubole.qds.sdk.java.api.BaseCommand; import com.qubole.qds.sdk.java.api.BaseCommand.COMMAND_TYPE; diff --git a/src/main/java/com/qubole/qds/sdk/java/details/PigCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/PigCommandBuilderImpl.java index 22f6ba76..8ebcd010 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/PigCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/PigCommandBuilderImpl.java @@ -18,7 +18,7 @@ import com.qubole.qds.sdk.java.api.BaseCommand; import com.qubole.qds.sdk.java.api.PigCommandBuilder; import com.qubole.qds.sdk.java.client.QdsClient; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.util.Map; class PigCommandBuilderImpl extends CommandBuilderImplBase implements PigCommandBuilder diff --git a/src/main/java/com/qubole/qds/sdk/java/details/PrestoCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/PrestoCommandBuilderImpl.java index c638a08a..3eae1886 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/PrestoCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/PrestoCommandBuilderImpl.java @@ -18,7 +18,7 @@ import com.qubole.qds.sdk.java.api.BaseCommand; import com.qubole.qds.sdk.java.api.PrestoCommandBuilder; import com.qubole.qds.sdk.java.client.QdsClient; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; class PrestoCommandBuilderImpl extends CommandBuilderImplBase implements PrestoCommandBuilder { diff --git a/src/main/java/com/qubole/qds/sdk/java/details/QdsClientImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/QdsClientImpl.java index f4a1c086..85c45fde 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/QdsClientImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/QdsClientImpl.java @@ -30,9 +30,9 @@ import com.qubole.qds.sdk.java.client.retry.RetryConnector; import com.qubole.qds.sdk.java.entities.SubCommands; import com.qubole.qds.sdk.java.entities.SubCommandsDeserializer; -import org.codehaus.jackson.Version; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.module.SimpleModule; +import com.fasterxml.jackson.core.Version; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; import javax.ws.rs.client.AsyncInvoker; import javax.ws.rs.client.Client; import javax.ws.rs.client.Entity; diff --git a/src/main/java/com/qubole/qds/sdk/java/details/ShellCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/ShellCommandBuilderImpl.java index 37bb6316..bb1fb766 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/ShellCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/ShellCommandBuilderImpl.java @@ -19,7 +19,7 @@ import com.qubole.qds.sdk.java.api.BaseCommand; import com.qubole.qds.sdk.java.api.ShellCommandBuilder; import com.qubole.qds.sdk.java.client.QdsClient; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.util.List; diff --git a/src/main/java/com/qubole/qds/sdk/java/details/SparkCommandBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/SparkCommandBuilderImpl.java index d5db4981..694503e8 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/SparkCommandBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/SparkCommandBuilderImpl.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.details; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.qubole.qds.sdk.java.api.BaseCommand.COMMAND_TYPE; import com.qubole.qds.sdk.java.api.BaseCommand; diff --git a/src/main/java/com/qubole/qds/sdk/java/details/StoreTablePropertiesBuilderImpl.java b/src/main/java/com/qubole/qds/sdk/java/details/StoreTablePropertiesBuilderImpl.java index fda77c28..e31e5f38 100644 --- a/src/main/java/com/qubole/qds/sdk/java/details/StoreTablePropertiesBuilderImpl.java +++ b/src/main/java/com/qubole/qds/sdk/java/details/StoreTablePropertiesBuilderImpl.java @@ -18,7 +18,7 @@ import com.qubole.qds.sdk.java.api.StoreTablePropertiesBuilder; import com.qubole.qds.sdk.java.client.QdsClient; import com.qubole.qds.sdk.java.entities.Status; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.util.Map; class StoreTablePropertiesBuilderImpl extends InvocationCallbackBase implements StoreTablePropertiesBuilder diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/Account.java b/src/main/java/com/qubole/qds/sdk/java/entities/Account.java index 2341bf19..5ea33642 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/Account.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/Account.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Account diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/AccountCredentials.java b/src/main/java/com/qubole/qds/sdk/java/entities/AccountCredentials.java index da03d2bf..f6c01528 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/AccountCredentials.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/AccountCredentials.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class AccountCredentials diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/AddNode.java b/src/main/java/com/qubole/qds/sdk/java/entities/AddNode.java index 14d1e97b..dbc16c7c 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/AddNode.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/AddNode.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class AddNode diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/AllCommandsReport.java b/src/main/java/com/qubole/qds/sdk/java/entities/AllCommandsReport.java index e62c4248..2a38863a 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/AllCommandsReport.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/AllCommandsReport.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/CanonicalHiveCommandsReport.java b/src/main/java/com/qubole/qds/sdk/java/entities/CanonicalHiveCommandsReport.java index 40b9944b..22aaa1a7 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/CanonicalHiveCommandsReport.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/CanonicalHiveCommandsReport.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/CanonicalQuery.java b/src/main/java/com/qubole/qds/sdk/java/entities/CanonicalQuery.java index 1cd6c7c8..25947c05 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/CanonicalQuery.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/CanonicalQuery.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class CanonicalQuery diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/Cluster.java b/src/main/java/com/qubole/qds/sdk/java/entities/Cluster.java index b38e15d4..aecf9f0a 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/Cluster.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/Cluster.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/ClusterItem.java b/src/main/java/com/qubole/qds/sdk/java/entities/ClusterItem.java index f27b03e2..c18e6ccf 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/ClusterItem.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/ClusterItem.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class ClusterItem diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/ClusterMetrics.java b/src/main/java/com/qubole/qds/sdk/java/entities/ClusterMetrics.java index 5b3b3706..48285f9e 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/ClusterMetrics.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/ClusterMetrics.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class ClusterMetrics { diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/ClusterNode.java b/src/main/java/com/qubole/qds/sdk/java/entities/ClusterNode.java index 3ab5e639..b938baae 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/ClusterNode.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/ClusterNode.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class ClusterNode diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/ClusterNodeOld.java b/src/main/java/com/qubole/qds/sdk/java/entities/ClusterNodeOld.java index 88063907..19f8c214 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/ClusterNodeOld.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/ClusterNodeOld.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class ClusterNodeOld diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/ClusterState.java b/src/main/java/com/qubole/qds/sdk/java/entities/ClusterState.java index aa63f2bd..257992fd 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/ClusterState.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/ClusterState.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/Command.java b/src/main/java/com/qubole/qds/sdk/java/entities/Command.java index 8db3d339..6ead11b9 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/Command.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/Command.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Command diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/CommandMetaData.java b/src/main/java/com/qubole/qds/sdk/java/entities/CommandMetaData.java index 00f180e1..1022f588 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/CommandMetaData.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/CommandMetaData.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class CommandMetaData diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/CommandResponse.java b/src/main/java/com/qubole/qds/sdk/java/entities/CommandResponse.java index e4ec8464..b6e54e84 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/CommandResponse.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/CommandResponse.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.Map; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/Commands.java b/src/main/java/com/qubole/qds/sdk/java/entities/Commands.java index 0ab566cf..76608339 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/Commands.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/Commands.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/DbTap.java b/src/main/java/com/qubole/qds/sdk/java/entities/DbTap.java index 0657502f..4d3df1cb 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/DbTap.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/DbTap.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class DbTap diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/DbTapList.java b/src/main/java/com/qubole/qds/sdk/java/entities/DbTapList.java index c940addc..2bfa8022 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/DbTapList.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/DbTapList.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/DependencyInfo.java b/src/main/java/com/qubole/qds/sdk/java/entities/DependencyInfo.java index 17a049ba..0831fd0f 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/DependencyInfo.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/DependencyInfo.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/Ec2Settings.java b/src/main/java/com/qubole/qds/sdk/java/entities/Ec2Settings.java index 3275d73d..6238a839 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/Ec2Settings.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/Ec2Settings.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Ec2Settings diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/FairSchedulerSettings.java b/src/main/java/com/qubole/qds/sdk/java/entities/FairSchedulerSettings.java index afda2b29..3a3bc2e8 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/FairSchedulerSettings.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/FairSchedulerSettings.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class FairSchedulerSettings diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/HadoopSettings.java b/src/main/java/com/qubole/qds/sdk/java/entities/HadoopSettings.java index ff6e15df..03e2df6d 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/HadoopSettings.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/HadoopSettings.java @@ -16,7 +16,7 @@ package com.qubole.qds.sdk.java.entities; import java.util.Map; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class HadoopSettings diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/HiveTable.java b/src/main/java/com/qubole/qds/sdk/java/entities/HiveTable.java index 3ff8294a..b68b78d9 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/HiveTable.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/HiveTable.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/Interval.java b/src/main/java/com/qubole/qds/sdk/java/entities/Interval.java index d03f3947..25bd298a 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/Interval.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/Interval.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Interval diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/Message.java b/src/main/java/com/qubole/qds/sdk/java/entities/Message.java index 924ecac7..dd9f726b 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/Message.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/Message.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Message diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/NameAndType.java b/src/main/java/com/qubole/qds/sdk/java/entities/NameAndType.java index 85107197..9e1f24f0 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/NameAndType.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/NameAndType.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class NameAndType diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/NameTypePosition.java b/src/main/java/com/qubole/qds/sdk/java/entities/NameTypePosition.java index d5f4ff9d..058bbb44 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/NameTypePosition.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/NameTypePosition.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class NameTypePosition extends NameAndType { diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/NodeOperation.java b/src/main/java/com/qubole/qds/sdk/java/entities/NodeOperation.java index ab7ecb2c..8c8d4631 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/NodeOperation.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/NodeOperation.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class NodeOperation diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/Notebook.java b/src/main/java/com/qubole/qds/sdk/java/entities/Notebook.java index 57340663..b002f90e 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/Notebook.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/Notebook.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/NotebookResult.java b/src/main/java/com/qubole/qds/sdk/java/entities/NotebookResult.java index cf5f7623..5117fc95 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/NotebookResult.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/NotebookResult.java @@ -1,6 +1,6 @@ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/PagingInfo.java b/src/main/java/com/qubole/qds/sdk/java/entities/PagingInfo.java index b12a246a..e5d8d243 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/PagingInfo.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/PagingInfo.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class PagingInfo diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/PrestoSettings.java b/src/main/java/com/qubole/qds/sdk/java/entities/PrestoSettings.java index 89c66c2f..0a354741 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/PrestoSettings.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/PrestoSettings.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class PrestoSettings diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/Query.java b/src/main/java/com/qubole/qds/sdk/java/entities/Query.java index c546f173..da4ebfa7 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/Query.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/Query.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Query diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/ResultValue.java b/src/main/java/com/qubole/qds/sdk/java/entities/ResultValue.java index 52ce05f5..326f6a75 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/ResultValue.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/ResultValue.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/Schedule.java b/src/main/java/com/qubole/qds/sdk/java/entities/Schedule.java index 1deddb64..2d96d925 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/Schedule.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/Schedule.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/ScheduleCommand.java b/src/main/java/com/qubole/qds/sdk/java/entities/ScheduleCommand.java index d1e8721a..d499b70f 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/ScheduleCommand.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/ScheduleCommand.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class ScheduleCommand diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/SchedulesResponse.java b/src/main/java/com/qubole/qds/sdk/java/entities/SchedulesResponse.java index 7b973e4a..605983c5 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/SchedulesResponse.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/SchedulesResponse.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/Schema.java b/src/main/java/com/qubole/qds/sdk/java/entities/Schema.java index e6b6650c..6d9e8cad 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/Schema.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/Schema.java @@ -15,8 +15,8 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonAnySetter; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/SchemaListDescribed.java b/src/main/java/com/qubole/qds/sdk/java/entities/SchemaListDescribed.java index 4b4981f3..b4ad11db 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/SchemaListDescribed.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/SchemaListDescribed.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/SchemaOrdinal.java b/src/main/java/com/qubole/qds/sdk/java/entities/SchemaOrdinal.java index f2d541d0..3a779f35 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/SchemaOrdinal.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/SchemaOrdinal.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/SecuritySettings.java b/src/main/java/com/qubole/qds/sdk/java/entities/SecuritySettings.java index 75699c41..4082fae4 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/SecuritySettings.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/SecuritySettings.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class SecuritySettings diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/SpotInstanceSettings.java b/src/main/java/com/qubole/qds/sdk/java/entities/SpotInstanceSettings.java index 4a6013ef..35c333f0 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/SpotInstanceSettings.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/SpotInstanceSettings.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class SpotInstanceSettings diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/State.java b/src/main/java/com/qubole/qds/sdk/java/entities/State.java index 6ccfc27e..80ce6766 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/State.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/State.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class State diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/Status.java b/src/main/java/com/qubole/qds/sdk/java/entities/Status.java index 23ae42c6..4aee1aea 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/Status.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/Status.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Status diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/SubCommands.java b/src/main/java/com/qubole/qds/sdk/java/entities/SubCommands.java index 4b851253..3a976b57 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/SubCommands.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/SubCommands.java @@ -16,8 +16,8 @@ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonDeserialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.HashMap; diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/SubCommandsDeserializer.java b/src/main/java/com/qubole/qds/sdk/java/entities/SubCommandsDeserializer.java index ebc45660..7cee03fe 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/SubCommandsDeserializer.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/SubCommandsDeserializer.java @@ -16,11 +16,11 @@ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.map.DeserializationContext; -import org.codehaus.jackson.map.JsonDeserializer; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.Iterator; @@ -51,21 +51,21 @@ public SubCommands deserialize(JsonParser jp, DeserializationContext ctxt) // or it can have an array with tag sub_commands // which will have Command objects for all the sub commands Iterator> elementsIterator = - node.getFields(); + node.fields(); while (elementsIterator.hasNext()) { Map.Entry element = elementsIterator.next(); String name = element.getKey(); JsonNode val = element.getValue(); if (name.equalsIgnoreCase("sub_commands")) { - Command[] subCommands = mapper.readValue(val, Command[].class); + Command[] subCommands = mapper.readValue(jp, Command[].class); if (subCommands != null) { compositeCommand.setsub_commands(subCommands); } } else { // put it in hash map as earlier - compositeCommand.put(name, val.getTextValue()); + compositeCommand.put(name, val.textValue()); } } return compositeCommand; diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/SuccessAndStatus.java b/src/main/java/com/qubole/qds/sdk/java/entities/SuccessAndStatus.java index 3de477a3..89599e1b 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/SuccessAndStatus.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/SuccessAndStatus.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class SuccessAndStatus diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/TableProperties.java b/src/main/java/com/qubole/qds/sdk/java/entities/TableProperties.java index b762173d..a047b0df 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/TableProperties.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/TableProperties.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/sparkjobserver/App.java b/src/main/java/com/qubole/qds/sdk/java/entities/sparkjobserver/App.java index d67ce8eb..2f9d0d7a 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/sparkjobserver/App.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/sparkjobserver/App.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities.sparkjobserver; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class App diff --git a/src/main/java/com/qubole/qds/sdk/java/entities/sparkjobserver/AppItem.java b/src/main/java/com/qubole/qds/sdk/java/entities/sparkjobserver/AppItem.java index 98aaaa25..e27469f0 100644 --- a/src/main/java/com/qubole/qds/sdk/java/entities/sparkjobserver/AppItem.java +++ b/src/main/java/com/qubole/qds/sdk/java/entities/sparkjobserver/AppItem.java @@ -15,7 +15,7 @@ */ package com.qubole.qds.sdk.java.entities.sparkjobserver; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class AppItem diff --git a/src/test/java/com/qubole/qds/sdk/java/TestClient.java b/src/test/java/com/qubole/qds/sdk/java/TestClient.java index e53dcf98..bde21822 100644 --- a/src/test/java/com/qubole/qds/sdk/java/TestClient.java +++ b/src/test/java/com/qubole/qds/sdk/java/TestClient.java @@ -20,6 +20,7 @@ import com.qubole.qds.sdk.java.details.RequestDetails; import com.qubole.qds.sdk.java.details.ForPage; import com.qubole.qds.sdk.java.details.QdsClientImpl; +import org.apache.http.client.utils.URIBuilder; import org.testng.Assert; import org.testng.annotations.Test; import javax.ws.rs.client.AsyncInvoker; @@ -100,10 +101,10 @@ protected WebTarget prepareTarget(ForPage forPage, RequestDetails entity, String client.command().startDate(startDate).endDate(endDate).allUsers(allUsers).includeQueryProperties(qProps).history().invoke(); WebTarget webTarget = webTargetReference.get(); Assert.assertNotNull(webTarget); - Assert.assertTrue(webTarget.getUri().toString().contains("end_date="+endDate)); + Assert.assertTrue(webTarget.getUri().toString().contains("end_date="+endDate.replaceAll(":", "%3A"))); Assert.assertTrue(webTarget.getUri().toString().contains("include_query_properties="+qProps)); Assert.assertTrue(webTarget.getUri().toString().contains("all_users="+0)); - Assert.assertTrue(webTarget.getUri().toString().contains("start_date="+startDate)); + Assert.assertTrue(webTarget.getUri().toString().contains("start_date="+startDate.replaceAll(":", "%3A"))); } diff --git a/src/test/java/com/qubole/qds/sdk/java/unittests/AbstractTest.java b/src/test/java/com/qubole/qds/sdk/java/unittests/AbstractTest.java index 8b9969fd..43d20fcd 100644 --- a/src/test/java/com/qubole/qds/sdk/java/unittests/AbstractTest.java +++ b/src/test/java/com/qubole/qds/sdk/java/unittests/AbstractTest.java @@ -16,7 +16,7 @@ package com.qubole.qds.sdk.java.unittests; import java.util.Map; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.testng.Assert; import org.testng.annotations.BeforeClass; import com.amazonaws.util.json.JSONObject; From b42becef2d01fd42eec02a5a8f3b5194c2707cf0 Mon Sep 17 00:00:00 2001 From: abhijitjaiswal Date: Mon, 14 Jan 2019 12:45:35 +0530 Subject: [PATCH 5/6] Preparing for release 1.0.0 --- README.md | 2 +- examples/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 726ed46d..daea95d9 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The SDK is available in The Central Repository. To use the SDK, add the followin com.qubole.qds-sdk-java qds-sdk-java - 0.9.4 + 1.0.0 ``` diff --git a/examples/pom.xml b/examples/pom.xml index b4c70378..260f7cdf 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -16,7 +16,7 @@ com.qubole.qds-sdk-java qds-sdk-java - 0.9.4 + 1.0.0 diff --git a/pom.xml b/pom.xml index a6fdefc0..5539da80 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.qubole.qds-sdk-java qds-sdk-java Qubole Data Service Java SDK - 0.9.4-snapshot + 1.0.0 A Java library that provides the tools you need to authenticate with, and use the Qubole Data Service API. From c652374075c7b72071f73db960f5f3a43f922afd Mon Sep 17 00:00:00 2001 From: abhijitjaiswal Date: Mon, 14 Jan 2019 13:16:56 +0530 Subject: [PATCH 6/6] Added -snapshot to the release version --- examples/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 260f7cdf..3ec56c1d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -16,7 +16,7 @@ com.qubole.qds-sdk-java qds-sdk-java - 1.0.0 + 1.0.0-snapshot diff --git a/pom.xml b/pom.xml index 5539da80..c75ac20a 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.qubole.qds-sdk-java qds-sdk-java Qubole Data Service Java SDK - 1.0.0 + 1.0.0-snapshot A Java library that provides the tools you need to authenticate with, and use the Qubole Data Service API.