* Initial design of adding exception codes to exceptions
* Initial design of adding exception codes to exceptions
* change int module name to string
* add comment
* shorten message
* shorten message
* added checkstyle
* developing checker
* completed checkstyle plugin and unit test for it
* fix NPE
* fix checker so it ignores throws on exceptions that aren't new
* change parameter order in InvalidResponseException
* accept Msg.code() in any parameter since some exceptions like MessageException have the message string as the second parameter
* exclude generated files
* BIG COMMIT added error codes to all exception throws
* example test fix
* Modified tests such that the assert statements would better match the message responses.
* Modified additional tests such that the assert statements would better match the message responses.
* fix test
* merge master
* merge master
* Fourth commit of modified tests such that the assert statements would better match the message response
* Changes made to modify assert statements such that they match the new errors which now use error codes. Also changed ResourceNotFoundException to include error codes in its messages.
* Modified assert messages to better match new error codes
* Time Zone changes DRAFT. Certain tests pass in intellij and fail during mvn install
* Modified assert messages to better match new error codes
* Added comments for time zone fixes. Previous commit comment on time zone fixes was incorrect. By invaliding caches, all tests on both intellij and mvn install passed.
* Reverted changes on azure-pipelines.yml
* updated hapi-fhir version for checkstyle module
* changes to azure-pipelines.yml
* changes to azure-pipelines.yml
* change to pom.xml to include hapi-fhir-checkstyle in ALLMODULES
* changes to azure-piplines (these changes are to be reverted after testing)
* reverted changes to azure-piplines
* reverted change where hapi-fhir-checkstyle was added to pom.xml (hapi-fhir)
* Attempted fix on checkstyle build error
* modified azure-piplines.yml to change maven repository for checkstyle build
* Attempted fix on checkstyle build error
* checkstyle config location change for hapi-depoloyable-pom. (will be reverted if it does not work)
* attempted dependency add for hapi-depoloyable-pom. (will be reverted if it does not work)
* reverted changes for hapi-deployable-pom
* add javadoc
* update last code
* Attempted fix on checkstyle build error
* Finished adding in missing error codes to pass Checkstyle checks
* Test pipelining
* Fixing errors and bumping version (as suggested by Gary)
* Merge
* Fixing Checkstyle error
* Attempted fix for date error
* Add error code onto assert statement
* Add in a couple more error codes
* Fixing assert statements
* Bump to static version for dependency
* Adding error code to message
* Adding error codes to exceptions
* Adding error codes to exceptions
* Change to work with cdr branch
* Update to faulty error message
* Merge changes
* allow checkstyle pom to deploy
Co-authored-by: Ken Stevens <khstevens@gmail.com>
Co-authored-by: Simon Zuccherato <simon.zuccherato@smilecdr.com>
Co-authored-by: Predap <simon.zuccherato@gmail.com>
Co-authored-by: Predap <46201929+Predap@users.noreply.github.com>
Co-authored-by: Tadgh <garygrantgraham@gmail.com>
* Bump a number of versions
* Fixes
* Work on version bump
* Bump
* Test fix
* More version bumps
* Build fixes
* Test fixes
* Fixes
* Fixes
* Test fix
* Bump jacoco
* Test fix
* Test fix
* Test fix
* Build fix
* Build fix
* Remove versioned H2
* Build fix
* Avoid memory issue in validation tests
* JDK bump
* Restore compile with errorprone
* Force coloured output
* Force jansi
* Try again to force jansi
* Fix for hardcoded date that just passed
* Fixes to JPA
* Improve changelog
* Work on failing test
* Test fix
* Compile fix
* One more version bump
* Test fixes
* some fixmes to start
* Added some FIXMEs
* added RequestPartitionId to reosurceDelivryMessage and ResourceModifiedMessage
* ResourceDeliveryMessage and ResourceModifiedMessage tests
* fixed issue with test missing partitionHelperSvc mocked bean
* Added tests and implemented SubscriptionMatchingSubscriber for partition aware subscription
* modified implementation of partitionId in CanonicalSubscription
* Moved PartitionablePartitionId, and refactored all calls to getUserData(Constants.RESOURCE_PARTITION_ID) and setUserData(Constants.RESOURCE_PARTITION_ID)
* Revert "Moved PartitionablePartitionId, and refactored all calls to getUserData(Constants.RESOURCE_PARTITION_ID) and setUserData(Constants.RESOURCE_PARTITION_ID)"
This reverts commit fe40fb9733.
* Got added partitionId to subscriptions, added changes to make SubscriptionMatchingSubscriberTest work
* added SubscriptionTriggering test, also added partition support to subscriptionLoader
* Changed implementation for storing partition id of subscriptions from messages, refactored tests to new implementation
* added all subscription systemRequestDetails with all partition to subscription reader
* refactored a generic system request details with default all partition request
* Added test for dao subscriptions, fixes to get the test working
* added partition support for latest version delivery
* added doc changes and changelog for multitenancy subscription
* cleanup and added partitioned subscription manually trigger test
* fixed mocked subscriptionDao
* added package-info for subscription module
* some code review changes
* removed AllPartitionSystemRequestDetail, added new text for multitenant subscription
* renamed method for code review
* version bump to 5.7.0PRE7
Co-authored-by: Michael Buckley <michael.buckley@smilecdr.com>
Co-authored-by: Ken Stevens <khstevens@gmail.com>
Co-authored-by: Long Ma <long@smilecdr.com>
Co-authored-by: Steven Li <steven@smilecdr.com>
* move mail config to mail service constructor
* update subscription email sender
* added license text
* [2669] bump HAPI version to 5.7.0-PRE6-SNAPSHOT
* add changelog
* First cut at multithreading bundle validation
* javadoc
* change test to a red-green test
* add daoconfig
* move bundle concurrency config from validationsupport to request validator
* Moved concurrent details from ValidationOptions to FhirValidator
* Remove bundleValidationThreadCount (it's set by creating an appropriate executor)
* validate threadpool prefixes
* FIXME cleanup
* reassign FIXMEs to JB
* only create the threadpool if it will be used
* Add the MdcTaskDectorator to all threadpools
* Add bundle path to concurrently validated bundle resource validation messages.
* Add test to check bundle entry path being added to validation messages
* Threaded validation of contained resources initial checkin
* FHIR validator refactored to maintain correct bundle path and async validation task
* Refactored to use validation complete invoke callback to support raw string resource or resource object
* switch from XML to JSON
* # Conflicts:
# hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java
# hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java
* Updated to use new HAPI-FHIR version
* merge 'validate_contains_change' into issue-3144-multi-threaded-bundle-validation
* Updated to use new HAPI-FHIR version
* Revert "Updated to use new HAPI-FHIR version"
This reverts commit 910b7f676b.
* Revert "merge 'validate_contains_change' into issue-3144-multi-threaded-bundle-validation"
This reverts commit c7d60fc3e6.
* Revert "Updated to use new HAPI-FHIR version"
This reverts commit aa8a7af455.
# Conflicts:
# hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java
* Fix Test dependencies after reverting changes.
* merge 'validate_contains_change' to 2564-contained-resource-validation-flag
* Disable threadpool prefix name validate check.
* merge master
* fix thread regexp
* pre-review cleanup
* change log
* fix test
* revert to XML as default validation serialization
* fix test
* fix test
Co-authored-by: Jaison B <jaisonb@gmail.com>
* issue-1134 initial work on adding retry handler
* issue-1134 subdscription creation fixes
* issue-1134 update the test
* issue-1134 retry policy off canonicalsubscription
* issue 1134 base subscription changes
* add failing test
* issue 1134 retry configs on base parameters
* issue 1134 passing forward params
* issue-1134 added more tests for making sure subscriptions create their channels correctly
* issue-1134 updates to get the retry to channels
* issue-1134 updating channel factory
* issue-1134 remove the dlq since it's not defineable
* issue-3120 changelog added
* issue-3120 cleaning up
* issue-3120 test fix
* issue-3120 review fixes
* issue-3120 fixed bad master merge
* issue-3120 updates for new release
Co-authored-by: leif stawnyczy <leifstawnyczy@leifs-MacBook-Pro.local>
Co-authored-by: Ken Stevens <khstevens@gmail.com>
* issue-1134 initial work on adding retry handler
* issue-1134 subdscription creation fixes
* issue-1134 update the test
* issue-1134 retry policy off canonicalsubscription
* issue 1134 base subscription changes
* add failing test
* issue 1134 retry configs on base parameters
* issue 1134 passing forward params
* issue-1134 added more tests for making sure subscriptions create their channels correctly
* issue-1134 updates to get the retry to channels
* issue-1134 updating channel factory
* issue-1134 remove the dlq since it's not defineable
* issue-3120 changelog added
* issue-3120 cleaning up
* issue-3120 test fix
* issue-3120 review fixes
* issue-3120 fixed bad master merge
Co-authored-by: leif stawnyczy <leifstawnyczy@leifs-MacBook-Pro.local>
Co-authored-by: Ken Stevens <khstevens@gmail.com>
* Add tests. Add implementation in R4. Add changelog
* Wip partial fixup of other STU versions
* Updated usages of new patient type everything api
* Partial commit of incomplete documentation
* Remove docs
* Cut to token instead of string
* Bump hapi version due to breaking api changes
* Migration finished
* Work on LOBS
* Add to ClobMigrated annotation
* Deal with lobs
* Work on new approach
* HAPI FHIR version bump
* Add changelog
* Add license header
* Fix intermittent
* CLeanup
* Cleanup
* first pass moving core storage classes to storage-api
* move term service apis
* nearly done
* rename hapi-fhir-storage-api to hapi-fhir-storage and move transaction processor
* rename hapi-fhir-storage-api to hapi-fhir-storage and move transaction processor
* create new SearchConstants class to store platform independent search constants
* move a couple of subscription services
* move transaction processor adapter to storage
* version bump
* move searchparam
* fix test
* fix compile includes
* fix text
* fix docs
* Avoid dead SearchParameter links in CapabilityStatement
* Resolve fixmes
* Build fix
* Test fix
* Test fix
* Test fix
* Work on metadata
* Fixes
* Test fixes
* Test fix
* Test fix
* Test fixes
* Test fix
* Work on test fixes
* Test fixes
* Test fixes
* Test fixes
* Test fix
* Fix params
* Resolve fixme
* Adjust changelogs
* Version bump to 5.6.0-PRE7
* Add license header
* Bump version to 5.6.0-PRE5-SNAPSHOT
* initial roughout of mdm clear batch job
* still roughing out classes
* finished first draft of reader
* most tests passing now
* all tests pass. now FIXMEs
* FIXMEs done. Time for regression.
* fix test
* changelog and docs
* fix test
* pre-review cleanup
* version bump
* move spring autowire deps for cdr
* move spring autowire deps for cdr
* finally got beans working phew
* rearrange method calls so persistence module can perform clear operation on its own
* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_mdm/mdm_operations.md
Co-authored-by: Tadgh <tadgh@cs.toronto.edu>
* review feedback
* review feedback
* Remove inheritance
* fix beans
Co-authored-by: Tadgh <tadgh@cs.toronto.edu>
Co-authored-by: Tadgh <garygrantgraham@gmail.com>
* prepare to add $delete-expunge operation that will create a spring batch job
* Add operation
* Wire up jpa provider. Begin with failing test.
* Copy/paste bulk import job as a starting point.
FIXME with proposed design
* delete expunge job parameter validation with test
* implemented reader
stubbed processor, writer
* wip for master merge
* started implementing reader
* started implementing reader
* working with stubs
* happy path batch delete expunge is done
* Provider done but test not passing. Guessing batch infrastructure not running in that test.
* IT test works now
* add reader test
* Converted delete _expunge=true to use new batch job
* DeleteExpungeDaoTest passes
* Fix test
* Change batch size to integer
* rename search count to batch size
* Make delete expunge partition aware
* updated docs
* pre-review cleanup
* change log
* add partition id to SystemRequestDetails
* Make RequestPartitionId serializable
* Change delete expunge provider to use partition id instead of tenant name
* fix tests
* test pointcut gets called
* assert on pointcut calls
* Add resource type to STORAGE_PARTITION_SELECTED pointcut
* bump hapi-fhir version
move expunge provider parameters from JpaConstants to ProviderConstants
* bump hapi-fhir version
* copyrights
* restore deleteexpungeservice for mdm
* restore deleteexpungeservice for mdm
* fix test
* public constants
* convert instant to date
* Moved expunge constants to ProviderConstants
* final review
* disabling InMemoryResourceMatcherR5Test.testNowNextMinute() to see if I can get a clean test run
* fix tests
* fix tests
* fix tests
* fix tests
* review feedback
* review feedback
* review feedback
* review feedback
* review feedback
* review feedback
* improve logging
* bump version
* version bump
* recovering from failed merge
* unzip RequestListJson per Gary's suggestion. I didn't want to do it at first, but as usual Gary was right.
* fix serialization
* Start work on OpenAPI
* Fixes
* Work on OpenAPI
* Cleanup
* Cleanup
* More swagger work
* Build fix
* More work
* More work
* Add documentation
* Docs fixes
* Add changelog
* License updates
* Add API
* Cleanup
* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_plain/openapi.md
Co-authored-by: patrick-vachon-smilecdr <81274188+patrick-vachon-smilecdr@users.noreply.github.com>
* Work on scripts
* Add docs
* Compile fix
* Work on fixes
* Fix tests
* Test fix
* Test fix
* Build fix
* Tests
* Build fix
* Work on pipeline
* Version bump
* Test fix
* Version bump
* Test fix attempts
* Test fix
* Test fix
* Remove accidentally committed files
* Fixes
* Tets fixes
* Test fix
* Test fix
* Test fix
* Test fixes
* Test fixes
* Test fixes
* License header updates
* test fix
* Test fixes
* Test fix
* Test fixes
* Test fix
* Checkstyle bump
Co-authored-by: patrick-vachon-smilecdr <81274188+patrick-vachon-smilecdr@users.noreply.github.com>
* Start work on bul;k import
* Work on bulk import
* Have batch working
* Working
* Working
* More work
* More work on bulk export
* Address fixmes
* License header updates
* Test fixes
* License header updates
* Test fix
* Test fix
* Version bumps
* Work on config
* Test cleanup
* One more version bump
* Version bump
* CLeanup
* A few additions
* Test fixes
* Test fix
* Test fix
* Migration fix
* Test fix
* Test fix
* Search param service cleanup
* Work on collapsing search param
* Search param cleanup
* Work on build
* Test fix
* Test fixes
* Ongoing work
* Test fix
* Compile fix
* Test fixes
* Test fix
* Test fix
* License header updates
* Remove fixme
* Cleanup
* Cleanup
* Validation enhancements
* Work on validation api reworking
* Keep working on validation API
* Keep working on new term API
* Work on validation api
* Ongoing work on validation
* Work on integrating validation
* Work on validation API
* Add to validation API
* Work on validation
* Work on API
* Work on validation
* Work on validation API
* Work on validation API
* Work on validation api
* Work on validation API
* Work on validation api
* Validation API changes
* Work on API
* More work on validationo API
* Work on validation API
* FIxes
* WOrk on validation api
* Work on validation API
* Tests passing!
* More cleanup
* More validation API changes
* Fix intermittent test failure
* Package reorg
* Validation API work
* Work on doocumentation
* Work on API
* More work on new validation API
* Fix errorprone-reported error
* Test fixes
* Documentation updates
* Documentation tweaks
* Work on API
* Bean name adjustments
* Build fixes
* Some test fixes
* Don't succeed validation on unknown codesystem
* Test fixes
* Work on error messages
* Work on code validation API
* work on tests
* Work on validation
* Test fix
* Update DSTU3 validation reources
* Upgrade structures
* Test fixes
Squashed commit of the following:
commit 12f89a423a
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 14:38:51 2017 -0400
Minimize validation resources
commit f6868cce5c
Merge: 3b80779fd31e158311d8
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 14:05:34 2017 -0400
Forward port fix for #710
Merge branch 'master' into hapi3_refactor
commit 3b80779fd3
Merge: 1f534985e8356d9acaf7
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 12:31:09 2017 -0400
Forward port #705, #708, and #710
Merge branch 'master' into hapi3_refactor
commit 1f534985e8
Merge: 7c39a47852dedd3d635b
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 10:52:59 2017 -0400
Forward port #695
Merge branch 'master' into hapi3_refactor
commit 7c39a47852
Merge: e0ffb84d216efafe62f1
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 09:53:17 2017 -0400
Forward port #688
Merge branch 'master' into hapi3_refactor
commit e0ffb84d21
Merge: 52388c11c1d19b00ff09
Author: James <jamesagnew@gmail.com>
Date: Sat Aug 12 14:59:46 2017 -0400
Merge branch 'master' into hapi3_refactor
commit 52388c11c1
Author: James <jamesagnew@gmail.com>
Date: Sat Aug 12 06:21:46 2017 -0400
Cleanup
commit 209752cd63
Author: James <jamesagnew@gmail.com>
Date: Thu Aug 10 11:18:19 2017 -0400
Fix tests
commit 4543408dc8
Author: James <jamesagnew@gmail.com>
Date: Sat Aug 5 06:55:50 2017 -0400
Fix a potential deadlock
commit ee360f5376
Author: James <jamesagnew@gmail.com>
Date: Sat Aug 5 06:22:06 2017 -0400
Add R4 code to CLI
commit 1a95ba3b65
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Aug 3 06:14:01 2017 -0400
More cleanup
commit f0d8802681
Author: James <jamesagnew@gmail.com>
Date: Wed Aug 2 11:27:43 2017 -0400
Tests are working!
commit a4cbda357e
Author: James Agnew <jamesagnew@gmail.com>
Date: Wed Aug 2 10:42:04 2017 -0400
Connection handling cleanup for new tests
commit 0e2cecfbd0
Author: James Agnew <jamesagnew@gmail.com>
Date: Wed Aug 2 10:16:28 2017 -0400
Clean up R4 JPA tests
commit 40317a650d
Author: James <jamesagnew@gmail.com>
Date: Wed Aug 2 09:12:38 2017 -0400
Work on R4 for JPA server
commit e7f8f8c30d
Author: James <jamesagnew@gmail.com>
Date: Tue Aug 1 20:43:47 2017 -0400
More work on porting tests
commit 43c9003258
Author: James <jamesagnew@gmail.com>
Date: Tue Aug 1 07:09:29 2017 -0400
Work on porting DSTU1 tests
commit 602857f1e2
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 31 22:34:08 2017 -0400
More work on bring unit tests up to date
commit e326a7b0cd
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 31 17:36:38 2017 -0400
Credit for #686 and forward port the fix to R4 validator
commit 96543c3992
Merge: 3fb75aa61a9901b802c4
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 31 17:12:33 2017 -0400
Merge branch 'master' into hapi3_refactor
commit 3fb75aa61a
Author: James <jamesagnew@gmail.com>
Date: Mon Jul 31 15:21:30 2017 -0400
More work on cleanup
commit b02fbb6804
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 22:11:07 2017 -0400
Work on porting STU1 tests
commit 1ae37b0db3
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 20:56:10 2017 -0400
Try to get coverage report working
commit 72b88849b3
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 20:27:02 2017 -0400
Fix android tests
commit e5f6c35aea
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 30 19:31:18 2017 -0400
More work on getting legacy code cleaned up
commit 0b513b0845
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 30 18:41:13 2017 -0400
Continue work on removing deprecated API
commit defea69aa3
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 17:10:01 2017 -0400
More cleanup of legacy code
commit 9ae7295705
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 30 07:11:45 2017 -0400
More cleanup of legacy code
commit ebd3eeb5ee
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 06:43:25 2017 -0400
More work on removing legacy code
commit 92224c2532
Author: James <jamesagnew@gmail.com>
Date: Sat Jul 29 18:44:06 2017 -0400
Remove DSTU1 Bundle
commit c52cacf71b
Author: James <jamesagnew@gmail.com>
Date: Sat Jul 29 14:27:42 2017 -0400
Now compiling
commit b405e51773
Merge: c3ddf04e25cb2cea54d7
Author: James Agnew <jamesagnew@gmail.com>
Date: Fri Jul 28 06:21:02 2017 -0400
Merge branch 'master' into hapi3_refactor
commit c3ddf04e25
Author: James <jamesagnew@gmail.com>
Date: Thu Jul 27 11:06:06 2017 -0400
Sync R4 releases in
commit b13333c3c0
Author: James <jamesagnew@gmail.com>
Date: Fri Jul 14 05:52:33 2017 -0400
JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions.
commit 2e60ff7521
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 13 20:02:46 2017 -0400
Fix imports
commit a92ace2e0d
Merge: 3196db96d11a6b3ea867
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 13 12:02:27 2017 -0400
Merge branch 'master' into hapi3_refactor
commit 3196db96d1
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 13 11:48:10 2017 -0400
Don't add false paging link to request
commit bd4e1d3388
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 9 21:32:16 2017 -0400
Finally building correctly!
commit 6464ce9304
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 9 16:38:28 2017 -0400
Work on refactor
commit 0059f2e48e
Author: James <jamesagnew@gmail.com>
Date: Sat Jul 8 07:16:20 2017 -0400
Keep working on refactor
commit 6c2e87e8cc
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 6 22:35:13 2017 -0400
Lots of work on refactor
commit 11cab97504
Merge: 34ec6b88076c47bd4c51
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 6 21:43:57 2017 -0400
Merge branch 'master' into hapi3_refactor
commit 34ec6b8807
Merge: f8e647511bc520e60ac1
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 6 21:43:49 2017 -0400
Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor
commit f8e647511b
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 6 18:46:55 2017 -0400
Work on hapi3 changes
commit c520e60ac1
Author: James <jamesagnew@gmail.com>
Date: Wed Jul 5 08:08:40 2017 -0400
Keep working on refactor
commit f1d2ee9092
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 3 22:10:59 2017 -0400
Continue refactor for HAPI 3
commit 9281ccafc3
Merge: ea1264cd8e294d080bd3
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 3 20:34:16 2017 -0400
Merge branch 'master' into hapi3_refactor
commit ea1264cd8e
Author: James <jamesagnew@gmail.com>
Date: Wed Jun 28 10:26:01 2017 -0400
Continue work on refactor
commit fbe2f98a02
Merge: b2bef471000a4dcc32ec
Author: James <jamesagnew@gmail.com>
Date: Wed Jun 28 06:21:22 2017 -0400
Merge branch 'master' into hapi3_refactor
commit b2bef47100
Author: James <jamesagnew@gmail.com>
Date: Tue Jun 27 21:13:23 2017 -0400
Work on refactor
commit 8f76e4e463
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jun 25 21:55:35 2017 -0400
Lots of work on refactoring