Skip to content

Merging in Dev to Master for 6.3.3 release#507

Merged
peterbae merged 57 commits intomasterfrom
dev
Sep 23, 2017
Merged

Merging in Dev to Master for 6.3.3 release#507
peterbae merged 57 commits intomasterfrom
dev

Conversation

@peterbae
Copy link
Copy Markdown
Contributor

No description provided.

peterbae and others added 30 commits August 29, 2017 16:54
All objects in Java implicity extend `java.lang.Object` so `extends Object` is redundant.

Removing it will reduce confusion, and increase code readability.
```
if (foo()) {
   return true;
} else {
   return false;
}
```

can be simplified to:
```
return foo();
```
`return;` is unnecessary if it is the last statement in a `void` method
|Example|Replacement|
|-|-|
|`condition ? true : false`|`condition`|
|`condition ? false : true`|`!condition`|
|`value == null ? null : value`|`value`|
|`result != 0 ? result : 0`|`result`|
|`a == b ? a : b`|`b`|
xiangyushawn and others added 26 commits September 12, 2017 09:35
* 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
fix methods that use sp_fkeys
Remove unnecessary return statements
Simplify overly complex boolean expressions
Revert "removing javax.xml.bind package dependency "
…ed_APIs

Revert "Removing deprecated APIs in java 9"
Revert "Remove redundant if/else statements"
@msftclas
Copy link
Copy Markdown

@peterbae,
Thanks for your contribution as a Microsoft full-time employee or intern. You do not need to sign a CLA.
Thanks,
Microsoft Pull Request Bot

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #507 into master will increase coverage by 0.14%.
The diff coverage is 74.74%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #507      +/-   ##
============================================
+ Coverage      46.3%   46.44%   +0.14%     
- Complexity     2209     2212       +3     
============================================
  Files           108      108              
  Lines         25231    25312      +81     
  Branches       4173     4181       +8     
============================================
+ Hits          11682    11755      +73     
+ Misses        11537    11530       -7     
- Partials       2012     2027      +15
Flag Coverage Δ Complexity Δ
#JDBC41 46.21% <74.74%> (+0.13%) 2203 <38> (+6) ⬆️
#JDBC42 46.34% <74.74%> (+0.2%) 2211 <38> (+10) ⬆️
Impacted Files Coverage Δ Complexity Δ
...om/microsoft/sqlserver/jdbc/SQLServerResource.java 100% <ø> (ø) 4 <0> (ø) ⬇️
...osoft/sqlserver/jdbc/SQLServerSecurityUtility.java 50.74% <ø> (ø) 10 <0> (ø) ⬇️
...a/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java 0% <ø> (ø) 0 <0> (ø) ⬇️
src/main/java/microsoft/sql/Types.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...va/com/microsoft/sqlserver/jdbc/StreamTabName.java 85% <ø> (ø) 7 <0> (ø) ⬇️
...rc/main/java/com/microsoft/sqlserver/jdbc/DDC.java 44.14% <ø> (-0.58%) 103 <0> (-2)
.../microsoft/sqlserver/jdbc/SQLServerDataSource.java 45.98% <0%> (-1.01%) 66 <0> (ø)
...om/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java 52.32% <0%> (-0.2%) 238 <0> (-1)
src/main/java/microsoft/sql/DateTimeOffset.java 41.42% <0%> (ø) 11 <1> (ø) ⬇️
...n/java/com/microsoft/sqlserver/jdbc/Parameter.java 61.58% <100%> (-0.86%) 63 <2> (ø)
... and 23 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 b9cdef4...33ff0e2. Read the comment docs.

@peterbae peterbae merged commit edc794c into master Sep 23, 2017
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.

9 participants