You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by yu...@apache.org on 2022/04/03 08:09:15 UTC
[pulsar] branch master updated: [hotfix] Remove unnecessary override methods
This is an automated email from the ASF dual-hosted git repository.
yuruguo 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 d1a302e [hotfix] Remove unnecessary override methods
d1a302e is described below
commit d1a302e60a8f61615800679522016f21dcd01295
Author: Roc Marshal <fl...@126.com>
AuthorDate: Sun Apr 3 16:06:53 2022 +0800
[hotfix] Remove unnecessary override methods
---
.../pulsar/client/admin/internal/TopicPoliciesImpl.java | 12 ------------
.../org/apache/pulsar/functions/sink/PulsarSinkTest.java | 4 ----
.../runtime/kubernetes/KubernetesRuntimeFactoryTest.java | 10 ----------
.../functions/runtime/kubernetes/KubernetesRuntimeTest.java | 11 -----------
.../functions/runtime/process/ProcessRuntimeTest.java | 11 -----------
.../io/batchdatagenerator/BatchDataGeneratorSource.java | 13 +------------
.../apache/pulsar/io/datagenerator/DataGeneratorSource.java | 13 +------------
.../java/org/apache/pulsar/io/dynamodb/StreamsRecord.java | 2 +-
.../pulsar/io/kafka/connect/AbstractKafkaConnectSource.java | 6 ------
.../apache/pulsar/io/rabbitmq/sink/RabbitMQSinkTest.java | 4 ----
.../java/org/apache/pulsar/io/redis/sink/RedisSinkTest.java | 4 ----
.../pulsar/tests/integration/io/TestPropertySource.java | 6 ------
12 files changed, 3 insertions(+), 93 deletions(-)
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicPoliciesImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicPoliciesImpl.java
index bd30037..e5b1d69 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicPoliciesImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicPoliciesImpl.java
@@ -80,18 +80,6 @@ public class TopicPoliciesImpl extends BaseResource implements TopicPolicies {
}
}
-
- @Override
- public void setBacklogQuota(String topic, BacklogQuota backlogQuota) throws PulsarAdminException {
- TopicPolicies.super.setBacklogQuota(topic, backlogQuota);
- }
-
-
- @Override
- public void removeBacklogQuota(String topic) throws PulsarAdminException {
- TopicPolicies.super.removeBacklogQuota(topic);
- }
-
@Override
public void setBacklogQuota(String topic, BacklogQuota backlogQuota,
BacklogQuotaType backlogQuotaType) throws PulsarAdminException {
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/sink/PulsarSinkTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/sink/PulsarSinkTest.java
index 88b1dde..48a6d17 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/sink/PulsarSinkTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/sink/PulsarSinkTest.java
@@ -347,10 +347,6 @@ public class PulsarSinkTest {
for (String topic : topics) {
SinkRecord<String> record = new SinkRecord<>(new Record<String>() {
- @Override
- public Optional<String> getKey() {
- return Optional.empty();
- }
@Override
public String getValue() {
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryTest.java
index ac85540..6579385 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryTest.java
@@ -19,7 +19,6 @@
package org.apache.pulsar.functions.runtime.kubernetes;
-import io.kubernetes.client.openapi.apis.AppsV1Api;
import io.kubernetes.client.openapi.apis.CoreV1Api;
import io.kubernetes.client.openapi.models.V1ConfigMap;
import io.kubernetes.client.openapi.models.V1PodSpec;
@@ -65,11 +64,6 @@ public class KubernetesRuntimeFactoryTest {
class TestSecretProviderConfigurator implements SecretsProviderConfigurator {
@Override
- public void init(Map<String, String> config) {
-
- }
-
- @Override
public String getSecretsProviderClassName(FunctionDetails functionDetails) {
if (!StringUtils.isEmpty(functionDetails.getSecretsMap())) {
if (functionDetails.getRuntime() == FunctionDetails.Runtime.JAVA) {
@@ -104,10 +98,6 @@ public class KubernetesRuntimeFactoryTest {
return null;
}
- @Override
- public void doAdmissionChecks(AppsV1Api appsV1Api, CoreV1Api coreV1Api, String jobNamespace, String jobName, FunctionDetails functionDetails) {
-
- }
}
private KubernetesRuntimeFactory factory;
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java
index 995546c..7c64b66 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java
@@ -24,8 +24,6 @@ import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.protobuf.util.JsonFormat;
-import io.kubernetes.client.openapi.apis.AppsV1Api;
-import io.kubernetes.client.openapi.apis.CoreV1Api;
import io.kubernetes.client.custom.Quantity;
import io.kubernetes.client.openapi.models.V1Container;
import io.kubernetes.client.openapi.models.V1PodSpec;
@@ -112,11 +110,6 @@ public class KubernetesRuntimeTest {
class TestSecretProviderConfigurator implements SecretsProviderConfigurator {
@Override
- public void init(Map<String, String> config) {
-
- }
-
- @Override
public String getSecretsProviderClassName(FunctionDetails functionDetails) {
if (!StringUtils.isEmpty(functionDetails.getSecretsMap())) {
if (functionDetails.getRuntime() == FunctionDetails.Runtime.JAVA) {
@@ -151,10 +144,6 @@ public class KubernetesRuntimeTest {
return null;
}
- @Override
- public void doAdmissionChecks(AppsV1Api appsV1Api, CoreV1Api coreV1Api, String jobNamespace, String jobName, FunctionDetails functionDetails) {
-
- }
}
private KubernetesRuntimeFactory factory;
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeTest.java
index 5b13af9..bcbb0a4 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeTest.java
@@ -37,8 +37,6 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
-import io.kubernetes.client.openapi.apis.AppsV1Api;
-import io.kubernetes.client.openapi.apis.CoreV1Api;
import io.kubernetes.client.openapi.models.V1PodSpec;
import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.apache.pulsar.functions.instance.InstanceConfig;
@@ -66,11 +64,6 @@ public class ProcessRuntimeTest {
class TestSecretsProviderConfigurator implements SecretsProviderConfigurator {
@Override
- public void init(Map<String, String> config) {
-
- }
-
- @Override
public String getSecretsProviderClassName(FunctionDetails functionDetails) {
if (functionDetails.getRuntime() == FunctionDetails.Runtime.JAVA) {
return ClearTextSecretsProvider.class.getName();
@@ -99,10 +92,6 @@ public class ProcessRuntimeTest {
return TypeToken.get(String.class).getType();
}
- @Override
- public void doAdmissionChecks(AppsV1Api appsV1Api, CoreV1Api coreV1Api, String jobNamespace, String jobName, FunctionDetails functionDetails) {
-
- }
}
private static final String TEST_TENANT = "test-function-tenant";
diff --git a/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorSource.java b/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorSource.java
index 7a986e5..3a7fed0 100644
--- a/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorSource.java
+++ b/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorSource.java
@@ -21,7 +21,6 @@ package org.apache.pulsar.io.batchdatagenerator;
import io.codearte.jfairy.Fairy;
import java.nio.charset.StandardCharsets;
import java.util.Map;
-import java.util.Optional;
import java.util.function.Consumer;
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.functions.api.Record;
@@ -63,17 +62,7 @@ public class BatchDataGeneratorSource implements BatchSource<Person> {
public Record<Person> readNext() throws Exception {
if (iteration++ < maxRecordsPerCycle) {
Thread.sleep(50);
- return new Record<Person>() {
- @Override
- public Optional<String> getKey() {
- return Optional.empty();
- }
-
- @Override
- public Person getValue() {
- return new Person(fairy.person());
- }
- };
+ return () -> new Person(fairy.person());
}
return null;
}
diff --git a/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorSource.java b/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorSource.java
index 785a5f5..40938a6 100644
--- a/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorSource.java
+++ b/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorSource.java
@@ -20,7 +20,6 @@ package org.apache.pulsar.io.datagenerator;
import io.codearte.jfairy.Fairy;
import java.util.Map;
-import java.util.Optional;
import org.apache.pulsar.functions.api.Record;
import org.apache.pulsar.io.core.Source;
import org.apache.pulsar.io.core.SourceContext;
@@ -39,17 +38,7 @@ public class DataGeneratorSource implements Source<Person> {
@Override
public Record<Person> read() throws Exception {
Thread.sleep(dataGeneratorSourceConfig.getSleepBetweenMessages());
- return new Record<Person>() {
- @Override
- public Optional<String> getKey() {
- return Optional.empty();
- }
-
- @Override
- public Person getValue() {
- return new Person(fairy.person());
- }
- };
+ return () -> new Person(fairy.person());
}
@Override
diff --git a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecord.java b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecord.java
index 600cdb3..4be63c1 100644
--- a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecord.java
+++ b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecord.java
@@ -45,7 +45,7 @@ public class StreamsRecord implements Record<byte[]> {
private static final CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder();
private final Optional<String> key;
private final byte[] value;
- private final Map<String, String> properties = new HashMap<String, String> ();
+ private final Map<String, String> properties = new HashMap<> ();
public StreamsRecord(com.amazonaws.services.kinesis.model.Record record) {
if (record instanceof RecordAdapter) {
com.amazonaws.services.dynamodbv2.model.Record dynamoRecord = ((RecordAdapter) record).getInternalObject();
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/AbstractKafkaConnectSource.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/AbstractKafkaConnectSource.java
index 8c0b2e3..97390a8 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/AbstractKafkaConnectSource.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/AbstractKafkaConnectSource.java
@@ -39,7 +39,6 @@ import org.apache.kafka.connect.storage.OffsetBackingStore;
import org.apache.kafka.connect.storage.OffsetStorageReader;
import org.apache.kafka.connect.storage.OffsetStorageReaderImpl;
import org.apache.kafka.connect.storage.OffsetStorageWriter;
-import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.functions.api.Record;
import org.apache.pulsar.io.core.Source;
import org.apache.pulsar.io.core.SourceContext;
@@ -216,11 +215,6 @@ public abstract class AbstractKafkaConnectSource<T> implements Source<T> {
}
@Override
- public Schema getSchema() {
- return null;
- }
-
- @Override
public Optional<Long> getRecordSequence() {
return RECORD_SEQUENCE;
}
diff --git a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkTest.java b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkTest.java
index 4f5acd4..e089d7b 100644
--- a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkTest.java
+++ b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkTest.java
@@ -78,10 +78,6 @@ public class RabbitMQSinkTest {
private Record<byte[]> build(String topic, String key, String value, String routingKey) {
// prepare a SinkRecord
SinkRecord<byte[]> record = new SinkRecord<>(new Record<byte[]>() {
- @Override
- public Optional<String> getKey() {
- return Optional.empty();
- }
@Override
public byte[] getValue() {
diff --git a/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/sink/RedisSinkTest.java b/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/sink/RedisSinkTest.java
index 2c8ab66..43fe9fe 100644
--- a/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/sink/RedisSinkTest.java
+++ b/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/sink/RedisSinkTest.java
@@ -80,10 +80,6 @@ public class RedisSinkTest {
private Record<byte[]> build(String topic, String key, String value) {
// prepare a SinkRecord
SinkRecord<byte[]> record = new SinkRecord<>(new Record<byte[]>() {
- @Override
- public Optional<String> getKey() {
- return Optional.empty();
- }
@Override
public byte[] getValue() {
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestPropertySource.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestPropertySource.java
index 245929b..5809cc7 100644
--- a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestPropertySource.java
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestPropertySource.java
@@ -22,10 +22,8 @@ import org.apache.pulsar.functions.api.Record;
import org.apache.pulsar.io.core.Source;
import org.apache.pulsar.io.core.SourceContext;
-import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
-import java.util.Optional;
public class TestPropertySource implements Source<String> {
@@ -37,10 +35,6 @@ public class TestPropertySource implements Source<String> {
public Record<String> read() throws Exception {
Thread.sleep(50);
return new Record<String>() {
- @Override
- public Optional<String> getKey() {
- return Optional.empty();
- }
@Override
public String getValue() {