From 8f50cae1750ad0ef887cbf5c1d582dfd99cbb4b5 Mon Sep 17 00:00:00 2001
From: Lai Jiang <jianglai@google.com>
Date: Sat, 2 Oct 2021 19:23:09 -0400
Subject: [PATCH] Remove the use of AppEngineEnvironment in Spec11Pipeline
 (#1365)

After #1348 it is no longer necessary to use AppEngineEnvironment in
Beam pipelines. In tests it is taken care of by the
DatastoreEntityExtension whereas on Dataflow the
RegistryPipelineWorkerInitializer does the same initialization for Ofy.
---
 .../registry/beam/spec11/Spec11Pipeline.java  | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java b/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java
index 76f178e7b..59042a9b9 100644
--- a/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java
+++ b/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java
@@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableSet;
 import dagger.Component;
 import dagger.Module;
 import dagger.Provides;
-import google.registry.backup.AppEngineEnvironment;
 import google.registry.beam.common.RegistryJpaIO;
 import google.registry.beam.common.RegistryJpaIO.Read;
 import google.registry.beam.spec11.SafeBrowsingTransforms.EvaluateSafeBrowsingFn;
@@ -45,7 +44,6 @@ import org.apache.beam.sdk.io.TextIO;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.DoFn;
-import org.apache.beam.sdk.transforms.DoFn.ProcessElement;
 import org.apache.beam.sdk.transforms.GroupByKey;
 import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.transforms.ParDo;
@@ -135,26 +133,24 @@ public class Spec11Pipeline implements Serializable {
                   @ProcessElement
                   public void processElement(
                       @Element KV<String, String> input, OutputReceiver<DomainNameInfo> output) {
-                    try (AppEngineEnvironment allowOfyEntity = new AppEngineEnvironment()) {
-                      DomainBase domainBase =
-                          jpaTm()
-                              .transact(
-                                  () ->
-                                      jpaTm()
-                                          .loadByKey(
-                                              VKey.createSql(DomainBase.class, input.getKey())));
-                      String emailAddress = input.getValue();
-                      if (emailAddress == null) {
-                        emailAddress = "";
-                      }
-                      DomainNameInfo domainNameInfo =
-                          DomainNameInfo.create(
-                              domainBase.getDomainName(),
-                              domainBase.getRepoId(),
-                              domainBase.getCurrentSponsorRegistrarId(),
-                              emailAddress);
-                      output.output(domainNameInfo);
+                    DomainBase domainBase =
+                        jpaTm()
+                            .transact(
+                                () ->
+                                    jpaTm()
+                                        .loadByKey(
+                                            VKey.createSql(DomainBase.class, input.getKey())));
+                    String emailAddress = input.getValue();
+                    if (emailAddress == null) {
+                      emailAddress = "";
                     }
+                    DomainNameInfo domainNameInfo =
+                        DomainNameInfo.create(
+                            domainBase.getDomainName(),
+                            domainBase.getRepoId(),
+                            domainBase.getCurrentSponsorRegistrarId(),
+                            emailAddress);
+                    output.output(domainNameInfo);
                   }
                 }));
   }