Skip to content

Commit d58bbc0

Browse files
authored
use a newer api in guava (apache#4034)
1 parent a214282 commit d58bbc0

File tree

7 files changed

+14
-7
lines changed

7 files changed

+14
-7
lines changed

gobblin-compaction/src/main/java/org/apache/gobblin/compaction/mapreduce/MRCompactor.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import com.google.common.util.concurrent.FutureCallback;
5656
import com.google.common.util.concurrent.Futures;
5757
import com.google.common.util.concurrent.ListenableFuture;
58+
import com.google.common.util.concurrent.MoreExecutors;
5859

5960
import org.apache.gobblin.compaction.Compactor;
6061
import org.apache.gobblin.compaction.dataset.Dataset;
@@ -723,7 +724,7 @@ public void onFailure(Throwable t) {
723724
addCallback(datasetsToBeVerified, future2);
724725
}
725726
}
726-
});
727+
}, MoreExecutors.directExecutor());
727728
}
728729

729730
/**

gobblin-data-management/src/main/java/org/apache/gobblin/data/management/retention/DatasetCleaner.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import com.google.common.util.concurrent.Futures;
4141
import com.google.common.util.concurrent.ListenableFuture;
4242
import com.google.common.util.concurrent.ListeningExecutorService;
43+
import com.google.common.util.concurrent.MoreExecutors;
4344
import com.typesafe.config.Config;
4445

4546
import org.apache.gobblin.configuration.ConfigurationKeys;
@@ -170,7 +171,7 @@ public void onSuccess(Void arg0) {
170171
LOG.info("Successfully cleaned: " + dataset.datasetURN());
171172
Instrumented.markMeter(DatasetCleaner.this.datasetsCleanSuccessMeter);
172173
}
173-
});
174+
}, MoreExecutors.directExecutor());
174175
}
175176
}
176177

gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/restore/ComplianceRestoreJob.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.google.common.util.concurrent.FutureCallback;
3333
import com.google.common.util.concurrent.Futures;
3434
import com.google.common.util.concurrent.ListenableFuture;
35+
import com.google.common.util.concurrent.MoreExecutors;
3536

3637
import javax.annotation.Nullable;
3738
import lombok.extern.slf4j.Slf4j;
@@ -109,7 +110,7 @@ public void onFailure(Throwable t) {
109110
.of(ComplianceEvents.FAILURE_CONTEXT_METADATA_KEY, ExceptionUtils.getFullStackTrace(t),
110111
ComplianceEvents.DATASET_URN_METADATA_KEY, dataset.datasetURN()));
111112
}
112-
});
113+
}, MoreExecutors.directExecutor());
113114
}
114115
}
115116

gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/retention/ComplianceRetentionJob.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.google.common.util.concurrent.FutureCallback;
3939
import com.google.common.util.concurrent.Futures;
4040
import com.google.common.util.concurrent.ListenableFuture;
41+
import com.google.common.util.concurrent.MoreExecutors;
4142

4243
import edu.umd.cs.findbugs.annotations.SuppressWarnings;
4344
import javax.annotation.Nullable;
@@ -156,7 +157,7 @@ public void onFailure(Throwable t) {
156157
.of(ComplianceEvents.FAILURE_CONTEXT_METADATA_KEY, ExceptionUtils.getFullStackTrace(t),
157158
ComplianceEvents.DATASET_URN_METADATA_KEY, dataset.datasetURN()));
158159
}
159-
});
160+
}, MoreExecutors.directExecutor());
160161
}
161162
}
162163

gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/validation/ComplianceValidationJob.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.google.common.util.concurrent.FutureCallback;
3333
import com.google.common.util.concurrent.Futures;
3434
import com.google.common.util.concurrent.ListenableFuture;
35+
import com.google.common.util.concurrent.MoreExecutors;
3536

3637
import javax.annotation.Nullable;
3738
import lombok.extern.slf4j.Slf4j;
@@ -106,7 +107,7 @@ public void onFailure(Throwable t) {
106107
.of(ComplianceEvents.FAILURE_CONTEXT_METADATA_KEY, ExceptionUtils.getFullStackTrace(t),
107108
ComplianceEvents.DATASET_URN_METADATA_KEY, dataset.datasetURN()));
108109
}
109-
});
110+
}, MoreExecutors.directExecutor());
110111
}
111112
}
112113

gobblin-runtime/src/main/java/org/apache/gobblin/runtime/app/ServiceBasedAppLauncher.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.slf4j.Logger;
3434
import org.slf4j.LoggerFactory;
3535

36+
import com.google.common.util.concurrent.MoreExecutors;
3637
import com.google.common.util.concurrent.Service;
3738
import com.google.common.util.concurrent.ServiceManager;
3839

@@ -157,7 +158,7 @@ public void failure(Service service) {
157158
LOG.error("Could not shutdown services gracefully. This may cause the application to hang.");
158159
}
159160
}
160-
});
161+
}, MoreExecutors.directExecutor());
161162

162163
Runtime.getRuntime().addShutdownHook(new Thread() {
163164
@Override

gobblin-runtime/src/main/java/org/apache/gobblin/runtime/embedded/EmbeddedGobblin.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import com.google.common.escape.Escaper;
6060
import com.google.common.util.concurrent.FutureCallback;
6161
import com.google.common.util.concurrent.Futures;
62+
import com.google.common.util.concurrent.MoreExecutors;
6263
import com.linkedin.data.template.DataTemplate;
6364
import com.typesafe.config.Config;
6465
import com.typesafe.config.ConfigFactory;
@@ -513,7 +514,7 @@ private void stopGobblinInstanceDriver() {
513514
log.error("Failed to shutdown Gobblin instance driver.");
514515
}
515516
}
516-
});
517+
}, MoreExecutors.directExecutor());
517518

518519
return listener.getJobDriver();
519520
}

0 commit comments

Comments
 (0)