[jbosscache-commits] JBoss Cache SVN: r6530 - in core/trunk/src/main/java/org/jboss/cache/factories: context and 1 other directory.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Wed Aug 6 10:57:47 EDT 2008
Author: manik.surtani at jboss.com
Date: 2008-08-06 10:57:47 -0400 (Wed, 06 Aug 2008)
New Revision: 6530
Added:
core/trunk/src/main/java/org/jboss/cache/factories/ContextMetaFactory.java
Removed:
core/trunk/src/main/java/org/jboss/cache/factories/context/ContextMetaFactory.java
Modified:
core/trunk/src/main/java/org/jboss/cache/factories/CommandsMetaFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/LockManagerFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/NodeMetaFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/RegionManagerFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/RuntimeConfigAwareFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/StateTransferFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/StateTransferManagerFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/TransactionManagerFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/context/OptimisticContextFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/context/PessimisticContextFactory.java
Log:
Cleaned up ugly generic casts in factories
Modified: core/trunk/src/main/java/org/jboss/cache/factories/CommandsMetaFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/CommandsMetaFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/CommandsMetaFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -16,17 +16,17 @@
@DefaultFactoryFor(classes = CommandsFactory.class)
public class CommandsMetaFactory extends ComponentFactory
{
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("deprecation")
protected <T> T construct(Class<T> componentType)
{
switch (configuration.getNodeLockingScheme())
{
case MVCC:
- return (T) new CommandsFactoryImpl();
+ return componentType.cast(new CommandsFactoryImpl());
case OPTIMISTIC:
- return (T) new OptimisticCommandsFactoryImpl();
+ return componentType.cast(new OptimisticCommandsFactoryImpl());
case PESSIMISTIC:
- return (T) new PessimisticCommandsFactoryImpl();
+ return componentType.cast(new PessimisticCommandsFactoryImpl());
}
throw new ConfigurationException("Unknown locking scheme " + configuration.getNodeLockingScheme());
}
Copied: core/trunk/src/main/java/org/jboss/cache/factories/ContextMetaFactory.java (from rev 6527, core/trunk/src/main/java/org/jboss/cache/factories/context/ContextMetaFactory.java)
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/ContextMetaFactory.java (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ContextMetaFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -0,0 +1,37 @@
+package org.jboss.cache.factories;
+
+import org.jboss.cache.config.ConfigurationException;
+import org.jboss.cache.factories.annotations.DefaultFactoryFor;
+import org.jboss.cache.factories.context.ContextFactory;
+import org.jboss.cache.factories.context.MVCCContextFactory;
+import org.jboss.cache.factories.context.OptimisticContextFactory;
+import org.jboss.cache.factories.context.PessimisticContextFactory;
+
+/**
+ * Responsible for creating the appropriate {@link org.jboss.cache.factories.context.ContextFactory} based on configuration used.
+ *
+ * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
+ * @since 3.0
+ */
+ at DefaultFactoryFor(classes = ContextFactory.class)
+public class ContextMetaFactory extends ComponentFactory
+{
+ @SuppressWarnings("deprecation")
+ protected <T> T construct(Class<T> componentType)
+ {
+ if (log.isTraceEnabled()) log.trace("Cache configuration is " + configuration.getNodeLockingScheme());
+ switch (configuration.getNodeLockingScheme())
+ {
+ case MVCC:
+ if (log.isTraceEnabled()) log.trace("Creating an MVCC context factory");
+ return componentType.cast(new MVCCContextFactory());
+ case OPTIMISTIC:
+ if (log.isTraceEnabled()) log.trace("Creating an optimistic context factory");
+ return componentType.cast(new OptimisticContextFactory());
+ case PESSIMISTIC:
+ if (log.isTraceEnabled()) log.trace("Creating a pessimistic context factory");
+ return componentType.cast(new PessimisticContextFactory());
+ }
+ throw new ConfigurationException("Unknown configuration node locking scheme");
+ }
+}
Modified: core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -29,7 +29,6 @@
public class EmptyConstructorFactory extends ComponentFactory
{
@Override
- @SuppressWarnings("unchecked")
protected <T> T construct(Class<T> componentType)
{
try
@@ -47,7 +46,7 @@
componentImpl = getClass().getClassLoader().loadClass(componentType.getName() + "Impl");
}
- return (T) componentImpl.newInstance();
+ return componentType.cast(componentImpl.newInstance());
}
else
{
Modified: core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -193,12 +193,11 @@
}
@Override
- @SuppressWarnings("unchecked")
protected <T> T construct(Class<T> componentType)
{
try
{
- return (T) buildInterceptorChain();
+ return componentType.cast(buildInterceptorChain());
}
catch (Exception e)
{
Modified: core/trunk/src/main/java/org/jboss/cache/factories/LockManagerFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/LockManagerFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/LockManagerFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -16,19 +16,19 @@
public class LockManagerFactory extends EmptyConstructorFactory
{
@Override
- @SuppressWarnings({"unchecked", "deprecation"})
+ @SuppressWarnings("deprecation")
protected <T> T construct(Class<T> componentType)
{
if (log.isTraceEnabled()) log.trace("Cache configuration is " + configuration.getNodeLockingScheme());
switch (configuration.getNodeLockingScheme())
{
case MVCC:
- return (T) super.construct(MVCCLockManager.class);
+ return componentType.cast(super.construct(MVCCLockManager.class));
case OPTIMISTIC:
- return (T) super.construct(NodeBasedLockManager.class);
+ return componentType.cast(super.construct(NodeBasedLockManager.class));
case PESSIMISTIC:
default:
- return (T) super.construct(PessimisticNodeBasedLockManager.class);
+ return componentType.cast(super.construct(PessimisticNodeBasedLockManager.class));
}
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/factories/NodeMetaFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/NodeMetaFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/NodeMetaFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -16,17 +16,17 @@
@DefaultFactoryFor(classes = NodeFactory.class)
public class NodeMetaFactory extends ComponentFactory
{
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("deprecation")
protected <T> T construct(Class<T> componentType)
{
switch (configuration.getNodeLockingScheme())
{
case MVCC:
- return (T) new MVCCNodeFactory();
+ return componentType.cast(new MVCCNodeFactory());
case OPTIMISTIC:
- return (T) new OptimisticNodeFactory();
+ return componentType.cast(new OptimisticNodeFactory());
case PESSIMISTIC:
- return (T) new PessimisticNodeFactory();
+ return componentType.cast(new PessimisticNodeFactory());
default:
throw new ConfigurationException("Unknown locking scheme " + configuration.getNodeLockingScheme());
}
Modified: core/trunk/src/main/java/org/jboss/cache/factories/RegionManagerFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/RegionManagerFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/RegionManagerFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -14,15 +14,15 @@
@DefaultFactoryFor(classes = RegionManager.class)
public class RegionManagerFactory extends ComponentFactory
{
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("deprecation")
protected <T> T construct(Class<T> componentType)
{
switch (configuration.getNodeLockingScheme())
{
case MVCC:
- return (T) new RegionManagerImpl();
+ return componentType.cast(new RegionManagerImpl());
default:
- return (T) new LegacyRegionManagerImpl();
+ return componentType.cast(new LegacyRegionManagerImpl());
}
}
}
\ No newline at end of file
Modified: core/trunk/src/main/java/org/jboss/cache/factories/RuntimeConfigAwareFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/RuntimeConfigAwareFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/RuntimeConfigAwareFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -18,7 +18,6 @@
public class RuntimeConfigAwareFactory extends EmptyConstructorFactory
{
@Override
- @SuppressWarnings("unchecked")
protected <T> T construct(Class<T> componentType)
{
T component = super.construct(componentType);
Modified: core/trunk/src/main/java/org/jboss/cache/factories/StateTransferFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/StateTransferFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/StateTransferFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -28,17 +28,17 @@
@DefaultFactoryFor(classes = {StateTransferGenerator.class, StateTransferIntegrator.class})
public class StateTransferFactory extends ComponentFactory
{
+ @SuppressWarnings("deprecation")
protected <T> T construct(Class<T> componentType)
{
-
if (componentType.equals(StateTransferIntegrator.class))
{
switch (configuration.getNodeLockingScheme())
{
case MVCC:
- return (T) new DefaultStateTransferIntegrator();
+ return componentType.cast(new DefaultStateTransferIntegrator());
default:
- return (T) new LegacyStateTransferIntegrator();
+ return componentType.cast(new LegacyStateTransferIntegrator());
}
}
else
@@ -46,9 +46,9 @@
switch (configuration.getNodeLockingScheme())
{
case MVCC:
- return (T) new DefaultStateTransferGenerator();
+ return componentType.cast(new DefaultStateTransferGenerator());
default:
- return (T) new LegacyStateTransferGenerator();
+ return componentType.cast(new LegacyStateTransferGenerator());
}
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/factories/StateTransferManagerFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/StateTransferManagerFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/StateTransferManagerFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -14,15 +14,15 @@
@DefaultFactoryFor(classes = StateTransferManager.class)
public class StateTransferManagerFactory extends ComponentFactory
{
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("deprecation")
protected <T> T construct(Class<T> componentType)
{
switch (configuration.getNodeLockingScheme())
{
case MVCC:
- return (T) new DefaultStateTransferManager();
+ return componentType.cast(new DefaultStateTransferManager());
default:
- return (T) new LegacyStateTransferManager();
+ return componentType.cast(new LegacyStateTransferManager());
}
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/factories/TransactionManagerFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/TransactionManagerFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/TransactionManagerFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -15,7 +15,6 @@
@DefaultFactoryFor(classes = {TransactionManager.class})
public class TransactionManagerFactory extends ComponentFactory
{
- @SuppressWarnings("unchecked")
protected <T> T construct(Class<T> componentType)
{
// See if we had a TransactionManager injected into our config
@@ -53,6 +52,6 @@
log.info("failed looking up TransactionManager, will not use transactions", e);
}
}
- return (T) transactionManager;
+ return componentType.cast(transactionManager);
}
}
Deleted: core/trunk/src/main/java/org/jboss/cache/factories/context/ContextMetaFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/context/ContextMetaFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/context/ContextMetaFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -1,34 +0,0 @@
-package org.jboss.cache.factories.context;
-
-import org.jboss.cache.config.ConfigurationException;
-import org.jboss.cache.factories.ComponentFactory;
-import org.jboss.cache.factories.annotations.DefaultFactoryFor;
-
-/**
- * Responsible for creating the appropriate {@link ContextFactory} based on configuration used.
- *
- * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
- * @since 3.0
- */
- at DefaultFactoryFor(classes = ContextFactory.class)
-public class ContextMetaFactory extends ComponentFactory
-{
- @SuppressWarnings("unchecked")
- protected <T> T construct(Class<T> componentType)
- {
- if (log.isTraceEnabled()) log.trace("Cache configuration is " + configuration.getNodeLockingScheme());
- switch (configuration.getNodeLockingScheme())
- {
- case MVCC:
- if (log.isTraceEnabled()) log.trace("Creating an MVCC context factory");
- return (T) new MVCCContextFactory();
- case OPTIMISTIC:
- if (log.isTraceEnabled()) log.trace("Creating an optimistic context factory");
- return (T) new OptimisticContextFactory();
- case PESSIMISTIC:
- if (log.isTraceEnabled()) log.trace("Creating a pessimistic context factory");
- return (T) new PessimisticContextFactory();
- }
- throw new ConfigurationException("Unknown configuration node locking scheme");
- }
-}
Modified: core/trunk/src/main/java/org/jboss/cache/factories/context/OptimisticContextFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/context/OptimisticContextFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/context/OptimisticContextFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -12,7 +12,10 @@
*
* @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
* @since 3.0
+ * @deprecated will be removed when optimistic locking is removed.
*/
+ at Deprecated
+ at SuppressWarnings("deprecation")
public class OptimisticContextFactory extends PessimisticContextFactory
{
@Override
Modified: core/trunk/src/main/java/org/jboss/cache/factories/context/PessimisticContextFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/context/PessimisticContextFactory.java 2008-08-06 14:42:03 UTC (rev 6529)
+++ core/trunk/src/main/java/org/jboss/cache/factories/context/PessimisticContextFactory.java 2008-08-06 14:57:47 UTC (rev 6530)
@@ -16,7 +16,10 @@
*
* @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
* @since 3.0
+ * @deprecated will be removed when pessimistic locking is removed.
*/
+ at Deprecated
+ at SuppressWarnings("deprecation")
public class PessimisticContextFactory implements ContextFactory
{
DataContainer container;
More information about the jbosscache-commits
mailing list