/**
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You 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.apache.camel.impl;

import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;

import org.apache.camel.NamedNode;
import org.apache.camel.spi.NodeIdFactory;

/**
 * Default id factory.
 */
public class DefaultNodeIdFactory implements NodeIdFactory {

    protected static Map<String, AtomicInteger> nodeCounters = new HashMap<>();

    public String createId(NamedNode definition) {
        String key = definition.getShortName();
        return key + getNodeCounter(key).incrementAndGet();
    }

    /**
     * Returns the counter for the given node key, lazily creating one if necessary
     */
    protected static synchronized AtomicInteger getNodeCounter(String key) {
        AtomicInteger answer = nodeCounters.get(key);
        if (answer == null) {
            answer = new AtomicInteger(0);
            nodeCounters.put(key, answer);
        }
        return answer;
    }


    /**
     * Helper method for test purposes that allows tests to start clean (made protected 
     *  to ensure that it is not called accidentally)
     */
    protected static synchronized void resetAllCounters() {
        for (AtomicInteger counter : nodeCounters.values()) {
            counter.set(0);
        }
    }
}

@@ -846,20 +846,16 @@
 va.util.
-Hash
 Map;%0Aimp
@@ -860,32 +860,57 @@
 mport java.util.
+concurrent.ConcurrentHash
 Map;%0Aimport java
@@ -1188,16 +1188,26 @@
 s = new 
+Concurrent
 HashMap%3C
@@ -1499,29 +1499,16 @@
  static 
-synchronized 
 AtomicIn
@@ -1554,201 +1554,75 @@
     
-AtomicInteger answer = nodeCounters.get(key);%0A        if (answer == null) %7B%0A            answer = new AtomicInteger(0);%0A            nodeCounters.put(key, answer);%0A        %7D%0A        return answer
+return nodeCounters.computeIfAbsent(key, k -%3E new AtomicInteger(0))
 ;%0A  
@@ -1778,32 +1778,32 @@
 ntally)%0A     */%0A
+
     protected st
@@ -1811,21 +1811,8 @@
 tic 
-synchronized 
 void

Improve DefaultNodeIdFactory concurrency