From 66e41863078bfd34dbdb40c73d36b0beeb1ac325 Mon Sep 17 00:00:00 2001 From: "tobias.pobocik" Date: Wed, 6 Nov 2024 13:07:10 +0100 Subject: [PATCH] Bump checkstyle to 10.18.2 https://checkstyle.org/releasenotes.html#Release_10.18.2 JIRA: LIGHTY-341 Signed-off-by: tobias.pobocik (cherry picked from commit ea1758b) --- .../java/io/lighty/codecs/util/ConverterUtils.java | 12 ++++-------- .../io/lighty/codecs/util/JsonNodeConverter.java | 12 ++++-------- .../java/io/lighty/codecs/util/XmlNodeConverter.java | 3 +-- .../spring/LightyCoreSpringConfiguration.java | 3 +-- .../core/controller/api/AbstractLightyModule.java | 6 ++---- .../controller/impl/util/FileToDatastoreUtils.java | 6 ++---- lighty-core/lighty-parent/pom.xml | 2 +- 7 files changed, 15 insertions(+), 29 deletions(-) diff --git a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/ConverterUtils.java b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/ConverterUtils.java index a336a822f1..9d2bfe5a7c 100644 --- a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/ConverterUtils.java +++ b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/ConverterUtils.java @@ -44,13 +44,11 @@ private ConverterUtils() { * Returns the {@link RpcDefinition} from the given {@link EffectiveModelContext} and given {@link QName}. * The {@link QName} of a rpc can be constructed via * - *

- * {@code + *

{@code * QName.create("http://netconfcentral.org/ns/toaster", "2009-11-20", "make-toast"); * } , where {@code "make-toast"} is the name of the RPC given in the yang model. * - *

- * If the given RPC was found in the {@link EffectiveModelContext} the {@link RpcDefinition} will be returned + *

If the given RPC was found in the {@link EffectiveModelContext} the {@link RpcDefinition} will be returned * * @param effectiveModelContext the effective model context used for the RPC resolution * @param rpcQName {@link QName} of the RPC @@ -175,8 +173,7 @@ public static XmlElement rpcAsOutput(final XmlElement inputXmlElement, final Str /** * Finds the {@link DataSchemaContext} for the given {@link QName} in {@link EffectiveModelContext}. * - *

- * Search is performed only on first level nodes of the modules, for recursive search, + *

Search is performed only on first level nodes of the modules, for recursive search, * the {@link YangInstanceIdentifier} is needed, thus consider using * {@link ConverterUtils#getSchemaNode(EffectiveModelContext, YangInstanceIdentifier)}. * @@ -206,8 +203,7 @@ public static XmlElement rpcAsOutput(final XmlElement inputXmlElement, final Str * Finds the {@link DataSchemaContext} for the given namespace, revision and local name * in {@link EffectiveModelContext}. * - *

- * Search is performed only on first level nodes of the modules, for recursive search, + *

Search is performed only on first level nodes of the modules, for recursive search, * the {@link YangInstanceIdentifier} is needed, thus consider using * {@link ConverterUtils#getSchemaNode(EffectiveModelContext, YangInstanceIdentifier)}. * diff --git a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/JsonNodeConverter.java b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/JsonNodeConverter.java index 3bd0325526..76cdda6014 100644 --- a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/JsonNodeConverter.java +++ b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/JsonNodeConverter.java @@ -52,11 +52,9 @@ public class JsonNodeConverter implements NodeConverter { * This constructor will create an instance of {@link JsonNodeConverter} with the given * {@link EffectiveModelContext}. * - *

- * The effective model context will be used for proper RPC and Node resolution. + *

The effective model context will be used for proper RPC and Node resolution. * - *

- * The {@code JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02} will be used for JSON + *

The {@code JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02} will be used for JSON * serialization/deserialization of data. * * @param effectiveModelContext initial effective model context @@ -69,11 +67,9 @@ public JsonNodeConverter(final EffectiveModelContext effectiveModelContext) { * This constructor will create an instance of {@link JsonNodeConverter} with the given * {@link EffectiveModelContext} and customizable {@link JSONCodecFactorySupplier}. * - *

- * The effective model context will be used for proper RPC and Node resolution. + *

The effective model context will be used for proper RPC and Node resolution. * - *

- * The {@code JSONCodecFactorySupplier} instance will be used for JSON serialization/deserialization of data. + *

The {@code JSONCodecFactorySupplier} instance will be used for JSON serialization/deserialization of data. * * @param effectiveModelContext initial effective model context * @param jsonCodecFactorySupplier JSON codec factory supplier diff --git a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/XmlNodeConverter.java b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/XmlNodeConverter.java index 29c526cd8d..2b0a5acd9d 100644 --- a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/XmlNodeConverter.java +++ b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/XmlNodeConverter.java @@ -127,8 +127,7 @@ public Writer serializeRpc(final Inference inference, final NormalizedNode norma /** * Deserializes a given XML input data into {@link NormalizedNode}. * - *

- * In the case of deserializing multiple top level list entries, entries are expected to be wrapped in + *

In the case of deserializing multiple top level list entries, entries are expected to be wrapped in * {@code }. * * @param inference {@link Inference} pointing to a node we are trying to deserialize diff --git a/lighty-core/lighty-controller-spring-di/src/main/java/io/lighty/core/controller/spring/LightyCoreSpringConfiguration.java b/lighty-core/lighty-controller-spring-di/src/main/java/io/lighty/core/controller/spring/LightyCoreSpringConfiguration.java index cd3d957432..1d58a6fe3b 100644 --- a/lighty-core/lighty-controller-spring-di/src/main/java/io/lighty/core/controller/spring/LightyCoreSpringConfiguration.java +++ b/lighty-core/lighty-controller-spring-di/src/main/java/io/lighty/core/controller/spring/LightyCoreSpringConfiguration.java @@ -46,8 +46,7 @@ * {@link LightyController} shutdown process. This configuration initializes all core lighty.io services as spring * beans. * - *

- * Example: + *

Example: * 

  * @Configuration
  * public class LightyConfiguration extends LightyCoreSprigConfiguration {
diff --git a/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/api/AbstractLightyModule.java b/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/api/AbstractLightyModule.java
index 7162691e1e..7a21f6d79f 100644
--- a/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/api/AbstractLightyModule.java
+++ b/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/api/AbstractLightyModule.java
@@ -35,8 +35,7 @@
  * {@link AbstractLightyModule#startBlocking()} and
  * {@link AbstractLightyModule#shutdown()} methods.
  *
- * 

- * Example usage:
+ * 
Example usage:
  * 
  * 
  *     public class MyLightyModule extends AbstractLightyModule {
@@ -212,8 +211,7 @@ public final boolean shutdown(final long duration, final TimeUnit unit) {
     /**
      * Invoke blocking shutdown after blocking start.
      *
-     * 

-     * Release CountDownLatch locking this thread and shutdown.
+     * 
Release CountDownLatch locking this thread and shutdown.
      * @param duration duration to wait for shutdown to complete
      * @param unit {@link TimeUnit} of {@code duration}
      * @return {@code boolean} indicating shutdown sucess
diff --git a/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/util/FileToDatastoreUtils.java b/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/util/FileToDatastoreUtils.java
index b70953a53d..070c29b43a 100644
--- a/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/util/FileToDatastoreUtils.java
+++ b/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/util/FileToDatastoreUtils.java
@@ -83,11 +83,9 @@ public static void importConfigDataFile(final InputStream inputStream,
     /**
      * Writes/merges input stream containing serialized normalized node data into config datastore.
      *
-     * 

-     * Node is written at root node, that means only top level nodes are supported.
+     * 
Node is written at root node, that means only top level nodes are supported.
      *
-     * 

-     * In the case of importing XML file, node needs to be wrapped in
+     * 
In the case of importing XML file, node needs to be wrapped in
      * {@code } element.
      *
      * @param inputStream           stream of serialized node to deserialize
diff --git a/lighty-core/lighty-parent/pom.xml b/lighty-core/lighty-parent/pom.xml
index fe07e24f8c..ff72cdd876 100644
--- a/lighty-core/lighty-parent/pom.xml
+++ b/lighty-core/lighty-parent/pom.xml
@@ -193,7 +193,7 @@
                             com.puppycrawl.tools
                             checkstyle
                             
-                            10.18.1
+                            10.18.2
                         
                         
                             com.github.sevntu-checkstyle