Author: areshetnyak
Date: 2011-12-29 10:10:05 -0500 (Thu, 29 Dec 2011)
New Revision: 5388
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleMultiDbJDBCConnection.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleSingleDbJDBCConnection.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/Packet.java
Log:
EXOJCR-1687 : Fix new sonar violations in JCR project.
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-12-29
13:02:55 UTC (rev 5387)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-12-29
15:10:05 UTC (rev 5388)
@@ -862,7 +862,9 @@
final Set<InternalQName> descendantNt =
this.nodeTypeRepository.getSubtypes(nodeTypeName);
if (descendantNt.size() > 0)
{
- StringBuilder message = new StringBuilder("Can not remove
").append(nodeTypeName.getAsString()).append("nodetype, because the following
node types depend on it: ");
+ StringBuilder message =
+ new StringBuilder("Can not remove
").append(nodeTypeName.getAsString()).append(
+ "nodetype, because the following node types depend on it: ");
for (final InternalQName internalQName : descendantNt)
{
message.append(internalQName.getAsString()).append(" ");
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2011-12-29
13:02:55 UTC (rev 5387)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java 2011-12-29
15:10:05 UTC (rev 5388)
@@ -182,8 +182,8 @@
+ jdbcDataContainer.containerName
+ "' AND ((STORAGE_DESC is null and DATA is null) or
(STORAGE_DESC is not null and DATA is not null))";
}
- queries
- .add(new InspectionQuery(statement, new String[]{DBConstants.COLUMN_ID},
"Incorrect JCR_VALUE records", InspectionStatus.ERR));
+ queries.add(new InspectionQuery(statement, new String[]{DBConstants.COLUMN_ID},
"Incorrect JCR_VALUE records",
+ InspectionStatus.ERR));
queries.add(new InspectionQuery(jdbcDataContainer.multiDb
? "select * from JCR_MITEM P where P.P_TYPE=9 and NOT EXISTS "
+ "(select * from JCR_MREF R where P.ID=R.PROPERTY_ID)"
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2011-12-29
13:02:55 UTC (rev 5387)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2011-12-29
15:10:05 UTC (rev 5388)
@@ -588,7 +588,8 @@
{
removeValuesStatement =
dbConnection
- .prepareStatement("DELETE FROM JCR_SVALUE WHERE PROPERTY_ID IN
(SELECT ID FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND "
+ .prepareStatement("DELETE FROM JCR_SVALUE WHERE PROPERTY_ID "
+ + "IN (SELECT ID FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND
"
+ "(NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR
NAME = '[http://www.jcp.org/jcr/1.0]lockOwner'))");
removeValuesStatement.setString(1, containerName);
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java 2011-12-29
13:02:55 UTC (rev 5387)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java 2011-12-29
15:10:05 UTC (rev 5388)
@@ -150,9 +150,9 @@
{
if (dbDialect == DBConstants.DB_DIALECT_MYSQL_MYISAM || dbDialect ==
DBConstants.DB_DIALECT_MYSQL_MYISAM_UTF8)
{
- LOG.warn("MyISAM is not supported due to its lack of transaction support
and integrity check, so use it only" +
- " if you don't expect any support and performances in read
accesses are more important than the consistency" +
- " in your use-case. This dialect is only dedicated to the
community.");
+ LOG.warn("MyISAM is not supported due to its lack of transaction support
and integrity check, so use it only"
+ + " if you don't expect any support and performances in read
accesses are more important than the consistency"
+ + " in your use-case. This dialect is only dedicated to the
community.");
}
if (dbSourceName != null)
{
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleMultiDbJDBCConnection.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleMultiDbJDBCConnection.java 2011-12-29
13:02:55 UTC (rev 5387)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleMultiDbJDBCConnection.java 2011-12-29
15:10:05 UTC (rev 5388)
@@ -103,7 +103,8 @@
FIND_NODES_BY_PARENTID_LAZILY_CQ
.replaceFirst(
"select",
- "select /*+ USE_NL(V) INDEX(I JCR_IDX_MITEM_N_ORDER_NUM) INDEX(P
JCR_IDX_MITEM_PARENT_FK) INDEX(V JCR_IDX_MVALUE_PROPERTY) */");
+ "select /*+ USE_NL(V) INDEX(I JCR_IDX_MITEM_N_ORDER_NUM) INDEX(P
JCR_IDX_MITEM_PARENT_FK)"
+ + " INDEX(V JCR_IDX_MVALUE_PROPERTY) */");
}
/**
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleSingleDbJDBCConnection.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleSingleDbJDBCConnection.java 2011-12-29
13:02:55 UTC (rev 5387)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleSingleDbJDBCConnection.java 2011-12-29
15:10:05 UTC (rev 5388)
@@ -88,8 +88,8 @@
FIND_ITEM_QPATH_BY_ID_CQ = FIND_ITEM_QPATH_BY_ID_CQ_QUERY;
FIND_PROPERTIES_BY_PARENTID_AND_PATTERN_CQ_TEMPLATE =
"select /*+ INDEX(I JCR_FK_SITEM_PARENT) INDEX(V
JCR_IDX_SVALUE_PROPERTY)*/"
- + " I.ID, I.PARENT_ID, I.NAME, I.VERSION, I.I_CLASS, I.I_INDEX,
I.N_ORDER_NUM, I.P_TYPE, I.P_MULTIVALUED, V.ORDER_NUM,"
- + " V.DATA, V.STORAGE_DESC from JCR_SITEM I LEFT OUTER JOIN JCR_SVALUE V
ON (V.PROPERTY_ID=I.ID)";
+ + " I.ID, I.PARENT_ID, I.NAME, I.VERSION, I.I_CLASS, I.I_INDEX,
I.N_ORDER_NUM, I.P_TYPE, I.P_MULTIVALUED,"
+ + " V.ORDER_NUM, V.DATA, V.STORAGE_DESC from JCR_SITEM I LEFT OUTER JOIN
JCR_SVALUE V ON (V.PROPERTY_ID=I.ID)";
FIND_NODES_AND_PROPERTIES =
"select J.*, P.ID AS P_ID, P.NAME AS P_NAME, P.VERSION AS P_VERSION,
P.P_TYPE, P.P_MULTIVALUED,"
@@ -104,7 +104,8 @@
FIND_NODES_BY_PARENTID_LAZILY_CQ
.replaceFirst(
"select",
- "select /*+ USE_NL(V) INDEX(I JCR_IDX_SITEM_N_ORDER_NUM) INDEX(P
JCR_IDX_SITEM_PARENT_FK) INDEX(V JCR_IDX_SVALUE_PROPERTY) */ ");
+ "select /*+ USE_NL(V) INDEX(I JCR_IDX_SITEM_N_ORDER_NUM) INDEX(P
JCR_IDX_SITEM_PARENT_FK)"
+ + " INDEX(V JCR_IDX_SVALUE_PROPERTY) */ ");
}
/**
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java 2011-12-29
13:02:55 UTC (rev 5387)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java 2011-12-29
15:10:05 UTC (rev 5388)
@@ -148,7 +148,8 @@
{
public void run()
{
- cache.getAdvancedCache().withFlags(Flag.SKIP_LOCKING,
Flag.FORCE_ASYNCHRONOUS, Flag.SKIP_REMOTE_LOOKUP).removeAsync(key);
+ cache.getAdvancedCache().withFlags(Flag.SKIP_LOCKING,
Flag.FORCE_ASYNCHRONOUS,
+ Flag.SKIP_REMOTE_LOOKUP).removeAsync(key);
}
});
}
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java 2011-12-29
13:02:55 UTC (rev 5387)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java 2011-12-29
15:10:05 UTC (rev 5388)
@@ -48,7 +48,8 @@
/**
* The logger
*/
- private static final Log LOG =
ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.JBossStandaloneJTAManagerLookup");
+ private static final Log LOG =
+
ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.JBossStandaloneJTAManagerLookup");
private Method manager, user;
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java
===================================================================
---
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java 2011-12-29
13:02:55 UTC (rev 5387)
+++
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java 2011-12-29
15:10:05 UTC (rev 5388)
@@ -77,7 +77,7 @@
/**
* Empty constructor.
*/
- private Type() //NOSONAR
+ private Type() // NOSONAR
{
}
}
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/Packet.java
===================================================================
---
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/Packet.java 2011-12-29
13:02:55 UTC (rev 5387)
+++
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/Packet.java 2011-12-29
15:10:05 UTC (rev 5388)
@@ -205,7 +205,7 @@
/**
* Private PacketType constructor.
*/
- private PacketType() //NOSONAR
+ private PacketType() // NOSONAR
{
}
}