Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prototype for simplifying Configuration in ClientCore #44565

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prototype for simplifying Configuration in ClientCore #44565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions sdk/clientcore/core/checkstyle-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
<suppress files="io.clientcore.core.implementation.http.rest.RequestDataConfiguration.java" checks="MissingJavadocTypeCheck" />
<suppress files="io.clientcore.core.implementation.http.rest.RestProxyImpl.java" checks="MissingJavadocTypeCheck" />
<suppress files="io.clientcore.core.implementation.instrumentation.Slf4jLoggerShim.java" checks="MissingJavadocTypeCheck" />
<suppress files="io.clientcore.core.implementation.utils.EnvironmentConfiguration.java" checks="MissingJavadocTypeCheck" />
<suppress files="io.clientcore.core.implementation.utils.ImplUtils.java" checks="MissingJavadocTypeCheck" />
<suppress files="io.clientcore.core.implementation.instrumentation.Slf4jLoggerShim.java" checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" />
<suppress files="io.clientcore.core.implementation.utils.EnvironmentConfiguration.java" checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" />
<suppress files="io.clientcore.core.implementation.ReflectionSerializable.java" checks="com.azure.tools.checkstyle.checks.JavadocThrowsChecks" />
<suppress files="io.clientcore.core.implementation.http.serializer.HttpResponseBodyDecoder.java" checks="com.azure.tools.checkstyle.checks.JavadocThrowsChecks" />
<suppress files="io.clientcore.core.http.client.JdkHttpClientBuilder.java" checks="com.azure.tools.checkstyle.checks.ServiceClientBuilderCheck" />
Expand Down
1 change: 0 additions & 1 deletion sdk/clientcore/core/spotbugs-exclude.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@
<Match>
<Bug pattern="MS_EXPOSE_REP" />
<Or>
<Class name="io.clientcore.core.implementation.utils.EnvironmentConfiguration" />
<Class name="io.clientcore.core.serialization.json.implementation.jackson.core.io.CharTypes" />
<Class name="io.clientcore.core.serialization.json.implementation.jackson.core.io.ContentReference" />
<Class name="io.clientcore.core.utils.SharedExecutorService" />
Expand Down
36 changes: 6 additions & 30 deletions sdk/clientcore/core/src/main/java/io/clientcore/core/http/models/ProxyOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
import io.clientcore.core.utils.ChallengeHandler;
import io.clientcore.core.utils.DigestChallengeHandler;
import io.clientcore.core.utils.configuration.Configuration;
import io.clientcore.core.utils.configuration.ConfigurationProperty;
import io.clientcore.core.utils.configuration.ConfigurationPropertyBuilder;

import java.io.UnsupportedEncodingException;
import java.net.InetSocketAddress;
Expand Down Expand Up @@ -69,29 +67,6 @@ public final class ProxyOptions {
private static final Pattern UNESCAPED_PERIOD = Pattern.compile("(?<!\\\\)\\.");
private static final Pattern ANY = Pattern.compile("\\*");

private static final ConfigurationProperty<String> NON_PROXY_PROPERTY
= ConfigurationPropertyBuilder.ofString(ConfigurationProperties.HTTP_PROXY_NON_PROXY_HOSTS)
.shared(true)
.logValue(true)
.build();
private static final ConfigurationProperty<String> HOST_PROPERTY
= ConfigurationPropertyBuilder.ofString(ConfigurationProperties.HTTP_PROXY_HOST)
.shared(true)
.logValue(true)
.build();
private static final ConfigurationProperty<Integer> PORT_PROPERTY
= ConfigurationPropertyBuilder.ofInteger(ConfigurationProperties.HTTP_PROXY_PORT)
.shared(true)
.defaultValue(DEFAULT_HTTPS_PORT)
.build();
private static final ConfigurationProperty<String> USER_PROPERTY
= ConfigurationPropertyBuilder.ofString(ConfigurationProperties.HTTP_PROXY_USER)
.shared(true)
.logValue(true)
.build();
private static final ConfigurationProperty<String> PASSWORD_PROPERTY
= ConfigurationPropertyBuilder.ofString(ConfigurationProperties.HTTP_PROXY_PASSWORD).shared(true).build();

private final InetSocketAddress address;
private final Type type;
private String username;
Expand Down Expand Up @@ -381,17 +356,18 @@ private static ProxyOptions attemptToLoadJavaProxy(Configuration configuration,
}

private static ProxyOptions attemptToLoadSdkProxy(Configuration configuration, boolean createUnresolved) {
String host = configuration.get(HOST_PROPERTY);
String host = configuration.get(ConfigurationProperties.HTTP_PROXY_HOST);

// No proxy configuration setup.
if (isNullOrEmpty(host)) {
return null;
}

int port = configuration.get(PORT_PROPERTY);
String nonProxyHostsString = configuration.get(NON_PROXY_PROPERTY);
String username = configuration.get(USER_PROPERTY);
String password = configuration.get(PASSWORD_PROPERTY);
String portConfig = configuration.get(ConfigurationProperties.HTTP_PROXY_PORT);
int port = (portConfig == null) ? DEFAULT_HTTPS_PORT : Integer.parseInt(portConfig);
String nonProxyHostsString = configuration.get(ConfigurationProperties.HTTP_PROXY_NON_PROXY_HOSTS);
String username = configuration.get(ConfigurationProperties.HTTP_PROXY_USER);
String password = configuration.get(ConfigurationProperties.HTTP_PROXY_PASSWORD);

return createOptions(host, port, nonProxyHostsString, username, password, createUnresolved);
}
Expand Down
14 changes: 4 additions & 10 deletions ...tcore/core/src/main/java/io/clientcore/core/http/pipeline/HttpInstrumentationOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
import io.clientcore.core.http.models.HttpHeaderName;
import io.clientcore.core.instrumentation.InstrumentationOptions;
import io.clientcore.core.utils.configuration.Configuration;
import io.clientcore.core.utils.configuration.ConfigurationProperty;
import io.clientcore.core.utils.configuration.ConfigurationPropertyBuilder;

import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -323,15 +321,11 @@ public enum HttpLogLevel {
private static final String BODY_VALUE = "body";
private static final String BODY_AND_HEADERS_VALUE = "body_and_headers";

private static final ConfigurationProperty<String> HTTP_LOG_LEVEL
= ConfigurationPropertyBuilder.ofString("http.log.level")
.shared(true)
.environmentVariableName(Configuration.HTTP_LOG_LEVEL)
.defaultValue("none")
.build();

static HttpLogLevel fromConfiguration(Configuration configuration) {
String logLevel = configuration.get(HTTP_LOG_LEVEL);
String logLevel = configuration.get(Configuration.HTTP_LOG_LEVEL);
if (logLevel == null) {
logLevel = configuration.get("http.log.level");
}

if (HEADERS_VALUE.equalsIgnoreCase(logLevel)) {
return HEADERS;
Expand Down
2 changes: 1 addition & 1 deletion sdk/clientcore/core/src/main/java/io/clientcore/core/http/pipeline/HttpPipelineBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public HttpPipeline build() {
if (httpClient != null) {
client = httpClient;
} else {
if (Configuration.getGlobalConfiguration().get("ENABLE_HTTP_CLIENT_SHARING", Boolean.TRUE)) {
if (Boolean.parseBoolean(Configuration.getGlobalConfiguration().get("AZURE_HTTP_CLIENT_SHARING"))) {
client = HttpClient.getSharedInstance();
} else {
client = HttpClient.getNewInstance();
Expand Down
4 changes: 1 addition & 3 deletions ...e/core/src/main/java/io/clientcore/core/implementation/instrumentation/DefaultLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

package io.clientcore.core.implementation.instrumentation;

import io.clientcore.core.implementation.utils.EnvironmentConfiguration;
import io.clientcore.core.instrumentation.logging.LogLevel;
import io.clientcore.core.utils.configuration.Configuration;

Expand Down Expand Up @@ -217,7 +216,6 @@ private static void zeroPad(int value, byte[] bytes, int index) {

private static LogLevel fromEnvironment() {
// LogLevel is so basic, we can't use configuration to read it (since Configuration needs to log too)
String level = EnvironmentConfiguration.getGlobalConfiguration().get(Configuration.LOG_LEVEL);
return LogLevel.fromString(level);
return LogLevel.fromString(Configuration.getGlobalConfiguration().get(Configuration.LOG_LEVEL));
}
}
226 changes: 0 additions & 226 deletions .../core/src/main/java/io/clientcore/core/implementation/utils/EnvironmentConfiguration.java
View file
Open in desktop

This file was deleted.

Loading
Loading