cgivre commented on a change in pull request #2401:
URL: https://github.com/apache/drill/pull/2401#discussion_r782611662
##########
File path: exec/jdbc-all/pom.xml
##########
@@ -562,7 +562,7 @@
This is likely due to you adding new dependencies to a
java-exec and not updating the excludes in this module. This is important as it
minimizes the size of the dependency of Drill application users.
</message>
- <maxsize>46600000</maxsize>
+ <maxsize>50000000</maxsize>
Review comment:
I'm not sure why this happened. I did bump the version of `okhttp3` to
4.9.1 or whatever the latest version is, but there are no new dependencies.
##########
File path:
exec/java-exec/src/main/java/org/apache/drill/exec/store/http/HttpOAuthConfig.java
##########
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.drill.exec.store.http;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.drill.common.PlanStringBuilder;
+
+import java.util.Map;
+
+@Slf4j
+@Builder
+@Getter
+@Setter
+@Accessors(fluent = true)
+@EqualsAndHashCode
+@JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonDeserialize(builder = HttpOAuthConfig.HttpOAuthConfigBuilder.class)
+public class HttpOAuthConfig {
+
+ @JsonProperty("baseURL")
+ private final String baseURL;
+
+ @JsonProperty("clientID")
+ private final String clientID;
+
+ @JsonProperty("clientSecret")
+ private final String clientSecret;
+
+ @JsonProperty("callbackURL")
+ private final String callbackURL;
+
+ @JsonProperty("authorizationURL")
+ private final String authorizationURL;
+
+ @JsonProperty("authorizationPath")
+ private final String authorizationPath;
+
+ @JsonProperty("authorizationParams")
+ private final Map<String, String> authorizationParams;
+
+ @JsonProperty("accessTokenPath")
+ private final String accessTokenPath;
+
+ @JsonProperty("generateCSRFToken")
+ private final boolean generateCSRFToken;
+
+ @JsonProperty("scope")
+ private final String scope;
+
+ @JsonProperty("tokens")
+ private final Map<String, String> tokens;
+
+ /**
+ * Clone constructor used for updating tokens
+ * @param that The original oAuth configs
+ * @param tokens The updated tokens
+ */
+ public HttpOAuthConfig(HttpOAuthConfig that, Map<String, String> tokens) {
+ this.baseURL = that.baseURL;
+ this.clientID = that.clientID;
+ this.clientSecret = that.clientSecret;
+ this.callbackURL = that.callbackURL;
+ this.authorizationURL = that.authorizationURL;
+ this.authorizationPath = that.authorizationPath;
+ this.authorizationParams = that.authorizationParams;
+ this.accessTokenPath = that.accessTokenPath;
+ this.generateCSRFToken = that.generateCSRFToken;
+ this.scope = that.scope;
+ this.tokens = tokens;
+ }
+
+ private HttpOAuthConfig(HttpOAuthConfig.HttpOAuthConfigBuilder builder) {
+ this.baseURL = builder.baseURL;
+ this.clientID = builder.clientID;
+ this.clientSecret = builder.clientSecret;
+ this.callbackURL = builder.callbackURL;
+ this.authorizationURL = builder.authorizationURL;
+ this.authorizationPath = builder.authorizationPath;
+ this.authorizationParams = builder.authorizationParams;
+ this.accessTokenPath = builder.accessTokenPath;
+ this.generateCSRFToken = builder.generateCSRFToken;
+ this.scope = builder.scope;
+ this.tokens = builder.tokens;
+ }
+
+ @Override
+ public String toString() {
+ return new PlanStringBuilder(this)
+ .field("baseURL", baseURL)
+ .field("clientID", clientID)
+ .maskedField("clientSecret", clientSecret)
+ .field("callbackURL", callbackURL)
+ .field("authorizationURL", authorizationURL)
+ .field("authorizationParams", authorizationParams)
+ .field("authorizationPath", authorizationPath)
+ .field("accessTokenPath", accessTokenPath)
+ .field("generateCSRFToken", generateCSRFToken)
+ .field("tokens", tokens.keySet())
+ .toString();
+ }
+
+ @JsonPOJOBuilder(withPrefix = "")
+ public static class HttpOAuthConfigBuilder {
+ @Getter
+ @Setter
Review comment:
Fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
