[Hawkular-commits] [hawkular/hawkular-alerts] 0b72d9: Unify json deserialization

Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-alerts Commit: 0b72d9b8199d07b50d404a44cdfb3af879a567a2 https://github.com/hawkular/hawkular-alerts/commit/0b72d9b8199d07b50d404a... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-02-06 (Sat, 06 Feb 2016) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/GroupConditionsInfo.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JsonImport.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/export/AlertDefinitions.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/FullTrigger.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsImportManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/impl/AlertsImportManagerTest.java M hawkular-alerts-rest-tests/pom.xml M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- Unify json deserialization Simplify json helpers classes Commit: e17ae8cd68d3da4516967ceb2c93c4dd5a16cf6e https://github.com/hawkular/hawkular-alerts/commit/e17ae8cd68d3da4516967c... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-02-07 (Sun, 07 Feb 2016) Changed paths: M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ActionsITest.groovy M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionPluginHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/EventsHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ResponseUtil.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- HWKALERTS-106 Review REST API annotations Commit: bd340c2081a7d1f977498e6c1e5aa8954ec65534 https://github.com/hawkular/hawkular-alerts/commit/bd340c2081a7d1f977498e... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-02-08 (Mon, 08 Feb 2016) Changed paths: M hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/src/test/java/org/hawkular/alerts/actions/irc/IrcPluginTest.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/export/ImportType.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/log/MsgLogger.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassPersistenceTest.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.java M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ActionsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/BusITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/GroupITest.groovy A hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ImportExportITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/TriggersITest.groovy A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ExportHandler.java A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ImportHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- HWKALERTS-8 Add Import/Export of alerts definitions Commit: 49c5645a45ab007036a3c10d88f5e112f5854ae9 https://github.com/hawkular/hawkular-alerts/commit/49c5645a45ab007036a3c1... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-02-09 (Tue, 09 Feb 2016) Changed paths: M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/AbstractITestBase.groovy M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/accounts/PersonaFilter.java Log Message: ----------- HAWKULAR-992 Return 400 if Hawkular-Tenant is set on Hawkular deployments Commit: 37a504a66bc5c6931bc0ddcc3685c5a0db18541d https://github.com/hawkular/hawkular-alerts/commit/37a504a66bc5c6931bc0dd... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-02-09 (Tue, 09 Feb 2016) Changed paths: M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/AbstractITestBase.groovy Log Message: ----------- Set Hawkular-Tenant on standalone cluster tests Commit: 56228d0267cce17dfd3ff97e8d6073c501d5b587 https://github.com/hawkular/hawkular-alerts/commit/56228d0267cce17dfd3ff9... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-02-09 (Tue, 09 Feb 2016) Changed paths: M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/DampeningITest.groovy Log Message: ----------- Fix data not deleted in itest Commit: ce2f6073c9105955f2c3c362fb935af0eab6a548 https://github.com/hawkular/hawkular-alerts/commit/ce2f6073c9105955f2c3c3... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-02-09 (Tue, 09 Feb 2016) Changed paths: R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/export/AlertDefinitions.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/export/Definitions.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/export/ImportType.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsImportManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ExportHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ImportHandler.java Log Message: ----------- Rename AlertsDefinitions per Definitions Commit: 6e321a4009e9f7b6246abb357c3b75687ee1a229 https://github.com/hawkular/hawkular-alerts/commit/6e321a4009e9f7b6246abb... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2016-02-09 (Tue, 09 Feb 2016) Changed paths: M hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/src/test/java/org/hawkular/alerts/actions/irc/IrcPluginTest.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/GroupConditionsInfo.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JsonImport.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/export/Definitions.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/export/ImportType.java A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/FullTrigger.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsImportManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/log/MsgLogger.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassPersistenceTest.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.java M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/impl/AlertsImportManagerTest.java M hawkular-alerts-rest-tests/pom.xml M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/AbstractITestBase.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ActionsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/BusITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/DampeningITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/GroupITest.groovy A hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ImportExportITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/TriggersITest.groovy M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionPluginHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/EventsHandler.java A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ExportHandler.java A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ImportHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ResponseUtil.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/accounts/PersonaFilter.java Log Message: ----------- Merge pull request #163 from lucasponce/import-export-triggers Import export triggers Compare: https://github.com/hawkular/hawkular-alerts/compare/9b9f9b66084a...6e321a...