/*
 * Copyright © 2015 Cask Data, Inc.
 *
 * Licensed 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 co.cask.cdap.metadata;

import co.cask.cdap.app.store.Store;
import co.cask.cdap.common.conf.Constants;
import co.cask.cdap.gateway.handlers.CommonHandlers;
import co.cask.cdap.internal.app.store.DefaultStore;
import co.cask.http.HttpHandler;
import com.google.inject.Key;
import com.google.inject.PrivateModule;
import com.google.inject.TypeLiteral;
import com.google.inject.multibindings.Multibinder;
import com.google.inject.name.Names;

import java.util.Set;

/**
 * Guice module for metadata service.
 */
public class MetadataServiceModule extends PrivateModule {

  @Override
  protected void configure() {
    Multibinder<HttpHandler> handlerBinder = Multibinder.newSetBinder(
      binder(), HttpHandler.class, Names.named(Constants.Metadata.HANDLERS_NAME));

    CommonHandlers.add(handlerBinder);
    handlerBinder.addBinding().to(MetadataHttpHandler.class);
    handlerBinder.addBinding().to(LineageHandler.class);
    expose(Key.get(new TypeLiteral<Set<HttpHandler>>() { }, Names.named(Constants.Metadata.HANDLERS_NAME)));
    bind(Store.class).to(DefaultStore.class);
    bind(MetadataAdmin.class).to(DefaultMetadataAdmin.class);
    expose(MetadataAdmin.class);
  }
}

@@ -627,45 +627,8 @@
 a;%0A%0A
-import co.cask.cdap.app.store.Store;%0A
 impo
@@ -723,61 +723,8 @@
 rs;%0A
-import co.cask.cdap.internal.app.store.DefaultStore;%0A
 impo
@@ -1548,54 +1548,8 @@
 ));%0A
-    bind(Store.class).to(DefaultStore.class);%0A
     

Remove un-intended changes