Dialer: Remove InstallIn annotation [20/x]
We don't have variants so we don't need this
Change-Id: Ie62bc384cc01d4c9a55ae2b5acb314003fb4b293
diff --git a/Android.mk b/Android.mk
index d00f747..dc584e2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -148,7 +148,6 @@
$(BASE_DIR)/dialer/inject/DialerVariant.java \
$(BASE_DIR)/dialer/inject/HasRootComponent.java \
$(BASE_DIR)/dialer/inject/IncludeInDialerRoot.java \
- $(BASE_DIR)/dialer/inject/InstallIn.java \
$(BASE_DIR)/dialer/inject/RootComponentGeneratorMetadata.java
LOCAL_STATIC_JAVA_LIBRARIES := \
diff --git a/java/com/android/dialer/activecalls/ActiveCallsModule.java b/java/com/android/dialer/activecalls/ActiveCallsModule.java
index 4d7f448..9c02ba6 100644
--- a/java/com/android/dialer/activecalls/ActiveCallsModule.java
+++ b/java/com/android/dialer/activecalls/ActiveCallsModule.java
@@ -17,15 +17,12 @@
package com.android.dialer.activecalls;
import com.android.dialer.activecalls.impl.ActiveCallsImpl;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import dagger.Binds;
import dagger.Module;
import javax.inject.Singleton;
/** Module for {@link ActiveCallsComponent} */
@Module
-@InstallIn(variants = DialerVariant.DIALER_TEST) // TODO(weijiaxu): put all variants.
public abstract class ActiveCallsModule {
@Singleton
diff --git a/java/com/android/dialer/calllog/CallLogModule.java b/java/com/android/dialer/calllog/CallLogModule.java
index 0e3a3be..5657270 100644
--- a/java/com/android/dialer/calllog/CallLogModule.java
+++ b/java/com/android/dialer/calllog/CallLogModule.java
@@ -22,14 +22,11 @@
import com.android.dialer.calllog.datasources.phonelookup.PhoneLookupDataSource;
import com.android.dialer.calllog.datasources.systemcalllog.SystemCallLogDataSource;
import com.android.dialer.calllog.datasources.voicemail.VoicemailDataSource;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import com.google.common.collect.ImmutableList;
import dagger.Module;
import dagger.Provides;
/** Dagger module which satisfies call log dependencies. */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module(includes = CallLogDatabaseModule.class)
public abstract class CallLogModule {
diff --git a/java/com/android/dialer/commandline/CommandLineModule.java b/java/com/android/dialer/commandline/CommandLineModule.java
index 9c7d87a..7329526 100644
--- a/java/com/android/dialer/commandline/CommandLineModule.java
+++ b/java/com/android/dialer/commandline/CommandLineModule.java
@@ -22,15 +22,12 @@
import com.android.dialer.commandline.impl.Help;
import com.android.dialer.commandline.impl.Version;
import com.android.dialer.function.Supplier;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import com.google.common.collect.ImmutableMap;
import dagger.Module;
import dagger.Provides;
import javax.inject.Inject;
/** Provides {@link Command} */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public abstract class CommandLineModule {
diff --git a/java/com/android/dialer/contacts/ContactsModule.java b/java/com/android/dialer/contacts/ContactsModule.java
index 2a27b76..9cbb6ae 100644
--- a/java/com/android/dialer/contacts/ContactsModule.java
+++ b/java/com/android/dialer/contacts/ContactsModule.java
@@ -24,15 +24,12 @@
import com.android.dialer.contacts.hiresphoto.HighResolutionPhotoRequester;
import com.android.dialer.contacts.hiresphoto.HighResolutionPhotoRequesterImpl;
import com.android.dialer.inject.ApplicationContext;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import dagger.Binds;
import dagger.Lazy;
import dagger.Module;
import dagger.Provides;
/** Module for standard {@link ContactsComponent} */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public abstract class ContactsModule {
@Provides
diff --git a/java/com/android/dialer/glidephotomanager/GlidePhotoManagerModule.java b/java/com/android/dialer/glidephotomanager/GlidePhotoManagerModule.java
index d4199f0..79629d6 100644
--- a/java/com/android/dialer/glidephotomanager/GlidePhotoManagerModule.java
+++ b/java/com/android/dialer/glidephotomanager/GlidePhotoManagerModule.java
@@ -17,14 +17,11 @@
package com.android.dialer.glidephotomanager;
import com.android.dialer.glidephotomanager.impl.GlidePhotoManagerImpl;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import dagger.Binds;
import dagger.Module;
import javax.inject.Singleton;
/** Module for {@link GlidePhotoManagerComponent} */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public abstract class GlidePhotoManagerModule {
@Binds
diff --git a/java/com/android/dialer/inject/ContextModule.java b/java/com/android/dialer/inject/ContextModule.java
index 970fa4e..12128ba 100644
--- a/java/com/android/dialer/inject/ContextModule.java
+++ b/java/com/android/dialer/inject/ContextModule.java
@@ -25,7 +25,6 @@
/** Provides the singleton application context object. */
@Module
-@InstallIn(variants = {DialerVariant.DIALER_DEMO, DialerVariant.DIALER_TEST})
public final class ContextModule {
@NonNull private final Context context;
diff --git a/java/com/android/dialer/inject/InstallIn.java b/java/com/android/dialer/inject/InstallIn.java
deleted file mode 100644
index a6f973b..0000000
--- a/java/com/android/dialer/inject/InstallIn.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * 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 com.android.dialer.inject;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for {@link dagger.Module dagger.Modules} which causes them to be installed in the
- * specified variants.
- *
- * <p>It has a parameter for users to enter on which variants annotated module will be installed and
- * also must be non-empty. Example:
- *
- * <pre>
- * <code>
- * @InstallIn(variants = {DialerVariant.DIALER_AOSP, DialerVariant.DIALER_TEST})
- * public class Module1 {}
- *
- * </code>
- * </pre>
- */
-@Target(ElementType.TYPE)
-public @interface InstallIn {
- DialerVariant[] variants();
-}
diff --git a/java/com/android/dialer/inject/RootComponentGeneratorMetadata.java b/java/com/android/dialer/inject/RootComponentGeneratorMetadata.java
index 924b41e..5987a27 100644
--- a/java/com/android/dialer/inject/RootComponentGeneratorMetadata.java
+++ b/java/com/android/dialer/inject/RootComponentGeneratorMetadata.java
@@ -21,7 +21,7 @@
/**
* Only used by rootcomponent generator to store metadata for locating annotated class with {@link
- * IncludeInDialerRoot}, {@link InstallIn}.
+ * IncludeInDialerRoot}.
*/
@Target(ElementType.TYPE)
public @interface RootComponentGeneratorMetadata {
diff --git a/java/com/android/dialer/phonelookup/PhoneLookupModule.java b/java/com/android/dialer/phonelookup/PhoneLookupModule.java
index 1c6218a..dd52470 100644
--- a/java/com/android/dialer/phonelookup/PhoneLookupModule.java
+++ b/java/com/android/dialer/phonelookup/PhoneLookupModule.java
@@ -16,8 +16,6 @@
package com.android.dialer.phonelookup;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import com.android.dialer.phonelookup.blockednumber.SystemBlockedNumberPhoneLookup;
import com.android.dialer.phonelookup.cequint.CequintPhoneLookup;
import com.android.dialer.phonelookup.cnap.CnapPhoneLookup;
@@ -29,7 +27,6 @@
import dagger.Provides;
/** Dagger module which binds the PhoneLookup implementation. */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public abstract class PhoneLookupModule {
diff --git a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java
index db4f7fa..3878ac5 100644
--- a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java
+++ b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java
@@ -16,15 +16,12 @@
package com.android.dialer.phonenumbergeoutil.impl;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil;
import dagger.Binds;
import dagger.Module;
import javax.inject.Singleton;
/** Module which binds {@link PhoneNumberGeoUtilImpl}. */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public abstract class PhoneNumberGeoUtilModule {
diff --git a/java/com/android/dialer/precall/impl/PreCallModule.java b/java/com/android/dialer/precall/impl/PreCallModule.java
index 7ffecee..7d5ee79 100644
--- a/java/com/android/dialer/precall/impl/PreCallModule.java
+++ b/java/com/android/dialer/precall/impl/PreCallModule.java
@@ -16,8 +16,6 @@
package com.android.dialer.precall.impl;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import com.android.dialer.precall.PreCall;
import com.android.dialer.precall.PreCallAction;
import com.google.common.collect.ImmutableList;
@@ -27,7 +25,6 @@
import javax.inject.Singleton;
/** Dagger module for {@link PreCall}. */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public abstract class PreCallModule {
diff --git a/java/com/android/dialer/promotion/impl/PromotionModule.java b/java/com/android/dialer/promotion/impl/PromotionModule.java
index 5750b5b..0606338 100644
--- a/java/com/android/dialer/promotion/impl/PromotionModule.java
+++ b/java/com/android/dialer/promotion/impl/PromotionModule.java
@@ -16,15 +16,12 @@
package com.android.dialer.promotion.impl;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import com.android.dialer.promotion.Promotion;
import com.google.common.collect.ImmutableList;
import dagger.Module;
import dagger.Provides;
/** Module for Promotion. */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public abstract class PromotionModule {
diff --git a/java/com/android/dialer/rootcomponentgenerator/MetadataGeneratingStep.java b/java/com/android/dialer/rootcomponentgenerator/MetadataGeneratingStep.java
index 266574d..0a8b831 100644
--- a/java/com/android/dialer/rootcomponentgenerator/MetadataGeneratingStep.java
+++ b/java/com/android/dialer/rootcomponentgenerator/MetadataGeneratingStep.java
@@ -19,7 +19,6 @@
import static javax.tools.Diagnostic.Kind.ERROR;
import com.android.dialer.inject.IncludeInDialerRoot;
-import com.android.dialer.inject.InstallIn;
import com.android.dialer.inject.RootComponentGeneratorMetadata;
import com.google.auto.common.BasicAnnotationProcessor.ProcessingStep;
import com.google.auto.common.MoreElements;
@@ -35,8 +34,7 @@
import javax.lang.model.element.TypeElement;
/**
- * Genereates metadata for every type annotated by {@link InstallIn} and {@link
- * IncludeInDialerRoot}.
+ * Genereates metadata for every type annotated by {@link IncludeInDialerRoot}.
*
* <p>The metadata has the information where the annotated types are and it is used by annotation
* processor when the processor tries to generate root component.
@@ -51,7 +49,7 @@
@Override
public Set<? extends Class<? extends Annotation>> annotations() {
- return ImmutableSet.of(IncludeInDialerRoot.class, InstallIn.class);
+ return ImmutableSet.of(IncludeInDialerRoot.class);
}
@Override
@@ -61,16 +59,6 @@
for (Element element : elementsByAnnotation.get(IncludeInDialerRoot.class)) {
generateMetadataFor(IncludeInDialerRoot.class, MoreElements.asType(element));
}
- for (Element element : elementsByAnnotation.get(InstallIn.class)) {
- if (element.getAnnotation(InstallIn.class).variants().length == 0) {
- processingEnv
- .getMessager()
- .printMessage(
- ERROR, String.format("@InstallIn %s must have at least one variant", element));
- continue;
- }
- generateMetadataFor(InstallIn.class, MoreElements.asType(element));
- }
return Collections.emptySet();
}
diff --git a/java/com/android/dialer/rootcomponentgenerator/RootComponentGeneratingStep.java b/java/com/android/dialer/rootcomponentgenerator/RootComponentGeneratingStep.java
index 06b994f..8a82f86 100644
--- a/java/com/android/dialer/rootcomponentgenerator/RootComponentGeneratingStep.java
+++ b/java/com/android/dialer/rootcomponentgenerator/RootComponentGeneratingStep.java
@@ -24,14 +24,11 @@
import com.android.dialer.inject.DialerRootComponent;
import com.android.dialer.inject.DialerVariant;
import com.android.dialer.inject.IncludeInDialerRoot;
-import com.android.dialer.inject.InstallIn;
import com.android.dialer.inject.RootComponentGeneratorMetadata;
import com.google.auto.common.BasicAnnotationProcessor.ProcessingStep;
import com.google.auto.common.MoreElements;
import com.google.common.base.Optional;
-import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ListMultimap;
import com.google.common.collect.SetMultimap;
import com.squareup.javapoet.AnnotationSpec;
import com.squareup.javapoet.ClassName;
@@ -86,15 +83,14 @@
@Override
public Set<? extends Class<? extends Annotation>> annotations() {
- return ImmutableSet.of(DialerRootComponent.class, InstallIn.class, IncludeInDialerRoot.class);
+ return ImmutableSet.of(DialerRootComponent.class, IncludeInDialerRoot.class);
}
@Override
public Set<? extends Element> process(
SetMultimap<Class<? extends Annotation>, Element> elementsByAnnotation) {
for (Element element : elementsByAnnotation.get(DialerRootComponent.class)) {
- // defer root components to the next round in case where the current build target contains
- // elements annotated with @InstallIn. Annotation processor cannot detect metadata files
+ // defer root components to the next round. Annotation processor cannot detect metadata files
// generated in the same round and the metadata is accessible in the next round.
if (shouldDeferRootComponent(elementsByAnnotation)) {
return elementsByAnnotation.get(DialerRootComponent.class);
@@ -107,8 +103,7 @@
private boolean shouldDeferRootComponent(
SetMultimap<Class<? extends Annotation>, Element> elementsByAnnotation) {
- return elementsByAnnotation.containsKey(InstallIn.class)
- || elementsByAnnotation.containsKey(IncludeInDialerRoot.class);
+ return elementsByAnnotation.containsKey(IncludeInDialerRoot.class);
}
/**
@@ -119,7 +114,6 @@
*/
private void generateRootComponent(TypeElement rootElement) {
DialerRootComponent dialerRootComponent = rootElement.getAnnotation(DialerRootComponent.class);
- ListMultimap<DialerVariant, TypeElement> componentModuleMap = generateComponentModuleMap();
List<TypeElement> componentList = generateComponentList();
DialerVariant dialerVariant = dialerRootComponent.variant();
TypeSpec.Builder rootComponentClassBuilder =
@@ -130,9 +124,6 @@
rootComponentClassBuilder.addSuperinterface(ClassName.get(componentWithSuperInterface));
}
AnnotationSpec.Builder componentAnnotation = AnnotationSpec.builder(Component.class);
- for (TypeElement annotatedElement : componentModuleMap.get(dialerVariant)) {
- componentAnnotation.addMember("modules", "$T.class", annotatedElement.asType());
- }
rootComponentClassBuilder.addAnnotation(componentAnnotation.build());
AnnotationMirror dialerRootComponentMirror =
@@ -154,19 +145,6 @@
return list;
}
- private ListMultimap<DialerVariant, TypeElement> generateComponentModuleMap() {
- ListMultimap<DialerVariant, TypeElement> map = ArrayListMultimap.create();
- extractInfoFromMetadata(
- InstallIn.class,
- (annotatedElement) -> {
- for (DialerVariant rootComponentName :
- annotatedElement.getAnnotation(InstallIn.class).variants()) {
- map.put(rootComponentName, annotatedElement);
- }
- });
- return map;
- }
-
private void extractInfoFromMetadata(
Class<? extends Annotation> annotation, MetadataProcessor metadataProcessor) {
PackageElement cachePackage =
diff --git a/java/com/android/dialer/simulator/impl/SimulatorModule.java b/java/com/android/dialer/simulator/impl/SimulatorModule.java
index af554b6..2bc72c9 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorModule.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorModule.java
@@ -16,8 +16,6 @@
package com.android.dialer.simulator.impl;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import com.android.dialer.simulator.Simulator;
import com.android.dialer.simulator.SimulatorConnectionsBank;
import dagger.Binds;
@@ -25,7 +23,6 @@
import javax.inject.Singleton;
/** This module provides an instance of the simulator. */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public abstract class SimulatorModule {
@Binds
diff --git a/java/com/android/dialer/storage/StorageModule.java b/java/com/android/dialer/storage/StorageModule.java
index 370998c..e1c5b4b 100644
--- a/java/com/android/dialer/storage/StorageModule.java
+++ b/java/com/android/dialer/storage/StorageModule.java
@@ -20,14 +20,11 @@
import android.preference.PreferenceManager;
import android.support.v4.content.ContextCompat;
import com.android.dialer.inject.ApplicationContext;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import dagger.Module;
import dagger.Provides;
import javax.inject.Singleton;
/** Module for the storage component. */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public class StorageModule {
diff --git a/java/com/android/dialer/theme/base/impl/AospThemeModule.java b/java/com/android/dialer/theme/base/impl/AospThemeModule.java
index 7cf52ca..7070932 100644
--- a/java/com/android/dialer/theme/base/impl/AospThemeModule.java
+++ b/java/com/android/dialer/theme/base/impl/AospThemeModule.java
@@ -18,14 +18,11 @@
import android.content.Context;
import com.android.dialer.inject.ApplicationContext;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import com.android.dialer.theme.base.Theme;
import dagger.Module;
import dagger.Provides;
/** Module which binds {@link AospThemeImpl}. */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public class AospThemeModule {
diff --git a/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java b/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java
index ada16c8..6578de5 100644
--- a/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java
+++ b/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java
@@ -22,15 +22,12 @@
import androidx.annotation.NonNull;
import com.android.dialer.common.Assert;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import com.android.incallui.calllocation.CallLocation;
import dagger.Binds;
import dagger.Module;
import javax.inject.Inject;
/** This module provides an instance of call location. */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public abstract class StubCallLocationModule {
diff --git a/java/com/android/voicemail/impl/VoicemailModule.java b/java/com/android/voicemail/impl/VoicemailModule.java
index 07968d8..a2a803a 100644
--- a/java/com/android/voicemail/impl/VoicemailModule.java
+++ b/java/com/android/voicemail/impl/VoicemailModule.java
@@ -18,8 +18,6 @@
import android.content.Context;
import com.android.dialer.inject.ApplicationContext;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import com.android.voicemail.VoicemailClient;
import com.android.voicemail.VoicemailPermissionHelper;
import com.android.voicemail.stub.StubVoicemailClient;
@@ -28,7 +26,6 @@
import javax.inject.Singleton;
/** This module provides an instance of the voicemail client. */
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public final class VoicemailModule {
diff --git a/java/com/android/voicemail/stub/StubVoicemailModule.java b/java/com/android/voicemail/stub/StubVoicemailModule.java
index efcb4cf..6c1552c 100644
--- a/java/com/android/voicemail/stub/StubVoicemailModule.java
+++ b/java/com/android/voicemail/stub/StubVoicemailModule.java
@@ -16,8 +16,6 @@
package com.android.voicemail.stub;
-import com.android.dialer.inject.DialerVariant;
-import com.android.dialer.inject.InstallIn;
import com.android.voicemail.VoicemailClient;
import dagger.Binds;
import dagger.Module;
@@ -26,7 +24,6 @@
/**
* A no-op version of the voicemail module for build targets that don't support the new OTMP client.
*/
-@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module
public abstract class StubVoicemailModule {