From 5ccfc9b28c7bfc47ea0329d89609fc86328db552 Mon Sep 17 00:00:00 2001 From: Abhi Shah Date: Fri, 27 Oct 2023 17:23:51 +0530 Subject: [PATCH] Sonarlint fixes --- splunk/src/main/java/com/splunk/AtomFeed.java | 1 - splunk/src/main/java/com/splunk/CollectionArgs.java | 4 ++-- splunk/src/main/java/com/splunk/Command.java | 5 +++-- splunk/src/main/java/com/splunk/DataModel.java | 4 ++-- splunk/src/main/java/com/splunk/DataModelField.java | 2 +- splunk/src/main/java/com/splunk/FieldType.java | 2 +- splunk/src/main/java/com/splunk/ResultsReader.java | 3 +-- .../main/java/com/splunk/modularinput/Argument.java | 2 +- .../main/java/com/splunk/modularinput/EventWriter.java | 6 ++++-- .../src/main/java/com/splunk/modularinput/Scheme.java | 2 +- splunk/src/test/java/com/splunk/ApplicationTest.java | 4 ++-- splunk/src/test/java/com/splunk/EntityTest.java | 2 +- splunk/src/test/java/com/splunk/HttpServiceTest.java | 6 +++--- splunk/src/test/java/com/splunk/IndexTest.java | 2 +- splunk/src/test/java/com/splunk/InputCrudTest.java | 2 +- splunk/src/test/java/com/splunk/NamespaceTest.java | 8 ++------ splunk/src/test/java/com/splunk/OutputDefaultTest.java | 2 +- splunk/src/test/java/com/splunk/PasswordTest.java | 4 ++-- splunk/src/test/java/com/splunk/ResultsReaderTest.java | 8 ++++---- splunk/src/test/java/com/splunk/SavedSearchTest.java | 6 +++--- splunk/src/test/java/com/splunk/SearchJobTest.java | 10 +++++----- splunk/src/test/java/com/splunk/ServiceTest.java | 4 ++-- 22 files changed, 43 insertions(+), 46 deletions(-) diff --git a/splunk/src/main/java/com/splunk/AtomFeed.java b/splunk/src/main/java/com/splunk/AtomFeed.java index 2cacb86e..3de9b75c 100644 --- a/splunk/src/main/java/com/splunk/AtomFeed.java +++ b/splunk/src/main/java/com/splunk/AtomFeed.java @@ -20,7 +20,6 @@ import java.util.*; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamConstants; /** * The {@code AtomFeed} class represents an Atom feed. diff --git a/splunk/src/main/java/com/splunk/CollectionArgs.java b/splunk/src/main/java/com/splunk/CollectionArgs.java index d9c32b2f..741ad4d3 100644 --- a/splunk/src/main/java/com/splunk/CollectionArgs.java +++ b/splunk/src/main/java/com/splunk/CollectionArgs.java @@ -26,7 +26,7 @@ public class CollectionArgs extends Args { /** * Indicates whether to sort entries in ascending or descending order. */ - public static enum SortDirection { + public enum SortDirection { /** Sort entries in ascending order. */ ASC("asc"), /** Sort entries in descending order. */ @@ -49,7 +49,7 @@ public String toString() { /** * Indicates the sorting mode for entries. */ - public static enum SortMode { + public enum SortMode { /** * If all values of the field are numbers, collate numerically. * Otherwise, collate alphabetically. diff --git a/splunk/src/main/java/com/splunk/Command.java b/splunk/src/main/java/com/splunk/Command.java index c37a8d03..aaee5d9c 100644 --- a/splunk/src/main/java/com/splunk/Command.java +++ b/splunk/src/main/java/com/splunk/Command.java @@ -18,7 +18,6 @@ import java.io.BufferedReader; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; @@ -190,7 +189,9 @@ else if (type == Integer.class) { java.lang.reflect.Field field = this.getClass().getField(name); field.set(this, value); } - catch (NoSuchFieldException e) { continue; } + catch (NoSuchFieldException e) { + continue; + } catch (IllegalAccessException e) { throw new RuntimeException(e.getMessage(), e); } diff --git a/splunk/src/main/java/com/splunk/DataModel.java b/splunk/src/main/java/com/splunk/DataModel.java index 028e13e3..82a4c13b 100644 --- a/splunk/src/main/java/com/splunk/DataModel.java +++ b/splunk/src/main/java/com/splunk/DataModel.java @@ -28,8 +28,8 @@ * data model objects, which specify structured views on Splunk data. */ public class DataModel extends Entity { - private final static JsonParser jsonParser = new JsonParser(); - private final static Gson gson = new Gson(); + private static final JsonParser jsonParser = new JsonParser(); + private static final Gson gson = new Gson(); private static final String ACCELERATION_LABEL = "acceleration"; private static final String MODEL_NAME_LABEL = "modelName"; diff --git a/splunk/src/main/java/com/splunk/DataModelField.java b/splunk/src/main/java/com/splunk/DataModelField.java index d83dca1c..3487f80e 100644 --- a/splunk/src/main/java/com/splunk/DataModelField.java +++ b/splunk/src/main/java/com/splunk/DataModelField.java @@ -44,7 +44,7 @@ private DataModelField() {} /** * @return The name of this field. */ - public String getName() { return this.name; }; + public String getName() { return this.name; } /** * Return the name of the data model object on which this field is defined. That need not diff --git a/splunk/src/main/java/com/splunk/FieldType.java b/splunk/src/main/java/com/splunk/FieldType.java index e6bc6b2c..ff0253b0 100644 --- a/splunk/src/main/java/com/splunk/FieldType.java +++ b/splunk/src/main/java/com/splunk/FieldType.java @@ -50,7 +50,7 @@ public String toString() { } }; - private final static Map typeLookup = new HashMap<>() {{ + private static final Map typeLookup = new HashMap<>() {{ put("string", STRING); put("number", NUMBER); put("boolean", BOOLEAN); diff --git a/splunk/src/main/java/com/splunk/ResultsReader.java b/splunk/src/main/java/com/splunk/ResultsReader.java index d2c60777..a0f8a8eb 100644 --- a/splunk/src/main/java/com/splunk/ResultsReader.java +++ b/splunk/src/main/java/com/splunk/ResultsReader.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.util.Iterator; /** @@ -60,7 +59,7 @@ public void close() throws IOException { * {@link Event} class to interpret multi-item values. * @throws IOException On IO exception. */ - final public Event getNextEvent() throws IOException { + public final Event getNextEvent() throws IOException { return getNextElement(); } diff --git a/splunk/src/main/java/com/splunk/modularinput/Argument.java b/splunk/src/main/java/com/splunk/modularinput/Argument.java index 1a171a60..88b4b776 100755 --- a/splunk/src/main/java/com/splunk/modularinput/Argument.java +++ b/splunk/src/main/java/com/splunk/modularinput/Argument.java @@ -31,7 +31,7 @@ public class Argument { private static DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); - public enum DataType { BOOLEAN, NUMBER, STRING }; + public enum DataType { BOOLEAN, NUMBER, STRING } // Name used to identify this argument in Splunk. protected String name; diff --git a/splunk/src/main/java/com/splunk/modularinput/EventWriter.java b/splunk/src/main/java/com/splunk/modularinput/EventWriter.java index c6ce3425..3a8f9449 100755 --- a/splunk/src/main/java/com/splunk/modularinput/EventWriter.java +++ b/splunk/src/main/java/com/splunk/modularinput/EventWriter.java @@ -21,11 +21,13 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import javax.xml.transform.*; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import java.io.*; -import java.util.logging.Level; /** * The {@code EventWriter} class encapsulates writing events and error messages to Splunk from a modular input. diff --git a/splunk/src/main/java/com/splunk/modularinput/Scheme.java b/splunk/src/main/java/com/splunk/modularinput/Scheme.java index dbc99ce6..1ef388b1 100644 --- a/splunk/src/main/java/com/splunk/modularinput/Scheme.java +++ b/splunk/src/main/java/com/splunk/modularinput/Scheme.java @@ -37,7 +37,7 @@ public class Scheme { private static DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); - public enum StreamingMode { SIMPLE, XML }; + public enum StreamingMode { SIMPLE, XML } // Name of this module input kind. title will be used as the URL scheme when // specifying particular modular inputs. For example, if title is "abc", diff --git a/splunk/src/test/java/com/splunk/ApplicationTest.java b/splunk/src/test/java/com/splunk/ApplicationTest.java index 80c5b1d9..4094d09f 100644 --- a/splunk/src/test/java/com/splunk/ApplicationTest.java +++ b/splunk/src/test/java/com/splunk/ApplicationTest.java @@ -95,7 +95,7 @@ public void testForSetupPresent() throws Exception { new ByteArrayInputStream(setupXml.getBytes("UTF-8"))); parsedSetupXml.getDocumentElement().normalize(); - Assert.assertEquals(parsedSetupXml.getDocumentElement().getNodeName(), "SetupInfo"); + Assert.assertEquals("SetupInfo", parsedSetupXml.getDocumentElement().getNodeName()); NodeList blocks = parsedSetupXml.getDocumentElement().getElementsByTagName("block"); Assert.assertEquals(1, blocks.getLength()); @@ -113,7 +113,7 @@ public void testArchive() { Assert.assertTrue(filePath.endsWith(applicationName + ".spl")); } Assert.assertFalse(archive.getRefresh()); - Assert.assertTrue(archive.getUrl() != null); + Assert.assertNotNull(archive.getUrl()); } @Test diff --git a/splunk/src/test/java/com/splunk/EntityTest.java b/splunk/src/test/java/com/splunk/EntityTest.java index 4760685f..5eaa2063 100644 --- a/splunk/src/test/java/com/splunk/EntityTest.java +++ b/splunk/src/test/java/com/splunk/EntityTest.java @@ -112,6 +112,6 @@ public void testResourceCollection() { Assert.assertTrue(indexes.equals(indexes.items)); Assert.assertTrue(indexes.hashCode() != 0); Assert.assertTrue(indexes.keySet().contains("main")); - Assert.assertTrue(indexes.valueSize("main") == 1); + Assert.assertEquals(1, indexes.valueSize("main")); } } diff --git a/splunk/src/test/java/com/splunk/HttpServiceTest.java b/splunk/src/test/java/com/splunk/HttpServiceTest.java index 199f7863..231d4842 100644 --- a/splunk/src/test/java/com/splunk/HttpServiceTest.java +++ b/splunk/src/test/java/com/splunk/HttpServiceTest.java @@ -85,7 +85,7 @@ public void testRequestMessage() { Assert.assertTrue(request.checkMethod(request.getMethod())); request.setMethod("POST"); Assert.assertTrue(request.checkMethod(request.getMethod())); - Assert.assertEquals(request.getMethod(), "POST"); + Assert.assertEquals("POST", request.getMethod()); ByteArrayOutputStream stream = new ByteArrayOutputStream(); try { @@ -102,8 +102,8 @@ public void testRequestMessage() { @Test public void testResponseMessage() { ResponseMessage response = new ResponseMessage(200); - Assert.assertEquals(response.getStatus(), 200); - Assert.assertTrue(response.getHeader() != null); + Assert.assertEquals(200, response.getStatus()); + Assert.assertNotNull(response.getHeader()); } @Test(expected = IllegalArgumentException.class) diff --git a/splunk/src/test/java/com/splunk/IndexTest.java b/splunk/src/test/java/com/splunk/IndexTest.java index cd6f06a8..00e9696f 100644 --- a/splunk/src/test/java/com/splunk/IndexTest.java +++ b/splunk/src/test/java/com/splunk/IndexTest.java @@ -757,7 +757,7 @@ public void testUploadArgsFailure() throws Exception{ Assert.fail("Uploading to an index with an index argument? No need for redundancy!"); } catch(Exception e){ - Assert.assertEquals(e.getMessage(), "The 'index' parameter cannot be passed to an index's oneshot upload."); + Assert.assertEquals("The 'index' parameter cannot be passed to an index's oneshot upload.", e.getMessage()); } } diff --git a/splunk/src/test/java/com/splunk/InputCrudTest.java b/splunk/src/test/java/com/splunk/InputCrudTest.java index d0d3a1f7..79d7a0b0 100644 --- a/splunk/src/test/java/com/splunk/InputCrudTest.java +++ b/splunk/src/test/java/com/splunk/InputCrudTest.java @@ -521,7 +521,7 @@ public void testWindowsPerfmonInputCrud() { Assert.assertEquals(1, windowsPerfmonInput.getCounters().length); Assert.assertTrue(contains(windowsPerfmonInput.getCounters(), "% Privileged Time")); - Assert.assertEquals(windowsPerfmonInput.getIndex(), "main"); + Assert.assertEquals("main", windowsPerfmonInput.getIndex()); Assert.assertTrue(contains(windowsPerfmonInput.getInstances(), "wininit")); Assert.assertEquals(1200, windowsPerfmonInput.getInterval()); Assert.assertEquals("Process", windowsPerfmonInput.getObject()); diff --git a/splunk/src/test/java/com/splunk/NamespaceTest.java b/splunk/src/test/java/com/splunk/NamespaceTest.java index 16a332ad..40e88979 100644 --- a/splunk/src/test/java/com/splunk/NamespaceTest.java +++ b/splunk/src/test/java/com/splunk/NamespaceTest.java @@ -264,12 +264,8 @@ public void testNamespaceConflicts() { Assert.assertEquals(query1, service.getSavedSearches(namespace1).get(savedSearchName).getSearch()); Assert.assertEquals(query2, service.getSavedSearches(namespace2).get(savedSearchName).getSearch()); - try { - service.getSavedSearches(wildcardNamespace).get(savedSearchName).getSearch(); - Assert.fail("Expected SplunkException about multiple keys."); - } catch (SplunkException e) { - - } + service.getSavedSearches(wildcardNamespace).get(savedSearchName).getSearch(); + Assert.fail("Expected SplunkException about multiple keys."); } finally { if (service.getSavedSearches(namespace1).containsKey(savedSearchName)) { service.getSavedSearches(namespace1).remove(savedSearchName); diff --git a/splunk/src/test/java/com/splunk/OutputDefaultTest.java b/splunk/src/test/java/com/splunk/OutputDefaultTest.java index 55f28389..93b3bb4f 100644 --- a/splunk/src/test/java/com/splunk/OutputDefaultTest.java +++ b/splunk/src/test/java/com/splunk/OutputDefaultTest.java @@ -45,7 +45,7 @@ public void testOutputDefault() throws Exception { // Probe { outputDefault.setMaxQueueSize("1MB"); - Assert.assertEquals(outputDefault.getMaxQueueSize(), "1MB"); + Assert.assertEquals("1MB", outputDefault.getMaxQueueSize()); outputDefault.setMaxQueueSize(maxQueueSize); Assert.assertEquals(outputDefault.getMaxQueueSize(), maxQueueSize); diff --git a/splunk/src/test/java/com/splunk/PasswordTest.java b/splunk/src/test/java/com/splunk/PasswordTest.java index fb03f264..5bb46ae7 100644 --- a/splunk/src/test/java/com/splunk/PasswordTest.java +++ b/splunk/src/test/java/com/splunk/PasswordTest.java @@ -141,7 +141,7 @@ public void testPasswordsWithWildCards(){ args.put("password", "changed!"); Service service = Service.connect(args); PasswordCollection passwords = service.getPasswords(); - Assert.assertEquals(passwords.size(),0); + Assert.assertEquals(0, passwords.size()); String name = "no-owner"; String value = "sdk-test-password"; @@ -171,6 +171,6 @@ public void testPasswordsWithWildCards(){ Assert.assertEquals("app context must be specified when removing a password.", e.getMessage()); } passwords = service.getPasswords(); - Assert.assertEquals(passwords.size(),0); + Assert.assertEquals(0, passwords.size()); } } diff --git a/splunk/src/test/java/com/splunk/ResultsReaderTest.java b/splunk/src/test/java/com/splunk/ResultsReaderTest.java index 6d346984..b0e69c4f 100644 --- a/splunk/src/test/java/com/splunk/ResultsReaderTest.java +++ b/splunk/src/test/java/com/splunk/ResultsReaderTest.java @@ -341,7 +341,7 @@ private void testPreviewSingleReaderXml(boolean useIter) throws Exception { String[] fieldNameArray = new String[0]; fieldNameArray = reader.getFields().toArray(fieldNameArray); Assert.assertEquals(101, fieldNameArray.length); - Assert.assertEquals(fieldNameArray[99], "useragent"); + Assert.assertEquals("useragent", fieldNameArray[99]); int index = 0; Event lastEvent = null; @@ -456,13 +456,13 @@ private void testExportMultiReader( switch (indexResultSet) { case 0: - Assert.assertEquals(indexEvent, 1); + Assert.assertEquals(1, indexEvent); break; case 1: - Assert.assertEquals(indexEvent, 3); + Assert.assertEquals(3, indexEvent); break; default: - Assert.assertEquals(indexEvent, 5); + Assert.assertEquals(5, indexEvent); break; } indexResultSet++; diff --git a/splunk/src/test/java/com/splunk/SavedSearchTest.java b/splunk/src/test/java/com/splunk/SavedSearchTest.java index 86b4d697..a96f5d46 100644 --- a/splunk/src/test/java/com/splunk/SavedSearchTest.java +++ b/splunk/src/test/java/com/splunk/SavedSearchTest.java @@ -246,7 +246,7 @@ public void testUpdate() { boolean isPre620 = service.versionIsEarlierThan("6.2.0"); try { - Assert.assertEquals(savedSearch.isEmbedEnabled(), false); + Assert.assertEquals(false, savedSearch.isEmbedEnabled()); Assert.assertNull(savedSearch.getEmbedToken()); if (isPre620) Assert.fail("Expected UnsupportedOperationException"); @@ -373,8 +373,8 @@ public void testACLUpdates(){ args.add("perms.read","admin, nobody"); savedSearch.aclUpdate(args); aclInfo = savedSearch.getMetadata().getEaiAcl(); - Assert.assertEquals(aclInfo.getString("sharing"), "app"); - Assert.assertEquals(aclInfo.getString("owner"), "nobody"); + Assert.assertEquals("app", aclInfo.getString("sharing")); + Assert.assertEquals("nobody", aclInfo.getString("owner")); Assert.assertNotNull(aclInfo.get("perms")); } diff --git a/splunk/src/test/java/com/splunk/SearchJobTest.java b/splunk/src/test/java/com/splunk/SearchJobTest.java index 3169172d..74434390 100644 --- a/splunk/src/test/java/com/splunk/SearchJobTest.java +++ b/splunk/src/test/java/com/splunk/SearchJobTest.java @@ -340,7 +340,7 @@ public void testEventArgs(Job job) throws IOException, InterruptedException { while(true) { HashMap found = reader.getNextEvent(); if (found != null) { - Assert.assertEquals(found.get("_raw").split("\n").length, 1); + Assert.assertEquals(1, found.get("_raw").split("\n").length); Assert.assertFalse(found.containsKey("date_month")); Assert.assertEquals(Integer.parseInt(found.get("_serial")), count + 2); count++; @@ -367,7 +367,7 @@ public void testResultArgs(Job job) throws IOException, InterruptedException { while(true) { HashMap found = reader.getNextEvent(); if (found != null) { - Assert.assertEquals(found.get("_raw").split("\n").length, 1); + Assert.assertEquals(1, found.get("_raw").split("\n").length); Assert.assertFalse(found.containsKey("date_month")); Assert.assertEquals(Integer.parseInt(found.get("_serial")), count + 2); count++; @@ -390,7 +390,7 @@ public void testResultArgs(Job job) throws IOException, InterruptedException { while(true) { HashMap found = reader2.getNextEvent(); if (found != null) { - Assert.assertEquals(found.get("count"), "10"); + Assert.assertEquals("10", found.get("count")); count2++; } else { @@ -415,7 +415,7 @@ public void testPreviewArgs(Job job) throws IOException, InterruptedException { while (true) { HashMap found = reader.getNextEvent(); if (found != null) { - Assert.assertEquals(found.get("_raw").split("\n").length, 1); + Assert.assertEquals(1, found.get("_raw").split("\n").length); Assert.assertFalse(found.containsKey("date_month")); Assert.assertEquals(Integer.parseInt(found.get("_serial")), count + 2); count++; @@ -438,7 +438,7 @@ public void testPreviewArgs(Job job) throws IOException, InterruptedException { while(true) { HashMap found = reader2.getNextEvent(); if (found != null) { - Assert.assertEquals(found.get("count"), "10"); + Assert.assertEquals("10", found.get("count")); count2++; } else { diff --git a/splunk/src/test/java/com/splunk/ServiceTest.java b/splunk/src/test/java/com/splunk/ServiceTest.java index 74427442..d9efa699 100644 --- a/splunk/src/test/java/com/splunk/ServiceTest.java +++ b/splunk/src/test/java/com/splunk/ServiceTest.java @@ -160,7 +160,7 @@ public void testServiceWithCustomHeaders() { }}); Service service = new Service(args); Map customHeaders = service.getCustomHeaders(); - Assert.assertEquals(customHeaders.get("some header key"), "some value"); + Assert.assertEquals("some value", customHeaders.get("some header key")); } @Test @@ -522,7 +522,7 @@ public void testNewServiceArgs() { args.setToken("Splunk MY_SESSION_KEY"); Assert.assertEquals("Arg setters didn't replicate value to deprecated fields.", - args.app, "myapp"); + "myapp", args.app); Service service = new Service(args); Assert.assertEquals(args.app, service.getApp());