Skip to content

Major Kotlin DSL Improvement #353

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
Merged
merged 51 commits into from
Apr 28, 2021
Merged

Major Kotlin DSL Improvement #353

merged 51 commits into from
Apr 28, 2021

Conversation

jeffgbutler
Copy link
Member

This large PR has the following general themes:

  1. Build out the full DSL for Kotlin. This avoids the use of the Java DSL entry points in SqlBuilder, more accurately expresses the nullability expectations of the DSL, and eliminates the platform types inferred from using the Java DSL in Kotlin
  2. Add a few missing capabilities to the Kotlin DSL
  3. Explicitly specify the return types for all Kotlin functions in keeping with community recommendations for a Kotlin library
  4. Update the recommended Kotlin meta-model pattern in all tests
  5. Improve the documentation for the Kotlin DSL

jeffgbutler added 30 commits March 8, 2021 11:44
@jeffgbutler
Update and extend the Kotlin DSL
552d3d5 
- Remove dependency on org.mybatis.dynamic.sql.SqlBuilder as this causes name collisions in some cases
- Explicitly denote the nullability aspects of the API
- Specify all return types per Kotlin Library coding conventions
@jeffgbutler
Use new Kotlin IR compiler
b70661a
@jeffgbutler
Use Proper pattern for support class
8132ff6
@jeffgbutler
Copyright
5a1c06c
@jeffgbutler
Better column builder
3375867
@jeffgbutler
Coverage
27ea732
@jeffgbutler
Style
5f72c56
@jeffgbutler
Explicit Nullability Declaration
2074542
@jeffgbutler
Overloads next to each other
b5833c7
@jeffgbutler
Chain when/then methods
ba8533a
@jeffgbutler
Merge branch 'master' into kotlin-dsl-update
455a0ee
@jeffgbutler
Updates after refactoring
65d5098
@jeffgbutler
Merge branch 'master' into kotlin-dsl-update
910171a
@jeffgbutler
Remove the supplier based methods
2a0d8c5 
They cause weird overload issues and the don't make much sense anymore as
the underlying Java code doesn't use them.
@jeffgbutler
Merge branch 'master' into kotlin-dsl-update
f4e6ad2 
# Conflicts:
#	src/test/kotlin/examples/kotlin/mybatis3/canonical/ReusableWhereTest.kt
@jeffgbutler
Merge fixes
3da4e04
@jeffgbutler
Merge branch 'master' into kotlin-dsl-update
e7c0dce 
# Conflicts:
#	src/test/java/examples/simple/PersonMapperTest.java
@jeffgbutler
Checkstyle
5a8e6f5
@jeffgbutler
Merge branch 'master' into kotlin-dsl-update
c3cbd0e
@jeffgbutler
Merge branch 'master' into kotlin-dsl-update
85f85c7
@jeffgbutler
New meta-model pattern
ca9bbc1
@jeffgbutler
Copyrights and Simple Formatting
6bb9124
@jeffgbutler
Add support for batch inserts with MyBatis
d576b8d
@jeffgbutler
Polishing
fa68b9e
@jeffgbutler
Code around some Kotlin warnings
9ef056b
@jeffgbutler
Kotlin documentation updates
1726192
@jeffgbutler
Start of update for Kotlin/MyBatis3 Documentation
3c2e7b1
@jeffgbutler
Start of support for Value or Null Mapping
f56b9fd
@jeffgbutler
Kotlin DSL Updates
ba5baf0
@jeffgbutler
Merge branch 'master' into kotlin-dsl-update
d8a7343 
# Conflicts:
#	src/main/java/org/mybatis/dynamic/sql/util/ValueOrNullMapping.java
@jeffgbutler
Updates after merge
dc190b1
@jeffgbutler
Support and tests for valueOrNull
a1de6aa
@jeffgbutler
Documentation Progress
f39b03b
@jeffgbutler
Merge branch 'master' into kotlin-dsl-update
74f54cc
@jeffgbutler
Support nullable collections in "in when present" methods
c911da5
@jeffgbutler
Add examples of generated keys with MyBatis/Kotlin
9bc2b35
@jeffgbutler
Documentation Progress
f71924a
@jeffgbutler
Start of better support for insertMultiple with Generated Keys in MyB…
ad46ba9 
…atis
@jeffgbutler
Tests
8835bb6
@jeffgbutler
Merge branch 'master' into kotlin-dsl-update
c6fff43 
# Conflicts:
#	src/main/java/org/mybatis/dynamic/sql/util/SqlProviderAdapter.java
#	src/test/kotlin/examples/kotlin/mybatis3/canonical/GeneratedAlwaysDynamicSqlSupport.kt
@jeffgbutler
Updates after merge
937f349
@jeffgbutler
Polishing
3d82b56
@jeffgbutler
Progress on Kotlin Documentation
100669d
@jeffgbutler
Merge branch 'master' into kotlin-dsl-update
89b7ee2
@jeffgbutler
Add flush capability to CommonInsertMapper
11b97cf
@jeffgbutler
Documentation of Update methods
b295cfc
@jeffgbutler
Add support for generated keys with insert select in Spring
06d8bcf
@jeffgbutler
Downgrade Kotlin for Jacoco
25ee44b
@jeffgbutler
Checkstyle
74023cd
@jeffgbutler
Checkstyle
57fda89
@jeffgbutler jeffgbutler added this to the 1.3.0 milestone Apr 28, 2021
@coveralls
Copy link

coveralls commented Apr 28, 2021 •
edited
Loading

Coverage Status

Coverage remained the same at 100.0% when pulling db492fe on jeffgbutler:kotlin-dsl-update into 3962a17 on mybatis:master.

@jeffgbutler jeffgbutler merged commit d023ee8 into mybatis:master Apr 28, 2021
@jeffgbutler jeffgbutler deleted the kotlin-dsl-update branch April 28, 2021 15:58
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
enhancement
Projects
None yet
Milestone
1.3.0
Development

Successfully merging this pull request may close these issues.
2 participants
@jeffgbutler @coveralls