You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2021/09/16 19:32:20 UTC
[pulsar] branch master updated: Fix malformed format string (#12060)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 39ddf6d Fix malformed format string (#12060)
39ddf6d is described below
commit 39ddf6d9ac5807fb4d580241b88185ef16ba4e60
Author: Shoothzj <sh...@gmail.com>
AuthorDate: Fri Sep 17 03:31:33 2021 +0800
Fix malformed format string (#12060)
---
.../pulsar/broker/resourcegroup/ResourceGroupService.java | 4 ++--
.../org/apache/pulsar/functions/utils/SinkConfigUtils.java | 3 +--
.../org/apache/pulsar/functions/utils/SourceConfigUtils.java | 3 +--
.../apache/pulsar/functions/worker/rest/api/ComponentImpl.java | 10 +++++-----
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupService.java
index 76c8c20..677c04a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupService.java
@@ -257,7 +257,7 @@ public class ResourceGroupService {
ResourceGroupOpStatus status = rg.registerUsage(fqNamespaceName.toString(), ResourceGroupRefTypes.Namespaces,
true, this.resourceUsageTransportManagerMgr);
if (status == ResourceGroupOpStatus.Exists) {
- String errMesg = String.format("Namespace {} already references the target resource group {}",
+ String errMesg = String.format("Namespace %s already references the target resource group %s",
fqNamespaceName, resourceGroupName);
throw new PulsarAdminException(errMesg);
}
@@ -281,7 +281,7 @@ public class ResourceGroupService {
ResourceGroupOpStatus status = rg.registerUsage(fqNamespaceName.toString(), ResourceGroupRefTypes.Namespaces,
false, this.resourceUsageTransportManagerMgr);
if (status == ResourceGroupOpStatus.DoesNotExist) {
- String errMesg = String.format("Namespace {} does not yet reference resource group {}",
+ String errMesg = String.format("Namespace %s does not yet reference resource group %s",
fqNamespaceName, resourceGroupName);
throw new PulsarAdminException(errMesg);
}
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfigUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfigUtils.java
index 3fe0dc1..ab682ec 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfigUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfigUtils.java
@@ -34,7 +34,6 @@ import org.apache.pulsar.common.functions.FunctionConfig;
import org.apache.pulsar.common.functions.Resources;
import org.apache.pulsar.common.io.ConnectorDefinition;
import org.apache.pulsar.common.io.SinkConfig;
-import org.apache.pulsar.common.io.SourceConfig;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.nar.NarClassLoader;
import org.apache.pulsar.common.util.ObjectMapperFactory;
@@ -399,7 +398,7 @@ public class SinkConfigUtils {
sinkClass = sinkClassLoader.loadClass(sinkClassName);
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException(
- String.format("Sink class %s not found in class loader", sinkClassName, e));
+ String.format("Sink class %s not found in class loader", sinkClassName), e);
}
// extract type from sink class
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfigUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfigUtils.java
index 6450d6e..6215fe3 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfigUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfigUtils.java
@@ -52,7 +52,6 @@ import java.util.HashMap;
import java.util.Map;
import static org.apache.commons.lang3.StringUtils.isEmpty;
-import static org.apache.commons.lang3.StringUtils.isNotEmpty;
import static org.apache.pulsar.functions.utils.FunctionCommon.convertProcessingGuarantee;
import static org.apache.pulsar.functions.utils.FunctionCommon.getSourceType;
@@ -324,7 +323,7 @@ public class SourceConfigUtils {
sourceClass = sourceClassLoader.loadClass(sourceClassName);
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException(
- String.format("Source class %s not found in class loader", sourceClassName, e));
+ String.format("Source class %s not found in class loader", sourceClassName), e);
}
if (!Source.class.isAssignableFrom(sourceClass) && !BatchSource.class.isAssignableFrom(sourceClass)) {
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java
index f8a17b5..c1bc996 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java
@@ -407,7 +407,7 @@ public abstract class ComponentImpl implements Component<PulsarWorkerService> {
newVersionedMetaData.getFunctionDetails().getNamespace(),
newVersionedMetaData.getFunctionDetails().getName(),
newVersionedMetaData, true,
- String.format("Error deleting {} @ /{}/{}/{}",
+ String.format("Error deleting %s @ /%s/%s/%s",
ComponentTypeUtils.toString(componentType), tenant, namespace, componentName));
// clean up component files stored in BK
@@ -538,12 +538,12 @@ public abstract class ComponentImpl implements Component<PulsarWorkerService> {
if (!FunctionMetaDataUtils.canChangeState(functionMetaData, Integer.parseInt(instanceId), start ? Function.FunctionState.RUNNING : Function.FunctionState.STOPPED)) {
log.error("Operation not permitted on {}/{}/{}", tenant, namespace, componentName);
- throw new RestException(Status.BAD_REQUEST, String.format("Operation not permitted"));
+ throw new RestException(Status.BAD_REQUEST, "Operation not permitted");
}
FunctionMetaData newFunctionMetaData = FunctionMetaDataUtils.changeFunctionInstanceStatus(functionMetaData, Integer.parseInt(instanceId), start);
internalProcessFunctionRequest(tenant, namespace, componentName, newFunctionMetaData, false,
- String.format("Failed to start/stop {}: {}/{}/{}/{}", ComponentTypeUtils.toString(componentType),
+ String.format("Failed to start/stop %s: %s/%s/%s/%s", ComponentTypeUtils.toString(componentType),
tenant, namespace, componentName, instanceId));
}
@@ -664,12 +664,12 @@ public abstract class ComponentImpl implements Component<PulsarWorkerService> {
if (!FunctionMetaDataUtils.canChangeState(functionMetaData, -1, start ? Function.FunctionState.RUNNING : Function.FunctionState.STOPPED)) {
log.error("Operation not permitted on {}/{}/{}", tenant, namespace, componentName);
- throw new RestException(Status.BAD_REQUEST, String.format("Operation not permitted"));
+ throw new RestException(Status.BAD_REQUEST, "Operation not permitted");
}
FunctionMetaData newFunctionMetaData = FunctionMetaDataUtils.changeFunctionInstanceStatus(functionMetaData, -1, start);
internalProcessFunctionRequest(tenant, namespace, componentName, newFunctionMetaData, false,
- String.format("Failed to start/stop {}: {}/{}/{}", ComponentTypeUtils.toString(componentType), tenant, namespace, componentName));
+ String.format("Failed to start/stop %s: %s/%s/%s", ComponentTypeUtils.toString(componentType), tenant, namespace, componentName));
}
public void restartFunctionInstances(final String tenant,