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-583 Update filespray and dfuxref clients to 9.6.x #695

Merged
merged 4 commits into from
Mar 27, 2024
Merged

HPCC4J-583 Update filespray and dfuxref clients to 9.6.x #695

merged 4 commits into from
Mar 27, 2024

Conversation

rpastrana
Copy link
Member

@rpastrana rpastrana commented Mar 13, 2024 •
edited
Loading

  • Updates filespray wsdl2java maven profile

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:

@rpastrana
HPCC4J-583 Update filespray and dfuxref clients to 9.6.x
880c1b9 
- Updates filespray wsdl2java maven profile

Signed-off-by: Rodrigo Pastrana <[email protected]>
@rpastrana rpastrana requested a review from jpmcmu March 13, 2024 19:08
@rpastrana
HPCC4J-583 Update filespray and dfuxref clients to 9.6.x
a1e7cf9 
- Updates wstopology, wssmc
- Wssmc wrapper manually updated

Signed-off-by: Rodrigo Pastrana <[email protected]>
@rpastrana
Copy link
Member Author

@jpmcmu the second commit contains the rest of the changes needed to get in synch w/ ESP 9.6.x
Notice the manual changes to wssmc wrapper changes which illustrate the problem we discussed this morning.

@rpastrana
HPCC4J-583 Update filespray and dfuxref clients to 9.6.x
113ac34 
- Updates wsworkunits, includes manual wsdl changes

Signed-off-by: Rodrigo Pastrana <[email protected]>
@rpastrana
Copy link
Member Author

@jpmcmu third commit include changes for wswu, I ended up having to manually change the WSDL

jpmcmu
jpmcmu reviewed Mar 15, 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.

@rpastrana A few questions, only real issue is the manual changes need to the wrapper we discussed offline

wsclient/src/main/java/org/hpccsystems/ws/client/gen/axis2/wscloud/latest/WsCloudStub.java
public WsCloudStub(org.apache.axis2.context.ConfigurationContext configurationContext)
throws org.apache.axis2.AxisFault {

this(configurationContext, "http://eclwatch-66ff99685c-4bl4k:8888/WsCloud?ver_=1.01");
Copy link
Contributor

Choose a reason for hiding this comment

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

I assume this URL string is never used, but do you know why Axis is embedding this info?

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 think the path and parameters are used to route and annotate the request url
We have made attempts to cleanse the url in the WSDL in the past, and future improvements should attempt to automatically do so.

...c/main/java/org/hpccsystems/ws/client/wrappers/gen/wssmc/BrowseResourcesResponseWrapper.java Outdated
this.local_portalURL = raw.getPortalURL();
this.local_netAddress = raw.getNetAddress();
// this.local_netAddress = raw.getNetAddress();
Copy link
Contributor

Choose a reason for hiding this comment

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

What was the change to BrowseResourceResponse? Did netAddress get renamed to localEspInstance?

Copy link
Member Author

Choose a reason for hiding this comment

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

apparently the service will populate either field based on the client version. We should not allow these types of changes going forward. For now, let's add logic to the wrapper to map the response value

@rpastrana
HPCC4J-583 Update wswu clients to 9.6.x
bc77af9 
- Manually updates wswu.wsdl to include recently dropped field

Signed-off-by: Rodrigo Pastrana <[email protected]>
@rpastrana
Copy link
Member Author

@jpmcmu 4th commit manually reinstates the netaddress field which was dropped in the latest update

@rpastrana rpastrana requested a review from jpmcmu March 15, 2024 19:21
jpmcmu
jpmcmu approved these changes Mar 27, 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.

@rpastrana looks good

@rpastrana rpastrana merged commit 9f245d2 into hpcc-systems:candidate-9.6.x Mar 27, 2024
5 of 6 checks passed
drealeed pushed a commit that referenced this pull request May 13, 2024
@rpastrana @drealeed
HPCC4J-583 Update filespray and dfuxref clients to 9.6.x (#695)
696bdd6 
* HPCC4J-583 Update filespray and dfuxref clients to 9.6.x

- Updates filespray wsdl2java maven profile

Signed-off-by: Rodrigo Pastrana <[email protected]>

* HPCC4J-583 Update filespray and dfuxref clients to 9.6.x

- Updates wstopology, wssmc
- Wssmc wrapper manually updated

Signed-off-by: Rodrigo Pastrana <[email protected]>

* HPCC4J-583 Update filespray and dfuxref clients to 9.6.x

- Updates wsworkunits, includes manual wsdl changes

Signed-off-by: Rodrigo Pastrana <[email protected]>

* HPCC4J-583 Update wswu clients to 9.6.x

- Manually updates wswu.wsdl to include recently dropped field

Signed-off-by: Rodrigo Pastrana <[email protected]>

---------

Signed-off-by: Rodrigo Pastrana <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@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.
2 participants
@rpastrana @jpmcmu