diff --git a/.gitignore b/.gitignore index 5e2ed86e89..c3b839e403 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ target/ # Builded war file /docker/*.war /docker/*.jar +src/test/java/it/reply/orchestrator/dal/entity/ReplicationRuleTest.java diff --git a/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java b/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java index 51d219b8c6..8c838eed35 100644 --- a/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java +++ b/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java @@ -34,8 +34,8 @@ @NoArgsConstructor public class MonitoringProperties { - @NotNull - @NonNull + // @NotNull + // @NonNull private URI url; @NotNull diff --git a/src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java b/src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java index ab4d5daa3a..ce8283357f 100644 --- a/src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java +++ b/src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java @@ -51,6 +51,11 @@ public MonitoringServiceImpl(MonitoringProperties monitoringProperties, @Override public Group getProviderData(String providerId) { + if (monitoringProperties.getUrl() == null) { + throw new DeploymentException( + "Error fetching monitoring data for provider <" + providerId + ">"); + } + URI requestUri = UriComponentsBuilder .fromHttpUrl(monitoringProperties.getUrl() + monitoringProperties.getProviderMetricsPath()) .buildAndExpand(providerId)