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

Update connectionResiliency branch with the changes from dev branch #643

Merged
merged 1,020 commits into from
Mar 9, 2018

Conversation

ulvii
Copy link
Contributor

@ulvii ulvii commented Mar 5, 2018

There are a few tests disabled, should be addressed when merging this branch to dev.

xiangyushawn and others added 30 commits September 12, 2017 09:35
…ft#74)

* Add connection properties to specify a custom TrustManager

Adds two new connection properties that can be used to specify a custom
TrustManager implementation:

trustManagerClass - Class name of the custom TrustManager

trustManagerConstructorArg - Optional argument to pass to the constructor
constructor of the custom TrustManager.

If encryption is enabled and the trustManagerClass property is specified,
it will be retrieved via Class.forName(...).

If the optional property trustManagerConstructorArg is specified, then a
constructor will be retrieved via getDeclaredConstructors(String.class).
The TrustManager will then be instantiated by specified the optional
argument as a parameter.

If the optional property trustManagerConstructorArg is not specfied,
then the default no argument constructor of the class will be retrieved
and instantiated.

* Adding a few simple test to verify the newly added connection properties

* Rename custom trustmanager test package name

Previous package name used camel case. Corrects naming to be lower case.

* Add missing newlines to trustmanager test classes

* Refactor references to trust managers in tests

* Refactor whitespace and unneeded extends Object

* Add resource cleanup to trust manager tests

* Refactor failure handling for trust manager test

* Rename tmClazz to tmClass

* Add new trust manager properties to SQLServerDataSource

* Reword comment

* Format custom trustmanager changes with auto formatter
Fix exception thrown by getters on null columns
removing javax.xml.bind package dependency
…ressions

Simplify overly complex boolean expressions
…nverter

Revert "removing javax.xml.bind package dependency "
…_deprecated_APIs

Revert "Removing deprecated APIs in java 9"
Replace manual array copying with System.arraycopy().
Calling toString() on a String object is redundant
Replace bare literals with magic constants. For example:

`cal.set(1, 1, 577738, 0, 0, 0);`

becomes

`cal.set(1, Calendar.FEBRUARY, 577738, 0, 0, 0);`
…if-statement

Revert "Remove redundant if/else statements"
cheenamalhotra and others added 21 commits February 8, 2018 16:55
Re-introduce Retry logic for prepared statement caching
…pare to class level declaration to avoid multi-threading issues.
Added needsPrepare Check and removed error code 99586 check
Update changelog and driver version for RTW 6.4 release
Update SNAPSHOT for upcoming preview release.
Update connectionResiliency branch with the changes from dev branch
@ulvii ulvii changed the title Latest changes from dev branch Update connectionResiliency branch with the changes from dev branch Mar 5, 2018
@ulvii ulvii requested a review from cheenamalhotra March 8, 2018 00:09
@codecov-io
Copy link

codecov-io commented Mar 8, 2018

Codecov Report

Merging #643 into connectionResiliency will increase coverage by 0.41%.
The diff coverage is 49.41%.

Impacted file tree graph

@@                    Coverage Diff                    @@
##             connectionResiliency    #643      +/-   ##
=========================================================
+ Coverage                   45.78%   46.2%   +0.41%     
- Complexity                   2225    2239      +14     
=========================================================
  Files                         109     110       +1     
  Lines                       25983   26120     +137     
  Branches                     4332    4347      +15     
=========================================================
+ Hits                        11897   12069     +172     
+ Misses                      12006   11963      -43     
- Partials                     2080    2088       +8
Flag Coverage Δ Complexity Δ
#JDBC41 ? ?
#JDBC42 46.08% <48.01%> (+0.48%) 2233 <10> (+18) ⬆️
#JDBC43 46.06% <47.24%> (?) 2234 <10> (?)
Impacted Files Coverage Δ Complexity Δ
...m/microsoft/sqlserver/jdbc/SQLServerResultSet.java 32.79% <ø> (+0.05%) 243 <0> (+2) ⬆️
...ncurrentlinkedhashmap/ConcurrentLinkedHashMap.java 37.9% <ø> (-4.74%) 41 <0> (-6)
...oft/sqlserver/jdbc/SQLServerResultSetMetaData.java 40.97% <ø> (ø) 23 <0> (ø) ⬇️
.../microsoft/sqlserver/jdbc/SQLServerConnection.java 46.4% <ø> (+4.66%) 311 <0> (+28) ⬆️
...t/sqlserver/jdbc/SQLServerConnectionPoolProxy.java 14.65% <ø> (ø) 14 <0> (ø) ⬇️
...m/microsoft/sqlserver/jdbc/SQLServerException.java 73.55% <ø> (-3.31%) 27 <0> (-2)
...om/microsoft/sqlserver/jdbc/SQLServerResource.java 100% <ø> (ø) 4 <0> (ø) ⬇️
...a/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...microsoft/sqlserver/jdbc/SQLServerADAL4JUtils.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...icrosoft/sqlserver/jdbc/SQLServerXAConnection.java 0% <0%> (ø) 0 <0> (ø) ⬇️
... and 52 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 06abd7f...be4b748. Read the comment docs.

@ulvii ulvii merged commit b20a75c into microsoft:connectionResiliency Mar 9, 2018
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.