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

Jump to bottom

HPCC4J-604 Suppress EclWatch redirects #711

Merged
merged 1 commit into from
May 28, 2024
Merged

HPCC4J-604 Suppress EclWatch redirects #711

merged 1 commit into from
May 28, 2024

Conversation

rpastrana
Copy link
Member

@rpastrana rpastrana commented May 22, 2024 •
edited
Loading

  • Appends rawxml param to all axis2 client calls

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change is a breaking change (fix or feature that will cause existing behavior to change).

Checklist:

  • I have created a corresponding JIRA ticket for this submission
  • My code follows the code style of this project.
    • I have applied the Eclipse code-format template provided.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the HPCC Systems CONTRIBUTORS document (https://github.com/hpcc-systems/HPCC-Platform/wiki/Guide-for-contributors).
  • The change has been fully tested:
    • This change does not cause any existing JUnits to fail.
    • I have include JUnit coverage to test this change
    • I have performed system test and covered possible regressions and side effects.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Premature optimization
    • This change fixes the problem, not just the symptom

Testing:

@github-actions GitHub Actions
Copy link

Jira Issue: https://hpccsystems.atlassian.net/browse/HPCC4J-604

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR

@rpastrana rpastrana requested a review from drealeed May 22, 2024 14:35
@rpastrana
Copy link
Member Author

@drealeed please take a look. I'm not convinced this change is 100% responsible for fixing the issue we were experiencing but the issue is no longer reproducible.

drealeed
drealeed approved these changes May 22, 2024
View reviewed changes
Copy link
Collaborator

@drealeed drealeed left a comment

Choose a reason for hiding this comment

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

It looks like that should fix the error I was getting. Thanks for jumping on it so fast.

@rpastrana rpastrana requested a review from jpmcmu May 23, 2024 13:01
@rpastrana
Copy link
Member Author

@jpmcmu please take a look.

jpmcmu
jpmcmu requested changes May 24, 2024
View reviewed changes
wsclient/src/main/java/org/hpccsystems/ws/client/BaseHPCCWsClient.java
@@ -574,6 +574,10 @@ protected Integer getStubConnectionTO() throws AxisFault
static public Stub setStubOptions(Stub thestub, Connection connection) throws AxisFault
{
Options opt = thestub._getServiceClient().getOptions();
EndpointReference toRef = opt.getTo();
String toAddress = toRef.getAddress() + (toRef.getAddress().contains("?") ? "&" : "?") + "rawxml_";
Copy link
Contributor

Choose a reason for hiding this comment

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

@rpastrana I looked around to see if there was a different way to set a query parameter in Axis2, but wasn't able to find another method. However, I do wonder if we should be using the URL & URI classes here to add the query param instead of doing it manually.

Copy link
Member Author

Choose a reason for hiding this comment

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

I considered URL, but you were in the midst of removing URL from our project.
At this point, it doesn't seem worthwhile to introduce URL here to add a query param

Copy link
Member Author

Choose a reason for hiding this comment

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

Looked into the URL/URI classes since I'm adding the comment your suggested, but didn't find any convenient methods allowing us to easily add a query param

wsclient/src/main/java/org/hpccsystems/ws/client/BaseHPCCWsClient.java
@@ -574,6 +574,10 @@ protected Integer getStubConnectionTO() throws AxisFault
static public Stub setStubOptions(Stub thestub, Connection connection) throws AxisFault
{
Options opt = thestub._getServiceClient().getOptions();
EndpointReference toRef = opt.getTo();
Copy link
Contributor

Choose a reason for hiding this comment

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

Lets add a comment why we are adding the rawxml_ query param here.

HPCC4J-604 Suppress EclWatch redirects
53da3db 
- Appends rawxml param to all axis2 client calls

Signed-off-by: Pastrana <[email protected]>
@rpastrana rpastrana force-pushed the HPCC4J-604-rawxmlQueryParamDelim branch from b163dce to 53da3db Compare May 24, 2024 14:50
@rpastrana rpastrana requested a review from jpmcmu May 24, 2024 14:51
@rpastrana
Copy link
Member Author

@jpmcmu please review

jpmcmu
jpmcmu approved these changes May 28, 2024
View reviewed changes
Copy link
Contributor

@jpmcmu jpmcmu left a comment

Choose a reason for hiding this comment

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

Looks good

@rpastrana rpastrana merged commit 66cc4fb into hpcc-systems:candidate-9.4.x May 28, 2024
4 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drealeed drealeed drealeed approved these changes

@jpmcmu jpmcmu jpmcmu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rpastrana @drealeed @jpmcmu