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

Graph Builder Refactoring #133

Merged
merged 4 commits into from
Sep 22, 2023
Merged

Conversation

c71n93
Copy link
Member

@c71n93 c71n93 commented Sep 19, 2023

Closes #119

Also:

  • Adds not working test with vertical dot notation, that need to be resolved (Fix XSL transformations #116)
  • Improves algorithm of graph building

PR-Codex overview

This PR focuses on improving the code readability and adding dependencies.

Detailed summary

  • Updated the Graph class to clarify the type of objects it contains.
  • Added the commons-lang3 dependency to the project.
  • Added a new test case for the DdrWorkflowTest class.
  • Refactored the IGraphNode class to use a different method for retrieving the name property.
  • Refactored the AttributesSetter class to use new utility methods for retrieving attribute content.
  • Updated the BasicDecoratorsResolver class to use new utility methods for retrieving attribute content.
  • Added new utility methods for attribute retrieval in various classes.
  • Updated the InnerPropagator class to use the new utility methods for attribute retrieval.
  • Updated the CondAttributesSetter class to use the new utility methods for attribute retrieval.

The following files were skipped due to too many changes: src/main/kotlin/org/objectionary/ddr/graph/CondAttributesSetter.kt, src/main/kotlin/org/objectionary/ddr/transform/Resolver.kt, src/test/resources/integration/in/basic_cycle/basic_cycle.xmir, src/main/kotlin/org/objectionary/ddr/transform/impl/CondNodesResolver.kt, src/test/resources/integration/out/basic_cycle/basic_cycle.xmir, src/main/kotlin/org/objectionary/ddr/graph/AttributesUtil.kt, src/main/kotlin/org/objectionary/ddr/graph/GraphBuilder.kt

✨ Ask PR-Codex anything about this PR by commenting with /codex {your question}

@c71n93
Copy link
Member Author

c71n93 commented Sep 19, 2023

@Graur could you review please?

@c71n93 c71n93 changed the title 119 graph builder Graph Builder Refactoring Sep 19, 2023
@c71n93 c71n93 force-pushed the 119-graph-builder branch 2 times, most recently from e0959c6 to 9918c23 Compare September 19, 2023 17:18
@Graur
Copy link

Graur commented Sep 20, 2023

@c71n93 Github check failed. Is it ok? Or you need some extra time to fix it?

@c71n93
Copy link
Member Author

c71n93 commented Sep 20, 2023

@Graur The problem appears only in CI, locally it's Okay. I will try to fix it.

@Graur
Copy link

Graur commented Sep 21, 2023

@c71n93 Seems like this is the reason:

Warning:  Used undeclared dependencies found:
	org.apache.commons:commons-lang3:jar:3.12.0:compile

@c71n93
Copy link
Member Author

c71n93 commented Sep 21, 2023

@Graur Thank you! I will fix it!

@Graur
Copy link

Graur commented Sep 21, 2023

@c71n93 Ok. The rest of the code is look good to me. If you fix this problem I can approve your changes.

@c71n93
Copy link
Member Author

c71n93 commented Sep 21, 2023

@Graur fixed

Copy link

@Graur Graur left a comment

Choose a reason for hiding this comment

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

@c71n93 It is better now, thanks!

@c71n93
Copy link
Member Author

c71n93 commented Sep 22, 2023

@yegor256 please take a look

@yegor256
Copy link
Member

@rultor merge

@rultor
Copy link
Contributor

rultor commented Sep 22, 2023

@rultor merge

@yegor256 OK, I'll try to merge now. You can check the progress of the merge here

@rultor rultor merged commit d29ef95 into objectionary:master Sep 22, 2023
3 checks passed
@rultor
Copy link
Contributor

rultor commented Sep 22, 2023

@rultor merge

@yegor256 Done! FYI, the full log is here (took me 12min)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refactor GraphBuilder class
5 participants