Skip to content

Commit 2662d7c

Browse files
Merge branch '7.7.x' into 7.8.x by gzimmers-cflt
2 parents f9820ee + b4bbae2 commit 2662d7c

File tree

2 files changed

+1
-79
lines changed

2 files changed

+1
-79
lines changed

core/src/test/java/io/confluent/kafka/schemaregistry/rest/RestApiServerDeploymentTest.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

core/src/test/java/io/confluent/kafka/schemaregistry/rest/RestApiTest.java

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,6 @@
1515

1616
package io.confluent.kafka.schemaregistry.rest;
1717

18-
import io.confluent.kafka.schemaregistry.ClusterTestHarness;
19-
import io.confluent.kafka.schemaregistry.CompatibilityLevel;
20-
import io.confluent.kafka.schemaregistry.ParsedSchema;
21-
import io.confluent.kafka.schemaregistry.avro.AvroSchema;
22-
import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
23-
import io.confluent.kafka.schemaregistry.avro.AvroUtils;
24-
import io.confluent.kafka.schemaregistry.client.rest.RestService;
25-
import io.confluent.kafka.schemaregistry.client.rest.entities.Metadata;
26-
import io.confluent.kafka.schemaregistry.client.rest.entities.Rule;
27-
import io.confluent.kafka.schemaregistry.client.rest.entities.RuleMode;
28-
import io.confluent.kafka.schemaregistry.client.rest.entities.RuleSet;
29-
import io.confluent.kafka.schemaregistry.client.rest.entities.Schema;
30-
import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaReference;
31-
import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryServerVersion;
32-
import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryDeployment;
33-
import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaString;
34-
import io.confluent.kafka.schemaregistry.client.rest.entities.ServerClusterId;
35-
import io.confluent.kafka.schemaregistry.client.rest.entities.SubjectVersion;
36-
import io.confluent.kafka.schemaregistry.client.rest.entities.requests.ConfigUpdateRequest;
37-
import io.confluent.kafka.schemaregistry.client.rest.entities.requests.RegisterSchemaRequest;
38-
import io.confluent.kafka.schemaregistry.client.rest.entities.requests.RegisterSchemaResponse;
39-
import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
40-
import io.confluent.kafka.schemaregistry.exceptions.InvalidSchemaException;
41-
import io.confluent.kafka.schemaregistry.rest.exceptions.Errors;
42-
import io.confluent.kafka.schemaregistry.rest.exceptions.RestInvalidSubjectException;
43-
import io.confluent.kafka.schemaregistry.rest.exceptions.RestInvalidVersionException;
44-
import io.confluent.kafka.schemaregistry.storage.KafkaSchemaRegistry;
45-
import io.confluent.kafka.schemaregistry.utils.AppInfoParser;
46-
import io.confluent.kafka.schemaregistry.utils.TestUtils;
47-
import java.io.IOException;
48-
import java.net.HttpURLConnection;
49-
import java.net.URL;
50-
import java.util.ArrayList;
51-
import java.util.Arrays;
52-
import java.util.Collections;
53-
import java.util.HashSet;
54-
import java.util.List;
55-
import java.util.Map;
56-
import java.util.Objects;
57-
import java.util.Properties;
58-
import org.apache.avro.Schema.Parser;
59-
import org.apache.avro.SchemaParseException;
60-
import org.junit.Test;
6118
import static io.confluent.kafka.schemaregistry.CompatibilityLevel.BACKWARD;
6219
import static io.confluent.kafka.schemaregistry.CompatibilityLevel.FORWARD;
6320
import static io.confluent.kafka.schemaregistry.CompatibilityLevel.FORWARD_TRANSITIVE;
@@ -87,6 +44,7 @@
8744
import io.confluent.kafka.schemaregistry.client.rest.entities.RuleSet;
8845
import io.confluent.kafka.schemaregistry.client.rest.entities.Schema;
8946
import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaReference;
47+
import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryDeployment;
9048
import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryServerVersion;
9149
import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaString;
9250
import io.confluent.kafka.schemaregistry.client.rest.entities.ServerClusterId;

0 commit comments

Comments
 (0)