svn commit: r1672472 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation: DestroyedLiteral.java InitializedLiteral.java

[st...@apache.org]

Author: struberg
Date: Thu Apr  9 19:57:34 2015
New Revision: 1672472

URL: http://svn.apache.org/r1672472
Log:
OWB-1025 provide Literals for @Destroyed and @Initialized

Added:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DestroyedLiteral.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedLiteral.java
      - copied, changed from r1672423, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java

Added: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DestroyedLiteral.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DestroyedLiteral.java?rev=1672472&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DestroyedLiteral.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DestroyedLiteral.java Thu Apr  9 19:57:34 2015
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.webbeans.annotation;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.context.Destroyed;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Singleton;
+import java.lang.annotation.Annotation;
+
+/**
+ * Destroyed literal.
+ *
+ * @since 1.5.0
+ */
+public class DestroyedLiteral extends AnnotationLiteral<Destroyed> implements Destroyed
+{
+
+    private static final long serialVersionUID = 8867272511520063730L;
+
+    public static final DestroyedLiteral INSTANCE_APPLICATION_SCOPED = new DestroyedLiteral(ApplicationScoped.class);
+    public static final DestroyedLiteral INSTANCE_SINGLETON_SCOPED = new DestroyedLiteral(Singleton.class);
+    public static final DestroyedLiteral INSTANCE_SESSION_SCOPED = new DestroyedLiteral(SessionScoped.class);
+    public static final DestroyedLiteral INSTANCE_CONVERSATION_SCOPED = new DestroyedLiteral(ConversationScoped.class);
+    public static final DestroyedLiteral INSTANCE_REQUEST_SCOPED = new DestroyedLiteral(RequestScoped.class);
+
+    private static final String TOSTRING = "@" + Destroyed.class.getName() + "(";
+
+
+    private Class<? extends Annotation> value;
+
+    public DestroyedLiteral(Class<? extends Annotation> value)
+    {
+        this.value = value;
+    }
+
+    @Override
+    public Class<? extends Annotation> value()
+    {
+        return value;
+    }
+
+    public void setValue(Class<? extends Annotation> value)
+    {
+        this.value = value;
+    }
+
+    @Override
+    public String toString()
+    {
+        return TOSTRING + value.getName() + ")";
+    }
+}

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedLiteral.java (from r1672423, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedLiteral.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedLiteral.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java&r1=1672423&r2=1672472&rev=1672472&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedLiteral.java Thu Apr  9 19:57:34 2015
@@ -18,39 +18,56 @@
  */
 package org.apache.webbeans.annotation;
 
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.context.Initialized;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.SessionScoped;
 import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Named;
+import javax.inject.Singleton;
+import java.lang.annotation.Annotation;
 
 /**
- * Named literal.
- * 
- * @version $Rev$ $Date$
+ * Initialized literal.
  *
+ * @since 1.5.0
  */
-public class NamedLiteral extends AnnotationLiteral<Named> implements Named
+public class InitializedLiteral extends AnnotationLiteral<Initialized> implements Initialized
 {
 
     private static final long serialVersionUID = 8867272511520063730L;
-    private String value;
-    
-    public NamedLiteral()
-    {
-        
-    }
 
-    public NamedLiteral(String value)
+    public static final InitializedLiteral INSTANCE_APPLICATION_SCOPED = new InitializedLiteral(ApplicationScoped.class);
+    public static final InitializedLiteral INSTANCE_SINGLETON_SCOPED = new InitializedLiteral(Singleton.class);
+    public static final InitializedLiteral INSTANCE_SESSION_SCOPED = new InitializedLiteral(SessionScoped.class);
+    public static final InitializedLiteral INSTANCE_CONVERSATION_SCOPED = new InitializedLiteral(ConversationScoped.class);
+    public static final InitializedLiteral INSTANCE_REQUEST_SCOPED = new InitializedLiteral(RequestScoped.class);
+
+
+    private static final String TOSTRING = "@" + Initialized.class.getName() + "(";
+
+    private Class<? extends Annotation> value;
+
+    public InitializedLiteral(Class<? extends Annotation> value)
     {
         this.value = value;
     }
 
     @Override
-    public String value()
+    public Class<? extends Annotation> value()
     {
         return value;
     }
 
-    public void setValue(String value)
+    public void setValue(Class<? extends Annotation> value)
     {
         this.value = value;
     }
+
+    @Override
+    public String toString()
+    {
+        return TOSTRING + value.getName() + ")";
+    }
+
 }