This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git
The following commit(s) were added to refs/heads/master by this push:
new 29723b9 old java cassandra blueprints deprecated
new 14cefc7 Merge pull request #173 from
frogfather/deprecate_old_cassandra_blueprints
29723b9 is described below
commit 29723b9b06d06887f333b90dd02122f263f672fb
Author: frogfather <j.a.campb...@icloud.com>
AuthorDate: Thu May 2 10:17:54 2019 +0100
old java cassandra blueprints deprecated
---
.../entity/nosql/cassandra/CassandraDatacenter.java | 13 +++----------
.../entity/nosql/cassandra/CassandraDatacenterImpl.java | 10 +++-------
.../brooklyn/entity/nosql/cassandra/CassandraFabric.java | 7 +++----
.../entity/nosql/cassandra/CassandraFabricImpl.java | 10 +++-------
.../brooklyn/entity/nosql/cassandra/CassandraNode.java | 4 +++-
.../entity/nosql/cassandra/CassandraNodeDriver.java | 6 +++++-
.../brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java | 4 +++-
.../entity/nosql/cassandra/CassandraNodeSshDriver.java | 4 +++-
.../brooklyn/entity/nosql/cassandra/TokenGenerator.java | 6 +++++-
.../brooklyn/entity/nosql/cassandra/TokenGenerators.java | 6 +++++-
10 files changed, 36 insertions(+), 34 deletions(-)
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java
index d9d2bbf..5a07c61 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java
@@ -44,17 +44,10 @@ import com.google.common.collect.Multimap;
import com.google.common.reflect.TypeToken;
/**
- * A group of {@link CassandraNode}s -- based on Brooklyn's {@link
DynamicCluster}
- * (though it is a "Datacenter" in Cassandra terms, where Cassandra's
"cluster" corresponds
- * to a Brooklyn Fabric, cf {@link CassandraFabric}).
- * The Datacenter can be resized, manually or by policy if required.
- * Tokens are selected intelligently.
- * <p>
- * Note that due to how Cassandra assumes ports are the same across a cluster,
- * it is <em>NOT</em> possible to deploy a cluster of size larger than 1 to
localhost.
- * (Some exploratory work has been done to use different 127.0.0.x IP's for
localhost,
- * and there is evidence this could be made to work.)
+ * @deprecated since 1.0.0; use {@link
'https://github.com/brooklyncentral/brooklyn-cassandra'} which is a pure YAML
template
+ * for a database cluster.
*/
+@Deprecated
@Catalog(name="Apache Cassandra Datacenter Cluster", description="Cassandra is
a highly scalable, eventually " +
"consistent, distributed, structured key-value store which provides a
ColumnFamily-based data model " +
"richer than typical key/value systems",
iconUrl="classpath:///cassandra-logo.jpeg")
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
index 5322c22..59b161a 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
@@ -70,14 +70,10 @@ import com.google.common.collect.Sets;
import com.google.common.net.HostAndPort;
/**
- * Implementation of {@link CassandraDatacenter}.
- * <p>
- * Several subtleties to note:
- * - a node may take some time after it is running and serving JMX to actually
be contactable on its thrift port
- * (so we wait for thrift port to be contactable)
- * - sometimes new nodes take a while to peer, and/or take a while to get a
consistent schema
- * (each up to 1m; often very close to the 1m)
+ * @deprecated since 1.0.0; use {@link
'https://github.com/brooklyncentral/brooklyn-cassandra'} which is a pure YAML
template
+ * for a database cluster.
*/
+@Deprecated
public class CassandraDatacenterImpl extends DynamicClusterImpl implements
CassandraDatacenter {
/*
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java
index 5d9a9ca..21574ad 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java
@@ -36,11 +36,10 @@ import com.google.common.collect.Multimap;
import com.google.common.reflect.TypeToken;
/**
- * A fabric of {@link CassandraNode}s, which forms a cluster spanning multiple
locations.
- * <p>
- * Each {@link CassandraDatacenter} child instance is actually just a part of
the whole cluster. It consists of the
- * nodes in that single location (which normally corresponds to a "datacenter"
in Cassandra terminology).
+ * @deprecated since 1.0.0; use {@link
'https://github.com/brooklyncentral/brooklyn-cassandra'} which is a pure YAML
template
+ * for a database cluster.
*/
+@Deprecated
@Catalog(name="Apache Cassandra Database Fabric", description="Cassandra is a
highly scalable, eventually " +
"consistent, distributed, structured key-value store which provides a
ColumnFamily-based data model " +
"richer than typical key/value systems",
iconUrl="classpath:///cassandra-logo.jpeg")
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java
index 5aa108d..259cd2a 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java
@@ -56,14 +56,10 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
/**
- * Implementation of {@link CassandraDatacenter}.
- * <p>
- * Serveral subtleties to note:
- * - a node may take some time after it is running and serving JMX to actually
be contactable on its thrift port
- * (so we wait for thrift port to be contactable)
- * - sometimes new nodes take a while to peer, and/or take a while to get a
consistent schema
- * (each up to 1m; often very close to the 1m)
+ * @deprecated since 1.0.0; use {@link
'https://github.com/brooklyncentral/brooklyn-cassandra'} which is a pure YAML
template
+ * for a database cluster.
*/
+@Deprecated
public class CassandraFabricImpl extends DynamicFabricImpl implements
CassandraFabric {
private static final Logger log =
LoggerFactory.getLogger(CassandraFabricImpl.class);
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
index daa14d5..8fbd834 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
@@ -44,8 +44,10 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag;
import org.apache.brooklyn.util.time.Duration;
/**
- * An {@link org.apache.brooklyn.api.entity.Entity} that represents a
Cassandra node in a {@link CassandraDatacenter}.
+ * @deprecated since 1.0.0; use {@link
'https://github.com/brooklyncentral/brooklyn-cassandra'} which is a pure YAML
template
+ * for a database cluster.
*/
+@Deprecated
@Catalog(name="Apache Cassandra Node", description="Cassandra is a highly
scalable, eventually " +
"consistent, distributed, structured key-value store which provides a
ColumnFamily-based data model " +
"richer than typical key/value systems",
iconUrl="classpath:///cassandra-logo.jpeg")
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeDriver.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeDriver.java
index 3893373..af5fee9 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeDriver.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeDriver.java
@@ -20,7 +20,11 @@ package org.apache.brooklyn.entity.nosql.cassandra;
import org.apache.brooklyn.entity.java.JavaSoftwareProcessDriver;
import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper;
-
+/**
+ * @deprecated since 1.0.0; use {@link
'https://github.com/brooklyncentral/brooklyn-cassandra'} which is a pure YAML
template
+ * for a database cluster.
+ */
+@Deprecated
public interface CassandraNodeDriver extends JavaSoftwareProcessDriver {
Integer getGossipPort();
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
index 6917e62..fb93163 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
@@ -81,8 +81,10 @@ import com.google.common.collect.Sets;
import com.google.common.net.HostAndPort;
/**
- * Implementation of {@link CassandraNode}.
+ * @deprecated since 1.0.0; use {@link
'https://github.com/brooklyncentral/brooklyn-cassandra'} which is a pure YAML
template
+ * for a database cluster.
*/
+@Deprecated
public class CassandraNodeImpl extends SoftwareProcessImpl implements
CassandraNode {
private static final Logger log =
LoggerFactory.getLogger(CassandraNodeImpl.class);
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java
index 8831e81..699f863 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java
@@ -65,8 +65,10 @@ import org.apache.brooklyn.util.time.Duration;
import org.apache.brooklyn.util.time.Time;
/**
- * Start a {@link CassandraNode} in a {@link Location} accessible over ssh.
+ * @deprecated since 1.0.0; use {@link
'https://github.com/brooklyncentral/brooklyn-cassandra'} which is a pure YAML
template
+ * for a database cluster.
*/
+@Deprecated
public class CassandraNodeSshDriver extends JavaSoftwareProcessSshDriver
implements CassandraNodeDriver {
private static final Logger log =
LoggerFactory.getLogger(CassandraNodeSshDriver.class);
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerator.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerator.java
index 6401c03..39ce015 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerator.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerator.java
@@ -20,7 +20,11 @@ package org.apache.brooklyn.entity.nosql.cassandra;
import java.math.BigInteger;
import java.util.Set;
-
+/**
+ * @deprecated since 1.0.0; use {@link
'https://github.com/brooklyncentral/brooklyn-cassandra'} which is a pure YAML
template
+ * for a database cluster.
+ */
+@Deprecated
public interface TokenGenerator {
BigInteger max();
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerators.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerators.java
index c7337e0..6866018 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerators.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerators.java
@@ -32,7 +32,11 @@ import org.apache.brooklyn.util.collections.MutableList;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-
+/**
+ * @deprecated since 1.0.0; use {@link
'https://github.com/brooklyncentral/brooklyn-cassandra'} which is a pure YAML
template
+ * for a database cluster.
+ */
+@Deprecated
public class TokenGenerators {
/**
