diff options
| author |   Vijay Venkatesh Kumar <vv770d@att.com> | 2017-06-12 02:47:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-06-12 02:47:57 +0000 |
| commit | e20ec1269d3d7bb856f5033fa018578ab684db97 (patch) | |
| tree | 0c17c904d35c33eedfac26939a049266cbcf195e | |
| parent | 94ceb2570ec120db2c483100b7919c63739547f1 (diff) | |
| parent | f1344c48f4cdf5cac3ca22dc73dc8f32b8a1beb8 (diff) | |
Merge "[DCAE-15] Final update for rebased code."
4 files changed, 6 insertions, 7 deletions
diff --git a/ncomp-core-tools/pom.xml b/ncomp-core-tools/pom.xml index f23bb06..03cc131 100644 --- a/ncomp-core-tools/pom.xml +++ b/ncomp-core-tools/pom.xml @@ -10,7 +10,6 @@ - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.target>1.7</maven.compiler.target> @@ -30,7 +29,6 @@ - <build> <plugins> diff --git a/ncomp-core-types/pom.xml b/ncomp-core-types/pom.xml index acc72c8..375e086 100644 --- a/ncomp-core-types/pom.xml +++ b/ncomp-core-types/pom.xml @@ -9,7 +9,6 @@ - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.target>1.7</maven.compiler.target> @@ -29,7 +28,6 @@ - <build> <plugins> diff --git a/ncomp-core-types/src/main/java/org/openecomp/ncomp/core/types/metrics/MetricDailyMeasurement.java b/ncomp-core-types/src/main/java/org/openecomp/ncomp/core/types/metrics/MetricDailyMeasurement.java index bb1a165..dacd307 100644 --- a/ncomp-core-types/src/main/java/org/openecomp/ncomp/core/types/metrics/MetricDailyMeasurement.java +++ b/ncomp-core-types/src/main/java/org/openecomp/ncomp/core/types/metrics/MetricDailyMeasurement.java @@ -31,9 +31,12 @@ import org.openecomp.ncomp.utils.journaling.JournalingObject; public class MetricDailyMeasurement extends JournalingObject implements Serializable { private static final long serialVersionUID = 6485680539666136294L; + static { + JournalingObject.addClassToWhiteList("org.openecomp.ncomp.core.types.metrics.*"); + } public JournalingList<MetricMeasurement> l; - private MetricMeasurement last; - private MetricMeasurement last2; + public MetricMeasurement last; + public MetricMeasurement last2; public MetricDailyMeasurement(String context, JournalingObject parent) { super(context,parent); diff --git a/ncomp-core-types/src/main/java/org/openecomp/ncomp/core/types/metrics/StringMetricMeasurement.java b/ncomp-core-types/src/main/java/org/openecomp/ncomp/core/types/metrics/StringMetricMeasurement.java index 18cbc1a..75a9bf1 100644 --- a/ncomp-core-types/src/main/java/org/openecomp/ncomp/core/types/metrics/StringMetricMeasurement.java +++ b/ncomp-core-types/src/main/java/org/openecomp/ncomp/core/types/metrics/StringMetricMeasurement.java @@ -26,7 +26,7 @@ import java.util.Date; public class StringMetricMeasurement extends MetricMeasurement implements Serializable { private static final long serialVersionUID = -4665287013236612581L; - String v; + public String v; public StringMetricMeasurement(Date d, String v) { this.d = d; |