Skip to content

Conversation

@Amit-CloudSufi
Copy link
Collaborator

No description provided.

@psainics
Copy link
Collaborator

Please Fix conflicts

@psainics
Copy link
Collaborator

Please revert unintended formatting !

@psainics
Copy link
Collaborator

psainics commented Feb 3, 2025

Resolve conflict src/main/java/io/cdap/plugin/http/common/BaseHttpConfig.java

@Amit-CloudSufi Amit-CloudSufi force-pushed the httpOath branch 2 times, most recently from 4e22508 to 5c95376 Compare February 5, 2025 12:32
}
}

public void validate(FailureCollector failureCollector) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

these changes are not removed, yet it is showing in diff, let the sequence of methods remain same to avoid unnecessary confusion.

Copy link
Collaborator

Choose a reason for hiding this comment

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

@Amit-CloudSufi this comment is still pending

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Sequence is same as before, it;s just that previous indentation was wrong I.e. 4 spaces, and currently the check style which was recommended by Ankit has 2 spaces, because of that it got updated when made changes. That's why it is shown is removed and added which updated spaces.

* Enum encoding the handled Oauth2 Grant Types
*/
public enum OAuthGrantType implements EnumWithValue {
REFRESH_TOKEN("refresh token", "Refresh Token"),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is the name refresh token intended and not missing a _ ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think it;s fine, @vikasrathee-cs let me know if we need to update it

Copy link
Collaborator

@psainics psainics left a comment

Choose a reason for hiding this comment

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

Some file have 2 space of indentation and some have 4.

eg:
OAuthClientAuthentication (2 space)
OAuthGrantType (4 space)

Please keep formatting consistent in the PR

protected String authType;

@Name(PROPERTY_OAUTH2_ENABLED)
@Name(PROPERTY_OAUTH2_ENABLED)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Revert unintended changes

@Nullable
public String getAuthUrl() {
return authUrl;
return authUrl;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Revert unintended changes

@Amit-CloudSufi
Copy link
Collaborator Author

raised a separate pr with indentation fix : #18

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants