Author: tv
Date: Mon Jul 27 09:22:22 2015
New Revision: 1692844
URL: http://svn.apache.org/r1692844
Log:
Remove dependency on commons-lang,
Remove redundant information
Use managed versions
Modified:
turbine/fulcrum/trunk/security/memory/pom.xml
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineUserManagerImpl.java
Modified: turbine/fulcrum/trunk/security/memory/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/pom.xml?rev=1692844&r1=1692843&r2=1692844&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/pom.xml (original)
+++ turbine/fulcrum/trunk/security/memory/pom.xml Mon Jul 27 09:22:22 2015
@@ -23,7 +23,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-memory</artifactId>
<version>1.1.1-SNAPSHOT</version>
<name>Fulcrum Security Memory Impl</name>
@@ -65,43 +64,23 @@
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.3.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
- <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
- <version>1.1.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineUserManagerImpl.java?rev=1692844&r1=1692843&r2=1692844&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineUserManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineUserManagerImpl.java
Mon Jul 27 09:22:22 2015
@@ -18,7 +18,6 @@ package org.apache.fulcrum.security.memo
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.memory.MemoryUserManagerImpl;
import org.apache.fulcrum.security.model.turbine.TurbineUserManager;
@@ -45,7 +44,8 @@ public class MemoryTurbineUserManagerImp
* if the implementation of User interface could not be
* determined, or does not exist.
*/
- public <T extends User> T getAnonymousUser() throws UnknownEntityException
+ @Override
+ public <T extends User> T getAnonymousUser() throws
UnknownEntityException
{
T user;
try
@@ -71,10 +71,11 @@ public class MemoryTurbineUserManagerImp
* @return True if this is an anonymous user
*
*/
- public boolean isAnonymousUser(User user)
+ @Override
+ public boolean isAnonymousUser(User user)
{
// Either just null, the name is null or the name is the empty string
- return (user == null) || StringUtils.isEmpty(user.getName());
+ return (user == null) || user.getName() == null ||
user.getName().isEmpty();
}
}