From 471d6e2b62becf45efc5789e86e985ab58f0ef0f Mon Sep 17 00:00:00 2001 From: shiyiyue1102 Date: Fri, 13 Sep 2024 19:11:57 +0800 Subject: [PATCH 1/5] fix derby usage filed --- .../service/NamespaceConfigInfoService.java | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java index c223df73e25..1c3c00ae01a 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java @@ -16,12 +16,13 @@ package com.alibaba.nacos.config.server.service; -import com.alibaba.nacos.config.server.model.capacity.TenantCapacity; +import com.alibaba.nacos.config.server.constant.PropertiesConstant; import com.alibaba.nacos.config.server.service.capacity.TenantCapacityPersistService; import com.alibaba.nacos.config.server.service.repository.ConfigInfoPersistService; -import com.alibaba.nacos.config.server.utils.PropertyUtil; import com.alibaba.nacos.core.namespace.injector.AbstractNamespaceDetailInjector; import com.alibaba.nacos.core.namespace.model.Namespace; +import com.alibaba.nacos.sys.env.EnvUtil; + import org.springframework.stereotype.Service; /** @@ -31,28 +32,26 @@ */ @Service public class NamespaceConfigInfoService extends AbstractNamespaceDetailInjector { - - private final ConfigInfoPersistService configInfoPersistService; - - private final TenantCapacityPersistService tenantCapacityPersistService; - - public NamespaceConfigInfoService(ConfigInfoPersistService configInfoPersistService, - TenantCapacityPersistService tenantCapacityPersistService) { - this.configInfoPersistService = configInfoPersistService; - this.tenantCapacityPersistService = tenantCapacityPersistService; - } - - @Override - public void injectDetail(Namespace namespace) { - // set tenant quota - TenantCapacity tenantCapacity = tenantCapacityPersistService.getTenantCapacity(namespace.getNamespace()); - if (tenantCapacity != null && tenantCapacity.getQuota() != null && tenantCapacity.getQuota() > 0) { - namespace.setQuota(tenantCapacity.getQuota()); - } else { - namespace.setQuota(PropertyUtil.getDefaultTenantQuota()); - } - // set config count. - int configCount = configInfoPersistService.configInfoCount(namespace.getNamespace()); - namespace.setConfigCount(configCount); - } + + private final ConfigInfoPersistService configInfoPersistService; + + private final TenantCapacityPersistService tenantCapacityPersistService; + + public NamespaceConfigInfoService(ConfigInfoPersistService configInfoPersistService, + TenantCapacityPersistService tenantCapacityPersistService) { + this.configInfoPersistService = configInfoPersistService; + this.tenantCapacityPersistService = tenantCapacityPersistService; + } + + @Override + public void injectDetail(Namespace namespace) { + + if (EnvUtil.getProperty(PropertiesConstant.DEFAULT_TENANT_QUOTA, Integer.class) != null) { + namespace.setQuota(EnvUtil.getProperty(PropertiesConstant.DEFAULT_TENANT_QUOTA, Integer.class)); + } + + // set config count. + int configCount = configInfoPersistService.configInfoCount(namespace.getNamespace()); + namespace.setConfigCount(configCount); + } } From f721edcad3d847bd8e161e623b3b4cd58de74795 Mon Sep 17 00:00:00 2001 From: shiyiyue1102 Date: Wed, 18 Sep 2024 10:12:45 +0800 Subject: [PATCH 2/5] code style --- .../service/NamespaceConfigInfoService.java | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java index 1c3c00ae01a..2fe8fcefe5c 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java @@ -22,7 +22,6 @@ import com.alibaba.nacos.core.namespace.injector.AbstractNamespaceDetailInjector; import com.alibaba.nacos.core.namespace.model.Namespace; import com.alibaba.nacos.sys.env.EnvUtil; - import org.springframework.stereotype.Service; /** @@ -32,26 +31,26 @@ */ @Service public class NamespaceConfigInfoService extends AbstractNamespaceDetailInjector { - - private final ConfigInfoPersistService configInfoPersistService; - - private final TenantCapacityPersistService tenantCapacityPersistService; - - public NamespaceConfigInfoService(ConfigInfoPersistService configInfoPersistService, - TenantCapacityPersistService tenantCapacityPersistService) { - this.configInfoPersistService = configInfoPersistService; - this.tenantCapacityPersistService = tenantCapacityPersistService; - } - - @Override - public void injectDetail(Namespace namespace) { - - if (EnvUtil.getProperty(PropertiesConstant.DEFAULT_TENANT_QUOTA, Integer.class) != null) { - namespace.setQuota(EnvUtil.getProperty(PropertiesConstant.DEFAULT_TENANT_QUOTA, Integer.class)); - } - - // set config count. - int configCount = configInfoPersistService.configInfoCount(namespace.getNamespace()); - namespace.setConfigCount(configCount); - } + + private final ConfigInfoPersistService configInfoPersistService; + + private final TenantCapacityPersistService tenantCapacityPersistService; + + public NamespaceConfigInfoService(ConfigInfoPersistService configInfoPersistService, + TenantCapacityPersistService tenantCapacityPersistService) { + this.configInfoPersistService = configInfoPersistService; + this.tenantCapacityPersistService = tenantCapacityPersistService; + } + + @Override + public void injectDetail(Namespace namespace) { + + if (EnvUtil.getProperty(PropertiesConstant.DEFAULT_TENANT_QUOTA, Integer.class) != null) { + namespace.setQuota(EnvUtil.getProperty(PropertiesConstant.DEFAULT_TENANT_QUOTA, Integer.class)); + } + + // set config count. + int configCount = configInfoPersistService.configInfoCount(namespace.getNamespace()); + namespace.setConfigCount(configCount); + } } From d7ef024f1621b94592268acc44dceb84b38b4a9d Mon Sep 17 00:00:00 2001 From: shiyiyue1102 Date: Wed, 18 Sep 2024 10:14:30 +0800 Subject: [PATCH 3/5] code style --- .../server/service/NamespaceConfigInfoService.java | 7 +------ .../service/NamespaceConfigInfoServiceTest.java | 11 ++--------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java index 2fe8fcefe5c..2a1a9d050e0 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java @@ -17,7 +17,6 @@ package com.alibaba.nacos.config.server.service; import com.alibaba.nacos.config.server.constant.PropertiesConstant; -import com.alibaba.nacos.config.server.service.capacity.TenantCapacityPersistService; import com.alibaba.nacos.config.server.service.repository.ConfigInfoPersistService; import com.alibaba.nacos.core.namespace.injector.AbstractNamespaceDetailInjector; import com.alibaba.nacos.core.namespace.model.Namespace; @@ -34,12 +33,8 @@ public class NamespaceConfigInfoService extends AbstractNamespaceDetailInjector private final ConfigInfoPersistService configInfoPersistService; - private final TenantCapacityPersistService tenantCapacityPersistService; - - public NamespaceConfigInfoService(ConfigInfoPersistService configInfoPersistService, - TenantCapacityPersistService tenantCapacityPersistService) { + public NamespaceConfigInfoService(ConfigInfoPersistService configInfoPersistService) { this.configInfoPersistService = configInfoPersistService; - this.tenantCapacityPersistService = tenantCapacityPersistService; } @Override diff --git a/config/src/test/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoServiceTest.java b/config/src/test/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoServiceTest.java index 8c24eae50b6..7f2768f4e40 100644 --- a/config/src/test/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoServiceTest.java +++ b/config/src/test/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoServiceTest.java @@ -39,9 +39,6 @@ public class NamespaceConfigInfoServiceTest { @Mock private ConfigInfoPersistService configInfoPersistService; - @Mock - private TenantCapacityPersistService tenantCapacityPersistService; - MockedStatic propertyUtilMockedStatic; @BeforeEach @@ -62,11 +59,9 @@ public void testInjectDetailNotDefault() { TenantCapacity tenantCapacity = new TenantCapacity(); tenantCapacity.setQuota(1023); - when(tenantCapacityPersistService.getTenantCapacity(namespaceId)).thenReturn(tenantCapacity); when(configInfoPersistService.configInfoCount(namespaceId)).thenReturn(101); Namespace namespace = new Namespace(namespaceId, "test123ShowName"); - NamespaceConfigInfoService namespaceConfigInfoService = new NamespaceConfigInfoService(configInfoPersistService, - tenantCapacityPersistService); + NamespaceConfigInfoService namespaceConfigInfoService = new NamespaceConfigInfoService(configInfoPersistService); namespaceConfigInfoService.injectDetail(namespace); assertEquals(101, namespace.getConfigCount()); assertEquals(1023, namespace.getQuota()); @@ -79,13 +74,11 @@ public void testInjectDetailDefaultQuota() { String namespaceId = "test1234"; TenantCapacity tenantCapacity = new TenantCapacity(); tenantCapacity.setQuota(0); - when(tenantCapacityPersistService.getTenantCapacity(namespaceId)).thenReturn(tenantCapacity); when(configInfoPersistService.configInfoCount(namespaceId)).thenReturn(105); when(PropertyUtil.getDefaultTenantQuota()).thenReturn(1025); Namespace namespace = new Namespace(namespaceId, "test123ShowName"); - NamespaceConfigInfoService namespaceConfigInfoService = new NamespaceConfigInfoService(configInfoPersistService, - tenantCapacityPersistService); + NamespaceConfigInfoService namespaceConfigInfoService = new NamespaceConfigInfoService(configInfoPersistService); namespaceConfigInfoService.injectDetail(namespace); assertEquals(105, namespace.getConfigCount()); From b5984acef5f1919f5439dcc4a97a2993d8bcf321 Mon Sep 17 00:00:00 2001 From: shiyiyue1102 Date: Wed, 18 Sep 2024 10:31:27 +0800 Subject: [PATCH 4/5] code style --- .../config/server/service/NamespaceConfigInfoServiceTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/config/src/test/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoServiceTest.java b/config/src/test/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoServiceTest.java index 7f2768f4e40..7c04ecd553c 100644 --- a/config/src/test/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoServiceTest.java +++ b/config/src/test/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoServiceTest.java @@ -17,7 +17,6 @@ package com.alibaba.nacos.config.server.service; import com.alibaba.nacos.config.server.model.capacity.TenantCapacity; -import com.alibaba.nacos.config.server.service.capacity.TenantCapacityPersistService; import com.alibaba.nacos.config.server.service.repository.ConfigInfoPersistService; import com.alibaba.nacos.config.server.utils.PropertyUtil; import com.alibaba.nacos.core.namespace.model.Namespace; From e2a7e6ba6e2575b89cceae5840edcaad6a49012f Mon Sep 17 00:00:00 2001 From: shiyiyue1102 Date: Wed, 18 Sep 2024 13:45:07 +0800 Subject: [PATCH 5/5] code style --- .../NamespaceConfigInfoServiceTest.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/config/src/test/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoServiceTest.java b/config/src/test/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoServiceTest.java index 7c04ecd553c..737649e39fe 100644 --- a/config/src/test/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoServiceTest.java +++ b/config/src/test/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoServiceTest.java @@ -16,10 +16,11 @@ package com.alibaba.nacos.config.server.service; +import com.alibaba.nacos.config.server.constant.PropertiesConstant; import com.alibaba.nacos.config.server.model.capacity.TenantCapacity; import com.alibaba.nacos.config.server.service.repository.ConfigInfoPersistService; -import com.alibaba.nacos.config.server.utils.PropertyUtil; import com.alibaba.nacos.core.namespace.model.Namespace; +import com.alibaba.nacos.sys.env.EnvUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -30,6 +31,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) @@ -38,11 +40,11 @@ public class NamespaceConfigInfoServiceTest { @Mock private ConfigInfoPersistService configInfoPersistService; - MockedStatic propertyUtilMockedStatic; + MockedStatic propertyUtilMockedStatic; @BeforeEach void setUp() throws Exception { - propertyUtilMockedStatic = Mockito.mockStatic(PropertyUtil.class); + propertyUtilMockedStatic = Mockito.mockStatic(EnvUtil.class); } @@ -55,12 +57,12 @@ void after() throws Exception { public void testInjectDetailNotDefault() { String namespaceId = "test1234"; - TenantCapacity tenantCapacity = new TenantCapacity(); - tenantCapacity.setQuota(1023); - + when(EnvUtil.getProperty(eq(PropertiesConstant.DEFAULT_TENANT_QUOTA), eq(Integer.class))).thenReturn(1023); when(configInfoPersistService.configInfoCount(namespaceId)).thenReturn(101); Namespace namespace = new Namespace(namespaceId, "test123ShowName"); - NamespaceConfigInfoService namespaceConfigInfoService = new NamespaceConfigInfoService(configInfoPersistService); + namespace.setQuota(200); + NamespaceConfigInfoService namespaceConfigInfoService = new NamespaceConfigInfoService( + configInfoPersistService); namespaceConfigInfoService.injectDetail(namespace); assertEquals(101, namespace.getConfigCount()); assertEquals(1023, namespace.getQuota()); @@ -75,13 +77,15 @@ public void testInjectDetailDefaultQuota() { tenantCapacity.setQuota(0); when(configInfoPersistService.configInfoCount(namespaceId)).thenReturn(105); - when(PropertyUtil.getDefaultTenantQuota()).thenReturn(1025); + when(EnvUtil.getProperty(eq(PropertiesConstant.DEFAULT_TENANT_QUOTA), eq(Integer.class))).thenReturn(null); Namespace namespace = new Namespace(namespaceId, "test123ShowName"); - NamespaceConfigInfoService namespaceConfigInfoService = new NamespaceConfigInfoService(configInfoPersistService); + namespace.setQuota(200); + NamespaceConfigInfoService namespaceConfigInfoService = new NamespaceConfigInfoService( + configInfoPersistService); namespaceConfigInfoService.injectDetail(namespace); assertEquals(105, namespace.getConfigCount()); - assertEquals(1025, namespace.getQuota()); + assertEquals(200, namespace.getQuota()); } }