Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[New] Added tx.getPolicy(Class<T> clazz, ...) overrides 

Old version are deprecated. This is to help the compiler know what we really want as result. This is a stop gap till we can make PolicyDef be typed, but this requires moving StrolchPolicy to model.
This commit is contained in:
Robert von Burg 2021-07-19 11:27:31 +02:00
parent 35bf9261e6
commit 87804809f3
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
View File

@ -317,7 +317,7 @@ public abstract class AbstractTransaction implements StrolchTransaction {
}
@Override
public <T extends StrolchRootElement> void releaseLock(Locator locator) throws StrolchLockException {
public void releaseLock(Locator locator) throws StrolchLockException {
this.realm.releaseLock(locator);
this.lockedElements.remove(locator);
}
@ -419,15 +419,27 @@ public abstract class AbstractTransaction implements StrolchTransaction {
}
@Override
@Deprecated
public <T extends StrolchPolicy> T getPolicy(PolicyDef policyDef) {
return getContainer().getComponent(PolicyHandler.class).getPolicy(policyDef, this);
}
@Override
public <T extends StrolchPolicy> T getPolicy(Class<T> clazz, PolicyDef policyDef) {
return getContainer().getComponent(PolicyHandler.class).getPolicy(policyDef, this);
}
@Override
@Deprecated
public <T extends StrolchPolicy> T getPolicy(PolicyDef policyDef, PolicyDef defaultDef) {
return getContainer().getComponent(PolicyHandler.class).getPolicy(policyDef, defaultDef, this);
}
@Override
public <T extends StrolchPolicy> T getPolicy(Class<T> clazz, PolicyDef policyDef, PolicyDef defaultDef) {
return getContainer().getComponent(PolicyHandler.class).getPolicy(policyDef, defaultDef, this);
}
private void assertQueryAllowed(StrolchQuery query) {
try {
getPrivilegeContext().validateAction(query);

39
li.strolch.agent/src/main/java/li/strolch/persistence/api/StrolchTransaction.java
View File

@ -238,9 +238,26 @@ public interface StrolchTransaction extends AutoCloseable {
* the type of policy to return
*
* @return the policy
*
* @deprecated use {@link #getPolicy(Class, PolicyDef)} instead
*/
@Deprecated
<T extends StrolchPolicy> T getPolicy(PolicyDef policyDef);
/**
* Instantiates the policy using the given {@link PolicyDef}
*
* @param clazz
* the type of policy to return
* @param policyDef
* the policy definition
* @param <T>
* the type of policy to return
*
* @return the policy
*/
<T extends StrolchPolicy> T getPolicy(Class<T> clazz, PolicyDef policyDef);
/**
* Instantiates the policy using the given {@link PolicyDef}, or if not available, the default policy
*
@ -252,9 +269,28 @@ public interface StrolchTransaction extends AutoCloseable {
* the type of policy to return
*
* @return the policy
*
* @deprecated user {@link #getPolicy(Class, PolicyDef, PolicyDef)} instead
*/
@Deprecated
<T extends StrolchPolicy> T getPolicy(PolicyDef policyDef, PolicyDef defaultDef);
/**
* Instantiates the policy using the given {@link PolicyDef}, or if not available, the default policy
*
* @param clazz
* the type of policy to return
* @param policyDef
* the policy definition
* @param defaultDef
* the default policy definition if the given policy definition is unavailable
* @param <T>
* the type of policy to return
*
* @return the policy
*/
<T extends StrolchPolicy> T getPolicy(Class<T> clazz, PolicyDef policyDef, PolicyDef defaultDef);
/**
* Returns the currently set {@link TransactionCloseStrategy}
*
@ -324,6 +360,7 @@ public interface StrolchTransaction extends AutoCloseable {
* StrolchTransactionException} which can be thrown by the caller to stop the exception
*
* @param exceptionMessage
* the message with which this TX has failed
*
* @return a {@link StrolchTransactionException} to be thrown by the caller
*/
@ -505,7 +542,7 @@ public interface StrolchTransaction extends AutoCloseable {
* @throws StrolchLockException
* if something goes wrong while unlocking
*/
<T extends StrolchRootElement> void releaseLock(Locator locator) throws StrolchLockException;
void releaseLock(Locator locator) throws StrolchLockException;
/**
* Adds the given {@link Command} to the transaction. Using this method guarantees that a {@link Command} is