[ML] Renaming ML setup and start contracts

jgowdyelastic · jgowdyelastic · commit 97d806ae863f · 2020-03-23T19:45:10.000Z
diff --git a/x-pack/plugins/ml/public/index.ts b/x-pack/plugins/ml/public/index.ts
@@ -6,8 +6,8 @@
 
 import { PluginInitializer } from 'kibana/public';
 import './index.scss';
-import { MlPlugin, Setup, Start } from './plugin';
+import { MlPlugin, MlPluginSetup, MlPluginStart } from './plugin';
 
-export const plugin: PluginInitializer<Setup, Start> = () => new MlPlugin();
+export const plugin: PluginInitializer<MlPluginSetup, MlPluginStart> = () => new MlPlugin();
 
-export { Setup, Start };
+export { MlPluginSetup, MlPluginStart };
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
@@ -28,7 +28,7 @@ export interface MlSetupDependencies {
   usageCollection: UsageCollectionSetup;
 }
 
-export class MlPlugin implements Plugin<Setup, Start> {
+export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
   setup(core: CoreSetup<MlStartDependencies>, pluginsSetup: MlSetupDependencies) {
     core.application.register({
       id: PLUGIN_ID,
@@ -77,5 +77,5 @@ export class MlPlugin implements Plugin<Setup, Start> {
   public stop() {}
 }
 
-export type Setup = ReturnType<MlPlugin['setup']>;
-export type Start = ReturnType<MlPlugin['start']>;
+export type MlPluginSetup = ReturnType<MlPlugin['setup']>;
+export type MlPluginStart = ReturnType<MlPlugin['start']>;
diff --git a/x-pack/plugins/ml/server/index.ts b/x-pack/plugins/ml/server/index.ts
@@ -6,6 +6,6 @@
 
 import { PluginInitializerContext } from 'kibana/server';
 import { MlServerPlugin } from './plugin';
-export { MlStartContract, MlSetupContract } from './plugin';
+export { MlPluginSetup, MlPluginStart } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => new MlServerPlugin(ctx);
diff --git a/x-pack/plugins/ml/server/plugin.ts b/x-pack/plugins/ml/server/plugin.ts
@@ -49,10 +49,10 @@ declare module 'kibana/server' {
   }
 }
 
-export type MlSetupContract = SharedServices;
-export type MlStartContract = void;
+export type MlPluginSetup = SharedServices;
+export type MlPluginStart = void;
 
-export class MlServerPlugin implements Plugin<MlSetupContract, MlStartContract, PluginsSetup> {
+export class MlServerPlugin implements Plugin<MlPluginSetup, MlPluginStart, PluginsSetup> {
   private log: Logger;
   private version: string;
   private mlLicense: MlServerLicense;
@@ -63,7 +63,7 @@ export class MlServerPlugin implements Plugin<MlSetupContract, MlStartContract,
     this.mlLicense = new MlServerLicense();
   }
 
-  public setup(coreSetup: CoreSetup, plugins: PluginsSetup): MlSetupContract {
+  public setup(coreSetup: CoreSetup, plugins: PluginsSetup): MlPluginSetup {
     plugins.features.registerFeature({
       id: PLUGIN_ID,
       name: i18n.translate('xpack.ml.featureRegistry.mlFeatureName', {
@@ -135,7 +135,7 @@ export class MlServerPlugin implements Plugin<MlSetupContract, MlStartContract,
     return createSharedServices(this.mlLicense, plugins.spaces, plugins.cloud);
   }
 
-  public start(): MlStartContract {}
+  public start(): MlPluginStart {}
 
   public stop() {
     this.mlLicense.unsubscribe();

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ export interface MlSetupDependencies {`
`28`	`28`	`usageCollection: UsageCollectionSetup;`
`29`	`29`	`}`
`30`	`30`
`31`		`-export class MlPlugin implements Plugin<Setup, Start> {`
	`31`	`+export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {`
`32`	`32`	`setup(core: CoreSetup<MlStartDependencies>, pluginsSetup: MlSetupDependencies) {`
`33`	`33`	`core.application.register({`
`34`	`34`	`id: PLUGIN_ID,`
`@@ -77,5 +77,5 @@ export class MlPlugin implements Plugin<Setup, Start> {`
`77`	`77`	`public stop() {}`
`78`	`78`	`}`
`79`	`79`
`80`		`-export type Setup = ReturnType<MlPlugin['setup']>;`
`81`		`-export type Start = ReturnType<MlPlugin['start']>;`
	`80`	`+export type MlPluginSetup = ReturnType<MlPlugin['setup']>;`
	`81`	`+export type MlPluginStart = ReturnType<MlPlugin['start']>;`