[Hawkular-commits] [hawkular/hawkular-alerts] 306563: Add Json anotations into API model

Branch: refs/heads/wintermute Home: https://github.com/hawkular/hawkular-alerts Commit: 306563731f4e0cf627c57641ed07dc9fba564a62 https://github.com/hawkular/hawkular-alerts/commit/306563731f4e0cf627c576... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2015-03-11 (Wed, 11 Mar 2015) Changed paths: M hawkular-alerts-api/pom.xml M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Availability.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/NumericData.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/StringData.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java A hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy Log Message: ----------- Add Json anotations into API model Commit: 22d89d27b394b18e6723964ec3895c92b61bdecb https://github.com/hawkular/hawkular-alerts/commit/22d89d27b394b18e672396... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2015-03-11 (Wed, 11 Mar 2015) Changed paths: M hawkular-alerts-api/pom.xml M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeConditionEval.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Availability.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/NumericData.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/StringData.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java A hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy Log Message: ----------- Merge pull request #22 from lucasponce/MODEL-Reviewed Add Json anotations into API model Compare: https://github.com/hawkular/hawkular-alerts/compare/e7da0458c3c2...22d89d...