Remove experimental annotation from Beam

sdks/java/core/src/main/java/org/apache/beam/sdk/io/GenerateSequence.java

@@ -23,7 +23,10 @@
 import com.google.auto.service.AutoService;
 import com.google.auto.value.AutoValue;
 import java.util.Map;
+<<<<<<< HEAD
 import javax.annotation.Nullable;
+=======
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)
 import org.apache.beam.sdk.expansion.ExternalTransformRegistrar;
 import org.apache.beam.sdk.transforms.ExternalTransformBuilder;
 import org.apache.beam.sdk.transforms.PTransform;

sdks/java/extensions/ml/src/main/java/org/apache/beam/sdk/extensions/ml/AnnotateImages.java

@@ -47,10 +47,14 @@
  *
  * @param <T> Type of input PCollection.
  */
+<<<<<<< HEAD
 @SuppressWarnings({
   "nullness" // TODO(https://github.com/apache/beam/issues/20497)
 })
 abstract class AnnotateImages<T>
+=======
+abstract class AnnotateImages<T extends @NonNull Object>
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)
     extends PTransform<PCollection<T>, PCollection<List<AnnotateImageResponse>>> {
 
   private static final Long MIN_BATCH_SIZE = 1L;

sdks/java/extensions/ml/src/main/java/org/apache/beam/sdk/extensions/ml/AnnotateVideoBytesWithContextFn.java

@@ -29,9 +29,12 @@
  * Implementation of AnnotateVideoFn accepting KVs as contents of input PCollection. Keys are the
  * ByteString encoded video contents, values - VideoContext objects.
  */
+<<<<<<< HEAD
 @SuppressWarnings({
   "nullness" // TODO(https://github.com/apache/beam/issues/20497)
 })
+=======
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)
 class AnnotateVideoBytesWithContextFn extends AnnotateVideoFn<KV<ByteString, VideoContext>> {
 
   public AnnotateVideoBytesWithContextFn(List<Feature> featureList) {

sdks/java/extensions/ml/src/main/java/org/apache/beam/sdk/extensions/ml/AnnotateVideoFn.java

@@ -39,9 +39,12 @@
  * @param <T> Class of input data being passed in - either ByteString - video data encoded into.
  *     String or String - a GCS URI of the video to be annotated.
  */
+<<<<<<< HEAD
 @SuppressWarnings({
   "nullness" // TODO(https://github.com/apache/beam/issues/20497)
 })
+=======
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)
 abstract class AnnotateVideoFn<T> extends DoFn<T, List<VideoAnnotationResults>> {
 
   protected final PCollectionView<Map<T, VideoContext>> contextSideInput;

sdks/java/extensions/ml/src/main/java/org/apache/beam/sdk/extensions/ml/AnnotateVideoFromBytesFn.java

@@ -30,9 +30,12 @@
  * Implementation of AnnotateVideoFn accepting ByteStrings as contents of input PCollection. Videos
  * decoded from the ByteStrings are annotated.
  */
+<<<<<<< HEAD
 @SuppressWarnings({
   "nullness" // TODO(https://github.com/apache/beam/issues/20497)
 })
+=======
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)
 class AnnotateVideoFromBytesFn extends AnnotateVideoFn<ByteString> {
 
   public AnnotateVideoFromBytesFn(

sdks/java/extensions/ml/src/main/java/org/apache/beam/sdk/extensions/ml/AnnotateVideoFromURIFn.java

@@ -29,9 +29,12 @@
  * Implementation of AnnotateVideoFn accepting Strings as contents of input PCollection. Annotates
  * videos found on GCS based on URIs from input PCollection.
  */
+<<<<<<< HEAD
 @SuppressWarnings({
   "nullness" // TODO(https://github.com/apache/beam/issues/20497)
 })
+=======
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)
 class AnnotateVideoFromURIFn extends AnnotateVideoFn<String> {
 
   public AnnotateVideoFromURIFn(

sdks/java/extensions/ml/src/main/java/org/apache/beam/sdk/extensions/ml/AnnotateVideoURIWithContextFn.java

@@ -28,9 +28,12 @@
  * Implementation of AnnotateVideoFn accepting KVs as contents of input PCollection. Keys are the
  * GCS URIs, values - VideoContext objects.
  */
+<<<<<<< HEAD
 @SuppressWarnings({
   "nullness" // TODO(https://github.com/apache/beam/issues/20497)
 })
+=======
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)
 class AnnotateVideoURIWithContextFn extends AnnotateVideoFn<KV<String, VideoContext>> {
 
   public AnnotateVideoURIWithContextFn(List<Feature> featureList) {

sdks/java/io/amazon-web-services2/src/main/java/org/apache/beam/sdk/io/aws2/sns/SnsIO.java

@@ -21,6 +21,10 @@
 
 import com.google.auto.value.AutoValue;
 import java.util.function.Consumer;
+<<<<<<< HEAD
+=======
+import org.apache.beam.sdk.coders.Coder;
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)
 import org.apache.beam.sdk.io.aws2.common.ClientBuilderFactory;
 import org.apache.beam.sdk.io.aws2.common.ClientConfiguration;
 import org.apache.beam.sdk.io.aws2.options.AwsOptions;

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/changestreams/action/package-info.java

@@ -16,7 +16,11 @@
  * limitations under the License.
  */
 /** Business logic to process change stream for Google Cloud Bigtable. */
+<<<<<<< HEAD
 @Internal
 package org.apache.beam.sdk.io.gcp.bigtable.changestreams.action;
 
 import org.apache.beam.sdk.annotations.Internal;
+=======
+package org.apache.beam.sdk.io.gcp.bigtable.changestreams.action;
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/changestreams/dao/package-info.java

@@ -16,7 +16,11 @@
  * limitations under the License.
  */
 /** Data access object for change stream for Google Cloud Bigtable. */
+<<<<<<< HEAD
 @Internal
 package org.apache.beam.sdk.io.gcp.bigtable.changestreams.dao;
 
 import org.apache.beam.sdk.annotations.Internal;
+=======
+package org.apache.beam.sdk.io.gcp.bigtable.changestreams.dao;
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/changestreams/dofn/package-info.java

@@ -16,7 +16,11 @@
  * limitations under the License.
  */
 /** DoFn and SDF definitions to process Google Cloud Bigtable Change Streams. */
+<<<<<<< HEAD
 @Internal
 package org.apache.beam.sdk.io.gcp.bigtable.changestreams.dofn;
 
 import org.apache.beam.sdk.annotations.Internal;
+=======
+package org.apache.beam.sdk.io.gcp.bigtable.changestreams.dofn;
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/changestreams/model/package-info.java

@@ -16,7 +16,11 @@
  * limitations under the License.
  */
 /** User models for the Google Cloud Bigtable change stream API. */
+<<<<<<< HEAD
 @Internal
 package org.apache.beam.sdk.io.gcp.bigtable.changestreams.model;
 
 import org.apache.beam.sdk.annotations.Internal;
+=======
+package org.apache.beam.sdk.io.gcp.bigtable.changestreams.model;
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/changestreams/package-info.java

@@ -16,7 +16,11 @@
  * limitations under the License.
  */
 /** Change stream for Google Cloud Bigtable. */
+<<<<<<< HEAD
 @Internal
 package org.apache.beam.sdk.io.gcp.bigtable.changestreams;
 
 import org.apache.beam.sdk.annotations.Internal;
+=======
+package org.apache.beam.sdk.io.gcp.bigtable.changestreams;
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/changestreams/restriction/package-info.java

@@ -16,7 +16,11 @@
  * limitations under the License.
  */
 /** Custom RestrictionTracker for Google Cloud Bigtable Change Streams. */
+<<<<<<< HEAD
 @Internal
 package org.apache.beam.sdk.io.gcp.bigtable.changestreams.restriction;
 
 import org.apache.beam.sdk.annotations.Internal;
+=======
+package org.apache.beam.sdk.io.gcp.bigtable.changestreams.restriction;
+>>>>>>> 9cf7248973 (Remove experimental annotation from Beam)