You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/11/08 17:07:01 UTC
svn commit: r1032614 - in /myfaces/extensions/cdi/trunk/core:
api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/
api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/projectstage/
impl/src/test/java/org/apache/myfac...
Author: gpetracek
Date: Mon Nov 8 16:07:00 2010
New Revision: 1032614
URL: http://svn.apache.org/viewvc?rev=1032614&view=rev
Log:
EXTCDI-15 allow easier implementations
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStageActivated.java
myfaces/extensions/cdi/trunk/core/api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/projectstage/ProjectStageTest.java
myfaces/extensions/cdi/trunk/core/api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/projectstage/TestProjectStages.java
myfaces/extensions/cdi/trunk/core/impl/src/test/java/org/apache/myfaces/extensions/cdi/core/test/impl/projectstage/testbeans/MyMailServiceMockImpl.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java?rev=1032614&r1=1032613&r2=1032614&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java Mon Nov 8 16:07:00 2010
@@ -146,16 +146,16 @@ public abstract class ProjectStage imple
*/
protected ProjectStage()
{
- String psNameIn = this.getClass().getSimpleName();
- psName = psNameIn.substring(1);
+ String projectStageClassName = this.getClass().getSimpleName();
+ psName = projectStageClassName;
- if (!projectStages.containsKey(psNameIn))
+ if (!projectStages.containsKey(projectStageClassName))
{
- projectStages.put(psName, this);
+ projectStages.put(projectStageClassName, this);
}
else
{
- throw new IllegalArgumentException("ProjectStage with name " + psNameIn + " already exists!");
+ throw new IllegalArgumentException("ProjectStage with name " + projectStageClassName + " already exists!");
}
// we cannot do this in the static block since it's not really deterministic
@@ -164,12 +164,12 @@ public abstract class ProjectStage imple
}
/**
- * @param psName the name of the ProjectStage
+ * @param projectStageClassName the name of the ProjectStage
* @return the ProjectStage which is identified by it's name
*/
- public static ProjectStage valueOf(String psName)
+ public static ProjectStage valueOf(String projectStageClassName)
{
- return projectStages.get(psName);
+ return projectStages.get(projectStageClassName);
}
public static ProjectStage[] values()
@@ -184,39 +184,44 @@ public abstract class ProjectStage imple
@Typed()
- public static final class CUnitTest extends ProjectStage
+ public static final class UnitTest extends ProjectStage
{
- };
- public static final CUnitTest UnitTest = new CUnitTest();
-
+ private static final long serialVersionUID = -7910349894182034559L;
+ }
+ public static final UnitTest UnitTest = new UnitTest();
@Typed()
- public static final class CDevelopment extends ProjectStage
+ public static final class Development extends ProjectStage
{
- };
- public static final CDevelopment Development = new CDevelopment();
+ private static final long serialVersionUID = 1977308277341527250L;
+ }
+ public static final Development Development = new Development();
@Typed()
- public static final class CSystemTest extends ProjectStage
+ public static final class SystemTest extends ProjectStage
{
- };
- public static final CSystemTest SystemTest = new CSystemTest();
+ private static final long serialVersionUID = -7444003351466372539L;
+ }
+ public static final SystemTest SystemTest = new SystemTest();
@Typed()
- public static final class CIntegrationTest extends ProjectStage
+ public static final class IntegrationTest extends ProjectStage
{
- };
- public static final CIntegrationTest IntegrationTest = new CIntegrationTest();
+ private static final long serialVersionUID = 2034474361615347127L;
+ }
+ public static final IntegrationTest IntegrationTest = new IntegrationTest();
@Typed()
- public static final class CStaging extends ProjectStage
+ public static final class Staging extends ProjectStage
{
- };
- public static final CStaging Staging = new CStaging();
+ private static final long serialVersionUID = -8426149532860809553L;
+ }
+ public static final Staging Staging = new Staging();
@Typed()
- public static final class CProduction extends ProjectStage
+ public static final class Production extends ProjectStage
{
- };
- public static final CProduction Production = new CProduction();
+ private static final long serialVersionUID = -4030601958667812084L;
+ }
+ public static final Production Production = new Production();
}
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStageActivated.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStageActivated.java?rev=1032614&r1=1032613&r2=1032614&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStageActivated.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStageActivated.java Mon Nov 8 16:07:00 2010
@@ -33,7 +33,7 @@ import java.lang.annotation.Target;
* <p>Example Usage:</p>
* <pre>
* @Alternative
- * @ProjectStageActivated({ProjectStage.CDevelopment.class, ProjectStage.CUnitTest.class})
+ * @ProjectStageActivated({ProjectStage.Development.class, ProjectStage.UnitTest.class})
* @ApplicationScoped
* public class MockMailServiceImpl implements MailService {...}
* </pre>
Modified: myfaces/extensions/cdi/trunk/core/api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/projectstage/ProjectStageTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/projectstage/ProjectStageTest.java?rev=1032614&r1=1032613&r2=1032614&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/projectstage/ProjectStageTest.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/projectstage/ProjectStageTest.java Mon Nov 8 16:07:00 2010
@@ -34,7 +34,10 @@ public class ProjectStageTest {
ProjectStage ps = ProjectStage.Development;
Assert.assertNotNull(ps);
- ProjectStage psOther = ProjectStage.valueOf("AnotherProjectStage");
+ ProjectStage psOther = ProjectStage.valueOf("CustomProjectStage");
+ Assert.assertNotNull(psOther);
+
+ psOther = TestProjectStages.CustomProjectStage;
Assert.assertNotNull(psOther);
ProjectStage psProd = ProjectStage.valueOf("Production");
Modified: myfaces/extensions/cdi/trunk/core/api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/projectstage/TestProjectStages.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/projectstage/TestProjectStages.java?rev=1032614&r1=1032613&r2=1032614&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/projectstage/TestProjectStages.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/projectstage/TestProjectStages.java Mon Nov 8 16:07:00 2010
@@ -25,8 +25,10 @@ import org.apache.myfaces.extensions.cdi
*/
public class TestProjectStages implements ProjectStageHolder
{
- public static final class CAnotherProjectStage extends ProjectStage
+ public static final class CustomProjectStage extends ProjectStage
{
- };
- public static final CAnotherProjectStage AnotherProjectStage = new CAnotherProjectStage();
+ private static final long serialVersionUID = 1029094387976167179L;
+ }
+
+ public static final CustomProjectStage CustomProjectStage = new CustomProjectStage();
}
Modified: myfaces/extensions/cdi/trunk/core/impl/src/test/java/org/apache/myfaces/extensions/cdi/core/test/impl/projectstage/testbeans/MyMailServiceMockImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/test/java/org/apache/myfaces/extensions/cdi/core/test/impl/projectstage/testbeans/MyMailServiceMockImpl.java?rev=1032614&r1=1032613&r2=1032614&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/test/java/org/apache/myfaces/extensions/cdi/core/test/impl/projectstage/testbeans/MyMailServiceMockImpl.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/test/java/org/apache/myfaces/extensions/cdi/core/test/impl/projectstage/testbeans/MyMailServiceMockImpl.java Mon Nov 8 16:07:00 2010
@@ -26,7 +26,7 @@ import javax.enterprise.inject.Alternati
/**
*/
@Alternative
-@ProjectStageActivated({ProjectStage.CUnitTest.class, ProjectStage.CDevelopment.class})
+@ProjectStageActivated({ProjectStage.UnitTest.class, ProjectStage.Development.class})
public class MyMailServiceMockImpl implements MyMailService
{