beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject [1/2] incubator-beam git commit: [BEAM-78] Move annotations in org.apache.beam.sdk package
Date Wed, 13 Apr 2016 00:36:03 GMT
Repository: incubator-beam
Updated Branches:
  refs/heads/master 46c82acf5 -> b640ba88c


[BEAM-78] Move annotations in org.apache.beam.sdk package


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/61f8dfdd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/61f8dfdd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/61f8dfdd

Branch: refs/heads/master
Commit: 61f8dfddaf3fcdd0354540b28d1c7f3f7ee157c7
Parents: 46c82ac
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Tue Apr 12 20:46:46 2016 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Tue Apr 12 20:46:46 2016 +0200

----------------------------------------------------------------------
 .../sdk/options/CloudDebuggerOptions.java       |  3 +-
 .../options/DataflowPipelineDebugOptions.java   |  3 +-
 .../DataflowPipelineWorkerPoolOptions.java      |  2 +-
 .../sdk/options/DataflowProfilingOptions.java   |  2 +-
 .../runners/BlockingDataflowPipelineRunner.java |  3 +-
 .../sdk/runners/DataflowPipelineRunner.java     |  3 +-
 .../runners/DataflowPipelineRunnerHooks.java    |  3 +-
 sdks/java/checkstyle.xml                        |  2 +-
 .../dataflow/sdk/annotations/Experimental.java  | 81 --------------------
 .../dataflow/sdk/annotations/package-info.java  | 21 -----
 .../google/cloud/dataflow/sdk/coders/Coder.java |  4 +-
 .../cloud/dataflow/sdk/io/AvroSource.java       |  2 +-
 .../cloud/dataflow/sdk/io/BlockBasedSource.java |  2 +-
 .../cloud/dataflow/sdk/io/BoundedSource.java    |  2 +-
 .../cloud/dataflow/sdk/io/CompressedSource.java |  2 +-
 .../cloud/dataflow/sdk/io/DatastoreIO.java      |  3 +-
 .../com/google/cloud/dataflow/sdk/io/Sink.java  |  2 +-
 .../google/cloud/dataflow/sdk/io/Source.java    |  2 +-
 .../cloud/dataflow/sdk/io/UnboundedSource.java  |  2 +-
 .../com/google/cloud/dataflow/sdk/io/Write.java |  3 +-
 .../dataflow/sdk/io/bigtable/BigtableIO.java    |  3 +-
 .../inprocess/InProcessPipelineRunner.java      |  3 +-
 .../cloud/dataflow/sdk/transforms/DoFn.java     |  4 +-
 .../dataflow/sdk/transforms/DoFnTester.java     |  2 +-
 .../sdk/transforms/DoFnWithContext.java         |  2 +-
 .../cloud/dataflow/sdk/transforms/ParDo.java    |  3 +-
 .../sdk/transforms/windowing/AfterAll.java      |  2 +-
 .../windowing/AfterDelayFromFirstElement.java   |  2 +-
 .../sdk/transforms/windowing/AfterEach.java     |  2 +-
 .../sdk/transforms/windowing/AfterFirst.java    |  2 +-
 .../sdk/transforms/windowing/AfterPane.java     |  2 +-
 .../windowing/AfterProcessingTime.java          |  2 +-
 .../transforms/windowing/AfterWatermark.java    |  2 +-
 .../transforms/windowing/DefaultTrigger.java    |  2 +-
 .../sdk/transforms/windowing/OutputTimeFn.java  |  2 +-
 .../sdk/transforms/windowing/OutputTimeFns.java |  2 +-
 .../sdk/transforms/windowing/Sessions.java      |  4 +-
 .../transforms/windowing/SlidingWindows.java    |  4 +-
 .../sdk/transforms/windowing/Trigger.java       |  2 +-
 .../sdk/transforms/windowing/Window.java        |  4 +-
 .../sdk/transforms/windowing/WindowFn.java      |  4 +-
 .../google/cloud/dataflow/sdk/util/Timers.java  |  2 +-
 .../dataflow/sdk/util/WindowingStrategy.java    |  2 +-
 .../sdk/util/state/InMemoryStateInternals.java  |  4 +-
 .../sdk/util/state/MergingStateAccessor.java    |  4 +-
 .../dataflow/sdk/util/state/ReadableState.java  |  4 +-
 .../dataflow/sdk/util/state/StateAccessor.java  |  4 +-
 .../dataflow/sdk/util/state/StateInternals.java |  4 +-
 .../cloud/dataflow/sdk/util/state/StateTag.java |  4 +-
 .../dataflow/sdk/util/state/StateTags.java      |  4 +-
 .../dataflow/sdk/util/state/ValueState.java     |  4 +-
 .../sdk/util/state/WatermarkHoldState.java      |  4 +-
 .../beam/sdk/annotations/Experimental.java      | 81 ++++++++++++++++++++
 .../beam/sdk/annotations/package-info.java      | 21 +++++
 .../java/javadoc/dataflow-sdk-docs/package-list |  2 +-
 sdks/java/javadoc/overview.html                 |  2 +-
 56 files changed, 179 insertions(+), 169 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/CloudDebuggerOptions.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/CloudDebuggerOptions.java b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/CloudDebuggerOptions.java
index 6f1551d..3f0503e 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/CloudDebuggerOptions.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/CloudDebuggerOptions.java
@@ -17,8 +17,9 @@
  */
 package com.google.cloud.dataflow.sdk.options;
 
+import org.apache.beam.sdk.annotations.Experimental;
+
 import com.google.api.services.clouddebugger.v2.model.Debuggee;
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
 
 import javax.annotation.Nullable;
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
index 6231bd4..1be93eb 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
@@ -17,8 +17,9 @@
  */
 package com.google.cloud.dataflow.sdk.options;
 
+import org.apache.beam.sdk.annotations.Experimental;
+
 import com.google.api.services.dataflow.Dataflow;
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.util.DataflowPathValidator;
 import com.google.cloud.dataflow.sdk.util.DataflowTransport;
 import com.google.cloud.dataflow.sdk.util.GcsStager;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java
index 0c6428f..44a9b00 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.options;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.runners.DataflowPipelineRunner;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptions.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptions.java b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptions.java
index f14b04d..3cd7b03 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptions.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptions.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.options;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 
 import java.util.HashMap;
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunner.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunner.java b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunner.java
index 8903181..9096c2b 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunner.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunner.java
@@ -17,9 +17,10 @@
  */
 package com.google.cloud.dataflow.sdk.runners;
 
+import org.apache.beam.sdk.annotations.Experimental;
+
 import com.google.cloud.dataflow.sdk.Pipeline;
 import com.google.cloud.dataflow.sdk.PipelineResult.State;
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.options.BlockingDataflowPipelineOptions;
 import com.google.cloud.dataflow.sdk.options.PipelineOptions;
 import com.google.cloud.dataflow.sdk.options.PipelineOptionsValidator;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java
index a154848..2818251 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java
@@ -23,6 +23,8 @@ import static com.google.cloud.dataflow.sdk.util.WindowedValue.valueInEmptyWindo
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 
+import org.apache.beam.sdk.annotations.Experimental;
+
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.services.clouddebugger.v2.Clouddebugger;
 import com.google.api.services.clouddebugger.v2.model.Debuggee;
@@ -36,7 +38,6 @@ import com.google.api.services.dataflow.model.WorkerPool;
 import com.google.cloud.dataflow.sdk.Pipeline;
 import com.google.cloud.dataflow.sdk.Pipeline.PipelineVisitor;
 import com.google.cloud.dataflow.sdk.PipelineResult.State;
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.coders.AvroCoder;
 import com.google.cloud.dataflow.sdk.coders.BigEndianLongCoder;
 import com.google.cloud.dataflow.sdk.coders.CannotProvideCoderException;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerHooks.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerHooks.java b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerHooks.java
index 2cf77a0..8f8c653 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerHooks.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerHooks.java
@@ -17,8 +17,9 @@
  */
 package com.google.cloud.dataflow.sdk.runners;
 
+import org.apache.beam.sdk.annotations.Experimental;
+
 import com.google.api.services.dataflow.model.Environment;
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
 
 /**
  * An instance of this class can be passed to the

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/checkstyle.xml
----------------------------------------------------------------------
diff --git a/sdks/java/checkstyle.xml b/sdks/java/checkstyle.xml
index 504bdc1..253b822 100644
--- a/sdks/java/checkstyle.xml
+++ b/sdks/java/checkstyle.xml
@@ -110,7 +110,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
       <!-- Checks for out of order import statements. -->
 
       <property name="severity" value="error"/>
-      <property name="groups" value="com.google,android,com,io,Jama,junit,net,org,sun,java,javax"/>
+      <property name="groups" value="org.apache.beam,com.google,android,com,io,Jama,junit,net,org,sun,java,javax"/>
       <!-- This ensures that static imports go first. -->
       <property name="option" value="top"/>
       <property name="tokens" value="STATIC_IMPORT, IMPORT"/>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/annotations/Experimental.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/annotations/Experimental.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/annotations/Experimental.java
deleted file mode 100644
index a15c1ed..0000000
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/annotations/Experimental.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.cloud.dataflow.sdk.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Signifies that a public API (public class, method or field) is subject to
- * incompatible changes, or even removal, in a future release. An API bearing
- * this annotation is exempt from any compatibility guarantees made by its
- * containing library. Note that the presence of this annotation implies nothing
- * about the quality or performance of the API in question, only the fact that
- * it is not "API-frozen."
- *
- * <p>It is generally safe for <i>applications</i> to depend on experimental
- * APIs, at the cost of some extra work during upgrades. However, it is
- * generally inadvisable for <i>libraries</i> (which get included on users'
- * class paths, outside the library developers' control) to do so.
- */
-@Retention(RetentionPolicy.CLASS)
-@Target({
-    ElementType.ANNOTATION_TYPE,
-    ElementType.CONSTRUCTOR,
-    ElementType.FIELD,
-    ElementType.METHOD,
-    ElementType.TYPE})
-@Documented
-public @interface Experimental {
-  public Kind value() default Kind.UNSPECIFIED;
-
-  /**
-   * An enumeration of various kinds of experimental APIs.
-   */
-  public enum Kind {
-    /** Generic group of experimental APIs. This is the default value. */
-    UNSPECIFIED,
-
-    /** Sources and sinks related experimental APIs. */
-    SOURCE_SINK,
-
-    /** Auto-scaling related experimental APIs. */
-    AUTOSCALING,
-
-    /** Trigger-related experimental APIs. */
-    TRIGGER,
-
-    /** Aggregator-related experimental APIs. */
-    AGGREGATOR,
-
-    /** Experimental APIs for Coder binary format identifiers. */
-    CODER_ENCODING_ID,
-
-    /** State-related experimental APIs. */
-    STATE,
-
-    /** Timer-related experimental APIs. */
-    TIMERS,
-
-    /** Experimental APIs related to customizing the output time for computed values. */
-    OUTPUT_TIME
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/annotations/package-info.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/annotations/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/annotations/package-info.java
deleted file mode 100644
index 5c3da15..0000000
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/annotations/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Defines annotations used across the SDK.
- */
-package com.google.cloud.dataflow.sdk.annotations;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/Coder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/Coder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/Coder.java
index 271676a..ff2e10e 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/Coder.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/Coder.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.coders;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 import com.google.cloud.dataflow.sdk.util.CloudObject;
 import com.google.cloud.dataflow.sdk.util.common.ElementByteSizeObserver;
 import com.google.common.base.Joiner;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/AvroSource.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/AvroSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/AvroSource.java
index 5a4d2a8..2e017c0 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/AvroSource.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/AvroSource.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.io;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.coders.AvroCoder;
 import com.google.cloud.dataflow.sdk.options.PipelineOptions;
 import com.google.cloud.dataflow.sdk.runners.PipelineRunner;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BlockBasedSource.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BlockBasedSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BlockBasedSource.java
index 6aa25db..86349c9 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BlockBasedSource.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BlockBasedSource.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.io;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.options.PipelineOptions;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedSource.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedSource.java
index 99be8c0..3ed2d7b 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedSource.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedSource.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.io;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.options.PipelineOptions;
 import com.google.cloud.dataflow.sdk.transforms.windowing.BoundedWindow;
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/CompressedSource.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/CompressedSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/CompressedSource.java
index 15e6e29..9543749 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/CompressedSource.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/CompressedSource.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.io;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.options.PipelineOptions;
 import com.google.common.base.Preconditions;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/DatastoreIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/DatastoreIO.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/DatastoreIO.java
index 8d85ab3..c2264e1 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/DatastoreIO.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/DatastoreIO.java
@@ -28,6 +28,8 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Verify.verify;
 
+import org.apache.beam.sdk.annotations.Experimental;
+
 import com.google.api.client.auth.oauth2.Credential;
 import com.google.api.client.util.BackOff;
 import com.google.api.client.util.BackOffUtils;
@@ -48,7 +50,6 @@ import com.google.api.services.datastore.client.DatastoreFactory;
 import com.google.api.services.datastore.client.DatastoreHelper;
 import com.google.api.services.datastore.client.DatastoreOptions;
 import com.google.api.services.datastore.client.QuerySplitter;
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.coders.EntityCoder;
 import com.google.cloud.dataflow.sdk.coders.SerializableCoder;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Sink.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Sink.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Sink.java
index 4f5ae2c..7845f47 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Sink.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Sink.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.io;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.options.PipelineOptions;
 import com.google.cloud.dataflow.sdk.values.PCollection;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Source.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Source.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Source.java
index 1eee771..86a8e64 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Source.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Source.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.io;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 
 import org.joda.time.Instant;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/UnboundedSource.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/UnboundedSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/UnboundedSource.java
index 67b7f10..9f4a234 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/UnboundedSource.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/UnboundedSource.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.io;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.options.PipelineOptions;
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Write.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Write.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Write.java
index bc8ebb8..a70105f 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Write.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Write.java
@@ -17,8 +17,9 @@
  */
 package com.google.cloud.dataflow.sdk.io;
 
+import org.apache.beam.sdk.annotations.Experimental;
+
 import com.google.cloud.dataflow.sdk.Pipeline;
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.coders.SerializableCoder;
 import com.google.cloud.dataflow.sdk.io.Sink.WriteOperation;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIO.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIO.java
index 01a42ce..0ce2a5e 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIO.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIO.java
@@ -21,12 +21,13 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
+import org.apache.beam.sdk.annotations.Experimental;
+
 import com.google.bigtable.v1.Mutation;
 import com.google.bigtable.v1.Row;
 import com.google.bigtable.v1.RowFilter;
 import com.google.bigtable.v1.SampleRowKeysResponse;
 import com.google.cloud.bigtable.config.BigtableOptions;
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.coders.Proto2Coder;
 import com.google.cloud.dataflow.sdk.coders.VarLongCoder;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunner.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunner.java
index 764ae09..797a533 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunner.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunner.java
@@ -17,10 +17,11 @@
  */
 package com.google.cloud.dataflow.sdk.runners.inprocess;
 
+import org.apache.beam.sdk.annotations.Experimental;
+
 import com.google.cloud.dataflow.sdk.Pipeline;
 import com.google.cloud.dataflow.sdk.Pipeline.PipelineExecutionException;
 import com.google.cloud.dataflow.sdk.PipelineResult;
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.io.AvroIO;
 import com.google.cloud.dataflow.sdk.io.TextIO;
 import com.google.cloud.dataflow.sdk.options.PipelineOptions;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFn.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFn.java
index b5ba983..74bb6ac 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFn.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFn.java
@@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 import com.google.cloud.dataflow.sdk.options.PipelineOptions;
 import com.google.cloud.dataflow.sdk.transforms.Combine.CombineFn;
 import com.google.cloud.dataflow.sdk.transforms.display.DisplayData;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnTester.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnTester.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnTester.java
index 1535e8e..1b1bb71 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnTester.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnTester.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.transforms;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.options.PipelineOptions;
 import com.google.cloud.dataflow.sdk.options.PipelineOptionsFactory;
 import com.google.cloud.dataflow.sdk.util.DirectModeExecutionContext;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContext.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContext.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContext.java
index a6d06c9..34d5d2c 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContext.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContext.java
@@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.options.PipelineOptions;
 import com.google.cloud.dataflow.sdk.transforms.Combine.CombineFn;
 import com.google.cloud.dataflow.sdk.transforms.DoFn.DelegatingAggregator;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/ParDo.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/ParDo.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/ParDo.java
index 89c9023..8f5d26c 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/ParDo.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/ParDo.java
@@ -17,8 +17,9 @@
  */
 package com.google.cloud.dataflow.sdk.transforms;
 
+import org.apache.beam.sdk.annotations.Experimental;
+
 import com.google.cloud.dataflow.sdk.Pipeline;
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.coders.CannotProvideCoderException;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.coders.CoderException;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAll.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAll.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAll.java
index 97f5616..aa93ec6 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAll.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAll.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.transforms.windowing;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.transforms.windowing.Trigger.OnceTrigger;
 import com.google.cloud.dataflow.sdk.util.ExecutableTrigger;
 import com.google.common.base.Preconditions;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterDelayFromFirstElement.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterDelayFromFirstElement.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterDelayFromFirstElement.java
index 2143b0c..34f7056 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterDelayFromFirstElement.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterDelayFromFirstElement.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.transforms.windowing;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.coders.InstantCoder;
 import com.google.cloud.dataflow.sdk.transforms.Combine;
 import com.google.cloud.dataflow.sdk.transforms.Min;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEach.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEach.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEach.java
index e35cc15..46b10da 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEach.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEach.java
@@ -19,7 +19,7 @@ package com.google.cloud.dataflow.sdk.transforms.windowing;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.util.ExecutableTrigger;
 
 import org.joda.time.Instant;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirst.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirst.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirst.java
index b7d491e..0a4f885 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirst.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirst.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.transforms.windowing;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.transforms.windowing.Trigger.OnceTrigger;
 import com.google.cloud.dataflow.sdk.util.ExecutableTrigger;
 import com.google.common.base.Preconditions;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPane.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPane.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPane.java
index 76136f7..5a261ee 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPane.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPane.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.transforms.windowing;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.coders.VarLongCoder;
 import com.google.cloud.dataflow.sdk.transforms.Sum;
 import com.google.cloud.dataflow.sdk.transforms.windowing.Trigger.OnceTrigger;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTime.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTime.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTime.java
index 7a82d9c..97cefa3 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTime.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTime.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.transforms.windowing;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.transforms.SerializableFunction;
 import com.google.cloud.dataflow.sdk.util.TimeDomain;
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermark.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermark.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermark.java
index 9ef8186..e62bce2 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermark.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermark.java
@@ -19,7 +19,7 @@ package com.google.cloud.dataflow.sdk.transforms.windowing;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.transforms.windowing.Trigger.OnceTrigger;
 import com.google.cloud.dataflow.sdk.util.ExecutableTrigger;
 import com.google.cloud.dataflow.sdk.util.TimeDomain;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTrigger.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTrigger.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTrigger.java
index 0e6b5ce..90c7211 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTrigger.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTrigger.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.transforms.windowing;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.util.TimeDomain;
 
 import org.joda.time.Instant;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFn.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFn.java
index 3100d23..76c8a11 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFn.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFn.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.transforms.windowing;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.common.collect.Ordering;
 
 import org.joda.time.Instant;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFns.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFns.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFns.java
index 6c03254..a080991 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFns.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFns.java
@@ -19,7 +19,7 @@ package com.google.cloud.dataflow.sdk.transforms.windowing;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Ordering;
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Sessions.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Sessions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Sessions.java
index 1e8db70..bf2a487 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Sessions.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Sessions.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.transforms.windowing;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 
 import org.joda.time.Duration;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindows.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindows.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindows.java
index 9bb6f9f..7c2a39e 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindows.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindows.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.transforms.windowing;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 
 import org.joda.time.Duration;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java
index fde8ca4..75d557b 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.transforms.windowing;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.util.ExecutableTrigger;
 import com.google.cloud.dataflow.sdk.util.TimeDomain;
 import com.google.cloud.dataflow.sdk.util.state.MergingStateAccessor;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Window.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Window.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Window.java
index aef61b2..e643339 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Window.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Window.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.transforms.windowing;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.coders.Coder.NonDeterministicException;
 import com.google.cloud.dataflow.sdk.transforms.DoFn;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowFn.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowFn.java
index f455426..baed3bd 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowFn.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowFn.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.transforms.windowing;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.util.WindowingStrategy;
 import com.google.common.collect.Ordering;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Timers.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Timers.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Timers.java
index a255309..2cd04a6 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Timers.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Timers.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.util;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 
 import org.joda.time.Instant;
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingStrategy.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingStrategy.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingStrategy.java
index 6068656..a94cce3 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingStrategy.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingStrategy.java
@@ -17,7 +17,7 @@
  */
 package com.google.cloud.dataflow.sdk.util;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental;
 import com.google.cloud.dataflow.sdk.transforms.windowing.BoundedWindow;
 import com.google.cloud.dataflow.sdk.transforms.windowing.DefaultTrigger;
 import com.google.cloud.dataflow.sdk.transforms.windowing.GlobalWindow;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternals.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternals.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternals.java
index 9d0b2ac..c6f07a5 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternals.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternals.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.util.state;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.transforms.Combine.CombineFn;
 import com.google.cloud.dataflow.sdk.transforms.Combine.KeyedCombineFn;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/MergingStateAccessor.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/MergingStateAccessor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/MergingStateAccessor.java
index 3f6b294..8998917 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/MergingStateAccessor.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/MergingStateAccessor.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.util.state;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 import com.google.cloud.dataflow.sdk.transforms.windowing.BoundedWindow;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ReadableState.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ReadableState.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ReadableState.java
index 201180a..02017ab 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ReadableState.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ReadableState.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.util.state;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 
 /**
  * A {@code StateContents} is produced by the read methods on all {@link State} objects.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateAccessor.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateAccessor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateAccessor.java
index 298f1ad..b42a69c 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateAccessor.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateAccessor.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.util.state;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 
 /**
  * Interface for accessing a {@link StateTag} in the current context.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateInternals.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateInternals.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateInternals.java
index d451a89..b8de079 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateInternals.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateInternals.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.util.state;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 import com.google.cloud.dataflow.sdk.transforms.GroupByKey;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTag.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTag.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTag.java
index a0b8d01..fc9cb0b 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTag.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTag.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.util.state;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.transforms.Combine.CombineFn;
 import com.google.cloud.dataflow.sdk.transforms.Combine.KeyedCombineFn;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTags.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTags.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTags.java
index 9a794ae..e70778d 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTags.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTags.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.util.state;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 import com.google.cloud.dataflow.sdk.coders.CannotProvideCoderException;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.coders.CoderRegistry;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ValueState.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ValueState.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ValueState.java
index 6bf22a7..9da9170 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ValueState.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ValueState.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.util.state;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 
 /**
  * State holding a single value.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/WatermarkHoldState.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/WatermarkHoldState.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/WatermarkHoldState.java
index 9e57977..6cd73ef 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/WatermarkHoldState.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/WatermarkHoldState.java
@@ -17,8 +17,8 @@
  */
 package com.google.cloud.dataflow.sdk.util.state;
 
-import com.google.cloud.dataflow.sdk.annotations.Experimental;
-import com.google.cloud.dataflow.sdk.annotations.Experimental.Kind;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.annotations.Experimental.Kind;
 import com.google.cloud.dataflow.sdk.transforms.windowing.BoundedWindow;
 import com.google.cloud.dataflow.sdk.transforms.windowing.OutputTimeFn;
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/org/apache/beam/sdk/annotations/Experimental.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/annotations/Experimental.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/annotations/Experimental.java
new file mode 100644
index 0000000..f806926
--- /dev/null
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/annotations/Experimental.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.beam.sdk.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Signifies that a public API (public class, method or field) is subject to
+ * incompatible changes, or even removal, in a future release. An API bearing
+ * this annotation is exempt from any compatibility guarantees made by its
+ * containing library. Note that the presence of this annotation implies nothing
+ * about the quality or performance of the API in question, only the fact that
+ * it is not "API-frozen."
+ *
+ * <p>It is generally safe for <i>applications</i> to depend on experimental
+ * APIs, at the cost of some extra work during upgrades. However, it is
+ * generally inadvisable for <i>libraries</i> (which get included on users'
+ * class paths, outside the library developers' control) to do so.
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target({
+    ElementType.ANNOTATION_TYPE,
+    ElementType.CONSTRUCTOR,
+    ElementType.FIELD,
+    ElementType.METHOD,
+    ElementType.TYPE})
+@Documented
+public @interface Experimental {
+  public Kind value() default Kind.UNSPECIFIED;
+
+  /**
+   * An enumeration of various kinds of experimental APIs.
+   */
+  public enum Kind {
+    /** Generic group of experimental APIs. This is the default value. */
+    UNSPECIFIED,
+
+    /** Sources and sinks related experimental APIs. */
+    SOURCE_SINK,
+
+    /** Auto-scaling related experimental APIs. */
+    AUTOSCALING,
+
+    /** Trigger-related experimental APIs. */
+    TRIGGER,
+
+    /** Aggregator-related experimental APIs. */
+    AGGREGATOR,
+
+    /** Experimental APIs for Coder binary format identifiers. */
+    CODER_ENCODING_ID,
+
+    /** State-related experimental APIs. */
+    STATE,
+
+    /** Timer-related experimental APIs. */
+    TIMERS,
+
+    /** Experimental APIs related to customizing the output time for computed values. */
+    OUTPUT_TIME
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/core/src/main/java/org/apache/beam/sdk/annotations/package-info.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/annotations/package-info.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/annotations/package-info.java
new file mode 100644
index 0000000..df42eda
--- /dev/null
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/annotations/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Defines annotations used across the SDK.
+ */
+package org.apache.beam.sdk.annotations;

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/javadoc/dataflow-sdk-docs/package-list
----------------------------------------------------------------------
diff --git a/sdks/java/javadoc/dataflow-sdk-docs/package-list b/sdks/java/javadoc/dataflow-sdk-docs/package-list
index a26f5a3..5c98c85 100644
--- a/sdks/java/javadoc/dataflow-sdk-docs/package-list
+++ b/sdks/java/javadoc/dataflow-sdk-docs/package-list
@@ -1,5 +1,5 @@
 com.google.cloud.dataflow.sdk
-com.google.cloud.dataflow.sdk.annotations
+org.apache.beam.sdk.annotations
 com.google.cloud.dataflow.sdk.coders
 com.google.cloud.dataflow.sdk.io
 com.google.cloud.dataflow.sdk.options

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/61f8dfdd/sdks/java/javadoc/overview.html
----------------------------------------------------------------------
diff --git a/sdks/java/javadoc/overview.html b/sdks/java/javadoc/overview.html
index 4ffd33f..0c9bd17 100644
--- a/sdks/java/javadoc/overview.html
+++ b/sdks/java/javadoc/overview.html
@@ -25,7 +25,7 @@
     </ul>
 
     <p>Please note that APIs marked
-    {@link com.google.cloud.dataflow.sdk.annotations.Experimental @Experimental}
+    {@link org.apache.beam.sdk.annotations.Experimental @Experimental}
     may change at any point and are not guaranteed to remain compatible across versions.</p>
   </body>
 </html>


Mime
View raw message