Skip to content

Commit

Permalink
Add license file
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Torson committed Mar 7, 2016
1 parent 2520911 commit 806c4d2
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 12 deletions.
24 changes: 24 additions & 0 deletions licence.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
This is free and unencumbered software released into the public domain.

Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.

In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

For more information, please refer to <http://unlicense.org>
24 changes: 12 additions & 12 deletions src/test/java/com/objectpartners/DtoTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ protected DtoTest() {
}

/**
* Creates an instance of {@link DtoTest} with the default ignore fields.
* Creates an instance of {@link DtoTest} with ignore fields and additional custom mappers.
*
* @param customMappers Any custom mappers for a given class type.
* @param ignoreFields The getters which should be ignored (e.g., "getId" or "isActive").
Expand Down Expand Up @@ -157,17 +157,17 @@ private void callGetter(String fieldName, Method getter, T instance, Object expe
private Object createObject(String fieldName, Class<?> clazz)
throws InstantiationException, IllegalAccessException {

final Supplier<?> supplier = this.mappers.get(clazz);
if (supplier != null) {
return supplier.get();
}

if (clazz.isEnum()) {
return clazz.getEnumConstants()[0];
}

try {
return clazz.newInstance();
try {
final Supplier<?> supplier = this.mappers.get(clazz);
if (supplier != null) {
return supplier.get();
}

if (clazz.isEnum()) {
return clazz.getEnumConstants()[0];
}
return clazz.newInstance();
} catch (IllegalAccessException | InstantiationException e) {
throw new RuntimeException("Unable to create objects for field '" + fieldName + "'.", e);
}
Expand Down

0 comments on commit 806c4d2

Please sign in to comment.