Skip to content

Commit 48ea04e

Browse files
committed
minor
1 parent 6fdf1a9 commit 48ea04e

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

paimon-api/src/main/java/org/apache/paimon/rest/RESTApi.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
@Public
9999
public class RESTApi {
100100

101-
public static final String QUERY_PARAMETER_WAREHOUSE_KEY = "warehouse";
102101
public static final String HEADER_PREFIX = "header.";
103102
public static final String MAX_RESULTS = "maxResults";
104103
public static final String PAGE_TOKEN = "pageToken";
@@ -128,8 +127,7 @@ public RESTApi(Options options, boolean configRequired) {
128127
String warehouse = options.get(WAREHOUSE);
129128
Map<String, String> queryParams =
130129
StringUtils.isNotEmpty(warehouse)
131-
? ImmutableMap.of(
132-
QUERY_PARAMETER_WAREHOUSE_KEY, RESTUtil.encodeString(warehouse))
130+
? ImmutableMap.of(WAREHOUSE.key(), RESTUtil.encodeString(warehouse))
133131
: ImmutableMap.of();
134132
baseHeaders = extractPrefixMap(options, HEADER_PREFIX);
135133
options =

paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogServer.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.apache.paimon.function.FunctionDefinition;
3939
import org.apache.paimon.function.FunctionImpl;
4040
import org.apache.paimon.operation.Lock;
41-
import org.apache.paimon.options.CatalogOptions;
4241
import org.apache.paimon.options.Options;
4342
import org.apache.paimon.partition.Partition;
4443
import org.apache.paimon.partition.PartitionStatistics;
@@ -120,10 +119,10 @@
120119
import static org.apache.paimon.CoreOptions.SNAPSHOT_CLEAN_EMPTY_DIRECTORIES;
121120
import static org.apache.paimon.CoreOptions.TYPE;
122121
import static org.apache.paimon.TableType.FORMAT_TABLE;
122+
import static org.apache.paimon.options.CatalogOptions.WAREHOUSE;
123123
import static org.apache.paimon.rest.RESTApi.MAX_RESULTS;
124124
import static org.apache.paimon.rest.RESTApi.PAGE_TOKEN;
125125
import static org.apache.paimon.rest.RESTApi.PARTITION_NAME_PATTERN;
126-
import static org.apache.paimon.rest.RESTApi.QUERY_PARAMETER_WAREHOUSE_KEY;
127126
import static org.apache.paimon.rest.RESTApi.TABLE_NAME_PATTERN;
128127
import static org.apache.paimon.rest.RESTApi.VIEW_NAME_PATTERN;
129128

@@ -167,7 +166,7 @@ public RESTCatalogServer(
167166
this.functionUri = resourcePaths.functions();
168167
Options conf = new Options();
169168
this.configResponse.getDefaults().forEach(conf::setString);
170-
conf.setString(CatalogOptions.WAREHOUSE.key(), dataPath);
169+
conf.setString(WAREHOUSE.key(), dataPath);
171170
CatalogContext context = CatalogContext.create(conf);
172171
Path warehousePath = new Path(dataPath);
173172
FileIO fileIO;
@@ -269,7 +268,7 @@ public MockResponse dispatch(RecordedRequest request) {
269268
}
270269
if (request.getPath().startsWith(resourcePaths.config())
271270
&& request.getRequestUrl()
272-
.queryParameter(QUERY_PARAMETER_WAREHOUSE_KEY)
271+
.queryParameter(WAREHOUSE.key())
273272
.equals(warehouse)) {
274273
return mockResponse(configResponse, 200);
275274
} else if (databaseUri.equals(request.getPath())

0 commit comments

Comments
 (0)