This is an automated email from the ASF dual-hosted git repository.
mmuzaf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new f1adff9 IGNITE-12539: fix hibernate 5.3 javadoc errors (#7259)
f1adff9 is described below
commit f1adff9040bbbbfd32b5b1f4d5da806924f9e6e7
Author: Maxim Muzafarov <mmu...@apache.org>
AuthorDate: Fri Jan 17 15:11:05 2020 +0300
IGNITE-12539: fix hibernate 5.3 javadoc errors (#7259)
---
.../hibernate/IgniteCollectionDataAccess.java | 32 ++++++++++++++++------
.../cache/hibernate/IgniteDomainDataRegion.java | 22 ++++++++-------
.../cache/hibernate/IgniteEntityDataAccess.java | 30 ++++++++++++--------
.../cache/hibernate/IgniteNaturalIdDataAccess.java | 30 ++++++++++++--------
4 files changed, 71 insertions(+), 43 deletions(-)
diff --git
a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteCollectionDataAccess.java
b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteCollectionDataAccess.java
index aabe32e..34d2195 100644
---
a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteCollectionDataAccess.java
+++
b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteCollectionDataAccess.java
@@ -25,27 +25,41 @@ import org.hibernate.cache.spi.access.CollectionDataAccess;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.persister.collection.CollectionPersister;
-/** */
+/**
+ * Implementation of {@link CollectionDataAccess} contract for managing
transactional and concurrent
+ * L2 cache access to cached collection data.
+ */
public class IgniteCollectionDataAccess extends IgniteCachedDomainDataAccess
implements CollectionDataAccess {
- /** */
+ /** Access strategiy type. */
private final AccessType accessType;
- /** */
- public IgniteCollectionDataAccess(HibernateAccessStrategyAdapter stgy,
AccessType accessType,
+ /**
+ * @param stgy Access strategy implementation.
+ * @param accessType Strategy access type.
+ * @param regionFactory Region factory.
+ * @param domainDataRegion Data region.
+ * @param ignite Ignite instance.
+ * @param cache Cache proxy.
+ */
+ public IgniteCollectionDataAccess(
+ HibernateAccessStrategyAdapter stgy,
+ AccessType accessType,
RegionFactory regionFactory,
- DomainDataRegion domainDataRegion, Ignite ignite,
- HibernateCacheProxy cache) {
+ DomainDataRegion domainDataRegion,
+ Ignite ignite,
+ HibernateCacheProxy cache
+ ) {
super(stgy, regionFactory, domainDataRegion, ignite, cache);
this.accessType = accessType;
}
- /** */
+ /** {@inheritDoc} */
@Override public AccessType getAccessType() {
return accessType;
}
- /** */
+ /** {@inheritDoc} */
@Override public Object generateCacheKey(
Object id,
CollectionPersister persister,
@@ -54,7 +68,7 @@ public class IgniteCollectionDataAccess extends
IgniteCachedDomainDataAccess imp
return HibernateKeyWrapper.staticCreateCollectionKey(id, persister,
tenantIdentifier);
}
- /** */
+ /** {@inheritDoc} */
@Override public Object getCacheKeyId(Object cacheKey) {
return ((HibernateKeyWrapper)cacheKey).id();
}
diff --git
a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteDomainDataRegion.java
b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteDomainDataRegion.java
index c422a52..1501f67 100644
---
a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteDomainDataRegion.java
+++
b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteDomainDataRegion.java
@@ -33,12 +33,14 @@ import org.hibernate.cache.spi.access.EntityDataAccess;
import org.hibernate.cache.spi.access.NaturalIdDataAccess;
import org.hibernate.cache.spi.support.AbstractDomainDataRegion;
-/** */
+/**
+ * Implementation of a region for cacheable domain data.
+ */
public class IgniteDomainDataRegion extends AbstractDomainDataRegion
implements ExtendedStatisticsSupport {
- /** */
+ /** Cache proxy. */
private final HibernateCacheProxy cache;
- /** */
+ /** Strategy factory. */
private HibernateAccessStrategyFactory stgyFactory;
/** */
@@ -56,7 +58,7 @@ public class IgniteDomainDataRegion extends
AbstractDomainDataRegion implements
completeInstantiation(regionCfg, buildingCtx);
}
- /** */
+ /** {@inheritDoc} */
@Override protected EntityDataAccess
generateEntityAccess(EntityDataCachingConfig entityAccessCfg) {
AccessType accessType = entityAccessCfg.getAccessType();
Ignite ignite = stgyFactory.node();
@@ -90,7 +92,7 @@ public class IgniteDomainDataRegion extends
AbstractDomainDataRegion implements
}
}
- /** */
+ /** {@inheritDoc} */
@Override protected CollectionDataAccess
generateCollectionAccess(CollectionDataCachingConfig cachingCfg) {
HibernateCacheProxy cache = stgyFactory.regionCache(getName());
AccessType accessType = cachingCfg.getAccessType();
@@ -125,7 +127,7 @@ public class IgniteDomainDataRegion extends
AbstractDomainDataRegion implements
}
}
- /** */
+ /** {@inheritDoc} */
@Override protected NaturalIdDataAccess
generateNaturalIdAccess(NaturalIdDataCachingConfig naturalIdAccessCfg) {
HibernateCacheProxy cache = stgyFactory.regionCache(getName());
AccessType accessType = naturalIdAccessCfg.getAccessType();
@@ -160,22 +162,22 @@ public class IgniteDomainDataRegion extends
AbstractDomainDataRegion implements
}
}
- /** */
+ /** {@inheritDoc} */
@Override public void destroy() throws CacheException {
// no-op
}
- /** */
+ /** {@inheritDoc} */
@Override public long getElementCountInMemory() {
return cache.offHeapEntriesCount();
}
- /** */
+ /** {@inheritDoc} */
@Override public long getElementCountOnDisk() {
return cache.sizeLong();
}
- /** */
+ /** {@inheritDoc} */
@Override public long getSizeInMemory() {
return cache.offHeapAllocatedSize();
}
diff --git
a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteEntityDataAccess.java
b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteEntityDataAccess.java
index 54fad42..dee21fb 100644
---
a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteEntityDataAccess.java
+++
b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteEntityDataAccess.java
@@ -27,53 +27,59 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.persister.entity.EntityPersister;
-/** */
+/**
+ * Implementation of contract for managing transactional and concurrent access
to cached entity data.
+ */
public class IgniteEntityDataAccess extends IgniteCachedDomainDataAccess
implements EntityDataAccess {
- /** */
+ /** Strategy access type. */
private final AccessType accessType;
/** */
- public IgniteEntityDataAccess(HibernateAccessStrategyAdapter stgy,
AccessType accessType,
+ public IgniteEntityDataAccess(
+ HibernateAccessStrategyAdapter stgy,
+ AccessType accessType,
RegionFactory regionFactory,
- DomainDataRegion domainDataRegion, Ignite ignite,
- HibernateCacheProxy cache) {
+ DomainDataRegion domainDataRegion,
+ Ignite ignite,
+ HibernateCacheProxy cache
+ ) {
super(stgy, regionFactory, domainDataRegion, ignite, cache);
this.accessType = accessType;
}
- /** */
+ /** {@inheritDoc} */
@Override public Object generateCacheKey(Object id, EntityPersister
persister, SessionFactoryImplementor factory,
String tenantIdentifier) {
return HibernateKeyWrapper.staticCreateEntityKey(id, persister,
tenantIdentifier);
}
- /** */
+ /** {@inheritDoc} */
@Override public Object getCacheKeyId(Object cacheKey) {
return ((HibernateKeyWrapper) cacheKey).id();
}
- /** */
+ /** {@inheritDoc} */
@Override public boolean insert(SharedSessionContractImplementor ses,
Object key, Object val, Object ver) {
return stgy.insert(key, val);
}
- /** */
+ /** {@inheritDoc} */
@Override public boolean afterInsert(SharedSessionContractImplementor ses,
Object key, Object val, Object ver) {
return stgy.afterInsert(key, val);
}
- /** */
+ /** {@inheritDoc} */
@Override public boolean update(SharedSessionContractImplementor ses,
Object key, Object val, Object curVer, Object prevVer) {
return stgy.update(key, val);
}
- /** */
+ /** {@inheritDoc} */
@Override public boolean afterUpdate(SharedSessionContractImplementor ses,
Object key, Object val, Object curVer, Object prevVer, SoftLock lock) {
return stgy.afterUpdate(key, val);
}
- /** */
+ /** {@inheritDoc} */
@Override public AccessType getAccessType() {
return accessType;
}
diff --git
a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteNaturalIdDataAccess.java
b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteNaturalIdDataAccess.java
index aa11ce5..c09f501 100644
---
a/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteNaturalIdDataAccess.java
+++
b/modules/hibernate-5.3/src/main/java/org/apache/ignite/cache/hibernate/IgniteNaturalIdDataAccess.java
@@ -28,52 +28,58 @@ import org.hibernate.cache.spi.access.SoftLock;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.persister.entity.EntityPersister;
-/** */
+/**
+ * Implementation of contract for managing transactional and concurrent access
to cached naturalId data.
+ */
public class IgniteNaturalIdDataAccess extends IgniteCachedDomainDataAccess
implements NaturalIdDataAccess {
- /** */
+ /** Strategy access type. */
private final AccessType accessType;
/** */
- public IgniteNaturalIdDataAccess(HibernateAccessStrategyAdapter stgy,
AccessType accessType,
+ public IgniteNaturalIdDataAccess(
+ HibernateAccessStrategyAdapter stgy,
+ AccessType accessType,
RegionFactory regionFactory,
- DomainDataRegion domainDataRegion, Ignite ignite,
- HibernateCacheProxy cache) {
+ DomainDataRegion domainDataRegion,
+ Ignite ignite,
+ HibernateCacheProxy cache
+ ) {
super(stgy, regionFactory, domainDataRegion, ignite, cache);
this.accessType = accessType;
}
- /** */
+ /** {@inheritDoc} */
@Override public AccessType getAccessType() {
return accessType;
}
- /** */
+ /** {@inheritDoc} */
@Override public Object generateCacheKey(Object[] naturalIdValues,
EntityPersister persister, SharedSessionContractImplementor ses) {
return
DefaultCacheKeysFactory.staticCreateNaturalIdKey(naturalIdValues, persister,
ses);
}
- /** */
+ /** {@inheritDoc} */
@Override public Object[] getNaturalIdValues(Object cacheKey) {
return DefaultCacheKeysFactory.staticGetNaturalIdValues(cacheKey);
}
- /** */
+ /** {@inheritDoc} */
@Override public boolean insert(SharedSessionContractImplementor ses,
Object key, Object val) throws CacheException {
return stgy.insert(key, val);
}
- /** */
+ /** {@inheritDoc} */
@Override public boolean afterInsert(SharedSessionContractImplementor ses,
Object key, Object val) throws CacheException {
return stgy.afterInsert(key, val);
}
- /** */
+ /** {@inheritDoc} */
@Override public boolean update(SharedSessionContractImplementor ses,
Object key, Object val) throws CacheException {
return stgy.update(key, val);
}
- /** */
+ /** {@inheritDoc} */
@Override public boolean afterUpdate(SharedSessionContractImplementor ses,
Object key, Object val, SoftLock lock) throws CacheException {
return stgy.afterUpdate(key, val);
}
