[FLINK-1165] [java-api] Rename "createCollectionEnvironment" to not b…

…reak existing APIs.
VonRosenchild · Feb 3, 2015 · aeec128 · aeec128
1 parent 36039b6
commit aeec128
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/...xamples/src/main/java/org/apache/flink/examples/java/misc/CollectionExecutionExample.java b/...xamples/src/main/java/org/apache/flink/examples/java/misc/CollectionExecutionExample.java
@@ -72,7 +72,7 @@ public String toString() {
  }
  public static void main(String[] args) throws Exception {
  // initialize a new Collection-based execution environment
- final ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment();
+ final ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment();
 
  // create objects for users and emails
  User[] usersArray = { new User(1, "Peter"), new User(2, "John"), new User(3, "Bill") };

diff --git a/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
@@ -865,7 +865,7 @@ public static ExecutionEnvironment getExecutionEnvironment() {
  * memory. Degree of parallelism will always be 1. This is useful during implementation and for debugging.
  * @return A Collection Environment
  */
- public static CollectionEnvironment createCollectionEnvironment(){
+ public static CollectionEnvironment createCollectionsEnvironment(){
  CollectionEnvironment ce = new CollectionEnvironment();
  ce.setDegreeOfParallelism(1);
  return ce;

diff --git a/.../test/java/org/apache/flink/api/common/operators/CollectionExecutionAccumulatorsTest.java b/.../test/java/org/apache/flink/api/common/operators/CollectionExecutionAccumulatorsTest.java
@@ -37,7 +37,7 @@ public void testAccumulator() {
  try {
  final int NUM_ELEMENTS = 100;
 
- ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment();
+ ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment();
 
  env.generateSequence(1, NUM_ELEMENTS)
  .map(new CountingMapper())

diff --git a/...src/test/java/org/apache/flink/api/common/operators/CollectionExecutionIterationTest.java b/...src/test/java/org/apache/flink/api/common/operators/CollectionExecutionIterationTest.java
@@ -44,7 +44,7 @@ public class CollectionExecutionIterationTest implements java.io.Serializable {
  @Test
  public void testBulkIteration() {
  try {
- ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment();
+ ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment();
 
  IterativeDataSet<Integer> iteration = env.fromElements(1).iterate(10);
 
@@ -67,7 +67,7 @@ public void testBulkIteration() {
  @Test
  public void testBulkIterationWithTerminationCriterion() {
  try {
- ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment();
+ ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment();
 
  IterativeDataSet<Integer> iteration = env.fromElements(1).iterate(100);
 
@@ -98,7 +98,7 @@ public boolean filter(Integer value) {
  @Test
  public void testDeltaIteration() {
  try {
- ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment();
+ ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment();
 
  @SuppressWarnings("unchecked")
  DataSet<Tuple2<Integer, Integer>> solInput = env.fromElements(

diff --git a/...a/org/apache/flink/api/common/operators/CollectionExecutionWithBroadcastVariableTest.java b/...a/org/apache/flink/api/common/operators/CollectionExecutionWithBroadcastVariableTest.java
@@ -42,7 +42,7 @@ public class CollectionExecutionWithBroadcastVariableTest {
  @Test
  public void testUnaryOp() {
  try {
- ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment();
+ ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment();
 
  DataSet<String> bcData = env.fromElements(SUFFIX);
 
@@ -68,7 +68,7 @@ public void testUnaryOp() {
  @Test
  public void testBinaryOp() {
  try {
- ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment();
+ ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment();
 
  DataSet<String> bcData = env.fromElements(SUFFIX);
  DataSet<String> inData = env.fromElements(TEST_DATA);

diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala
@@ -493,7 +493,7 @@ object ExecutionEnvironment {
  * memory. This is useful during implementation and for debugging.
  * @return
  */
- def createCollectionEnvironment: ExecutionEnvironment = {
+ def createCollectionsEnvironment: ExecutionEnvironment = {
  new ExecutionEnvironment(new CollectionEnvironment)
  }