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.

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

[ISSUE #3224]nacos-client module http client replace #3348

Merged
merged 10 commits into from
Jul 18, 2020
Merged

[ISSUE #3224]nacos-client module http client replace #3348

merged 10 commits into from
Jul 18, 2020

Conversation

Maijh97
Copy link
Collaborator

@Maijh97 Maijh97 commented Jul 16, 2020

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

#3224

Brief changelog

Replace the http client in the config package of the nacos-client module

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

@Maijh97
Copy link
Collaborator Author

Maijh97 commented Jul 16, 2020

please help to review this pr, thanks @KomachiSion

@Maijh97 Maijh97 closed this Jul 16, 2020
@Maijh97 Maijh97 reopened this Jul 16, 2020
@@ -226,54 +222,46 @@ private boolean publishConfigInner(String tenant, String dataId, String group, S
cr.setContent(content);
configFilterChainManager.doFilter(cr, null);
content = cr.getContent();

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not change intend please

}

HttpResult result = null;

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not change intend please

return false;
}

if (HttpURLConnection.HTTP_OK == result.code) {

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not change intend please

String ts = String.valueOf(System.currentTimeMillis());
String token = MD5Utils.md5Hex(ts + ParamUtil.getAppKey(), Constants.ENCODE);

header.addParam(Constants.CLIENT_APPNAME_HEADER, ParamUtil.getAppName());
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are these logic from?

Copy link
Collaborator Author

@Maijh97 Maijh97 Jul 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This logic comes from the old HttpSimpleClient#setHeaders method.

@@ -30,45 +28,42 @@

public static final Logger LOGGER = LogUtils.logger(EnvUtil.class);

public static void setSelfEnv(Map<String, List<String>> headers) {
public static void setSelfEnv(Header headers) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is these method refactor correctly? I see the input is come from httpclient.

Copy link
Collaborator Author

@Maijh97 Maijh97 Jul 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, the original input is also from the http client, this method is called by the ServerListManager#getApacheServerList method.

KomachiSion
KomachiSion previously approved these changes Jul 17, 2020
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java
@KomachiSion KomachiSion added kind/refactor java Pull requests that update Java code labels Jul 18, 2020
@KomachiSion KomachiSion added this to the 1.3.2 milestone Jul 18, 2020
@KomachiSion KomachiSion merged commit 63a4e30 into alibaba:develop Jul 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
java Pull requests that update Java code kind/refactor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants