openstack
/
monasca-api
Code Issues Proposed changes

Use new monasca-common package names 

Fixed some places where old api package name was used

Change-Id: I06c4f3f05fdce3893cbf25563a721ba561a4f934
This commit is contained in:
Craig Bryant 2014-10-13 21:23:42 -06:00
parent 000099703b
commit f23bc9f782
57 changed files with 109 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -4,16 +4,16 @@
## Build
Requires mon-common from https://github.com/hpcloud-mon/mon-common. Download and do mvn package.
Requires monasca-common from https://github.com/stackforge/monasca-common. Download and do mvn install.
```
mvn clean package
mvn clean install
```
## Usage
```
java -jar target/mon-api.jar server config-file.yml
java -jar target/monasca-api.jar server config-file.yml
```
## Design Overview

BIN
etc/security/keystore.jks
View File

Binary file not shown.

BIN
etc/security/prod-hpmiddleware-keystore.jks
View File

Binary file not shown.

BIN
etc/security/prod-hpmiddleware-truststore.jks
View File

Binary file not shown.

9
etc/security/project
View File

File diff suppressed because one or more lines are too long

BIN
etc/security/truststore.jks
View File

Binary file not shown.

2
pom.xml
View File

@ -306,7 +306,7 @@
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.hpcloud.mon.MonApiApplication</mainClass>
<mainClass>monasca.api.MonApiApplication</mainClass>
</transformer>
</transformers>
<shadedArtifactAttached>true</shadedArtifactAttached>

6
src/main/java/monasca/api/MonApiApplication.java
View File

@ -32,8 +32,8 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.hpcloud.messaging.kafka.KafkaHealthCheck;
import com.hpcloud.middleware.TokenAuth;
import monasca.common.messaging.kafka.KafkaHealthCheck;
import monasca.common.middleware.TokenAuth;
import monasca.api.bundle.SwaggerBundle;
import monasca.api.infrastructure.servlet.MockAuthenticationFilter;
import monasca.api.infrastructure.servlet.PostAuthenticationFilter;
@ -55,7 +55,7 @@ import monasca.api.resource.exception.JsonMappingExceptionManager;
import monasca.api.resource.exception.JsonProcessingExceptionMapper;
import monasca.api.resource.exception.ThrowableExceptionMapper;
import monasca.api.resource.serialization.SubAlarmExpressionSerializer;
import com.hpcloud.util.Injector;
import monasca.common.util.Injector;
/**
* Monitoring API application.

6
src/main/java/monasca/api/MonApiConfiguration.java
View File

@ -14,11 +14,11 @@
package monasca.api;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.hpcloud.messaging.kafka.KafkaConfiguration;
import monasca.common.messaging.kafka.KafkaConfiguration;
import monasca.api.infrastructure.middleware.MiddlewareConfiguration;
import com.hpcloud.configuration.DatabaseConfiguration;
import monasca.common.configuration.DatabaseConfiguration;
import com.hpcloud.configuration.InfluxDbConfiguration;
import monasca.common.configuration.InfluxDbConfiguration;
import io.dropwizard.Configuration;
import io.dropwizard.db.DataSourceFactory;

20
src/main/java/monasca/api/app/AlarmDefinitionService.java
View File

@ -36,14 +36,14 @@ import com.google.common.collect.Sets;
import monasca.api.MonApiConfiguration;
import monasca.api.app.command.UpdateAlarmDefinitionCommand;
import com.hpcloud.mon.common.event.AlarmDefinitionCreatedEvent;
import com.hpcloud.mon.common.event.AlarmDefinitionDeletedEvent;
import com.hpcloud.mon.common.event.AlarmDefinitionUpdatedEvent;
import com.hpcloud.mon.common.event.AlarmDeletedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.event.AlarmDefinitionCreatedEvent;
import monasca.common.model.event.AlarmDefinitionDeletedEvent;
import monasca.common.model.event.AlarmDefinitionUpdatedEvent;
import monasca.common.model.event.AlarmDeletedEvent;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.exception.EntityExistsException;
import monasca.api.domain.exception.EntityNotFoundException;
import monasca.api.domain.exception.InvalidEntityException;
@ -52,8 +52,8 @@ import monasca.api.domain.model.alarm.AlarmRepository;
import monasca.api.domain.model.alarmdefinition.AlarmDefinition;
import monasca.api.domain.model.alarmdefinition.AlarmDefinitionRepository;
import monasca.api.domain.model.notificationmethod.NotificationMethodRepository;
import com.hpcloud.util.Exceptions;
import com.hpcloud.util.Serialization;
import monasca.common.util.Exceptions;
import monasca.common.util.Serialization;
/**
* Services alarm definition related requests.

16
src/main/java/monasca/api/app/AlarmService.java
View File

@ -26,20 +26,20 @@ import org.slf4j.LoggerFactory;
import monasca.api.MonApiConfiguration;
import monasca.api.app.command.UpdateAlarmCommand;
import com.hpcloud.mon.common.event.AlarmDeletedEvent;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
import com.hpcloud.mon.common.event.AlarmUpdatedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.event.AlarmDeletedEvent;
import monasca.common.model.event.AlarmStateTransitionedEvent;
import monasca.common.model.event.AlarmUpdatedEvent;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.exception.EntityNotFoundException;
import monasca.api.domain.exception.InvalidEntityException;
import monasca.api.domain.model.alarm.Alarm;
import monasca.api.domain.model.alarm.AlarmRepository;
import monasca.api.domain.model.alarmdefinition.AlarmDefinition;
import monasca.api.domain.model.alarmdefinition.AlarmDefinitionRepository;
import com.hpcloud.util.Exceptions;
import com.hpcloud.util.Serialization;
import monasca.common.util.Exceptions;
import monasca.common.util.Serialization;
/**
* Services alarmed metric related requests.

6
src/main/java/monasca/api/app/MetricService.java
View File

@ -27,9 +27,9 @@ import com.codahale.metrics.MetricRegistry;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder;
import monasca.api.MonApiConfiguration;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.common.model.metric.MetricEnvelope;
import com.hpcloud.mon.common.model.metric.MetricEnvelopes;
import monasca.common.model.metric.Metric;
import monasca.common.model.metric.MetricEnvelope;
import monasca.common.model.metric.MetricEnvelopes;
/**
* Metric service implementation.

4
src/main/java/monasca/api/app/command/CreateMetricCommand.java
View File

@ -24,8 +24,8 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.fasterxml.jackson.annotation.JsonProperty;
import monasca.api.app.validation.DimensionValidation;
import monasca.api.app.validation.MetricNameValidation;
import com.hpcloud.mon.common.model.Services;
import com.hpcloud.mon.common.model.metric.Metric;
import monasca.common.model.Services;
import monasca.common.model.metric.Metric;
import monasca.api.resource.exception.Exceptions;
public class CreateMetricCommand {

2
src/main/java/monasca/api/app/command/UpdateAlarmCommand.java
View File

@ -15,7 +15,7 @@ package monasca.api.app.command;
import javax.validation.constraints.NotNull;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmState;
public class UpdateAlarmCommand {
@NotNull

8
src/main/java/monasca/api/app/validation/AlarmValidation.java
View File

@ -18,10 +18,10 @@ import java.util.List;
import javax.ws.rs.WebApplicationException;
import com.hpcloud.mon.common.model.Services;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.Services;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.resource.exception.Exceptions;
/**

2
src/main/java/monasca/api/app/validation/DimensionValidation.java
View File

@ -23,7 +23,7 @@ import javax.ws.rs.WebApplicationException;
import com.google.common.base.CharMatcher;
import com.google.common.base.Strings;
import com.google.common.primitives.Ints;
import com.hpcloud.mon.common.model.Services;
import monasca.common.model.Services;
import monasca.api.resource.exception.Exceptions;
/**

2
src/main/java/monasca/api/app/validation/MetricNameValidation.java
View File

@ -19,7 +19,7 @@ import javax.annotation.Nullable;
import com.google.common.base.CharMatcher;
import com.google.common.base.Strings;
import com.hpcloud.mon.common.model.Services;
import monasca.common.model.Services;
import monasca.api.resource.exception.Exceptions;
import com.sun.jersey.spi.container.WebApplication;

2
src/main/java/monasca/api/app/validation/Validation.java
View File

@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
import com.hpcloud.mon.common.model.Services;
import monasca.common.model.Services;
import monasca.api.resource.exception.Exceptions;
/**

6
src/main/java/monasca/api/domain/model/alarm/Alarm.java
View File

@ -18,9 +18,9 @@ import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.common.AbstractEntity;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.metric.MetricDefinition;
import monasca.common.model.domain.common.AbstractEntity;
import monasca.api.domain.model.common.Link;
import monasca.api.domain.model.common.Linked;
import com.wordnik.swagger.annotations.ApiModelProperty;

6
src/main/java/monasca/api/domain/model/alarm/AlarmRepository.java
View File

@ -3,9 +3,9 @@ package monasca.api.domain.model.alarm;
import java.util.List;
import java.util.Map;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.exception.EntityNotFoundException;
public interface AlarmRepository {

4
src/main/java/monasca/api/domain/model/alarmdefinition/AlarmDefinition.java
View File

@ -20,8 +20,8 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.domain.common.AbstractEntity;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.domain.common.AbstractEntity;
import monasca.api.domain.model.common.Link;
import monasca.api.domain.model.common.Linked;
import com.wordnik.swagger.annotations.ApiModel;

4
src/main/java/monasca/api/domain/model/alarmdefinition/AlarmDefinitionRepository.java
View File

@ -17,8 +17,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.exception.EntityNotFoundException;
/**

4
src/main/java/monasca/api/domain/model/alarmstatehistory/AlarmStateHistory.java
View File

@ -17,8 +17,8 @@ import java.util.List;
import org.joda.time.DateTime;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.metric.MetricDefinition;
public class AlarmStateHistory {
private String alarmId;

2
src/main/java/monasca/api/domain/model/metric/MetricDefinitionRepository.java
View File

@ -13,7 +13,7 @@
*/
package monasca.api.domain.model.metric;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.metric.MetricDefinition;
import java.util.List;
import java.util.Map;

2
src/main/java/monasca/api/domain/model/notificationmethod/NotificationMethod.java
View File

@ -15,7 +15,7 @@ package monasca.api.domain.model.notificationmethod;
import java.util.List;
import com.hpcloud.mon.domain.common.AbstractEntity;
import monasca.common.model.domain.common.AbstractEntity;
import monasca.api.domain.model.common.Link;
import monasca.api.domain.model.common.Linked;

2
src/main/java/monasca/api/domain/model/version/Version.java
View File

@ -17,7 +17,7 @@ import java.util.List;
import org.joda.time.DateTime;
import com.hpcloud.mon.domain.common.AbstractEntity;
import monasca.common.model.domain.common.AbstractEntity;
import monasca.api.domain.model.common.Link;
import monasca.api.domain.model.common.Linked;

4
src/main/java/monasca/api/infrastructure/persistence/influxdb/AlarmStateHistoryInfluxDbRepositoryImpl.java
View File

@ -39,8 +39,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import com.google.inject.Inject;
import monasca.api.MonApiConfiguration;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.model.alarmstatehistory.AlarmStateHistory;
import monasca.api.domain.model.alarmstatehistory.AlarmStateHistoryRepository;
import monasca.api.infrastructure.persistence.DimensionQueries;

2
src/main/java/monasca/api/infrastructure/persistence/influxdb/MetricDefinitionInfluxDbRepositoryImpl.java
View File

@ -16,7 +16,7 @@ package monasca.api.infrastructure.persistence.influxdb;
import com.google.inject.Inject;
import monasca.api.MonApiConfiguration;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.model.metric.MetricDefinitionRepository;
import org.influxdb.InfluxDB;

12
src/main/java/monasca/api/infrastructure/persistence/mysql/AlarmDefinitionMySqlRepositoryImpl.java
View File

@ -29,17 +29,17 @@ import org.skife.jdbi.v2.util.StringMapper;
import com.google.common.base.Joiner;
import com.google.common.collect.Iterables;
import com.hpcloud.mon.common.model.alarm.AggregateFunction;
import com.hpcloud.mon.common.model.alarm.AlarmOperator;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.alarm.AggregateFunction;
import monasca.common.model.alarm.AlarmOperator;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.exception.EntityNotFoundException;
import monasca.api.domain.model.alarmdefinition.AlarmDefinition;
import monasca.api.domain.model.alarmdefinition.AlarmDefinitionRepository;
import monasca.api.infrastructure.persistence.DimensionQueries;
import monasca.api.infrastructure.persistence.SubAlarmQueries;
import com.hpcloud.persistence.BeanMapper;
import monasca.common.persistence.BeanMapper;
/**
* Alarm repository implementation.

10
src/main/java/monasca/api/infrastructure/persistence/mysql/AlarmMySqlRepositoryImpl.java
View File

@ -25,15 +25,15 @@ import org.skife.jdbi.v2.DBI;
import org.skife.jdbi.v2.Handle;
import org.skife.jdbi.v2.Query;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.exception.EntityNotFoundException;
import monasca.api.domain.model.alarm.Alarm;
import monasca.api.domain.model.alarm.AlarmRepository;
import monasca.api.infrastructure.persistence.DimensionQueries;
import com.hpcloud.persistence.BeanMapper;
import com.hpcloud.persistence.SqlQueries;
import monasca.common.persistence.BeanMapper;
import monasca.common.persistence.SqlQueries;
/**
* Alarmed metric repository implementation.

2
src/main/java/monasca/api/infrastructure/persistence/mysql/NotificationMethodMySqlRepositoryImpl.java
View File

@ -29,7 +29,7 @@ import monasca.api.domain.exception.EntityNotFoundException;
import monasca.api.domain.model.notificationmethod.NotificationMethod;
import monasca.api.domain.model.notificationmethod.NotificationMethodRepository;
import monasca.api.domain.model.notificationmethod.NotificationMethodType;
import com.hpcloud.persistence.BeanMapper;
import monasca.common.persistence.BeanMapper;
/**
* Notification method repository implementation.

2
src/main/java/monasca/api/infrastructure/persistence/vertica/AlarmStateHistoryVerticaRepositoryImpl.java
View File

@ -35,7 +35,7 @@ import monasca.api.domain.model.alarmstatehistory.AlarmStateHistory;
import monasca.api.domain.model.alarmstatehistory.AlarmStateHistoryRepository;
import monasca.api.infrastructure.persistence.DimensionQueries;
import monasca.api.infrastructure.persistence.SubAlarmQueries;
import com.hpcloud.persistence.BeanMapper;
import monasca.common.persistence.BeanMapper;
/**
* Alarm repository implementation.

2
src/main/java/monasca/api/infrastructure/persistence/vertica/MetricDefinitionVerticaRepositoryImpl.java
View File

@ -26,7 +26,7 @@ import org.skife.jdbi.v2.DBI;
import org.skife.jdbi.v2.Handle;
import org.skife.jdbi.v2.Query;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.model.metric.MetricDefinitionRepository;
import monasca.api.infrastructure.persistence.DimensionQueries;

2
src/main/java/monasca/api/infrastructure/persistence/vertica/MetricQueries.java
View File

@ -18,7 +18,7 @@ import java.util.Map;
import org.skife.jdbi.v2.Handle;
import com.hpcloud.persistence.SqlQueries;
import monasca.common.persistence.SqlQueries;
/**
* Vertica utilities for building metric queries.

4
src/main/java/monasca/api/resource/AlarmDefinitionResource.java
View File

@ -44,8 +44,8 @@ import monasca.api.app.command.CreateAlarmDefinitionCommand;
import monasca.api.app.command.UpdateAlarmDefinitionCommand;
import monasca.api.app.validation.AlarmValidation;
import monasca.api.app.validation.Validation;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmState;
import monasca.api.domain.model.alarmdefinition.AlarmDefinition;
import monasca.api.domain.model.alarmdefinition.AlarmDefinitionRepository;
import monasca.api.resource.annotation.PATCH;

2
src/main/java/monasca/api/resource/AlarmResource.java
View File

@ -41,7 +41,7 @@ import com.google.common.base.Strings;
import monasca.api.app.AlarmService;
import monasca.api.app.command.UpdateAlarmCommand;
import monasca.api.app.validation.Validation;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmState;
import monasca.api.domain.model.alarm.Alarm;
import monasca.api.domain.model.alarm.AlarmRepository;
import monasca.api.domain.model.alarmdefinition.AlarmDefinition;

4
src/main/java/monasca/api/resource/Links.java
View File

@ -20,10 +20,10 @@ import javax.ws.rs.core.UriInfo;
import com.google.common.base.Preconditions;
import monasca.api.MonApiConfiguration;
import com.hpcloud.mon.domain.common.AbstractEntity;
import monasca.common.model.domain.common.AbstractEntity;
import monasca.api.domain.model.common.Link;
import monasca.api.domain.model.common.Linked;
import com.hpcloud.util.Injector;
import monasca.common.util.Injector;
/**
* Utilities for working with links.

6
src/main/java/monasca/api/resource/MetricResource.java
View File

@ -19,9 +19,9 @@ import com.google.common.base.Strings;
import monasca.api.app.MetricService;
import monasca.api.app.command.CreateMetricCommand;
import monasca.api.app.validation.Validation;
import com.hpcloud.mon.common.model.Services;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.Services;
import monasca.common.model.metric.Metric;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.model.metric.MetricDefinitionRepository;
import monasca.api.resource.exception.Exceptions;
import com.wordnik.swagger.annotations.Api;

2
src/main/java/monasca/api/resource/StatisticResource.java
View File

@ -29,7 +29,7 @@ import javax.ws.rs.core.MediaType;
import java.util.List;
import java.util.Map;
// import com.hpcloud.util.stats.Statistics;
// import monasca.common.util.stats.Statistics;
/**
* Statistics resource implementation.

2
src/main/java/monasca/api/resource/serialization/SubAlarmExpressionSerializer.java
View File

@ -20,7 +20,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import monasca.common.model.alarm.AlarmSubExpression;
public class SubAlarmExpressionSerializer extends JsonSerializer<AlarmSubExpression> {
@Override

2
src/main/resources/mon-api-config.yml
View File

@ -93,7 +93,7 @@ logging:
# Sets the level for 'com.example.app' to DEBUG.
com.example.app: DEBUG
com.hpcloud: debug
monasca.api: debug
appenders:
- type: console

4
src/test/java/monasca/api/app/AlarmDefinitionServiceTest.java
View File

@ -40,8 +40,8 @@ import org.testng.annotations.Test;
import monasca.api.MonApiConfiguration;
import monasca.api.app.AlarmDefinitionService.SubExpressions;
import monasca.api.app.command.UpdateAlarmDefinitionCommand;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.api.domain.model.alarm.AlarmRepository;
import monasca.api.domain.model.alarmdefinition.AlarmDefinition;
import monasca.api.domain.model.alarmdefinition.AlarmDefinitionRepository;

2
src/test/java/monasca/api/app/command/CreateAlarmDefinitionCommandTest.java
View File

@ -14,7 +14,7 @@
package monasca.api.app.command;
import static com.hpcloud.dropwizard.JsonHelpers.jsonFixture;
import static monasca.common.dropwizard.JsonHelpers.jsonFixture;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;

2
src/test/java/monasca/api/app/command/CreateNotificationMethodTest.java
View File

@ -14,7 +14,7 @@
package monasca.api.app.command;
import static com.hpcloud.dropwizard.JsonHelpers.jsonFixture;
import static monasca.common.dropwizard.JsonHelpers.jsonFixture;
import static org.testng.Assert.assertEquals;
import org.testng.annotations.Test;

4
src/test/java/monasca/api/app/validation/AlarmExpressionsTest.java
View File

@ -21,8 +21,8 @@ import javax.ws.rs.WebApplicationException;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.metric.MetricDefinition;
@Test
public class AlarmExpressionsTest {

2
src/test/java/monasca/api/domain/model/AlarmDefinitionTest.java
View File

@ -14,7 +14,7 @@
package monasca.api.domain.model;
import static com.hpcloud.dropwizard.JsonHelpers.jsonFixture;
import static monasca.common.dropwizard.JsonHelpers.jsonFixture;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;

2
src/test/java/monasca/api/domain/model/NotificationMethodTest.java
View File

@ -14,7 +14,7 @@
package monasca.api.domain.model;
import static com.hpcloud.dropwizard.JsonHelpers.jsonFixture;
import static monasca.common.dropwizard.JsonHelpers.jsonFixture;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;

2
src/test/java/monasca/api/domain/model/VersionTest.java
View File

@ -14,7 +14,7 @@
package monasca.api.domain.model;
import static com.hpcloud.dropwizard.JsonHelpers.jsonFixture;
import static monasca.common.dropwizard.JsonHelpers.jsonFixture;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;

8
src/test/java/monasca/api/infrastructure/persistence/mysql/AlarmDefinitionMySqlRepositoryImplTest.java
View File

@ -39,10 +39,10 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Resources;
import com.hpcloud.mon.common.model.alarm.AggregateFunction;
import com.hpcloud.mon.common.model.alarm.AlarmOperator;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.alarm.AggregateFunction;
import monasca.common.model.alarm.AlarmOperator;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.exception.EntityNotFoundException;
import monasca.api.domain.model.alarmdefinition.AlarmDefinition;
import monasca.api.domain.model.alarmdefinition.AlarmDefinitionRepository;

6
src/test/java/monasca/api/infrastructure/persistence/mysql/AlarmMySqlRepositoryImplTest.java
View File

@ -34,9 +34,9 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Resources;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.exception.EntityNotFoundException;
import monasca.api.domain.model.alarm.Alarm;
import monasca.api.domain.model.alarm.AlarmRepository;

2
src/test/java/monasca/api/infrastructure/persistence/vertica/AlarmStateHistoryVerticaRepositoryImplTest.java
View File

@ -14,7 +14,7 @@
package monasca.api.infrastructure.persistence.vertica;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmState;
import monasca.api.domain.model.alarmstatehistory.AlarmStateHistoryRepository;
import monasca.api.infrastructure.persistence.vertica.AlarmStateHistoryVerticaRepositoryImpl;

2
src/test/java/monasca/api/infrastructure/persistence/vertica/MetricDefinitionVerticaRepositoryImplTest.java
View File

@ -14,7 +14,7 @@
package monasca.api.infrastructure.persistence.vertica;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.metric.MetricDefinition;
import monasca.api.domain.model.metric.MetricDefinitionRepository;
import monasca.api.infrastructure.persistence.vertica.MetricDefinitionVerticaRepositoryImpl;

2
src/test/java/monasca/api/integration/docker/ITInfluxDBTest.java
View File

@ -88,7 +88,7 @@ public class ITInfluxDBTest {
System.out.println("Running " + latestShadedJarFileName);
ProcessBuilder pb = new ProcessBuilder("java", "-cp", "./target/" + latestShadedJarFileName,
"com.hpcloud.mon.MonApiApplication", "server",
"monasca.api.MonApiApplication", "server",
"src/test/resources/mon-api-config.yml");
File log = new File("mon-api-integration-test.log");
pb.redirectErrorStream(true);

2
src/test/java/monasca/api/resource/AbstractMonApiResourceTest.java
View File

@ -16,7 +16,7 @@ package monasca.api.resource;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import com.hpcloud.dropwizard.AbstractResourceTest;
import monasca.common.dropwizard.AbstractResourceTest;
import monasca.api.resource.exception.ConstraintViolationExceptionMapper;
import monasca.api.resource.exception.EntityExistsExceptionMapper;
import monasca.api.resource.exception.EntityNotFoundExceptionMapper;

2
src/test/java/monasca/api/resource/AlarmDefinitionResourceTest.java
View File

@ -40,7 +40,7 @@ import org.testng.annotations.Test;
import monasca.api.app.AlarmDefinitionService;
import monasca.api.app.command.CreateAlarmDefinitionCommand;
import monasca.api.app.command.UpdateAlarmDefinitionCommand;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmExpression;
import monasca.api.domain.exception.EntityNotFoundException;
import monasca.api.domain.model.alarmdefinition.AlarmDefinition;
import monasca.api.domain.model.alarmdefinition.AlarmDefinitionRepository;

4
src/test/java/monasca/api/resource/MetricResourceTest.java
View File

@ -14,8 +14,8 @@
package monasca.api.resource;
import static com.hpcloud.dropwizard.JsonHelpers.fromJson;
import static com.hpcloud.dropwizard.JsonHelpers.jsonFixture;
import static monasca.common.dropwizard.JsonHelpers.fromJson;
import static monasca.common.dropwizard.JsonHelpers.jsonFixture;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;

2
src/test/java/monasca/api/resource/VersionResourceTest.java
View File

@ -47,7 +47,7 @@ public class VersionResourceTest extends AbstractMonApiResourceTest {
super.setupResources();
version = new Version("v2.0", VersionStatus.CURRENT, new DateTime(1355253328));
version.setLinks(Arrays.asList(new Link("self",
"https://region-a.geo-1.maas.hpcloudsvc.com/v2.0")));
"https://cloudsvc.example.com/v2.0")));
repo = mock(VersionRepository.class);
when(repo.findById(eq("v2.0"))).thenReturn(version);