incubator-amber-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lmo...@apache.org
Subject svn commit: r1153895 - in /incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client: BasicClientInfo.java BasicClientInfoBuilder.java ClientInfo.java
Date Thu, 04 Aug 2011 14:51:14 GMT
Author: lmoren
Date: Thu Aug  4 14:51:13 2011
New Revision: 1153895

URL: http://svn.apache.org/viewvc?rev=1153895&view=rev
Log:
- added new fields to the dynamic registration domain classes

Modified:
    incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfo.java
    incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfoBuilder.java
    incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/ClientInfo.java

Modified: incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfo.java
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfo.java?rev=1153895&r1=1153894&r2=1153895&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfo.java
(original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfo.java
Thu Aug  4 14:51:13 2011
@@ -32,27 +32,12 @@ public class BasicClientInfo implements 
     protected String clientSecret;
     protected String redirectUri;
     protected String clientUri;
+    protected String description;
     protected String iconUri;
     protected Long issuedAt;
     protected Long expiresIn;
 
-    BasicClientInfo() {
-
-    }
-
-    protected BasicClientInfo(String clientId, String clientSecret, String redirectUri) {
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-        this.redirectUri = redirectUri;
-    }
-
-    protected BasicClientInfo(String name, String clientId, String clientSecret, String redirectUri,
-                           String iconUri) {
-        this.name = name;
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-        this.redirectUri = redirectUri;
-        this.iconUri = iconUri;
+    public BasicClientInfo() {
     }
 
     @Override
@@ -85,6 +70,11 @@ public class BasicClientInfo implements 
         return clientUri;
     }
 
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
     public void setClientUri(String clientUri) {
         this.clientUri = clientUri;
     }
@@ -125,6 +115,10 @@ public class BasicClientInfo implements 
         this.iconUri = iconUri;
     }
 
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -142,6 +136,12 @@ public class BasicClientInfo implements 
         if (clientSecret != null ? !clientSecret.equals(that.clientSecret) : that.clientSecret
!= null) {
             return false;
         }
+        if (clientUri != null ? !clientUri.equals(that.clientUri) : that.clientUri != null)
{
+            return false;
+        }
+        if (description != null ? !description.equals(that.description) : that.description
!= null) {
+            return false;
+        }
         if (expiresIn != null ? !expiresIn.equals(that.expiresIn) : that.expiresIn != null)
{
             return false;
         }
@@ -167,6 +167,8 @@ public class BasicClientInfo implements 
         result = 31 * result + (clientId != null ? clientId.hashCode() : 0);
         result = 31 * result + (clientSecret != null ? clientSecret.hashCode() : 0);
         result = 31 * result + (redirectUri != null ? redirectUri.hashCode() : 0);
+        result = 31 * result + (clientUri != null ? clientUri.hashCode() : 0);
+        result = 31 * result + (description != null ? description.hashCode() : 0);
         result = 31 * result + (iconUri != null ? iconUri.hashCode() : 0);
         result = 31 * result + (issuedAt != null ? issuedAt.hashCode() : 0);
         result = 31 * result + (expiresIn != null ? expiresIn.hashCode() : 0);

Modified: incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfoBuilder.java
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfoBuilder.java?rev=1153895&r1=1153894&r2=1153895&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfoBuilder.java
(original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfoBuilder.java
Thu Aug  4 14:51:13 2011
@@ -69,6 +69,11 @@ public class BasicClientInfoBuilder {
         return this;
     }
 
+    public BasicClientInfoBuilder setDescription(String value) {
+        info.setDescription(value);
+        return this;
+    }
+
     public BasicClientInfoBuilder setExpiresIn(Long value) {
         info.setExpiresIn(value);
         return this;

Modified: incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/ClientInfo.java
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/ClientInfo.java?rev=1153895&r1=1153894&r2=1153895&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/ClientInfo.java
(original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/ClientInfo.java
Thu Aug  4 14:51:13 2011
@@ -40,6 +40,8 @@ public interface ClientInfo {
 
     String getClientUri();
 
+    String getDescription();
+
     String getName();
 
     String getIconUri();



Mime
View raw message