Applied cleanup

Signed-off-by: pierantoniomerlino <[email protected]>
eclipse-kura · Nov 21, 2024 · 8e4e179 · 8e4e179
1 parent 3ee6c08
commit 8e4e179
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/...lipse.kura.linux.net/src/main/java/org/eclipse/kura/linux/net/dhcp/DhcpServerManager.java b/...lipse.kura.linux.net/src/main/java/org/eclipse/kura/linux/net/dhcp/DhcpServerManager.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2024 Eurotech and/or its affiliates and others
- * 
+ *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  *  Eurotech
  *******************************************************************************/

diff --git a/...clipse.kura.linux.net/src/main/java/org/eclipse/kura/linux/net/util/LinuxNetworkUtil.java b/...clipse.kura.linux.net/src/main/java/org/eclipse/kura/linux/net/util/LinuxNetworkUtil.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2024 Eurotech and/or its affiliates and others
- * 
+ *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  *  Eurotech
  *******************************************************************************/
@@ -287,7 +287,7 @@ public static boolean toolExists(String tool) {
      * Checks if the given Systemd system unit is installed.
      * The result is based on the exit code of "systemctl status <unitName>"
      * as presented in https://www.man7.org/linux/man-pages/man1/systemctl.1.html#EXIT_STATUS
-     * 
+     *
      * @param unitName
      *            the name of the Systemd system unit
      * @return true if the unit is installed
@@ -1152,7 +1152,7 @@ public void createApNetworkInterface(String ifaceName, String dedicatedApInterfa
             return;
         }
 
-        CommandStatus status = this.executeCommand(formIwDevIfaceInterfaceAddAp(ifaceName, dedicatedApInterface));
+        CommandStatus status = executeCommand(formIwDevIfaceInterfaceAddAp(ifaceName, dedicatedApInterface));
 
         if (!status.getExitStatus().isSuccessful()) {
             throw new KuraException(KuraErrorCode.OS_COMMAND_ERROR,
@@ -1165,7 +1165,7 @@ public void setNetworkInterfaceMacAddress(String ifaceName) throws KuraException
             return;
         }
 
-        CommandStatus status = this.executeCommand(formIpLinkSetAddress(ifaceName, FAKE_MAC_ADDRESS));
+        CommandStatus status = executeCommand(formIpLinkSetAddress(ifaceName, FAKE_MAC_ADDRESS));
 
         if (!status.getExitStatus().isSuccessful()) {
             throw new KuraException(KuraErrorCode.OS_COMMAND_ERROR,
@@ -1178,7 +1178,7 @@ public void setNetworkInterfaceLinkUp(String ifaceName) throws KuraException {
             return;
         }
 
-        CommandStatus status = this.executeCommand(formIpLinkSetStatus(ifaceName, "up"));
+        CommandStatus status = executeCommand(formIpLinkSetStatus(ifaceName, "up"));
 
         if (!status.getExitStatus().isSuccessful()) {
             throw new KuraException(KuraErrorCode.OS_COMMAND_ERROR, "Failed to set link up for interface " + ifaceName);
@@ -1190,7 +1190,7 @@ public void setNetworkInterfaceLinkDown(String ifaceName) throws KuraException {
             return;
         }
 
-        CommandStatus status = this.executeCommand(formIpLinkSetStatus(ifaceName, "down"));
+        CommandStatus status = executeCommand(formIpLinkSetStatus(ifaceName, "down"));
 
         if (!status.getExitStatus().isSuccessful()) {
             throw new KuraException(KuraErrorCode.OS_COMMAND_ERROR, "Failed to set link up for interface " + ifaceName);
@@ -1208,8 +1208,8 @@ private CommandStatus executeCommand(String[] commandString) {
 
     private static class StreamGobbler implements Runnable {
 
-        private InputStream inputStream;
-        private Consumer<String> consumer;
+        private final InputStream inputStream;
+        private final Consumer<String> consumer;
 
         public StreamGobbler(InputStream inputStream, Consumer<String> consumer) {
             this.inputStream = inputStream;
@@ -1218,7 +1218,7 @@ public StreamGobbler(InputStream inputStream, Consumer<String> consumer) {
 
         @Override
         public void run() {
-            new BufferedReader(new InputStreamReader(inputStream)).lines().forEach(consumer);
+            new BufferedReader(new InputStreamReader(this.inputStream)).lines().forEach(this.consumer);
         }
     }
 

diff --git a/...a.linux.net.test/src/test/java/org/eclipse/kura/linux/net/dhcp/DhcpServerManagerTest.java b/...a.linux.net.test/src/test/java/org/eclipse/kura/linux/net/dhcp/DhcpServerManagerTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2024 Eurotech and/or its affiliates and others
- * 
+ *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  *  Eurotech
  ******************************************************************************/
@@ -326,7 +326,7 @@ public void shouldNotGetAnyTool() throws NoSuchFieldException {
     @After
     public void deregisterStaticMocks() {
         if (this.mockedLinuxNetworkUtil != null) {
-            mockedLinuxNetworkUtil.close();
+            this.mockedLinuxNetworkUtil.close();
         }
     }
 
@@ -343,14 +343,14 @@ private void givenDhcpServerManager(DhcpServerTool dhcpServerTool) throws NoSuch
 
         TestUtil.setFieldValue(new DhcpServerManager(null), "dhcpServerTool", dhcpServerTool);
 
-        this.dhcpServerManager = new DhcpServerManager(executorMock);
+        this.dhcpServerManager = new DhcpServerManager(this.executorMock);
     }
 
     private void givenLinuxNetworkUtil(String toolName, Optional<String> unitName) {
         this.mockedLinuxNetworkUtil = Mockito.mockStatic(LinuxNetworkUtil.class);
-        mockedLinuxNetworkUtil.when(() -> LinuxNetworkUtil.toolExists(toolName)).thenReturn(true);
+        this.mockedLinuxNetworkUtil.when(() -> LinuxNetworkUtil.toolExists(toolName)).thenReturn(true);
         if (unitName.isPresent()) {
-            mockedLinuxNetworkUtil.when(() -> LinuxNetworkUtil.systemdSystemUnitExists(unitName.get()))
+            this.mockedLinuxNetworkUtil.when(() -> LinuxNetworkUtil.systemdSystemUnitExists(unitName.get()))
                     .thenReturn(true);
         }
     }

diff --git a/...ra.linux.net.test/src/test/java/org/eclipse/kura/linux/net/util/LinuxNetworkUtilTest.java b/...ra.linux.net.test/src/test/java/org/eclipse/kura/linux/net/util/LinuxNetworkUtilTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2022, 2024 Eurotech and/or its affiliates and others
- * 
+ *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  *  Eurotech
  *******************************************************************************/