Fix main branch issues (#9553)

nvazquez · web-flow · commit 296a44e932e5 · 2024-08-20T15:26:41.000+02:00
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/ImportRoleCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/ImportRoleCmdTest.java
@@ -32,19 +32,13 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyCollection;
-import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.cloud.exception.InvalidParameterValueException;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
 
 public class ImportRoleCmdTest {
     private ImportRoleCmd importRoleCmd;
diff --git a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
@@ -483,7 +483,7 @@ private boolean resourceSupportZeroBlocks(KVMStoragePool destPool, String resNam
                         } );
             }
         } catch (ApiException apiExc) {
-            s_logger.error(apiExc.getMessage());
+            logger.error(apiExc.getMessage());
         }
         return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,7 @@ private boolean resourceSupportZeroBlocks(KVMStoragePool destPool, String resNam`
`483`	`483`	`} );`
`484`	`484`	`}`
`485`	`485`	`} catch (ApiException apiExc) {`
`486`		`- s_logger.error(apiExc.getMessage());`
	`486`	`+ logger.error(apiExc.getMessage());`
`487`	`487`	`}`
`488`	`488`	`return false;`
`489`	`489`	`}`