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 2022/02/24 04:46:26 UTC
[pulsar] 02/02: Remove unused clock field in SchemasResources (#12826)
This is an automated email from the ASF dual-hosted git repository.
mmarshall pushed a commit to branch branch-2.8
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit cc45d9784327563c661842b5478d0e3bea63e714
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Tue Nov 23 21:42:16 2021 +0800
Remove unused clock field in SchemasResources (#12826)
### Modifications
Remove unused clock field in SchemasResources
(cherry picked from commit e61c6d6ad57a099c48f9ff0d87bce9831fcbb8de)
---
.../java/org/apache/pulsar/broker/admin/v1/SchemasResource.java | 7 -------
.../java/org/apache/pulsar/broker/admin/v2/SchemasResource.java | 7 +------
.../src/test/java/org/apache/pulsar/broker/admin/AdminTest.java | 9 +--------
3 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/SchemasResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/SchemasResource.java
index cab1294..c41f4c6 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/SchemasResource.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/SchemasResource.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.broker.admin.v1;
-import com.google.common.annotations.VisibleForTesting;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -26,7 +25,6 @@ import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import io.swagger.annotations.Example;
import io.swagger.annotations.ExampleProperty;
-import java.time.Clock;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -61,11 +59,6 @@ public class SchemasResource extends SchemasResourceBase {
super();
}
- @VisibleForTesting
- public SchemasResource(Clock clock) {
- super();
- }
-
@GET
@Path("/{tenant}/{cluster}/{namespace}/{topic}/schema")
@Produces(MediaType.APPLICATION_JSON)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/SchemasResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/SchemasResource.java
index af56c23..9e6f7e9 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/SchemasResource.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/SchemasResource.java
@@ -26,7 +26,6 @@ import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import io.swagger.annotations.Example;
import io.swagger.annotations.ExampleProperty;
-import java.time.Clock;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -57,12 +56,8 @@ import org.apache.pulsar.common.schema.LongSchemaVersion;
)
public class SchemasResource extends SchemasResourceBase {
- public SchemasResource() {
- super();
- }
-
@VisibleForTesting
- public SchemasResource(Clock clock) {
+ public SchemasResource() {
super();
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
index 583d847..f807016 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
@@ -38,9 +38,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import java.lang.reflect.Field;
import java.net.URI;
-import java.time.Clock;
-import java.time.Instant;
-import java.time.ZoneId;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
@@ -121,10 +118,6 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
private BrokerStats brokerStats;
private SchemasResource schemasResource;
private Field uriField;
- private final Clock mockClock = Clock.fixed(
- Instant.ofEpochSecond(365248800),
- ZoneId.of("-05:00")
- );
public AdminTest() {
super();
@@ -190,7 +183,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
doReturn("test").when(persistentTopics).clientAppId();
doReturn(mock(AuthenticationDataHttps.class)).when(persistentTopics).clientAuthData();
- schemasResource = spy(new SchemasResource(mockClock));
+ schemasResource = spy(new SchemasResource());
schemasResource.setServletContext(new MockServletContext());
schemasResource.setPulsar(pulsar);
}