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

De-duplicate ProxyMaker #1025

Merged
merged 4 commits into from Jan 20, 2023
Merged

De-duplicate ProxyMaker #1025

merged 4 commits into from Jan 20, 2023

Conversation

aSemy
Copy link
Contributor

@aSemy aSemy commented Jan 15, 2023

fix #1024

  • De-duplicates ProxyMaker, which was present in two modules, and both were almost identical
  • It seems that one of the classes was more up to date than the other - so I copied the newer changes (unfortunately git history of the other will be lost).
  • Minor fixes to get adjust the code to work correctly
  • remove an unused function on SubclassInstrumentation interface

Depends on #1023 (because I accidentally created this branch from the wrong base!)

@Raibaz
Copy link
Collaborator

Raibaz commented Jan 17, 2023

I just merged #1023, I think you can rebase this on top of master

@aSemy
de-duplicate ProxyMaker
d9ceddc 
Note that the git history of one of the ProxyMaker files won't be reflected in the surviving class

* rename JvmSubclassInstrumentation to avoid name class with SubclassInstrumentation
* update JvmSubclassInstrumentation to implement SubclassInstrumentation
* remove unused method setProxyHandler() from SubclassInstrumentation
@aSemy
update API spec after unused function was removed
e4ecd51
@aSemy
add Kotlin reflect (required for checking if class is sealed, in Prox…
6bb1911 
…yMaker)
@aSemy aSemy marked this pull request as ready for review January 20, 2023 10:55
@aSemy
Copy link
Contributor Author

aSemy commented Jan 20, 2023

@Raibaz thanks, rebased 👍

@Raibaz Raibaz merged commit cac70d9 into mockk:master Jan 20, 2023
@Raibaz
Copy link
Collaborator

Raibaz commented Jan 20, 2023

Thanks!

@aSemy aSemy deleted the fix/dedupe_proxymaker branch January 20, 2023 20:12
@stephanprantl stephanprantl mentioned this pull request Jan 30, 2023
Merged
@ecjante ecjante mentioned this pull request Feb 3, 2023
Open
@oliverspryn oliverspryn mentioned this pull request Aug 22, 2023
Closed
3 tasks
LeonRa added a commit to LeonRa/mockk that referenced this pull request Sep 10, 2023
@LeonRa
Revert "Merge pull request mockk#1025 from aSemy/fix/dedupe_proxymaker"
1fe07f1 
This reverts commit cac70d9, reversing
changes made to 7d322e3.

# Conflicts:
#	modules/mockk-agent-api/src/jvmMain/kotlin/io/mockk/proxy/common/ProxyMaker.kt
@LeonRa LeonRa mentioned this pull request Sep 10, 2023
Merged
2 tasks
LeonRa added a commit to LeonRa/mockk that referenced this pull request Sep 11, 2023
@LeonRa
Revert "Merge pull request mockk#1025 from aSemy/fix/dedupe_proxymaker"
6944843 
This reverts commit cac70d9, reversing
changes made to 7d322e3.

# Conflicts:
#	modules/mockk-agent-api/src/jvmMain/kotlin/io/mockk/proxy/common/ProxyMaker.kt
LeonRa added a commit to LeonRa/mockk that referenced this pull request Sep 11, 2023
@LeonRa
Revert "Merge pull request mockk#1025 from aSemy/fix/dedupe_proxymaker"
31ce02d 
This reverts commit cac70d9, reversing
changes made to 7d322e3.

# Conflicts:
#	modules/mockk-agent-api/src/jvmMain/kotlin/io/mockk/proxy/common/ProxyMaker.kt
SimonMarquis pushed a commit to SimonMarquis/mockk that referenced this pull request Sep 12, 2023
@LeonRa @SimonMarquis
Revert "Merge pull request mockk#1025 from aSemy/fix/dedupe_proxymaker"
641ec02 
This reverts commit cac70d9, reversing
changes made to 7d322e3.

# Conflicts:
#	modules/mockk-agent-api/src/jvmMain/kotlin/io/mockk/proxy/common/ProxyMaker.kt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

De-duplicate ProxyMaker class
2 participants
@aSemy @Raibaz