Apply a few linter improvement suggestions

Author: mremond

_examples/xmpp_chat_client/README.md

@@ -7,11 +7,11 @@ You can build the client using :
 ```
     go build -o example_client
 ```
-and then run with (on unix for example): 
+and then run with (on UNIX, for example): 
 ```
     ./example_client
 ```
-or you can simply build + run in one command while at the example directory root, like this:
+Alternatively, you can build and run in one command while at the example directory root, like this:
 ```
     go run xmpp_chat_client.go interface.go 
 ```
@@ -24,7 +24,7 @@ To provide a different configuration file, pass the following argument to the ex
     go run xmpp_chat_client.go interface.go -c /path/to/config
 ```
 where /path/to/config is the path to the directory containing the configuration file. The configuration file must be named 
-"config" and be using the yaml format.  
+"config" and be using the YAML format.  
 
 Required fields are :
 ```yaml
@@ -36,16 +36,17 @@ Client : # This is you
 
 # Contacts list, ";" separated
 Contacts : "testuser1@localhost;testuser3@localhost"
-# Should we log stanzas ?  
+# Should we log stanzas?  
 LogStanzas:
   - logger_on: "true"
   - logfile_path: "./logs" # Path to directory, not file.
 ```
 
 ## How to use
-Shortcuts :   
-    - ctrl+space  : switch between input window and menu window.  
-    - While in input window :  
-        - enter : sends a message if in message mode (see menu options)  
-        - ctrl+e : sends a raw stanza when in raw mode (see menu options)    
-    - ctrl+c : quit  
+
+Shortcuts:   
+    - ctrl+space: switch between input window and menu window.  
+    - While in the input window:  
+        - enter: sends a message if in message mode (see menu options)  
+        - ctrl+e: sends a raw stanza when in raw mode (see menu options)    
+    - ctrl+c: quit  

_examples/xmpp_chat_client/interface.go

@@ -3,9 +3,10 @@ package main
 import (
 	"errors"
 	"fmt"
-	"github.com/awesome-gocui/gocui"
 	"log"
 	"strings"
+
+	"github.com/awesome-gocui/gocui"
 )
 
 const (
@@ -283,7 +284,7 @@ func getLine(g *gocui.Gui, v *gocui.View) error {
 			// Updating the current correspondent, back-end side.
 			CorrespChan <- l
 			viewState.currentContact = l
-			// Showing the selected contact in contacts list
+			// Showing the selected contact in the contacts list
 			cl, _ := g.View(contactsListWindow)
 			cts := cl.ViewBufferLines()
 			cl.Clear()

_examples/xmpp_chat_client/xmpp_chat_client.go

@@ -10,17 +10,18 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"github.com/awesome-gocui/gocui"
-	"github.com/spf13/pflag"
-	"github.com/spf13/viper"
-	"gosrc.io/xmpp"
-	"gosrc.io/xmpp/stanza"
 	"log"
 	"os"
 	"path"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/awesome-gocui/gocui"
+	"github.com/spf13/pflag"
+	"github.com/spf13/viper"
+	"gosrc.io/xmpp"
+	"gosrc.io/xmpp/stanza"
 )
 
 const (
@@ -247,9 +248,9 @@ func readConfig() *config {
 	if err := viper.ReadInConfig(); err != nil {
 		if _, ok := err.(viper.ConfigFileNotFoundError); ok {
 			log.Fatalf("%s %s", err, "Please make sure you give a path to the directory of the config and not to the config itself.")
-		} else {
-			log.Panicln(err)
 		}
+
+		log.Panicln(err)
 	}
 
 	viper.SetConfigType(configType)

_examples/xmpp_pubsub_client/xmpp_ps_client.go

@@ -5,10 +5,11 @@ import (
 	"encoding/xml"
 	"errors"
 	"fmt"
-	"gosrc.io/xmpp"
-	"gosrc.io/xmpp/stanza"
 	"log"
 	"time"
+
+	"gosrc.io/xmpp"
+	"gosrc.io/xmpp/stanza"
 )
 
 const (
@@ -101,27 +102,26 @@ func createNode(ctx context.Context, cancel context.CancelFunc, client *xmpp.Cli
 	createCh, err := client.SendIQ(ctx, rqCreate)
 	if err != nil {
 		log.Fatalf("%+v", err)
-	} else {
+	}
 
-		if createCh != nil {
-			select {
-			case respCr := <-createCh:
-				// Got response from server
-				if respCr.Type == stanza.IQTypeError {
-					if vld, err := respCr.IsValid(); !vld {
-						log.Fatalf(invalidResp.Error()+" %+v"+" reason: %s", respCr, err)
-					}
-					if respCr.Error.Reason != "conflict" {
-						log.Fatalf("%+v", respCr.Error.Text)
-					}
-					log.Println(respCr.Error.Text)
-				} else {
-					fmt.Print("successfully created channel")
+	if createCh != nil {
+		select {
+		case respCr := <-createCh:
+			// Got response from server
+			if respCr.Type == stanza.IQTypeError {
+				if vld, err := respCr.IsValid(); !vld {
+					log.Fatalf(invalidResp.Error()+" %+v"+" reason: %s", respCr, err)
 				}
-			case <-time.After(100 * time.Millisecond):
-				cancel()
-				log.Fatal("No iq response was received in time while creating node")
+				if respCr.Error.Reason != "conflict" {
+					log.Fatalf("%+v", respCr.Error.Text)
+				}
+				log.Println(respCr.Error.Text)
+			} else {
+				fmt.Print("successfully created channel")
 			}
+		case <-time.After(100 * time.Millisecond):
+			cancel()
+			log.Fatal("No iq response was received in time while creating node")
 		}
 	}
 }

backoff_test.go

@@ -7,9 +7,9 @@ import (
 
 func TestDurationForAttempt_NoJitter(t *testing.T) {
 	b := backoff{Base: 25, NoJitter: true}
-	bInMS := time.Duration(b.Base) * time.Millisecond
-	if b.durationForAttempt(0) != bInMS {
-		t.Errorf("incorrect default duration for attempt #0 (%d) = %d", b.durationForAttempt(0)/time.Millisecond, bInMS/time.Millisecond)
+	bInMilli := time.Duration(b.Base) * time.Millisecond
+	if b.durationForAttempt(0) != bInMilli {
+		t.Errorf("incorrect default duration for attempt #0 (%d) = %d", b.durationForAttempt(0)/time.Millisecond, bInMilli/time.Millisecond)
 	}
 	var prevDuration, d time.Duration
 	for i := 0; i < 10; i++ {

client_internal_test.go

@@ -4,10 +4,11 @@ import (
 	"bytes"
 	"encoding/xml"
 	"fmt"
-	"gosrc.io/xmpp/stanza"
 	"strconv"
 	"testing"
 	"time"
+
+	"gosrc.io/xmpp/stanza"
 )
 
 const (

cmd/fluuxmpp/send.go

@@ -2,11 +2,12 @@ package main
 
 import (
 	"bufio"
-	"gosrc.io/xmpp/stanza"
 	"os"
 	"strings"
 	"sync"
 
+	"gosrc.io/xmpp/stanza"
+
 	"github.com/bdlm/log"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

component.go

@@ -7,8 +7,9 @@ import (
 	"encoding/xml"
 	"errors"
 	"fmt"
-	"gosrc.io/xmpp/stanza"
 	"io"
+
+	"gosrc.io/xmpp/stanza"
 )
 
 type ComponentOptions struct {
@@ -178,9 +179,8 @@ func (c *Component) sendWithWriter(writer io.Writer, packet []byte) error {
 // The provided context should have a timeout to prevent the client from waiting
 // forever for an IQ result. For example:
 //
-//   ctx, _ := context.WithTimeout(context.Background(), 30 * time.Second)
-//   result := <- client.SendIQ(ctx, iq)
-//
+//	ctx, _ := context.WithTimeout(context.Background(), 30 * time.Second)
+//	result := <- client.SendIQ(ctx, iq)
 func (c *Component) SendIQ(ctx context.Context, iq *stanza.IQ) (chan stanza.IQ, error) {
 	if iq.Attrs.Type != stanza.IQTypeSet && iq.Attrs.Type != stanza.IQTypeGet {
 		return nil, ErrCanOnlySendGetOrSetIq

config.go

@@ -1,9 +1,10 @@
 package xmpp
 
 import (
-	"gosrc.io/xmpp/stanza"
 	"os"
 	"time"
+
+	"gosrc.io/xmpp/stanza"
 )
 
 // Config & TransportConfiguration must not be modified after having been passed to NewClient. Any

qodana.yaml

@@ -0,0 +1,46 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+
+#################################################################################
+#              WARNING: Do not store sensitive information in this file,        #
+#               as its contents will be included in the Qodana report.          #
+#################################################################################
+version: "1.0"
+
+#Specify inspection profile for code analysis
+profile:
+  name: qodana.starter
+
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>
+
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>
+
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+
+# Quality gate. Will fail the CI/CD pipeline if any condition is not met
+# severityThresholds - configures maximum thresholds for different problem severities
+# testCoverageThresholds - configures minimum code coverage on a whole project and newly added code
+# Code Coverage is available in Ultimate and Ultimate Plus plans
+#failureConditions:
+#  severityThresholds:
+#    any: 15
+#    critical: 5
+#  testCoverageThresholds:
+#    fresh: 70
+#    total: 50
+
+#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
+linter: jetbrains/qodana-go:2025.3