summaryrefslogtreecommitdiffstats
path: root/rulemgt
diff options
context:
space:
mode:
Diffstat (limited to 'rulemgt')
-rw-r--r--rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java27
-rw-r--r--rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleQueryCondition.java4
2 files changed, 18 insertions, 13 deletions
diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
index daebff3..5d577cc 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
@@ -1,12 +1,12 @@
/**
- * Copyright 2017 ZTE Corporation.
- *
+ * Copyright 2017-2018 ZTE Corporation.
+ * <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,6 +17,7 @@
package org.onap.holmes.rulemgt;
import io.dropwizard.setup.Environment;
+
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
@@ -24,6 +25,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.servlet.DispatcherType;
+
import lombok.extern.slf4j.Slf4j;
import org.onap.holmes.common.config.MicroServiceConfig;
import org.onap.holmes.common.dropwizard.ioc.bundle.IOCApplication;
@@ -59,12 +61,15 @@ public class RuleActiveApp extends IOCApplication<RuleAppConfig> {
log.warn(e.getMessage(), e);
}
- ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor();
- service.scheduleAtFixedRate(
- new DcaeConfigurationPolling(MicroServiceConfig.getEnv(MicroServiceConfig.HOSTNAME)), 0,
- DcaeConfigurationPolling.POLLING_PERIOD, TimeUnit.MILLISECONDS);
- environment.servlets().addFilter("customFilter",new TransactionIdFilter()).addMappingForUrlPatterns(EnumSet
- .allOf(DispatcherType.class),true,"/*");
+ if (!System.getenv("TESTING").equals("1")) {
+ ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor();
+ service.scheduleAtFixedRate(
+ new DcaeConfigurationPolling(MicroServiceConfig.getEnv(MicroServiceConfig.HOSTNAME)), 0,
+ DcaeConfigurationPolling.POLLING_PERIOD, TimeUnit.MILLISECONDS);
+ }
+
+ environment.servlets().addFilter("customFilter", new TransactionIdFilter()).addMappingForUrlPatterns(EnumSet
+ .allOf(DispatcherType.class), true, "/*");
new MsbQuery().startTimer();
}
diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleQueryCondition.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleQueryCondition.java
index c6ba4b7..f4978ab 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleQueryCondition.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleQueryCondition.java
@@ -23,9 +23,9 @@ import lombok.Setter;
@Setter
public class RuleQueryCondition {
- @SerializedName(value = "ruleid")
+ @SerializedName(value = "ruleId")
private String rid;
- @SerializedName(value = "rulename")
+ @SerializedName(value = "ruleName")
private String name;
private int enabled;
private String creator;