* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Copyright (C) 2017 Amdocs
+ * ================================================================================
+ * Modifications Copyright (C) 2019 Ericsson
* =============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
public class MetricRegistryImpl implements MetricRegistry {
private String name;
- private Map<String,Metric> concurrentMetricMap=new ConcurrentHashMap<String,Metric>();
+ private Map<String, Metric> concurrentMetricMap = new ConcurrentHashMap<>();
public MetricRegistryImpl(String name) {
this.name = name;
@Override
public boolean register(Metric metric) {
- if(concurrentMetricMap.get(metric.name())==null){
- concurrentMetricMap.put(metric.name(),metric);
- return true;
- }
- return false;
+ return (concurrentMetricMap.putIfAbsent(metric.name(), metric) == null);
}
@Override
@Override
public Counter counter(String value) {
- if(concurrentMetricMap.get(value)!=null )
- return (Counter)concurrentMetricMap.get(value) ;
- else
- return null;
-
+ return (Counter)concurrentMetricMap.get(value);
}
@Override
--- /dev/null
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2019 Ericsson
+ * ================================================================================
+ * 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.
+ *
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.appc.metricservice.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.appc.metricservice.metric.Counter;
+import org.onap.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.metric.impl.DefaultPrimitiveCounter;
+
+public class MetricRegistryImplTest {
+
+ private static final String NAME = "NAME";
+ private MetricRegistryImpl registry;
+ @Before
+ public void setup() {
+ registry = new MetricRegistryImpl(null);
+ }
+
+ @Test
+ public void testRegister() {
+ Metric metric = new DefaultPrimitiveCounter(NAME, null);
+ assertNull(registry.counter(NAME));
+ assertTrue(registry.register(metric));
+ assertFalse(registry.register(metric));
+ assertTrue(registry.counter(NAME) instanceof Counter);
+ assertSame(metric, registry.metric(NAME));
+ }
+
+ @Test
+ public void testCounter() {
+ registry.dispose();
+ assertEquals(0, registry.metrics().length);
+ }
+
+}