Merge pull request #512 from jschoiRR/mold-diplo-2024-main

[Mold API, UI] 20240620일자 신규 소스 병합 및 빌드 오류 수정(한글화포함)

Author: jschoiRR

api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java

@@ -175,10 +175,6 @@ public Boolean isEncrypted() {
         return encrypted;
     }
 
-    public Boolean isEncrypted() {
-        return encrypted;
-    }
-
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java

@@ -55,6 +55,6 @@ List<ServiceOfferingVO> createSystemServiceOfferings(String name, String uniqueN
     List<ServiceOfferingVO> listPublicByCpuAndMemory(Integer cpus, Integer memory);
 
     List<ServiceOfferingVO> listByHostTag(String tag);
-    
+
     ServiceOfferingVO findServiceOfferingByComputeOnlyDiskOffering(long diskOfferingId, boolean includingRemoved);
 }

plugins/host-allocators/random/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java

@@ -36,6 +36,7 @@
 import com.cloud.deploy.DeploymentPlanner.ExcludeList;
 import com.cloud.host.Host;
 import com.cloud.host.Host.Type;
+import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.offering.ServiceOffering;
 import com.cloud.resource.ResourceManager;

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesServiceHelperImpl.java

@@ -102,25 +102,6 @@ public void checkVmCanBeDestroyed(UserVm userVm) {
         throw new CloudRuntimeException(msg);
     }
 
-    @Override
-    public void checkVmCanBeDestroyed(UserVm userVm) {
-        if (!UserVmManager.CKS_NODE.equals(userVm.getUserVmType())) {
-            return;
-        }
-        KubernetesClusterVmMapVO vmMapVO = kubernetesClusterVmMapDao.findByVmId(userVm.getId());
-        if (vmMapVO == null) {
-            return;
-        }
-        logger.error(String.format("VM ID: %s is a part of Kubernetes cluster ID: %d", userVm.getId(), vmMapVO.getClusterId()));
-        KubernetesCluster kubernetesCluster = kubernetesClusterDao.findById(vmMapVO.getClusterId());
-        String msg = "Instance is a part of a Kubernetes cluster";
-        if (kubernetesCluster != null) {
-            msg += String.format(": %s", kubernetesCluster.getName());
-        }
-        msg += ". Use Instance delete option from Kubernetes cluster details or scale API for " +
-                "Kubernetes clusters with 'nodeids' to destroy the instance.";
-        throw new CloudRuntimeException(msg);
-    }
 
     @Override
     public String getConfigComponentName() {

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java

@@ -349,7 +349,7 @@ protected List<UserVm> provisionKubernetesClusterNodeVms(final long nodeCount, f
             ResourceUnavailableException, InsufficientCapacityException {
         List<UserVm> nodes = new ArrayList<>();
         for (int i = offset + 1; i <= nodeCount; i++) {
-            CallContext vmContext = CallContext.register(CallContext.current(), ApiCommandResourceType.VirtualMachine);NetworkServiceImpl.java
+            CallContext vmContext = CallContext.register(CallContext.current(), ApiCommandResourceType.VirtualMachine);
             try {
                 UserVm vm = createKubernetesNode(publicIpAddress);
                 vmContext.setEventResourceId(vm.getId());

plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImpl.java

@@ -449,7 +449,7 @@ private String createResource(VolumeInfo vol, StoragePoolVO storagePoolVO) {
             applyQoSSettings(storagePoolVO, linstorApi, rscName, vol.getMaxIops());
 
             return LinstorUtil.getDevicePath(linstorApi, rscName);
-        } catch (ApiException apiEx)
+        } catch (ApiException apiEx) {
             logger.error("Linstor: ApiEx - " + apiEx.getMessage());
             throw new CloudRuntimeException(apiEx.getBestMessage(), apiEx);
         }

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2UserAuthenticator.java

@@ -59,7 +59,7 @@ public Pair<Boolean, ActionOnFailedAuthentication> authenticate(String username,
 
         final UserAccount userAccount = userAccountDao.getUserAccount(username, domainId);
         if (userAccount == null) {
-            s_logger.debug("Unable to find user with " + username + " in domain " + domainId + ", or user source is not OAUTH2");
+            logger.debug("Unable to find user with " + username + " in domain " + domainId + ", or user source is not OAUTH2");
             return new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
         } else {
             User user = userDao.getUser(userAccount.getId());

plugins/user-authenticators/oauth2/src/test/java/org/apache/cloudstack/oauth2/OAuth2UserAuthenticatorTest.java

@@ -48,7 +48,6 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.doReturn;
 
 @RunWith(MockitoJUnitRunner.class)
 public class OAuth2UserAuthenticatorTest {

server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java

@@ -25,6 +25,7 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 import org.springframework.stereotype.Component;

server/src/main/java/com/cloud/api/ApiServer.java

@@ -161,7 +161,6 @@
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.exception.UnavailableCommandException;
-import com.cloud.projects.dao.ProjectDao;
 import com.cloud.storage.VolumeApiService;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
@@ -224,12 +223,8 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
     @Inject
     private UUIDManager uuidMgr;
     @Inject
-    private AsyncJobManager asyncMgr;
-    @Inject
     private EntityManager entityMgr;
     @Inject
-    private ProjectDao projectDao;
-    @Inject
     private AlertManager alertMgr;
 
     private List<PluggableService> pluggableServices;