Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add support for multiple choice case statements within one augument in config...
[controller.git]
/
opendaylight
/
usermanager
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
usermanager
/
ServerConfig.java
diff --git
a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ServerConfig.java
b/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ServerConfig.java
index f50f9e71c9c7f05d23de14034744fbeba676c730..3145f2095f4d480af5f91bc5e2303fd89246ae14 100644
(file)
--- a/
opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ServerConfig.java
+++ b/
opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ServerConfig.java
@@
-11,11
+11,13
@@
package org.opendaylight.controller.usermanager;
import java.io.Serializable;
import java.io.Serializable;
+import org.opendaylight.controller.configuration.ConfigurationObject;
+
/**
* Configuration Java Object which represents a Remote AAA server configuration
* information for User Manager.
*/
/**
* Configuration Java Object which represents a Remote AAA server configuration
* information for User Manager.
*/
-public class ServerConfig implements Serializable {
+public class ServerConfig
extends ConfigurationObject
implements Serializable {
private static final long serialVersionUID = 1L;
// Order matters: JSP file expects following fields in the following order
private static final long serialVersionUID = 1L;
// Order matters: JSP file expects following fields in the following order
@@
-57,28
+59,37
@@
public class ServerConfig implements Serializable {
@Override
public boolean equals(Object obj) {
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj)
{
return true;
return true;
- if (obj == null)
+ }
+ if (obj == null) {
return false;
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
return false;
+ }
ServerConfig other = (ServerConfig) obj;
if (ip == null) {
ServerConfig other = (ServerConfig) obj;
if (ip == null) {
- if (other.ip != null)
+ if (other.ip != null)
{
return false;
return false;
- } else if (!ip.equals(other.ip))
+ }
+ } else if (!ip.equals(other.ip)) {
return false;
return false;
+ }
if (protocol == null) {
if (protocol == null) {
- if (other.protocol != null)
+ if (other.protocol != null)
{
return false;
return false;
- } else if (!protocol.equals(other.protocol))
+ }
+ } else if (!protocol.equals(other.protocol)) {
return false;
return false;
+ }
if (secret == null) {
if (secret == null) {
- if (other.secret != null)
+ if (other.secret != null)
{
return false;
return false;
- } else if (!secret.equals(other.secret))
+ }
+ } else if (!secret.equals(other.secret)) {
return false;
return false;
+ }
return true;
}
return true;
}