Author: tolusha Date: 2010-09-24 04:33:48 -0400 (Fri, 24 Sep 2010) New Revision: 3187 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataConsumer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/WorkspaceStorageCache.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/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.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/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/statistics/StatisticsJDBCStorageConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java Log: EXOJCR-954: add old methods without ItemType as parameter Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataConsumer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataConsumer.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataConsumer.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -43,6 +43,19 @@ { /** + * Find Item by parent (id) and name (with path index). + * + * @param parent + * NodeData + * @param name + * item name + * @return ItemData, data by parent and name + * @throws RepositoryException + */ + @Deprecated + ItemData getItemData(NodeData parent, QPathEntry name) throws RepositoryException; + + /** * Find Item by parent (id) and name (with path index) of define type. * * @param parent Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/WorkspaceStorageCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/WorkspaceStorageCache.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/WorkspaceStorageCache.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -42,6 +42,18 @@ public static final String LIVE_TIME_PARAMETER_NAME = "live-time"; /** + * Get item by parent identifier and name +index. + * + * @param parentIdentifier + * parent identifier + * @param name + * item name + * @return itemData by parent Identifier and item name with index or null in other case + */ + @Deprecated + ItemData get(String parentIdentifier, QPathEntry name); + + /** * Get item by parent identifier and name +index of define type. * * @param parentIdentifier 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 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -169,6 +169,22 @@ * @param parent * @param relPath * - array of QPathEntry which represents the relation path to the searched item + * @return existed item data or null if not found + * @throws RepositoryException + */ + @Deprecated + public ItemData getItemData(NodeData parent, QPathEntry[] relPathEntries) throws RepositoryException + { + return getItemData(parent, relPathEntries, ItemType.UNKNOWN); + } + + /** + * Return item data by parent NodeDada and relPathEntries If relpath is JCRPath.THIS_RELPATH = '.' + * it return itself + * + * @param parent + * @param relPath + * - array of QPathEntry which represents the relation path to the searched item * @param itemType * - item type * @return existed item data or null if not found @@ -209,6 +225,14 @@ /** * {@inheritDoc} */ + public ItemData getItemData(NodeData parentData, QPathEntry name) throws RepositoryException + { + return getItemData(parentData, name, ItemType.UNKNOWN); + } + + /** + * {@inheritDoc} + */ public ItemData getItemData(NodeData parent, QPathEntry name, ItemType itemType) throws RepositoryException { return getItemData(parent, name, false, itemType); @@ -287,6 +311,26 @@ * @return existed item or null if not found * @throws RepositoryException */ + @Deprecated + public ItemImpl getItem(NodeData parent, QPathEntry name, boolean pool) throws RepositoryException + { + return getItem(parent, name, pool, ItemType.UNKNOWN); + } + + /** + * Return Item by parent NodeDada and the name of searched item. + * + * @param parent + * - parent of the searched item + * @param name + * - item name + * @param itemType + * - item type + * @param pool + * - indicates does the item fall in pool + * @return existed item or null if not found + * @throws RepositoryException + */ public ItemImpl getItem(NodeData parent, QPathEntry name, boolean pool, ItemType itemType) throws RepositoryException { @@ -323,6 +367,27 @@ * - indicates does the item fall in pool * @param skipCheckInPersistence * - skip getting Item from persistence if need + * @return existed item or null if not found + * @throws RepositoryException + */ + @Deprecated + public ItemImpl getItem(NodeData parent, QPathEntry name, boolean pool, boolean skipCheckInPersistence) + throws RepositoryException + { + return getItem(parent, name, pool, skipCheckInPersistence, ItemType.UNKNOWN); + } + + /** + * Return Item by parent NodeDada and the name of searched item. + * + * @param parent + * - parent of the searched item + * @param name + * - item name + * @param pool + * - indicates does the item fall in pool + * @param skipCheckInPersistence + * - skip getting Item from persistence if need * @param itemType * - item type * @return existed item or null if not found @@ -363,6 +428,25 @@ * - array of QPathEntry which represents the relation path to the searched item * @param pool * - indicates does the item fall in pool + * @return existed item or null if not found + * @throws RepositoryException + */ + @Deprecated + public ItemImpl getItem(NodeData parent, QPathEntry[] relPath, boolean pool) throws RepositoryException + { + return getItem(parent, relPath, pool, ItemType.UNKNOWN); + } + + /** + * Return Item by parent NodeDada and array of QPathEntry which represent a relative path to the + * searched item + * + * @param parent + * - parent of the searched item + * @param relPath + * - array of QPathEntry which represents the relation path to the searched item + * @param pool + * - indicates does the item fall in pool * @param itemType * - item type * @return existed item or null if not found Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -166,6 +166,14 @@ /** * {@inheritDoc} */ + public ItemData getItemData(NodeData parent, QPathEntry name) throws RepositoryException + { + return getItemData(parent, name, ItemType.UNKNOWN); + } + + /** + * {@inheritDoc} + */ public ItemData getItemData(NodeData parent, QPathEntry name, ItemType itemType) throws RepositoryException { final ItemData item = persistentManager.getItemData(parent, name, itemType); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -381,6 +381,15 @@ * {@inheritDoc} */ @Override + public ItemData getItemData(NodeData parentData, QPathEntry name) throws RepositoryException + { + return getItemData(parentData, name, ItemType.UNKNOWN); + } + + /** + * {@inheritDoc} + */ + @Override public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType) throws RepositoryException { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -881,6 +881,14 @@ /** * {@inheritDoc} */ + public ItemData get(String parentIdentifier, QPathEntry name) + { + return get(parentIdentifier, name, ItemType.UNKNOWN); + } + + /** + * {@inheritDoc} + */ public ItemData get(final String parentId, final QPathEntry name, ItemType itemType) { if (enabled && parentId != null && name != null) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -128,6 +128,15 @@ * {@inheritDoc} */ @Override + public ItemData getItemData(NodeData parentData, QPathEntry name) throws RepositoryException + { + return getItemData(parentData, name, ItemType.UNKNOWN); + } + + /** + * {@inheritDoc} + */ + @Override public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType) throws RepositoryException { if (parentData != null) 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 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -799,6 +799,15 @@ /** * {@inheritDoc} */ + public ItemData getItemData(final NodeData parentData, final QPathEntry name) + throws RepositoryException + { + return getItemData(parentData, name, ItemType.UNKNOWN); + } + + /** + * {@inheritDoc} + */ public ItemData getItemData(final NodeData parentData, final QPathEntry name, ItemType itemType) throws RepositoryException { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -606,6 +606,14 @@ /** * {@inheritDoc} */ + public ItemData get(String parentId, QPathEntry name) + { + return get(parentId, name, ItemType.UNKNOWN); + } + + /** + * {@inheritDoc} + */ public ItemData get(String parentId, QPathEntry name, ItemType itemType) { String itemId = null; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -103,6 +103,14 @@ /** * {@inheritDoc} */ + public ItemData getItemData(NodeData parentData, QPathEntry name) throws RepositoryException + { + return getItemData(parentData, name, ItemType.UNKNOWN); + } + + /** + * {@inheritDoc} + */ public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType) throws RepositoryException { return copyItemData(storageDataManager.getItemData(parentData, name, itemType)); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -213,6 +213,14 @@ /** * {@inheritDoc} */ + public ItemData getItemData(NodeData parentData, QPathEntry name) throws RepositoryException + { + return getItemData(parentData, name, ItemType.UNKNOWN); + } + + /** + * {@inheritDoc} + */ public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType) throws RepositoryException { ItemData data = null; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -62,6 +62,14 @@ identifiers = new TreeMap(); } + /** + * {@inheritDoc} + */ + public ItemData getItemData(NodeData parentData, QPathEntry name) throws RepositoryException, IllegalStateException + { + return getItemData(parentData, name, ItemType.UNKNOWN); + } + public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType) throws RepositoryException, IllegalStateException { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -1046,6 +1046,14 @@ /** * {@inheritDoc} */ + public ItemData getItemData(NodeData parentData, QPathEntry name) throws RepositoryException, IllegalStateException + { + return getItemData(parentData, name, ItemType.UNKNOWN); + } + + /** + * {@inheritDoc} + */ public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType) throws RepositoryException, IllegalStateException { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/statistics/StatisticsJDBCStorageConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/statistics/StatisticsJDBCStorageConnection.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/statistics/StatisticsJDBCStorageConnection.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -386,6 +386,14 @@ /** * {@inheritDoc} */ + public ItemData getItemData(NodeData parentData, QPathEntry name) throws RepositoryException, IllegalStateException + { + return getItemData(parentData, name, ItemType.UNKNOWN); + } + + /** + * {@inheritDoc} + */ public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType) throws RepositoryException, IllegalStateException { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -51,6 +51,24 @@ /** * Reads <code>ItemData</code> from the storage using item's parent and name relative the parent + * location. + * + * @param parentData + * - the item's parent NodeData + * @param name + * - item's path entry (QName + index) + * @return - stored ItemData wich has exact the same path Entry (name+index) inside the parent; or + * null if not such an item data found + * @throws RepositoryException + * if some exception occured + * @throws IllegalStateException + * if connection is closed + */ + @Deprecated + ItemData getItemData(NodeData parentData, QPathEntry name) throws RepositoryException, IllegalStateException; + + /** + * Reads <code>ItemData</code> from the storage using item's parent and name relative the parent * location of define type. * * @param parentData Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java 2010-09-24 08:17:09 UTC (rev 3186) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java 2010-09-24 08:33:48 UTC (rev 3187) @@ -308,6 +308,14 @@ private volatile ItemData itemData; + /** + * {@inheritDoc} + */ + public ItemData get(String parentIdentifier, QPathEntry name) + { + return get(parentIdentifier, name, ItemType.UNKNOWN); + } + public ItemData get(String parentIdentifier, QPathEntry name, ItemType itemType) { if (itemData != null && itemType.isSuitableFor(itemData)) @@ -439,6 +447,15 @@ public AtomicInteger getItemDataByNodeDataNQPathEntryCalls = new AtomicInteger(); + /** + * {@inheritDoc} + */ + public ItemData getItemData(NodeData parentData, QPathEntry name) throws RepositoryException, + IllegalStateException + { + return getItemData(parentData, name, ItemType.UNKNOWN); + } + public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType) throws RepositoryException, IllegalStateException {