Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SCB-2711]remove unused configuration servicecomb.instance.properties… #3438

Merged
merged 1 commit into from Oct 29, 2022
Merged

[SCB-2711]remove unused configuration servicecomb.instance.properties… #3438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfig.java
View file
Open in desktop
Expand Up @@ -106,10 +106,6 @@ public String getServiceName() {
return BootStrapProperties.readServiceName(finalConfig);
}

public String getTags() {
return BootStrapProperties.readServiceInstanceTags(finalConfig);
}

public String getEnvironment() {
return BootStrapProperties.readServiceEnvironment(finalConfig);
}
Expand Down
14 changes: 0 additions & 14 deletions ...ns/foundation-config/src/main/java/org/apache/servicecomb/config/BootStrapProperties.java
View file
Open in desktop
Expand Up @@ -63,8 +63,6 @@ public class BootStrapProperties {

public static final String OLD_CONFIG_SERVICE_INSTANCE_INITIAL_STATUS = "instance_description.initialStatus";

private static final String OLD_CONFIG_SERVICE_INSTANCE_TAGS = "instance_description.properties.tags";

// service definition keys of new version
public static final String CONFIG_SERVICE_APPLICATION = "servicecomb.service.application";

Expand Down Expand Up @@ -93,8 +91,6 @@ public class BootStrapProperties {

public static final String CONFIG_SERVICE_INSTANCE_INITIAL_STATUS = "servicecomb.instance.initialStatus";

private static final String CONFIG_SERVICE_INSTANCE_TAGS = "servicecomb.instance.properties.tags";

// configuration default values
public static final String DEFAULT_APPLICATION = "default";

Expand Down Expand Up @@ -237,16 +233,6 @@ public static String readServiceInstanceInitialStatus() {
return readServiceInstanceInitialStatus(BootStrapProperties.configuration);
}

public static String readServiceInstanceTags(Configuration configuration) {
return readStringValue(configuration, CONFIG_SERVICE_INSTANCE_TAGS,
OLD_CONFIG_SERVICE_INSTANCE_TAGS,
null);
}

public static String readServiceInstanceTags() {
return readServiceInstanceTags(BootStrapProperties.configuration);
}

private static String readStringValue(Configuration configuration, String newKey, String oldKey,
String defaultValue) {
String result = configuration.getString(newKey, null);
Expand Down