openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1799066 - in /openwebbeans/trunk: samples/guess/src/main/java/org/apache/webbeans/sample/bean/ samples/guess/src/main/java/org/apache/webbeans/sample/guess/ samples/guess/src/main/java/org/apache/webbeans/sample/util/ samples/reservation/s...
Date Sun, 18 Jun 2017 09:54:02 GMT
Author: struberg
Date: Sun Jun 18 09:54:02 2017
New Revision: 1799066

URL: http://svn.apache.org/viewvc?rev=1799066&view=rev
Log:
OWB-1195 simplify annotations

Modified:
    openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
    openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
    openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
    openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java
    openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/entity/User.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ExceptionUtil.java
    openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/OwbTckElResolver.java
    openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java

Modified: openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java?rev=1799066&r1=1799065&r2=1799066&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
(original)
+++ openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
Sun Jun 18 09:54:02 2017
@@ -86,7 +86,8 @@ public class LoginBean
     }
 
 
-    @Produces @SessionScoped @LoggedInUser @Named(value="currentUser")
+    @Produces @SessionScoped @LoggedInUser
+    @Named("currentUser")
     public User getLoggedInUser()
     {
         return this.user;

Modified: openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java?rev=1799066&r1=1799065&r2=1799066&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
(original)
+++ openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
Sun Jun 18 09:54:02 2017
@@ -32,7 +32,7 @@ import javax.faces.application.FacesMess
 import javax.faces.context.FacesContext;
 import javax.inject.Inject;
 
-@Named(value = "game")
+@Named("game")
 @SessionScoped
 public class JSFNumberGuess implements Serializable
 {

Modified: openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java?rev=1799066&r1=1799065&r2=1799066&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
(original)
+++ openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
Sun Jun 18 09:54:02 2017
@@ -24,7 +24,7 @@ import javax.faces.application.FacesMess
 import javax.faces.application.FacesMessage.Severity;
 import javax.faces.context.FacesContext;
 
-@Named(value="facesMessage")
+@Named("facesMessage")
 @Dependent
 public class FacesMessageUtil
 {

Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java?rev=1799066&r1=1799065&r2=1799066&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java
(original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java
Sun Jun 18 09:54:02 2017
@@ -28,7 +28,7 @@ import org.apache.webbeans.reservation.b
 import org.apache.webbeans.reservation.controller.RegisterController;
 import org.apache.webbeans.reservation.util.JSFUtility;
 
-@Named(value="register")
+@Named("register")
 @RequestScoped
 public class RegisterBean
 {

Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/entity/User.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/entity/User.java?rev=1799066&r1=1799065&r2=1799066&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/entity/User.java
(original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/entity/User.java
Sun Jun 18 09:54:02 2017
@@ -54,10 +54,10 @@ public class User
     @Column(nullable=false,length=20)
     private String password;
     
-    @Temporal(value=TemporalType.DATE)
+    @Temporal(TemporalType.DATE)
     private Date registerDate;
     
-    @OneToMany(mappedBy="user",cascade={CascadeType.ALL})
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
     private Set<Reservation> reservations = new HashSet<Reservation>();
     
     @Version
@@ -67,7 +67,7 @@ public class User
     private boolean admin;
     
 
-    @Temporal(value=TemporalType.TIMESTAMP)
+    @Temporal(TemporalType.TIMESTAMP)
     private Date lastLoginDate;
 
     public User()

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java?rev=1799066&r1=1799065&r2=1799066&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java
Sun Jun 18 09:54:02 2017
@@ -77,13 +77,13 @@ public class OwbCDI extends CDI<Object>
     }
 
     @Override
-    public <U extends Object> Instance<U> select(final TypeLiteral<U> subtype,
final Annotation... qualifiers)
+    public <U> Instance<U> select(final TypeLiteral<U> subtype, final Annotation...
qualifiers)
     {
         return instance().select(subtype, qualifiers);
     }
 
     @Override
-    public <U extends Object> Instance<U> select(final Class<U> subtype,
final Annotation... qualifiers)
+    public <U> Instance<U> select(final Class<U> subtype, final Annotation...
qualifiers)
     {
         return instance().select(subtype, qualifiers);
     }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ExceptionUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ExceptionUtil.java?rev=1799066&r1=1799065&r2=1799066&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ExceptionUtil.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ExceptionUtil.java
Sun Jun 18 09:54:02 2017
@@ -65,7 +65,7 @@ public abstract class ExceptionUtil
         return e;
     }
 
-    @SuppressWarnings({ "unchecked" })
+    @SuppressWarnings("unchecked")
     private static class ExceptionHelper<T extends Throwable>
     {
         private void throwException(Throwable exception) throws T

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/OwbTckElResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/OwbTckElResolver.java?rev=1799066&r1=1799065&r2=1799066&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/OwbTckElResolver.java
(original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/OwbTckElResolver.java
Sun Jun 18 09:54:02 2017
@@ -45,7 +45,7 @@ public class OwbTckElResolver extends We
      * {@inheritDoc}
      */    
     @Override
-    @SuppressWarnings({"unchecked"})
+    @SuppressWarnings("unchecked")
     public Object getValue(ELContext context, Object obj, Object property) throws NullPointerException,
PropertyNotFoundException, ELException
     {
         //Bean instance

Modified: openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java?rev=1799066&r1=1799065&r2=1799066&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java
(original)
+++ openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java
Sun Jun 18 09:54:02 2017
@@ -94,13 +94,13 @@ public class OWBContainer implements SeC
     }
 
     @Override
-    public <U extends Object> Instance<U> select(final TypeLiteral<U> subtype,
final Annotation... qualifiers)
+    public <U> Instance<U> select(final TypeLiteral<U> subtype, final Annotation...
qualifiers)
     {
         return instance().select(subtype, qualifiers);
     }
 
     @Override
-    public <U extends Object> Instance<U> select(final Class<U> subtype,
final Annotation... qualifiers)
+    public <U> Instance<U> select(final Class<U> subtype, final Annotation...
qualifiers)
     {
         return instance().select(subtype, qualifiers);
     }



Mime
View raw message