[exo-jcr-commits] exo-jcr SVN: r5378 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene and 5 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Dec 28 10:33:39 EST 2011
Author: areshetnyak
Date: 2011-12-28 10:33:38 -0500 (Wed, 28 Dec 2011)
New Revision: 5378
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPathExt.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DerefQuery.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexMerger.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NotQuery.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ParentAxisQuery.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataMoveVisitor.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java
jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics/JCRAPIAspect.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/JCRPathExt.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPathExt.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPathExt.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -173,11 +173,11 @@
private static int addEntry(PathElement[] entries, int size, PathElement entry)
{
- if (entry == THIS_ELEMENT)
+ if (entry == THIS_ELEMENT) // NOSONAR
{
return size;
}
- if (size > 0 && entry == MOVE_UP_ELEMENT && !(entries[size - 1] == MOVE_UP_ELEMENT))
+ if (size > 0 && entry == MOVE_UP_ELEMENT && !(entries[size - 1] == MOVE_UP_ELEMENT)) // NOSONAR
{
if (size <= 0)
{
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -1569,7 +1569,7 @@
return;
}
}
- else if (wsSession != session)
+ else if (wsSession != session) // NOSONAR
{
// has a reference to the VH in traversed workspace,
// it's not a version storage, i.e. it's a property of versionable
@@ -1582,7 +1582,7 @@
}
finally
{
- if (wsSession != session)
+ if (wsSession != session) // NOSONAR
{
wsSession.logout();
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -1056,7 +1056,7 @@
ItemDataMoveVisitor initializer =
new ItemDataMoveVisitor((NodeData)destParentNode.getData(), destNodePath.getName().getInternalName(),
(NodeData)srcParentNode.getData(), nodeTypeManager, getTransientNodesManager(), true,
- triggerEventsForDescendentsOnRename || srcParentNode != destParentNode);
+ triggerEventsForDescendentsOnRename || srcParentNode != destParentNode); // NOSONAR
getTransientNodesManager().rename((NodeData)srcNode.getData(), initializer);
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -237,7 +237,7 @@
}
// if we get here we could not compact the query
- if (cQuery == contextQuery)
+ if (cQuery == contextQuery) // NOSONAR
{
return this;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DerefQuery.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DerefQuery.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DerefQuery.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -20,7 +20,6 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
import org.apache.lucene.search.Explanation;
-import org.apache.lucene.search.HitCollector;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Searcher;
@@ -140,7 +139,7 @@
public Query rewrite(IndexReader reader) throws IOException
{
Query cQuery = contextQuery.rewrite(reader);
- if (cQuery == contextQuery)
+ if (cQuery == contextQuery) // NOSONAR
{
return this;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -231,7 +231,7 @@
.rewrite(reader);
}
}
- if (cQuery == contextQuery && sQuery == subQuery)
+ if (cQuery == contextQuery && sQuery == subQuery) // NOSONAR
{
return this;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexMerger.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexMerger.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexMerger.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -294,7 +294,7 @@
isIdle = true;
}
Merge task = (Merge)mergeTasks.remove();
- if (task == QUIT)
+ if (task == QUIT) // NOSONAR
{
mergerIdle.release();
break;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NotQuery.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NotQuery.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NotQuery.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -89,7 +89,7 @@
public Query rewrite(IndexReader reader) throws IOException
{
Query cQuery = context.rewrite(reader);
- if (cQuery == context)
+ if (cQuery == context) // NOSONAR
{
return this;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ParentAxisQuery.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ParentAxisQuery.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ParentAxisQuery.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -117,7 +117,7 @@
public Query rewrite(IndexReader reader) throws IOException
{
Query cQuery = contextQuery.rewrite(reader);
- if (cQuery == contextQuery)
+ if (cQuery == contextQuery) // NOSONAR
{
return this;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -246,7 +246,7 @@
*/
public static int compare(Comparable c1, Comparable c2)
{
- if (c1 == c2)
+ if (c1 == c2) // NOSONAR
{
return 0;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -607,7 +607,7 @@
Node p = node.jjtGetParent();
for (int i = 0; i < p.jjtGetNumChildren(); i++) {
SimpleNode c = (SimpleNode) p.jjtGetChild(i);
- if (c == node) {
+ if (c == node) { // NOSONAR
queryNode = factory.createLocationStepQueryNode(parent);
queryNode.setNameTest(null);
queryNode.setIncludeDescendants(descendant);
@@ -976,7 +976,7 @@
Node p = node.jjtGetParent();
for (int i = 0; i < p.jjtGetNumChildren(); i++) {
SimpleNode c = (SimpleNode) p.jjtGetChild(i);
- if (c == node) {
+ if (c == node) { // NOSONAR
break;
}
descendant = (c.getId() == JJTSLASHSLASH
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataMoveVisitor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataMoveVisitor.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataMoveVisitor.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -27,7 +27,6 @@
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.datamodel.PropertyData;
import org.exoplatform.services.jcr.datamodel.QPath;
-import org.exoplatform.services.jcr.datamodel.QPathEntry;
import org.exoplatform.services.jcr.datamodel.ValueData;
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.core.SessionDataManager;
@@ -178,7 +177,7 @@
}
}
- if (destParent == srcParent)// (destParent.getIdentifier().equals(node.getParentIdentifier()))
+ if (destParent == srcParent) // NOSONAR
{
// move to same parent
srcChilds = destChilds;
@@ -216,7 +215,7 @@
srcIndex++;
}
// find index on destination in case when destination the same as source
- if (srcChilds == destChilds && (child.getQPath().getName().equals(destNodeName)))
+ if (srcChilds == destChilds && (child.getQPath().getName().equals(destNodeName))) // NOSONAR
{
destIndex++;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -374,7 +374,7 @@
{
return systemConnection == null
// we need system connection but it's not exist
- ? systemConnection = (systemDataContainer != dataContainer
+ ? systemConnection = (systemDataContainer != dataContainer // NOSONAR
// if it's different container instances
? systemDataContainer.equals(dataContainer) && thisConnection != null
// but container confugrations are same and non-system connnection open
@@ -396,7 +396,7 @@
{
return thisConnection == null
// we need this conatiner conection
- ? thisConnection = (systemDataContainer != dataContainer
+ ? thisConnection = (systemDataContainer != dataContainer // NOSONAR
// if it's different container instances
? dataContainer.equals(systemDataContainer) && systemConnection != null
// but container confugrations are same and system connnection open
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -586,7 +586,7 @@
{
String id1 = data.getParentIdentifier();
String id2 = parent.getIdentifier();
- if (id1 == id2)
+ if (id1 == id2) // NOSONAR
return true;
if (id1 == null && id2 != null)
return false;
Modified: jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics/JCRAPIAspect.java
===================================================================
--- jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics/JCRAPIAspect.java 2011-12-28 13:22:33 UTC (rev 5377)
+++ jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics/JCRAPIAspect.java 2011-12-28 15:33:38 UTC (rev 5378)
@@ -32,11 +32,6 @@
*/
package org.exoplatform.services.jcr.statistics;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.services.log.ExoLogger;
@@ -154,7 +149,7 @@
MAPPING = Collections.unmodifiableMap(tempMapping);
}
}
- if (statistics == UNKNOWN)
+ if (statistics == UNKNOWN) // NOSONAR
{
return null;
}
More information about the exo-jcr-commits
mailing list