You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:46:12 UTC
[09/50] brooklyn-library git commit: Nginx config classes: make
serializable
Nginx config classes: make serializable
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/ca6fb86d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/ca6fb86d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/ca6fb86d
Branch: refs/heads/0.4.0
Commit: ca6fb86d4814a97630fb88bed2b12db4ba71dd18
Parents: 4e9a81a
Author: Aled Sage <al...@gmail.com>
Authored: Tue Sep 25 13:38:15 2012 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Sep 26 12:36:17 2012 +0100
----------------------------------------------------------------------
.../brooklyn/entity/proxy/ProxySslConfig.groovy | 34 ++++++--------------
.../entity/proxy/nginx/UrlRewriteRule.java | 8 +++--
2 files changed, 15 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/ca6fb86d/software/webapp/src/main/java/brooklyn/entity/proxy/ProxySslConfig.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/ProxySslConfig.groovy b/software/webapp/src/main/java/brooklyn/entity/proxy/ProxySslConfig.groovy
index 37ffd68..91a17d0 100644
--- a/software/webapp/src/main/java/brooklyn/entity/proxy/ProxySslConfig.groovy
+++ b/software/webapp/src/main/java/brooklyn/entity/proxy/ProxySslConfig.groovy
@@ -1,6 +1,8 @@
package brooklyn.entity.proxy;
-public class ProxySslConfig {
+import com.google.common.base.Objects;
+
+public class ProxySslConfig implements Serializable {
/**
* url's for the SSL certificates required at the server
@@ -34,14 +36,7 @@ public class ProxySslConfig {
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result
- + ((certificate == null) ? 0 : certificate.hashCode());
- result = prime * result + ((key == null) ? 0 : key.hashCode());
- result = prime * result + (reuseSessions ? 1231 : 1237);
- result = prime * result + (targetIsSsl ? 1231 : 1237);
- return result;
+ return Objects.hashCode(certificate, key, reuseSessions, targetIsSsl);
}
@Override
@@ -53,21 +48,10 @@ public class ProxySslConfig {
if (getClass() != obj.getClass())
return false;
ProxySslConfig other = (ProxySslConfig) obj;
- if (certificate == null) {
- if (other.certificate != null)
- return false;
- } else if (!certificate.equals(other.certificate))
- return false;
- if (key == null) {
- if (other.key != null)
- return false;
- } else if (!key.equals(other.key))
- return false;
- if (reuseSessions != other.reuseSessions)
- return false;
- if (targetIsSsl != other.targetIsSsl)
- return false;
- return true;
+
+ return Objects.equal(certificate, other.certificate) &&
+ Objects.equal(key, other.key) &&
+ Objects.equal(reuseSessions, other.reuseSessions) &&
+ Objects.equal(targetIsSsl, other.targetIsSsl);
}
-
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/ca6fb86d/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/UrlRewriteRule.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/UrlRewriteRule.java b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/UrlRewriteRule.java
index 0628d17..1ec7fc9 100644
--- a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/UrlRewriteRule.java
+++ b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/UrlRewriteRule.java
@@ -1,5 +1,7 @@
package brooklyn.entity.proxy.nginx;
+import java.io.Serializable;
+
/** records a rewrite rule for use in URL rewriting such as by nginx;
* from and to are expected to be usual regex replacement strings,
* with the convention here (for portability) that:
@@ -9,8 +11,10 @@ package brooklyn.entity.proxy.nginx;
* </li>
* so eg use from = (.*)A(.*) and to = $1B$2 to change all occurrences of A to B
*/
-public class UrlRewriteRule {
-
+public class UrlRewriteRule implements Serializable {
+
+ private static final long serialVersionUID = -8457441487467968553L;
+
String from, to;
boolean isBreak;