Author: tv
Date: Fri Dec 9 10:29:13 2016
New Revision: 1773351
URL: http://svn.apache.org/viewvc?rev=1773351&view=rev
Log:
Generify factory service calls
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java?rev=1773351&r1=1773350&r2=1773351&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
Fri Dec 9 10:29:13 2016
@@ -56,13 +56,13 @@ public class DefaultUserManager implemen
{
/** Fulcrum user manager instance to delegate to */
private TurbineUserManager umDelegate = null;
-
+
private FactoryService factoryService = null;
-
+
/** The user class, which the UserManager uses as wrapper for Fulcrum
{@link TurbineUser} */
private String userWrapperClass;
-
-
+
+
/** Logging */
private static Log log = LogFactory.getLog(DefaultUserManager.class);
@@ -80,36 +80,47 @@ public class DefaultUserManager implemen
U u = (U) getUserWrapper(user);
return u;
}
-
+
/**
* Exception could be ignored, as it is tested before in {@link
#init(Configuration)}.
- *
+ *
+ * @param user the user object to wrap
* @return instance extending {@link User}
*/
@SuppressWarnings("unchecked")
- public <U extends User> U getUserWrapper(TurbineUser user)
+ public <U extends User> U getUserWrapper(TurbineUser user)
{
- try
+ try
{
Object params[] = new Object[] { user };
String signature[] = new String[] { TurbineUser.class.getName() };
return (U) factoryService.getInstance(getUserWrapperClass(),
params, signature);
- }
- catch (Exception e)
+ }
+ catch (Exception e)
{
log.error("after init/late instantiation exception", e);
return null; // (U)new DefaultUserImpl(user);
- }
+ }
}
- public String getUserWrapperClass()
+ /**
+ * Get the wrapper class for user objects
+ *
+ * @return the wrapper class name
+ */
+ public String getUserWrapperClass()
{
return userWrapperClass;
}
-
- public void setUserWrapperClass(String userWrapperClass2)
+
+ /**
+ * Set the wrapper class for user objects
+ *
+ * @param userWrapperClass2 the wrapper class name
+ */
+ public void setUserWrapperClass(String userWrapperClass2)
{
- userWrapperClass = userWrapperClass2;
+ userWrapperClass = userWrapperClass2;
}
/**
@@ -122,35 +133,37 @@ public class DefaultUserManager implemen
{
ServiceManager manager = TurbineServices.getInstance();
this.umDelegate =
(TurbineUserManager)manager.getService(TurbineUserManager.ROLE);
-
+
String userWrapperClass = conf.getString(
SecurityService.USER_WRAPPER_KEY,
SecurityService.USER_WRAPPER_DEFAULT);
-
+
// String userClass = conf.getString(
// SecurityService.USER_KEY,
// SecurityService.USER_DEFAULT);
-
- try
+
+ try
{
factoryService =
(FactoryService)manager.getService(FactoryService.ROLE);
-
- // check instantiation
-
+
+ // check instantiation
+
// should provide default constructor
TurbineUser turbineUser = umDelegate.getUserInstance();
- //(TurbineUser)
factoryService.getInstance(userClass);
+ //(TurbineUser)
factoryService.getInstance(userClass);
Object params[] = new Object[] { turbineUser };
String signature[] = new String[] { TurbineUser.class.getName() };
- User uc = (User) factoryService.getInstance(userWrapperClass,
params, signature);
-
+
+ // Just check if exceptions would occur
+ factoryService.getInstance(userWrapperClass, params, signature);
+
this.setUserWrapperClass(userWrapperClass);
- }
+ }
catch (Exception e)
{
throw new InitializationException("Failed to instantiate user
wrapper class", e);
}
-
+
}
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java?rev=1773351&r1=1773350&r2=1773351&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
Fri Dec 9 10:29:13 2016
@@ -792,7 +792,7 @@ public class TurbineTemplateService
try
{
FactoryService factory =
(FactoryService)TurbineServices.getInstance().getService(FactoryService.ROLE);
- tm = (Mapper) factory.getInstance(mapperClass);
+ tm = factory.getInstance(mapperClass);
}
catch (FactoryException e)
{
