LPD-6627 Rename

Author: brianchandotcom

portal-kernel/src/com/liferay/portal/kernel/dao/db/BaseDBProcess.java

@@ -287,10 +287,10 @@ protected void alterTableName(String tableName, String newTableName)
 	}
 
 	protected void closeConnections() {
-		Map<Thread, Connection> connectionMap = _companyConnectionMap.get(
+		Map<Thread, Connection> connectionsMap = _companyConnectionsMap.get(
 			CompanyThreadLocal.getCompanyId());
 
-		_closeConnections(connectionMap);
+		_closeConnections(connectionsMap);
 	}
 
 	/**
@@ -504,12 +504,12 @@ protected void removePrimaryKey(String tableName) throws Exception {
 
 	protected Connection connection;
 
-	private void _closeConnections(Map<Thread, Connection> connectionMap) {
-		if (MapUtil.isEmpty(connectionMap)) {
+	private void _closeConnections(Map<Thread, Connection> connectionsMap) {
+		if (MapUtil.isEmpty(connectionsMap)) {
 			return;
 		}
 
-		Collection<Connection> connections = connectionMap.values();
+		Collection<Connection> connections = connectionsMap.values();
 
 		try {
 			Iterator<Connection> iterator = connections.iterator();
@@ -589,10 +589,10 @@ private Connection _getConnection() {
 	private int _getConnectionsCount() {
 		int connectionsCount = 0;
 
-		for (Map<Thread, Connection> connectionMap :
-				_companyConnectionMap.values()) {
+		for (Map<Thread, Connection> connectionsMap :
+				_companyConnectionsMap.values()) {
 
-			connectionsCount += connectionMap.size();
+			connectionsCount += connectionsMap.size();
 		}
 
 		return connectionsCount;
@@ -734,7 +734,7 @@ private <T> void _processConcurrently(
 
 	private static final Log _log = LogFactoryUtil.getLog(BaseDBProcess.class);
 
-	private final Map<Long, Map<Thread, Connection>> _companyConnectionMap =
+	private final Map<Long, Map<Thread, Connection>> _companyConnectionsMap =
 		new ConcurrentHashMap<>();
 
 	private class ConnectionThreadProxyInvocationHandler
@@ -748,23 +748,23 @@ public Object invoke(Object proxy, Method method, Object[] args)
 
 			if (methodName.equals("close")) {
 				if (_getConnectionsCount() > 0) {
-					for (Map<Thread, Connection> connectionMap :
-							_companyConnectionMap.values()) {
+					for (Map<Thread, Connection> connectionsMap :
+							_companyConnectionsMap.values()) {
 
-						_closeConnections(connectionMap);
+						_closeConnections(connectionsMap);
 					}
 				}
 
 				return null;
 			}
 
-			Map<Thread, Connection> connectionMap =
-				_companyConnectionMap.computeIfAbsent(
+			Map<Thread, Connection> connectionsMap =
+				_companyConnectionsMap.computeIfAbsent(
 					CompanyThreadLocal.getCompanyId(),
 					key -> new ConcurrentHashMap<>());
 
 			return method.invoke(
-				connectionMap.computeIfAbsent(
+				connectionsMap.computeIfAbsent(
 					Thread.currentThread(), thread -> _getConnection()),
 				args);
 		}