Merge pull request #193 from splunk/revert-v2-changes

Updated version checks to enable v2 search APIs

Author: ashah-splunk

splunk/src/main/java/com/splunk/Job.java

@@ -372,15 +372,15 @@ private InputStream getEventsMethod(String methodPath, Map args) {
         // v1(GET), v2(POST)
         String fullPath;
         ResponseMessage response;
-        if (service.versionIsEarlierThan("9.0")) {
+        if (!service.enableV2SearchApi()) {
             fullPath = path.replace(JobCollection.REST_PATH_V2, JobCollection.REST_PATH) + methodPath;
             response = service.get(fullPath, args);
         }
         else {
             fullPath = path.replace(JobCollection.REST_PATH, JobCollection.REST_PATH_V2) + methodPath;
             response = service.post(fullPath, args);
         }
-
+        
         return response.getContent();
     }
 

splunk/src/main/java/com/splunk/JobCollection.java

@@ -34,7 +34,7 @@ public class JobCollection extends EntityCollection<Job> {
      * @param service The connected {@code Service} instance.
      */
     JobCollection(Service service) {
-        super(service, service.versionIsAtLeast("9.0") ? REST_PATH_V2 : REST_PATH, Job.class);
+        super(service, service.enableV2SearchApi() ? REST_PATH_V2 : REST_PATH, Job.class);
         this.refreshArgs.put("count", "0");
     }
 
@@ -46,7 +46,7 @@ public class JobCollection extends EntityCollection<Job> {
      * return and how to sort them (see {@link CollectionArgs}).
      */
     JobCollection(Service service, Args args) {
-        super(service, service.versionIsAtLeast("9.0") ? REST_PATH_V2 : REST_PATH, Job.class, args);
+        super(service, service.enableV2SearchApi() ? REST_PATH_V2 : REST_PATH, Job.class);
         this.refreshArgs.put("count", "0");
     }
 
@@ -87,7 +87,7 @@ public Job create(String query, Map args) {
             .item(0)
             .getTextContent();
 
-        String path = service.versionIsAtLeast("9.0") ? REST_PATH_V2 : REST_PATH;
+        String path = service.enableV2SearchApi() ? REST_PATH_V2 : REST_PATH;
         Job job = new Job(service, path + "/" + sid);
         job.refresh();
 

splunk/src/main/java/com/splunk/Service.java

@@ -66,6 +66,9 @@ public class Service extends BaseService {
     /** The version of this Splunk instance, once logged in. */
     public String version = null;
 
+    /** The type of this Splunk instance, once logged in. */
+    public String instanceType = null;
+
     /** The default host name, which is used when a host name is not provided.*/
     public static String DEFAULT_HOST = "localhost";
 
@@ -225,7 +228,7 @@ public InputStream export(String search, Map args) {
         }
         ResponseMessage response;
 
-        if (versionIsAtLeast("9.0"))
+        if(enableV2SearchApi())
             response = post(JobCollection.REST_PATH_V2 + "/export", args);
         else {
             response = post(JobCollection.REST_PATH + "/export", args);
@@ -1147,6 +1150,7 @@ public Service login(String username, String password) {
             .getTextContent();
         this.token = "Splunk " + sessionKey;
         this.version = this.getInfo().getVersion();
+        this.instanceType = this.getInfo().getInstanceType();
         if (versionCompare("4.3") >= 0)
             this.passwordEndPoint = "storage/passwords";
 
@@ -1258,7 +1262,7 @@ public ResponseMessage parse(String query) {
     public ResponseMessage parse(String query, Map args) {
         args = Args.create(args).add("q", query);
 
-        if (versionIsAtLeast("9.0"))
+        if(enableV2SearchApi())
             return post("search/v2/parser", args);
         else
             return get("search/parser", args);
@@ -1350,6 +1354,15 @@ public void setBearerToken(String value) {
         this.token = value.contains("Splunk") || value.contains("Bearer") ? value : "Bearer " + value;
     }
 
+
+    public boolean enableV2SearchApi(){
+        if(this.instanceType.equalsIgnoreCase("cloud")) {
+            return versionIsAtLeast("9.0.2209");
+        }else{
+            return versionIsAtLeast("9.0.2");
+        }
+    }
+
     /**
      * Returns true if this Splunk instance's version is no earlier than
      * the version specified in {@code version}.

splunk/src/main/java/com/splunk/ServiceInfo.java

@@ -155,6 +155,8 @@ public String getVersion() {
         return getString("version");
     }
 
+    public String getInstanceType() {return  getString("instance_type", "");}
+
     /**
      * Indicates whether this Splunk instance is running under a free license.
      *

splunk/src/test/java/com/splunk/ServiceTest.java

@@ -715,4 +715,24 @@ public void testPost() {
         Assert.assertTrue(firstLineIsXmlDtd(response.getContent()));
     }
 
+    /*
+    Test whether the V2 and V1 Search APIs are switched properly based on the Type of Splunk Instance and Version.
+     */
+    @Test
+    public void testEnableV2Api(){
+        if(service.instanceType.equalsIgnoreCase("cloud")) {
+            if(service.versionIsEarlierThan("9.0.2209")){
+                Assert.assertFalse(service.enableV2SearchApi());
+            }else{
+                Assert.assertTrue(service.enableV2SearchApi());
+            }
+        }else{
+            if(service.versionIsEarlierThan("9.0.2")){
+                Assert.assertFalse(service.enableV2SearchApi());
+            }else{
+                Assert.assertTrue(service.enableV2SearchApi());
+            }
+        }
+    }
+
 }