HHH-10770 JCache provider updates

* Steer away from EntryProcessor
* Add tests

Author: chrisdennis

hibernate-jcache/src/main/java/org/hibernate/cache/jcache/JCacheMessageLogger.java

@@ -12,6 +12,7 @@
 
 import org.hibernate.internal.CoreMessageLogger;
 
+import static org.jboss.logging.Logger.Level.ERROR;
 import static org.jboss.logging.Logger.Level.WARN;
 
 /**
@@ -36,4 +37,12 @@ public interface JCacheMessageLogger extends CoreMessageLogger {
 			id = NAMESPACE + 2
 	)
 	void attemptToRestopAlreadyStoppedJCacheProvider();
+
+	@LogMessage(level = ERROR)
+	@Message(
+			value = "Cache: %s Key: %s Lockable: %s. A soft-locked cache entry was missing. This is either"
+					+ " out of balance lock/unlock sequences, or an eagerly evicting cache.",
+			id = NAMESPACE + 3
+	)
+	void missingLock(JCacheRegion region, Object key, Object value);
 }

hibernate-jcache/src/main/java/org/hibernate/cache/jcache/JCacheRegionFactory.java

@@ -22,6 +22,7 @@
 
 import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.cache.CacheException;
+import org.hibernate.cache.jcache.time.Timestamper;
 import org.hibernate.cache.spi.CacheDataDescription;
 import org.hibernate.cache.spi.CollectionRegion;
 import org.hibernate.cache.spi.EntityRegion;
@@ -187,11 +188,11 @@ CacheManager getCacheManager() {
 	}
 
 	static long nextTS() {
-		return System.currentTimeMillis() / 100;
+		return Timestamper.next();
 	}
 
 	static int timeOut() {
-		return (int) (TimeUnit.SECONDS.toMillis(60) / 100);
+		return (int) TimeUnit.SECONDS.toMillis( 60 ) * Timestamper.ONE_MS;
 	}
 
 	private String getProp(Properties properties, String prop) {

hibernate-jcache/src/main/java/org/hibernate/cache/jcache/JCacheTransactionalDataRegion.java

@@ -9,7 +9,6 @@
 import java.util.EnumSet;
 import java.util.Set;
 import javax.cache.Cache;
-import javax.cache.processor.EntryProcessor;
 
 import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.cache.spi.CacheDataDescription;
@@ -33,17 +32,19 @@ public JCacheTransactionalDataRegion(Cache<Object, Object> cache, CacheDataDescr
 		this.options = options;
 	}
 
+	@Override
 	public boolean isTransactionAware() {
 		return false;
 	}
 
+	@Override
 	public CacheDataDescription getCacheDataDescription() {
 		return metadata;
 	}
 
 	protected void throwIfAccessTypeUnsupported(AccessType accessType) {
-		if ( supportedAccessTypes().contains( accessType ) ) {
-			throw new UnsupportedOperationException( "This doesn't JCacheTransactionalDataRegion doesn't support " + accessType );
+		if ( !supportedAccessTypes().contains( accessType ) ) {
+			throw new UnsupportedOperationException( "JCacheTransactionalDataRegion doesn't support " + accessType );
 		}
 	}
 
@@ -67,12 +68,15 @@ public void put(Object key, Object value) {
 		cache.put( key, value );
 	}
 
-	public SessionFactoryOptions getSessionFactoryOptions() {
-		return options;
+	public boolean putIfAbsent(Object key, Object value) {
+		return cache.putIfAbsent( key, value );
 	}
 
-	public <T> T invoke(Object key, EntryProcessor<Object, Object, T> entryProcessor, Object... args) {
-		return cache.invoke( key, entryProcessor, args);
+	public boolean replace(Object key, Object expected, Object value) {
+		return cache.replace( key, expected, value );
 	}
 
+	public SessionFactoryOptions getSessionFactoryOptions() {
+		return options;
+	}
 }