From f0220018903a08e57574c06d0a74802cbdcca5be Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Wed, 8 Nov 2017 12:25:01 +0800 Subject: [PATCH] Add a MD5 Util Class Change-Id: I8d4f82fd7afcfc58ca32879f48df92baca6d3445 Issue-ID: HOLMES-86 Signed-off-by: Guangrong Fu --- holmes-actions/pom.xml | 5 +- .../common/dcae/entity/DcaeConfigurations.java | 29 +++++--- .../onap/holmes/common/dmaap/entity/PolicyMsg.java | 2 +- .../java/org/onap/holmes/common/utils/Md5Util.java | 45 ++++++++++++ .../org/onap/holmes/common/utils/Md5UtilTest.java | 82 ++++++++++++++++++++++ pom.xml | 5 ++ 6 files changed, 155 insertions(+), 13 deletions(-) create mode 100644 holmes-actions/src/main/java/org/onap/holmes/common/utils/Md5Util.java create mode 100644 holmes-actions/src/test/java/org/onap/holmes/common/utils/Md5UtilTest.java diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml index d72348e..d91e88a 100644 --- a/holmes-actions/pom.xml +++ b/holmes-actions/pom.xml @@ -75,7 +75,10 @@ io.dropwizard dropwizard-jdbi - + + com.google.guava + guava + org.apache.poi poi diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java index 8c98699..a8045ec 100644 --- a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java +++ b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/DcaeConfigurations.java @@ -23,40 +23,47 @@ import java.util.Map; import java.util.Set; import lombok.NoArgsConstructor; -@NoArgsConstructor public class DcaeConfigurations extends HashMap{ - private Map streamsPublishes = new HashMap<>(); - private Map streamsSubscribes = new HashMap<>(); - private List rules = new ArrayList<>(); + + private static final String STREAMS_PUBLISHES = "streamsPublishes"; + private static final String STREAMS_SUBSCRIBES = "streamsSubscribes"; + private static final String RULES = "rules"; + + public DcaeConfigurations(){ + super(); + this.put(STREAMS_PUBLISHES, new HashMap()); + this.put(STREAMS_SUBSCRIBES, new HashMap()); + this.put(RULES, new ArrayList()); + } public void addDefaultRule(Rule rule) { if (null == rule) { return; } - this.rules.add(rule); + ((List)(this.get(RULES))).add(rule); } public List getDefaultRules() { - return this.rules; + return (List)(this.get(RULES)); } public SecurityInfo addPubSecInfo(String key, SecurityInfo value) { - return this.streamsPublishes.put(key, value); + return ((Map)(this.get(STREAMS_PUBLISHES))).put(key, value); } public SecurityInfo getPubSecInfo(String key) { - return this.streamsPublishes.get(key); + return ((Map)(this.get(STREAMS_PUBLISHES))).get(key); } public SecurityInfo addSubSecInfo(String key, SecurityInfo value) { - return this.streamsSubscribes.put(key, value); + return ((Map)(this.get(STREAMS_SUBSCRIBES))).put(key, value); } public SecurityInfo getSubSecInfo(String key) { - return this.streamsSubscribes.get(key); + return ((Map)(this.get(STREAMS_SUBSCRIBES))).get(key); } public Set getSubKeys(){ - return this.streamsSubscribes.keySet(); + return ((Map)(this.get(STREAMS_SUBSCRIBES))).keySet(); } } diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/entity/PolicyMsg.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/entity/PolicyMsg.java index 37713b4..2ef25dc 100644 --- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/entity/PolicyMsg.java +++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/entity/PolicyMsg.java @@ -32,7 +32,7 @@ public class PolicyMsg { private EVENT_STATUS closedLoopEventStatus = EVENT_STATUS.ONSET; private long closedLoopAlarmStart; private long closedLoopAlarmEnd; - private String closedLoopEventClient; + private String closedLoopEventClient = "DCAE.HolmesInstance"; private String policyVersion; private String policyName; private String policyScope; diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/Md5Util.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/Md5Util.java new file mode 100644 index 0000000..1c06b52 --- /dev/null +++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/Md5Util.java @@ -0,0 +1,45 @@ +/* + * Copyright 2017 ZTE Corporation. + * + * 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 + * + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.holmes.common.utils; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.google.common.hash.HashCode; +import com.google.common.hash.HashFunction; +import com.google.common.hash.Hashing; +import java.nio.charset.Charset; +import net.sf.json.JSONObject; + +public class Md5Util { + + private static HashFunction hf = Hashing.md5(); + private static Charset defaultCharset = Charset.forName("UTF-8"); + + private Md5Util() { + + } + + public static String md5(String data) { + String actualData = data == null ? "" : data; + HashCode hash = hf.newHasher().putString(actualData, defaultCharset).hash(); + return hash.toString(); + } + + public static String md5(Object data) throws JsonProcessingException { + String actualData = data == null ? "{}" : JacksonUtil.beanToJson(data); + return md5(actualData); + } +} diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/Md5UtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/Md5UtilTest.java new file mode 100644 index 0000000..041b09d --- /dev/null +++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/Md5UtilTest.java @@ -0,0 +1,82 @@ +/* + * Copyright 2017 ZTE Corporation. + * + * 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 + * + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.holmes.common.utils; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.core.IsNot.not; +import static org.junit.Assert.assertThat; + +import com.fasterxml.jackson.core.JsonProcessingException; +import org.junit.Test; +import org.onap.holmes.common.dcae.entity.DcaeConfigurations; +import org.onap.holmes.common.dcae.entity.SecurityInfo; + +public class Md5UtilTest { + @Test + public void testMd5NormalDiff(){ + String contents1 = "contents1"; + String contents2 = "contents2"; + + assertThat(Md5Util.md5(contents1), not(equalTo(Md5Util.md5(contents2)))); + } + + @Test + public void testMd5NormalSame(){ + String contents1 = "contents"; + String contents2 = "contents"; + + assertThat(Md5Util.md5(contents1), equalTo(Md5Util.md5(contents2))); + } + + @Test + public void testMd5Null(){ + String contents1 = null; + String contents2 = null; + + assertThat(Md5Util.md5(contents1), equalTo(Md5Util.md5(contents2))); + } + + @Test + public void testMd5ObjDiff(){ + DcaeConfigurations config1 = new DcaeConfigurations(); + DcaeConfigurations config2 = new DcaeConfigurations(); + + config1.addPubSecInfo("config1", new SecurityInfo()); + config2.addPubSecInfo("config2", new SecurityInfo()); + + try { + assertThat(Md5Util.md5(config1), not(equalTo(Md5Util.md5(config2)))); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + } + + @Test + public void testMd5ObjSame(){ + DcaeConfigurations config1 = new DcaeConfigurations(); + DcaeConfigurations config2 = new DcaeConfigurations(); + + config1.addPubSecInfo("config", new SecurityInfo()); + config2.addPubSecInfo("config", new SecurityInfo()); + + try { + assertThat(Md5Util.md5(config1), equalTo(Md5Util.md5(config2))); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0977abe..12e4da5 100644 --- a/pom.xml +++ b/pom.xml @@ -177,6 +177,11 @@ httpclient 4.5.3 + + com.google.guava + guava + 19.0 + -- 2.16.6