code fix

ashah-splunk · ashah-splunk · commit ce4631bddead · 2022-11-30T17:04:13.000+05:30
re-fetch version and InstanceType if null
diff --git a/splunk/src/main/java/com/splunk/Service.java b/splunk/src/main/java/com/splunk/Service.java
@@ -1356,6 +1356,9 @@ public void setBearerToken(String value) {
 
 
     public boolean enableV2SearchApi(){
+        if(null == this.instanceType){
+            this.instanceType = this.getInfo().getInstanceType();
+        }
         if(this.instanceType.equalsIgnoreCase("cloud")) {
             return versionIsAtLeast("9.0.2209");
         }else{
@@ -1411,6 +1414,9 @@ boolean versionIsEarlierThan(String version) {
      *         or 1 if this version is greater than the given version.
      */
     public int versionCompare(String otherVersion) {
+        if(null == this.version){
+            this.version = this.getInfo().getVersion();
+        }
         String[] components1 = this.version.split("\\.");
         String[] components2 = otherVersion.split("\\.");
         int numComponents = Math.max(components1.length, components2.length);
diff --git a/splunk/src/test/java/com/splunk/ServiceTest.java b/splunk/src/test/java/com/splunk/ServiceTest.java
@@ -735,4 +735,19 @@ public void testEnableV2Api(){
         }
     }
 
+    /*
+    Test when Service instance is created using token, it doesn't result in Null Pointer while accessing instanceType and version
+     */
+    @Test
+    public void testServiceWithTokenAuth(){
+        Service newService = new Service(service.getHost());
+        newService.setToken(service.getToken());
+        try{
+            newService.enableV2SearchApi();
+            newService.versionCompare("9.0.2");
+        }catch (Exception ex){
+            Assert.assertNull(ex);
+        }
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -735,4 +735,19 @@ public void testEnableV2Api(){`
`735`	`735`	`}`
`736`	`736`	`}`
`737`	`737`
	`738`	`+ /*`
	`739`	`+ Test when Service instance is created using token, it doesn't result in Null Pointer while accessing instanceType and version`
	`740`	`+ */`
	`741`	`+ @Test`
	`742`	`+ public void testServiceWithTokenAuth(){`
	`743`	`+ Service newService = new Service(service.getHost());`
	`744`	`+ newService.setToken(service.getToken());`
	`745`	`+ try{`
	`746`	`+ newService.enableV2SearchApi();`
	`747`	`+ newService.versionCompare("9.0.2");`
	`748`	`+ }catch (Exception ex){`
	`749`	`+ Assert.assertNull(ex);`
	`750`	`+ }`
	`751`	`+ }`
	`752`	`+`
`738`	`753`	`}`