Skip to content

Commit

Permalink
feat:优化配置中心相关接口定义&支持查询服务契约
Browse files Browse the repository at this point in the history
  • Loading branch information
@chuntaojun
chuntaojun committed Jan 17, 2024
1 parent 537de1f commit 983c759
Show file tree
Hide file tree
Showing 5 changed files with 111 additions and 26 deletions.
6 changes: 3 additions & 3 deletions ...-common/polaris-model/src/test/java/com/tencent/polaris/api/pojo/ServiceEventKeyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ServiceEventKeyTest {
@Test
public void verifyCase1() {
int receiveExceptionCnt = 0;
int expectExceptionCnt = 6;
int expectExceptionCnt = EventType.values().length - 1;
for (EventType eventType : EventType.values()) {
try {
ServiceEventKey key = new ServiceEventKey(new ServiceKey("", ""), eventType);
Expand All @@ -41,7 +41,7 @@ public void verifyCase1() {
@Test
public void verifyCase2() {
int receiveExceptionCnt = 0;
int expectExceptionCnt = 6;
int expectExceptionCnt = EventType.values().length - 1;
for (EventType eventType : EventType.values()) {
try {
ServiceEventKey key = new ServiceEventKey(new ServiceKey("test_ns", ""), eventType);
Expand All @@ -56,7 +56,7 @@ public void verifyCase2() {
@Test
public void verifyCase3() {
int receiveExceptionCnt = 0;
int expectExceptionCnt = 6;
int expectExceptionCnt = EventType.values().length - 1;
for (EventType eventType : EventType.values()) {
try {
ServiceEventKey key = new ServiceEventKey(new ServiceKey("", "test_svc"), eventType);
Expand Down
12 changes: 11 additions & 1 deletion ...-api/src/main/java/com/tencent/polaris/configuration/api/rpc/CreateConfigFileRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package com.tencent.polaris.configuration.api.rpc;

import com.tencent.polaris.api.utils.StringUtils;

import java.util.Map;

public class CreateConfigFileRequest {
Expand Down Expand Up @@ -75,7 +77,15 @@ public void setLabels(Map<String, String> labels) {
}

public void verify() {

if (StringUtils.isBlank(getNamespace())) {
throw new IllegalArgumentException("namespace cannot be empty.");
}
if (StringUtils.isBlank(getGroup())) {
throw new IllegalArgumentException("file group cannot be empty.");
}
if (StringUtils.isBlank(getFilename())) {
throw new IllegalArgumentException("file name cannot be empty.");
}
}

public static final class Builder {
Expand Down
12 changes: 11 additions & 1 deletion ...api/src/main/java/com/tencent/polaris/configuration/api/rpc/ReleaseConfigFileRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package com.tencent.polaris.configuration.api.rpc;

import com.tencent.polaris.api.utils.StringUtils;

public class ReleaseConfigFileRequest {
private String namespace;

Expand Down Expand Up @@ -62,7 +64,15 @@ public void setReleaseName(String releaseName) {
}

public void verify() {

if (StringUtils.isBlank(getNamespace())) {
throw new IllegalArgumentException("namespace cannot be empty.");
}
if (StringUtils.isBlank(getGroup())) {
throw new IllegalArgumentException("file group cannot be empty.");
}
if (StringUtils.isBlank(getFilename())) {
throw new IllegalArgumentException("file name cannot be empty.");
}
}

public static final class Builder {
Expand Down
49 changes: 37 additions & 12 deletions .../src/test/java/com/tencent/polaris/configuration/client/ConfigFilePublishServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
package com.tencent.polaris.configuration.client;

import com.tencent.polaris.configuration.api.core.ConfigFileMetadata;
import com.tencent.polaris.configuration.api.rpc.CreateConfigFileRequest;
import com.tencent.polaris.configuration.api.rpc.ReleaseConfigFileRequest;
import com.tencent.polaris.configuration.api.rpc.UpdateConfigFileRequest;
import com.tencent.polaris.configuration.client.internal.ConfigFileManager;
import com.tencent.polaris.configuration.client.internal.DefaultConfigFileMetadata;
import org.junit.Test;
Expand Down Expand Up @@ -133,53 +136,75 @@ public void testReleaseFileNameBlank2() {
@Test(expected = RuntimeException.class)
public void testCreateConfigFile() {
ConfigFileMetadata configFileMetadata = new DefaultConfigFileMetadata("testNamespace", "testGroup", "testFile");

doThrow(new RuntimeException("test")).when(configFileManager).createConfigFile(configFileMetadata, "content");
CreateConfigFileRequest request = new CreateConfigFileRequest();
request.setFilename(configFileMetadata.getFileName());
request.setContent("content");
request.setGroup(configFileMetadata.getFileGroup());
request.setNamespace(configFileMetadata.getNamespace());
doThrow(new RuntimeException("test")).when(configFileManager).createConfigFile(request);

defaultConfigFilePublishService.createConfigFile("testNamespace", "testGroup", "testFile", "content");
}

@Test(expected = RuntimeException.class)
public void testCreateConfigFile2() {
ConfigFileMetadata configFileMetadata = new DefaultConfigFileMetadata("testNamespace", "testGroup", "testFile");

doThrow(new RuntimeException("test")).when(configFileManager).createConfigFile(configFileMetadata, "content");
CreateConfigFileRequest request = new CreateConfigFileRequest();
request.setFilename(configFileMetadata.getFileName());
request.setContent("content");
request.setGroup(configFileMetadata.getFileGroup());
request.setNamespace(configFileMetadata.getNamespace());
doThrow(new RuntimeException("test")).when(configFileManager).createConfigFile(request);

defaultConfigFilePublishService.createConfigFile(configFileMetadata, "content");
}

@Test(expected = RuntimeException.class)
public void testUpdateConfigFile() {
ConfigFileMetadata configFileMetadata = new DefaultConfigFileMetadata("testNamespace", "testGroup", "testFile");

doThrow(new RuntimeException("test")).when(configFileManager).updateConfigFile(configFileMetadata, "content");
UpdateConfigFileRequest request = new UpdateConfigFileRequest();
request.setFilename(configFileMetadata.getFileName());
request.setContent("content");
request.setGroup(configFileMetadata.getFileGroup());
request.setNamespace(configFileMetadata.getNamespace());
doThrow(new RuntimeException("test")).when(configFileManager).updateConfigFile(request);

defaultConfigFilePublishService.updateConfigFile("testNamespace", "testGroup", "testFile", "content");
}

@Test(expected = RuntimeException.class)
public void testUpdateConfigFile2() {
ConfigFileMetadata configFileMetadata = new DefaultConfigFileMetadata("testNamespace", "testGroup", "testFile");

doThrow(new RuntimeException("test")).when(configFileManager).updateConfigFile(configFileMetadata, "content");
UpdateConfigFileRequest request = new UpdateConfigFileRequest();
request.setFilename(configFileMetadata.getFileName());
request.setContent("content");
request.setGroup(configFileMetadata.getFileGroup());
request.setNamespace(configFileMetadata.getNamespace());
doThrow(new RuntimeException("test")).when(configFileManager).updateConfigFile(request);

defaultConfigFilePublishService.updateConfigFile(configFileMetadata, "content");
}

@Test(expected = RuntimeException.class)
public void testReleaseConfigFile() {
ConfigFileMetadata configFileMetadata = new DefaultConfigFileMetadata("testNamespace", "testGroup", "testFile");

doThrow(new RuntimeException("test")).when(configFileManager).releaseConfigFile(configFileMetadata);
ReleaseConfigFileRequest request = new ReleaseConfigFileRequest();
request.setFilename(configFileMetadata.getFileName());
request.setGroup(configFileMetadata.getFileGroup());
request.setNamespace(configFileMetadata.getNamespace());
doThrow(new RuntimeException("test")).when(configFileManager).releaseConfigFile(request);

defaultConfigFilePublishService.releaseConfigFile("testNamespace", "testGroup", "testFile");
}

@Test(expected = RuntimeException.class)
public void testReleaseConfigFile2() {
ConfigFileMetadata configFileMetadata = new DefaultConfigFileMetadata("testNamespace", "testGroup", "testFile");

doThrow(new RuntimeException("test")).when(configFileManager).releaseConfigFile(configFileMetadata);
ReleaseConfigFileRequest request = new ReleaseConfigFileRequest();
request.setFilename(configFileMetadata.getFileName());
request.setGroup(configFileMetadata.getFileGroup());
request.setNamespace(configFileMetadata.getNamespace());
doThrow(new RuntimeException("test")).when(configFileManager).releaseConfigFile(request);

defaultConfigFilePublishService.releaseConfigFile(configFileMetadata);
}
Expand Down
58 changes: 49 additions & 9 deletions ...rc/test/java/com/tencent/polaris/configuration/client/internal/ConfigFileManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
import com.tencent.polaris.configuration.api.core.ConfigFileFormat;
import com.tencent.polaris.configuration.api.core.ConfigFileMetadata;
import com.tencent.polaris.configuration.api.core.ConfigKVFile;
import com.tencent.polaris.configuration.api.rpc.CreateConfigFileRequest;
import com.tencent.polaris.configuration.api.rpc.ReleaseConfigFileRequest;
import com.tencent.polaris.configuration.api.rpc.UpdateConfigFileRequest;
import com.tencent.polaris.configuration.client.ConfigFileTestUtils;
import org.junit.Assert;
import org.junit.Before;
Expand Down Expand Up @@ -101,22 +104,39 @@ public void testGetConfigPropertiesFile() {
@Test(expected = RuntimeException.class)
public void testCreateConfigFileOnFail() {
ConfigFileMetadata configFileMetadata = ConfigFileTestUtils.assembleDefaultConfigFileMeta();
doThrow(new RuntimeException("test")).when(fileManager).createConfigFile(configFileMetadata, "content");
fileManager.createConfigFile(configFileMetadata, "content");
CreateConfigFileRequest request = new CreateConfigFileRequest();
request.setNamespace(configFileMetadata.getNamespace());
request.setGroup(configFileMetadata.getFileGroup());
request.setFilename(configFileMetadata.getFileName());
request.setContent("content");

doThrow(new RuntimeException("test")).when(fileManager).createConfigFile(request);
fileManager.createConfigFile(request);
}

@Test(expected = RuntimeException.class)
public void testUpdateConfigFileOnFail() {
ConfigFileMetadata configFileMetadata = ConfigFileTestUtils.assembleDefaultConfigFileMeta();
doThrow(new RuntimeException("test")).when(fileManager).updateConfigFile(configFileMetadata, "content");
fileManager.updateConfigFile(configFileMetadata, "content");
UpdateConfigFileRequest request = new UpdateConfigFileRequest();
request.setNamespace(configFileMetadata.getNamespace());
request.setGroup(configFileMetadata.getFileGroup());
request.setFilename(configFileMetadata.getFileName());
request.setContent("content");

doThrow(new RuntimeException("test")).when(fileManager).updateConfigFile(request);
fileManager.updateConfigFile(request);
}

@Test(expected = RuntimeException.class)
public void testReleaseConfigFileOnFail() {
ConfigFileMetadata configFileMetadata = ConfigFileTestUtils.assembleDefaultConfigFileMeta();
doThrow(new RuntimeException("test")).when(fileManager).releaseConfigFile(configFileMetadata);
fileManager.releaseConfigFile(configFileMetadata);
ReleaseConfigFileRequest request = new ReleaseConfigFileRequest();
request.setNamespace(configFileMetadata.getNamespace());
request.setGroup(configFileMetadata.getFileGroup());
request.setFilename(configFileMetadata.getFileName());

doThrow(new RuntimeException("test")).when(fileManager).releaseConfigFile(request);
fileManager.releaseConfigFile(request);
}

@Test(expected = RuntimeException.class)
Expand All @@ -131,7 +151,14 @@ public void testCreateConfigFile() {
doThrow(new RuntimeException("test")).when(configFileConnector).createConfigFile(configFile);

ConfigFileManager fileManager = new ConfigFileManager(configFileConnector);
fileManager.createConfigFile(configFileMetadata, "content");

CreateConfigFileRequest request = new CreateConfigFileRequest();
request.setNamespace(configFileMetadata.getNamespace());
request.setGroup(configFileMetadata.getFileGroup());
request.setFilename(configFileMetadata.getFileName());
request.setContent("content");

fileManager.createConfigFile(request);
}

@Test(expected = RuntimeException.class)
Expand All @@ -146,7 +173,14 @@ public void testUpdateConfigFile() {
doThrow(new RuntimeException("test")).when(configFileConnector).updateConfigFile(configFile);

ConfigFileManager fileManager = new ConfigFileManager(configFileConnector);
fileManager.updateConfigFile(configFileMetadata, "content");

UpdateConfigFileRequest request = new UpdateConfigFileRequest();
request.setNamespace(configFileMetadata.getNamespace());
request.setGroup(configFileMetadata.getFileGroup());
request.setFilename(configFileMetadata.getFileName());
request.setContent("content");

fileManager.updateConfigFile(request);
}


Expand All @@ -157,7 +191,13 @@ public void testReleaseConfigFile() {
doThrow(new RuntimeException("test")).when(configFileConnector).releaseConfigFile(Mockito.any());

ConfigFileManager fileManager = new ConfigFileManager(configFileConnector);
ConfigFileResponse response = fileManager.releaseConfigFile(configFileMetadata);

ReleaseConfigFileRequest request = new ReleaseConfigFileRequest();
request.setNamespace(configFileMetadata.getNamespace());
request.setGroup(configFileMetadata.getFileGroup());
request.setFilename(configFileMetadata.getFileName());

ConfigFileResponse response = fileManager.releaseConfigFile(request);
System.out.println(response);
}
}

0 comments on commit 983c759

Please sign in to comment.