From f550b87388497044d7f96e74510dcc8393ec85a0 Mon Sep 17 00:00:00 2001 From: Georg Fritzsche Date: Thu, 7 Mar 2019 21:42:40 +0800 Subject: [PATCH 1/7] Moved fretboard/ to experiments/ --- components/service/{fretboard => experiments}/.gitignore | 0 components/service/{fretboard => experiments}/README.md | 0 components/service/{fretboard => experiments}/build.gradle | 0 components/service/{fretboard => experiments}/proguard-rules.pro | 0 .../{fretboard => experiments}/src/main/AndroidManifest.xml | 0 .../mozilla/components/service/fretboard/DeviceUuidFactory.kt | 0 .../main/java/mozilla/components/service/fretboard/Experiment.kt | 0 .../mozilla/components/service/fretboard/ExperimentDescriptor.kt | 0 .../components/service/fretboard/ExperimentDownloadException.kt | 0 .../mozilla/components/service/fretboard/ExperimentEvaluator.kt | 0 .../mozilla/components/service/fretboard/ExperimentPayload.kt | 0 .../java/mozilla/components/service/fretboard/ExperimentSource.kt | 0 .../mozilla/components/service/fretboard/ExperimentStorage.kt | 0 .../mozilla/components/service/fretboard/ExperimentsSnapshot.kt | 0 .../main/java/mozilla/components/service/fretboard/Fretboard.kt | 0 .../mozilla/components/service/fretboard/JSONExperimentParser.kt | 0 .../java/mozilla/components/service/fretboard/ValuesProvider.kt | 0 .../fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt | 0 .../service/fretboard/scheduler/jobscheduler/SyncJob.kt | 0 .../service/fretboard/scheduler/workmanager/SyncWorker.kt | 0 .../fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt | 0 .../components/service/fretboard/source/kinto/KintoClient.kt | 0 .../service/fretboard/source/kinto/KintoExperimentSource.kt | 0 .../service/fretboard/source/kinto/SignatureVerifier.kt | 0 .../service/fretboard/storage/flatfile/ExperimentsSerializer.kt | 0 .../fretboard/storage/flatfile/FlatFileExperimentStorage.kt | 0 .../mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt | 0 .../components/service/fretboard/ExperimentEvaluatorTest.kt | 0 .../mozilla/components/service/fretboard/ExperimentPayloadTest.kt | 0 .../java/mozilla/components/service/fretboard/ExperimentTest.kt | 0 .../java/mozilla/components/service/fretboard/FretboardTest.kt | 0 .../components/service/fretboard/JSONExperimentParserTest.kt | 0 .../mozilla/components/service/fretboard/ValuesProviderTest.kt | 0 .../components/service/fretboard/source/kinto/KintoClientTest.kt | 0 .../service/fretboard/source/kinto/KintoExperimentSourceTest.kt | 0 .../service/fretboard/source/kinto/SignatureVerifierTest.kt | 0 .../fretboard/storage/flatfile/ExperimentsSerializerTest.kt | 0 .../fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt | 0 .../resources/mockito-extensions/org.mockito.plugins.MockMaker | 0 39 files changed, 0 insertions(+), 0 deletions(-) rename components/service/{fretboard => experiments}/.gitignore (100%) rename components/service/{fretboard => experiments}/README.md (100%) rename components/service/{fretboard => experiments}/build.gradle (100%) rename components/service/{fretboard => experiments}/proguard-rules.pro (100%) rename components/service/{fretboard => experiments}/src/main/AndroidManifest.xml (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/Experiment.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/Fretboard.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt (100%) rename components/service/{fretboard => experiments}/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt (100%) rename components/service/{fretboard => experiments}/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt (100%) rename components/service/{fretboard => experiments}/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt (100%) rename components/service/{fretboard => experiments}/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt (100%) rename components/service/{fretboard => experiments}/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt (100%) rename components/service/{fretboard => experiments}/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt (100%) rename components/service/{fretboard => experiments}/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt (100%) rename components/service/{fretboard => experiments}/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt (100%) rename components/service/{fretboard => experiments}/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt (100%) rename components/service/{fretboard => experiments}/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt (100%) rename components/service/{fretboard => experiments}/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt (100%) rename components/service/{fretboard => experiments}/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt (100%) rename components/service/{fretboard => experiments}/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt (100%) rename components/service/{fretboard => experiments}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%) diff --git a/components/service/fretboard/.gitignore b/components/service/experiments/.gitignore similarity index 100% rename from components/service/fretboard/.gitignore rename to components/service/experiments/.gitignore diff --git a/components/service/fretboard/README.md b/components/service/experiments/README.md similarity index 100% rename from components/service/fretboard/README.md rename to components/service/experiments/README.md diff --git a/components/service/fretboard/build.gradle b/components/service/experiments/build.gradle similarity index 100% rename from components/service/fretboard/build.gradle rename to components/service/experiments/build.gradle diff --git a/components/service/fretboard/proguard-rules.pro b/components/service/experiments/proguard-rules.pro similarity index 100% rename from components/service/fretboard/proguard-rules.pro rename to components/service/experiments/proguard-rules.pro diff --git a/components/service/fretboard/src/main/AndroidManifest.xml b/components/service/experiments/src/main/AndroidManifest.xml similarity index 100% rename from components/service/fretboard/src/main/AndroidManifest.xml rename to components/service/experiments/src/main/AndroidManifest.xml diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/Experiment.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/Experiment.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/Experiment.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/Experiment.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/Fretboard.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/Fretboard.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/Fretboard.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/Fretboard.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt b/components/service/experiments/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt rename to components/service/experiments/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt diff --git a/components/service/fretboard/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/components/service/experiments/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from components/service/fretboard/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to components/service/experiments/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker From a6d32c79d54502c611b6032ef41016bbb16d3e67 Mon Sep 17 00:00:00 2001 From: Georg Fritzsche Date: Thu, 7 Mar 2019 21:43:58 +0800 Subject: [PATCH 2/7] Move fretboard/ to fretboard-temp/ --- components/service/{fretboard => fretboard-temp}/.gitignore | 0 components/service/{fretboard => fretboard-temp}/README.md | 0 components/service/{fretboard => fretboard-temp}/build.gradle | 0 .../service/{fretboard => fretboard-temp}/proguard-rules.pro | 0 .../{fretboard => fretboard-temp}/src/main/AndroidManifest.xml | 0 .../mozilla/components/service/fretboard/DeviceUuidFactory.kt | 0 .../main/java/mozilla/components/service/fretboard/Experiment.kt | 0 .../mozilla/components/service/fretboard/ExperimentDescriptor.kt | 0 .../components/service/fretboard/ExperimentDownloadException.kt | 0 .../mozilla/components/service/fretboard/ExperimentEvaluator.kt | 0 .../mozilla/components/service/fretboard/ExperimentPayload.kt | 0 .../java/mozilla/components/service/fretboard/ExperimentSource.kt | 0 .../mozilla/components/service/fretboard/ExperimentStorage.kt | 0 .../mozilla/components/service/fretboard/ExperimentsSnapshot.kt | 0 .../main/java/mozilla/components/service/fretboard/Fretboard.kt | 0 .../mozilla/components/service/fretboard/JSONExperimentParser.kt | 0 .../java/mozilla/components/service/fretboard/ValuesProvider.kt | 0 .../fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt | 0 .../service/fretboard/scheduler/jobscheduler/SyncJob.kt | 0 .../service/fretboard/scheduler/workmanager/SyncWorker.kt | 0 .../fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt | 0 .../components/service/fretboard/source/kinto/KintoClient.kt | 0 .../service/fretboard/source/kinto/KintoExperimentSource.kt | 0 .../service/fretboard/source/kinto/SignatureVerifier.kt | 0 .../service/fretboard/storage/flatfile/ExperimentsSerializer.kt | 0 .../fretboard/storage/flatfile/FlatFileExperimentStorage.kt | 0 .../mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt | 0 .../components/service/fretboard/ExperimentEvaluatorTest.kt | 0 .../mozilla/components/service/fretboard/ExperimentPayloadTest.kt | 0 .../java/mozilla/components/service/fretboard/ExperimentTest.kt | 0 .../java/mozilla/components/service/fretboard/FretboardTest.kt | 0 .../components/service/fretboard/JSONExperimentParserTest.kt | 0 .../mozilla/components/service/fretboard/ValuesProviderTest.kt | 0 .../components/service/fretboard/source/kinto/KintoClientTest.kt | 0 .../service/fretboard/source/kinto/KintoExperimentSourceTest.kt | 0 .../service/fretboard/source/kinto/SignatureVerifierTest.kt | 0 .../fretboard/storage/flatfile/ExperimentsSerializerTest.kt | 0 .../fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt | 0 .../resources/mockito-extensions/org.mockito.plugins.MockMaker | 0 39 files changed, 0 insertions(+), 0 deletions(-) rename components/service/{fretboard => fretboard-temp}/.gitignore (100%) rename components/service/{fretboard => fretboard-temp}/README.md (100%) rename components/service/{fretboard => fretboard-temp}/build.gradle (100%) rename components/service/{fretboard => fretboard-temp}/proguard-rules.pro (100%) rename components/service/{fretboard => fretboard-temp}/src/main/AndroidManifest.xml (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/Experiment.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/Fretboard.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt (100%) rename components/service/{fretboard => fretboard-temp}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%) diff --git a/components/service/fretboard/.gitignore b/components/service/fretboard-temp/.gitignore similarity index 100% rename from components/service/fretboard/.gitignore rename to components/service/fretboard-temp/.gitignore diff --git a/components/service/fretboard/README.md b/components/service/fretboard-temp/README.md similarity index 100% rename from components/service/fretboard/README.md rename to components/service/fretboard-temp/README.md diff --git a/components/service/fretboard/build.gradle b/components/service/fretboard-temp/build.gradle similarity index 100% rename from components/service/fretboard/build.gradle rename to components/service/fretboard-temp/build.gradle diff --git a/components/service/fretboard/proguard-rules.pro b/components/service/fretboard-temp/proguard-rules.pro similarity index 100% rename from components/service/fretboard/proguard-rules.pro rename to components/service/fretboard-temp/proguard-rules.pro diff --git a/components/service/fretboard/src/main/AndroidManifest.xml b/components/service/fretboard-temp/src/main/AndroidManifest.xml similarity index 100% rename from components/service/fretboard/src/main/AndroidManifest.xml rename to components/service/fretboard-temp/src/main/AndroidManifest.xml diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/Experiment.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/Experiment.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/Experiment.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/Experiment.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/Fretboard.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/Fretboard.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/Fretboard.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/Fretboard.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt diff --git a/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt b/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt similarity index 100% rename from components/service/fretboard/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt rename to components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt b/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt rename to components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt b/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt rename to components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt b/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt rename to components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt b/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt rename to components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt b/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt rename to components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt b/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt rename to components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt b/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt rename to components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt b/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt rename to components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt b/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt rename to components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt b/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt rename to components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt b/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt rename to components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt diff --git a/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt b/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt similarity index 100% rename from components/service/fretboard/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt rename to components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt diff --git a/components/service/fretboard/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/components/service/fretboard-temp/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from components/service/fretboard/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to components/service/fretboard-temp/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker From cd614a8a12f04d317cc50c4c26624976514beac1 Mon Sep 17 00:00:00 2001 From: Georg Fritzsche Date: Thu, 7 Mar 2019 21:45:00 +0800 Subject: [PATCH 3/7] Move fretboard-temp/ back to fretboard/ --- components/service/{fretboard-temp => fretboard}/.gitignore | 0 components/service/{fretboard-temp => fretboard}/README.md | 0 components/service/{fretboard-temp => fretboard}/build.gradle | 0 .../service/{fretboard-temp => fretboard}/proguard-rules.pro | 0 .../{fretboard-temp => fretboard}/src/main/AndroidManifest.xml | 0 .../mozilla/components/service/fretboard/DeviceUuidFactory.kt | 0 .../main/java/mozilla/components/service/fretboard/Experiment.kt | 0 .../mozilla/components/service/fretboard/ExperimentDescriptor.kt | 0 .../components/service/fretboard/ExperimentDownloadException.kt | 0 .../mozilla/components/service/fretboard/ExperimentEvaluator.kt | 0 .../mozilla/components/service/fretboard/ExperimentPayload.kt | 0 .../java/mozilla/components/service/fretboard/ExperimentSource.kt | 0 .../mozilla/components/service/fretboard/ExperimentStorage.kt | 0 .../mozilla/components/service/fretboard/ExperimentsSnapshot.kt | 0 .../main/java/mozilla/components/service/fretboard/Fretboard.kt | 0 .../mozilla/components/service/fretboard/JSONExperimentParser.kt | 0 .../java/mozilla/components/service/fretboard/ValuesProvider.kt | 0 .../fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt | 0 .../service/fretboard/scheduler/jobscheduler/SyncJob.kt | 0 .../service/fretboard/scheduler/workmanager/SyncWorker.kt | 0 .../fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt | 0 .../components/service/fretboard/source/kinto/KintoClient.kt | 0 .../service/fretboard/source/kinto/KintoExperimentSource.kt | 0 .../service/fretboard/source/kinto/SignatureVerifier.kt | 0 .../service/fretboard/storage/flatfile/ExperimentsSerializer.kt | 0 .../fretboard/storage/flatfile/FlatFileExperimentStorage.kt | 0 .../mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt | 0 .../components/service/fretboard/ExperimentEvaluatorTest.kt | 0 .../mozilla/components/service/fretboard/ExperimentPayloadTest.kt | 0 .../java/mozilla/components/service/fretboard/ExperimentTest.kt | 0 .../java/mozilla/components/service/fretboard/FretboardTest.kt | 0 .../components/service/fretboard/JSONExperimentParserTest.kt | 0 .../mozilla/components/service/fretboard/ValuesProviderTest.kt | 0 .../components/service/fretboard/source/kinto/KintoClientTest.kt | 0 .../service/fretboard/source/kinto/KintoExperimentSourceTest.kt | 0 .../service/fretboard/source/kinto/SignatureVerifierTest.kt | 0 .../fretboard/storage/flatfile/ExperimentsSerializerTest.kt | 0 .../fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt | 0 .../resources/mockito-extensions/org.mockito.plugins.MockMaker | 0 39 files changed, 0 insertions(+), 0 deletions(-) rename components/service/{fretboard-temp => fretboard}/.gitignore (100%) rename components/service/{fretboard-temp => fretboard}/README.md (100%) rename components/service/{fretboard-temp => fretboard}/build.gradle (100%) rename components/service/{fretboard-temp => fretboard}/proguard-rules.pro (100%) rename components/service/{fretboard-temp => fretboard}/src/main/AndroidManifest.xml (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/Experiment.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/Fretboard.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt (100%) rename components/service/{fretboard-temp => fretboard}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%) diff --git a/components/service/fretboard-temp/.gitignore b/components/service/fretboard/.gitignore similarity index 100% rename from components/service/fretboard-temp/.gitignore rename to components/service/fretboard/.gitignore diff --git a/components/service/fretboard-temp/README.md b/components/service/fretboard/README.md similarity index 100% rename from components/service/fretboard-temp/README.md rename to components/service/fretboard/README.md diff --git a/components/service/fretboard-temp/build.gradle b/components/service/fretboard/build.gradle similarity index 100% rename from components/service/fretboard-temp/build.gradle rename to components/service/fretboard/build.gradle diff --git a/components/service/fretboard-temp/proguard-rules.pro b/components/service/fretboard/proguard-rules.pro similarity index 100% rename from components/service/fretboard-temp/proguard-rules.pro rename to components/service/fretboard/proguard-rules.pro diff --git a/components/service/fretboard-temp/src/main/AndroidManifest.xml b/components/service/fretboard/src/main/AndroidManifest.xml similarity index 100% rename from components/service/fretboard-temp/src/main/AndroidManifest.xml rename to components/service/fretboard/src/main/AndroidManifest.xml diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/Experiment.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/Experiment.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/Experiment.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/Experiment.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/Fretboard.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/Fretboard.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/Fretboard.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/Fretboard.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt diff --git a/components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt b/components/service/fretboard/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt similarity index 100% rename from components/service/fretboard-temp/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt rename to components/service/fretboard/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt diff --git a/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt b/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt similarity index 100% rename from components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt rename to components/service/fretboard/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt diff --git a/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt b/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt similarity index 100% rename from components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt rename to components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt diff --git a/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt b/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt similarity index 100% rename from components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt rename to components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt diff --git a/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt b/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt similarity index 100% rename from components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt rename to components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt diff --git a/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt b/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt similarity index 100% rename from components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt rename to components/service/fretboard/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt diff --git a/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt b/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt similarity index 100% rename from components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt rename to components/service/fretboard/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt diff --git a/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt b/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt similarity index 100% rename from components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt rename to components/service/fretboard/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt diff --git a/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt b/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt similarity index 100% rename from components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt rename to components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt diff --git a/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt b/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt similarity index 100% rename from components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt rename to components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt diff --git a/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt b/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt similarity index 100% rename from components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt rename to components/service/fretboard/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt diff --git a/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt b/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt similarity index 100% rename from components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt rename to components/service/fretboard/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt diff --git a/components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt b/components/service/fretboard/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt similarity index 100% rename from components/service/fretboard-temp/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt rename to components/service/fretboard/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt diff --git a/components/service/fretboard-temp/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/components/service/fretboard/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from components/service/fretboard-temp/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to components/service/fretboard/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker From 077f0aca1db5a9da080e4f5ff0547d4684b965fd Mon Sep 17 00:00:00 2001 From: Georg Fritzsche Date: Fri, 8 Mar 2019 16:15:29 +0800 Subject: [PATCH 4/7] Add components/service/experiments to global files --- .buildconfig.yml | 4 ++++ CODEOWNERS | 3 +++ README.md | 2 ++ 3 files changed, 9 insertions(+) diff --git a/.buildconfig.yml b/.buildconfig.yml index 3ccb64e0671..91117d7b1c9 100644 --- a/.buildconfig.yml +++ b/.buildconfig.yml @@ -188,6 +188,10 @@ projects: path: components/service/fretboard description: 'An Android framework for segmenting users in order to run A/B tests and rollout features gradually.' publish: true + service-experiments: + path: components/service/experiments + description: 'An Android SDK for running experiments on user segments in multiple branches.' + publish: true service-glean: path: components/service/glean description: 'A client-side telemetry SDK for collecting metrics and sending them to the Mozilla telemetry service' diff --git a/CODEOWNERS b/CODEOWNERS index fde49bedc91..17c2b963757 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -23,6 +23,9 @@ /components/service/glean/ @mozilla-mobile/telemetry /samples/glean/ @mozilla-mobile/telemetry +# Experiments library +/components/service/experiments/ @mozilla-mobile/telemetry + # Release Engineering pipeline /automation/ @mozilla-mobile/releng @mozilla-mobile/act /CODEOWNERS @mozilla-mobile/releng @mozilla-mobile/act diff --git a/README.md b/README.md index 3d4f0c4d390..bc413d6475b 100644 --- a/README.md +++ b/README.md @@ -162,6 +162,8 @@ _Components and libraries to interact with backend services._ * 🔴 [**Glean**](components/service/glean/README.md) - A client-side telemetry SDK for collecting metrics and sending them to Mozilla's telemetry service (eventually replacing [service-telemetry](components/service/telemetry/README.md)). +* 🔴 [**Experiments**](components/service/experiments/README.md) - An Android SDK for running experiments on user segments in multiple branches. + * 🔴 [**Pocket**](components/service/pocket/README.md) - A library for communicating with the Pocket API. * 🔵 [**Telemetry**](components/service/telemetry/README.md) - A generic library for sending telemetry pings from Android applications to Mozilla's telemetry service. From c6f379adc7cfc46e8d9c429c1b92dedbd16f9c5a Mon Sep 17 00:00:00 2001 From: Georg Fritzsche Date: Fri, 8 Mar 2019 16:44:28 +0800 Subject: [PATCH 5/7] Mass rename (F|f)retboard to (E|e)xperiments inside experiments/ --- components/service/experiments/README.md | 70 ++++----- .../experiments/src/main/AndroidManifest.xml | 2 +- .../DeviceUuidFactory.kt | 4 +- .../{fretboard => experiments}/Experiment.kt | 2 +- .../ExperimentDescriptor.kt | 2 +- .../ExperimentDownloadException.kt | 2 +- .../ExperimentEvaluator.kt | 4 +- .../ExperimentPayload.kt | 2 +- .../ExperimentSource.kt | 4 +- .../ExperimentStorage.kt | 2 +- .../ExperimentsSnapshot.kt | 2 +- .../{fretboard => experiments}/Fretboard.kt | 6 +- .../JSONExperimentParser.kt | 2 +- .../ValuesProvider.kt | 2 +- .../jobscheduler/JobSchedulerSyncScheduler.kt | 2 +- .../scheduler/jobscheduler/SyncJob.kt | 12 +- .../scheduler/workmanager/SyncWorker.kt | 12 +- .../workmanager/WorkManagerSyncScheduler.kt | 4 +- .../source/kinto/KintoClient.kt | 4 +- .../source/kinto/KintoExperimentSource.kt | 10 +- .../source/kinto/SignatureVerifier.kt | 8 +- .../storage/flatfile/ExperimentsSerializer.kt | 8 +- .../flatfile/FlatFileExperimentStorage.kt | 6 +- .../DeviceUuidFactoryTest.kt | 2 +- .../ExperimentEvaluatorTest.kt | 2 +- .../ExperimentPayloadTest.kt | 2 +- .../ExperimentTest.kt | 2 +- .../FretboardTest.kt | 144 +++++++++--------- .../JSONExperimentParserTest.kt | 2 +- .../ValuesProviderTest.kt | 2 +- .../source/kinto/KintoClientTest.kt | 4 +- .../source/kinto/KintoExperimentSourceTest.kt | 6 +- .../source/kinto/SignatureVerifierTest.kt | 8 +- .../flatfile/ExperimentsSerializerTest.kt | 6 +- .../flatfile/FlatFileExperimentStorageTest.kt | 6 +- 35 files changed, 179 insertions(+), 179 deletions(-) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/DeviceUuidFactory.kt (95%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/Experiment.kt (98%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/ExperimentDescriptor.kt (87%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/ExperimentDownloadException.kt (90%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/ExperimentEvaluator.kt (98%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/ExperimentPayload.kt (98%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/ExperimentSource.kt (86%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/ExperimentStorage.kt (93%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/ExperimentsSnapshot.kt (91%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/Fretboard.kt (98%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/JSONExperimentParser.kt (99%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/ValuesProvider.kt (98%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt (95%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/scheduler/jobscheduler/SyncJob.kt (74%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/scheduler/workmanager/SyncWorker.kt (58%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/scheduler/workmanager/WorkManagerSyncScheduler.kt (90%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/source/kinto/KintoClient.kt (95%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/source/kinto/KintoExperimentSource.kt (91%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/source/kinto/SignatureVerifier.kt (97%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/storage/flatfile/ExperimentsSerializer.kt (89%) rename components/service/experiments/src/main/java/mozilla/components/service/{fretboard => experiments}/storage/flatfile/FlatFileExperimentStorage.kt (89%) rename components/service/experiments/src/test/java/mozilla/components/service/{fretboard => experiments}/DeviceUuidFactoryTest.kt (97%) rename components/service/experiments/src/test/java/mozilla/components/service/{fretboard => experiments}/ExperimentEvaluatorTest.kt (99%) rename components/service/experiments/src/test/java/mozilla/components/service/{fretboard => experiments}/ExperimentPayloadTest.kt (98%) rename components/service/experiments/src/test/java/mozilla/components/service/{fretboard => experiments}/ExperimentTest.kt (96%) rename components/service/experiments/src/test/java/mozilla/components/service/{fretboard => experiments}/FretboardTest.kt (82%) rename components/service/experiments/src/test/java/mozilla/components/service/{fretboard => experiments}/JSONExperimentParserTest.kt (99%) rename components/service/experiments/src/test/java/mozilla/components/service/{fretboard => experiments}/ValuesProviderTest.kt (97%) rename components/service/experiments/src/test/java/mozilla/components/service/{fretboard => experiments}/source/kinto/KintoClientTest.kt (95%) rename components/service/experiments/src/test/java/mozilla/components/service/{fretboard => experiments}/source/kinto/KintoExperimentSourceTest.kt (97%) rename components/service/experiments/src/test/java/mozilla/components/service/{fretboard => experiments}/source/kinto/SignatureVerifierTest.kt (99%) rename components/service/experiments/src/test/java/mozilla/components/service/{fretboard => experiments}/storage/flatfile/ExperimentsSerializerTest.kt (97%) rename components/service/experiments/src/test/java/mozilla/components/service/{fretboard => experiments}/storage/flatfile/FlatFileExperimentStorageTest.kt (96%) diff --git a/components/service/experiments/README.md b/components/service/experiments/README.md index b775f062c95..b04f48d7890 100644 --- a/components/service/experiments/README.md +++ b/components/service/experiments/README.md @@ -1,6 +1,6 @@ -# [Android Components](../../../README.md) > Service > Fretboard +# [Android Components](../../../README.md) > Service > Experiments -An Android framework for segmenting users in order to run A/B tests and rollout features gradually. +An Android SDK for running experiments on user segments in multiple branches. ## Usage @@ -9,20 +9,20 @@ An Android framework for segmenting users in order to run A/B tests and rollout Use Gradle to download the library from [maven.mozilla.org](https://maven.mozilla.org/) ([Setup repository](../../../README.md#maven-repository)): ```Groovy -implementation "org.mozilla.components:service-fretboard:{latest-version}" +implementation "org.mozilla.components:service-experiments:{latest-version}" ``` -### Creating Fretboard instance -In order to use the library, first you have to create a new `Fretboard` instance. You do this once per app launch -(typically in your `Application` class `onCreate` method). You simply have to instantiate the `Fretboard` class and +### Creating an Experiments instance +In order to use the library, first you have to create a new `Experiments` instance. You do this once per app launch +(typically in your `Application` class `onCreate` method). You simply have to instantiate the `Experiments` class and provide the `ExperimentStorage` and `ExperimentSource` implementations, like this: ```Kotlin class SampleApp : Application() { - lateinit var fretboard: Fretboard + lateinit var experiments: Experiments override fun onCreate() { - fretboard = Fretboard( + experiments = Experiments( experimentSource, experimentStorage ) @@ -31,46 +31,46 @@ class SampleApp : Application() { ``` #### Using Kinto as experiment source -Fretboard includes a default source implementation for a Kinto backend, which you can use like this: +Experiments includes a default source implementation for a Kinto backend, which you can use like this: ```Kotlin // Specify which HTTP (Fetch) client to use val httpClient = GeckoViewFetchClient(context) -val fretboard = Fretboard( +val experiments = Experiments( KintoExperimentSource(baseUrl, bucketName, collectionName, httpClient), experimentStorage ) ``` #### Using a JSON file as experiment storage -Fretboard includes support for flat JSON files as storage mechanism out of the box: +Experiments includes support for flat JSON files as storage mechanism out of the box: ```Kotlin -val fretboard = Fretboard( +val experiments = Experiments( experimentSource, FlatFileExperimentStorage(File(context.filesDir, "experiments.json")) ) ``` ### Fetching experiments from disk -After instantiating `Fretboard`, in order to load the list of already downloaded +After instantiating `Experiments`, in order to load the list of already downloaded experiments from disk, you need to call the `loadExperiments` method (don't call it on the UI thread, this example uses a coroutine): ```Kotlin launch(CommonPool) { - fretboard.loadExperiments() + experiments.loadExperiments() } ``` ### Updating experiment list -Fretboard provides two ways of updating the downloaded experiment list from the server: the first one is to directly -call `updateExperiments` on a `Fretboard` instance, which forces experiments to be updated immediately and synchronously +Experiments provides two ways of updating the downloaded experiment list from the server: the first one is to directly +call `updateExperiments` on a `Experiments` instance, which forces experiments to be updated immediately and synchronously (do not call this on the main thread), like this: ```Kotlin -fretboard.updateExperiments() +experiments.updateExperiments() ``` The second one is to use the provided `JobScheduler`-based scheduler, like this: @@ -79,13 +79,13 @@ val scheduler = JobSchedulerSyncScheduler(context) scheduler.schedule(EXPERIMENTS_JOB_ID, ComponentName(this, ExperimentsSyncService::class.java)) ``` -Where `ExperimentsSyncService` is a subclass of `SyncJob` you create like this, providing the `Fretboard` instance via the -`getFretboard` method: +Where `ExperimentsSyncService` is a subclass of `SyncJob` you create like this, providing the `Experiments` instance via the +`getExperiments` method: ```Kotlin class ExperimentsSyncService : SyncJob() { - override fun getFretboard(): Fretboard { - return fretboard + override fun getExperiments(): Experiments { + return experiments } } ``` @@ -99,50 +99,50 @@ And then you have to register it on the manifest, just like any other `JobServic ``` ### Checking if a user is part of an experiment -In order to check if a user is part of a specific experiment, Fretboard provides two APIs: a Kotlin-friendly +In order to check if a user is part of a specific experiment, Experiments provides two APIs: a Kotlin-friendly `withExperiment` API and a more Java-like `isInExperiment`. In both cases you pass an instance of `ExperimentDescriptor` with the name of the experiment you want to check: ```Kotlin val descriptor = ExperimentDescriptor("first-experiment-name") -fretboard.withExperiment(descriptor) { +experiments.withExperiment(descriptor) { someButton.setBackgroundColor(Color.RED) } -otherButton.isEnabled = fretboard.isInExperiment(descriptor) +otherButton.isEnabled = experiments.isInExperiment(descriptor) ``` ### Getting experiment metadata -Fretboard allows experiments to carry associated metadata, which can be retrieved using the Kotlin-friendly +Experiments allows experiments to carry associated metadata, which can be retrieved using the Kotlin-friendly `withExperiment` API or the more Java-like `getExperiment` API, like this: ```Kotlin val descriptor = ExperimentDescriptor("first-experiment-name") -fretboard.withExperiment(descriptor) { +experiments.withExperiment(descriptor) { toolbar.setColor(Color.parseColor(it.payload?.get("color") as String)) } -textView.setText(fretboard.getExperiment(descriptor)?.payload?.get("message")) +textView.setText(experiments.getExperiment(descriptor)?.payload?.get("message")) ``` ### Setting override values -Fretboard allows you to force activate / deactivate a specific experiment via `setOverride`, you +Experiments allows you to force activate / deactivate a specific experiment via `setOverride`, you simply have to pass true to activate it, false to deactivate: ```Kotlin val descriptor = ExperimentDescriptor("first-experiment-name") -fretboard.setOverride(context, descriptor, true) +experiments.setOverride(context, descriptor, true) ``` You can also clear an override for an experiment or all overrides: ```Kotlin val descriptor = ExperimentDescriptor("first-experiment-name") -fretboard.clearOverride(context, descriptor) -fretboard.clearAllOverrides(context) +experiments.clearOverride(context, descriptor) +experiments.clearAllOverrides(context) ``` ### Filters -Fretboard allows you to specify the following filters: +Experiments allows you to specify the following filters: - Buckets: Every user is in one of 100 buckets (0-99). For every experiment you can set up a min and max value (0 <= min <= max <= 100). The bounds are [min, max). - Both max and min are optional. For example, specifying only min = 0 or only max = 100 includes all users - 0-100 includes all users (as opposed to 0-99) @@ -158,16 +158,16 @@ Fretboard allows you to specify the following filters: - region: custom region, different from the one from the default locale (like a GeoIP, or something similar). - release channel: release channel of the app (alpha, beta, etc) -For region and release channel to work you must provide a `ValuesProvider` implementation when creating the `Fretboard` instance, as detailed below +For region and release channel to work you must provide a `ValuesProvider` implementation when creating the `Experiments` instance, as detailed below ### Specifying custom values for filters -Additionally, Fretboard allows you to specify a custom `ValuesProvider` object in order to return a custom region, +Additionally, Experiments allows you to specify a custom `ValuesProvider` object in order to return a custom region, different from the one of the current locale (perhaps doing a GeoIP or something like that), or the app relase channel (alpha, beta, etc). It also allows you to override the values for other experiment properties (such as the appId, country, etc): ```Kotlin -val fretboard = Fretboard( +val experiments = Experiments( experimentSource, experimentStorage, object : ValuesProvider { diff --git a/components/service/experiments/src/main/AndroidManifest.xml b/components/service/experiments/src/main/AndroidManifest.xml index 67c913482d8..3b94ac66d8f 100644 --- a/components/service/experiments/src/main/AndroidManifest.xml +++ b/components/service/experiments/src/main/AndroidManifest.xml @@ -2,4 +2,4 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + package="mozilla.components.service.experiments" /> diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/DeviceUuidFactory.kt similarity index 95% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/DeviceUuidFactory.kt index 6fbc84b2028..c4fcc45eabf 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/DeviceUuidFactory.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/DeviceUuidFactory.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments import android.content.Context import java.util.UUID @@ -38,7 +38,7 @@ internal class DeviceUuidFactory(context: Context) { } companion object { - private const val PREFS_FILE = "mozilla.components.service.fretboard" + private const val PREFS_FILE = "mozilla.components.service.experiments" private const val PREF_UUID_KEY = "device_uuid" } } diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/Experiment.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/Experiment.kt similarity index 98% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/Experiment.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/Experiment.kt index e7c6c0d04f4..e982721814f 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/Experiment.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/Experiment.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments /** * Represents an A/B test experiment, diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentDescriptor.kt similarity index 87% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentDescriptor.kt index 6b7a91d8cc9..7ab5e23eeaa 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentDescriptor.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentDescriptor.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments /** * Class used to identify an experiment diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentDownloadException.kt similarity index 90% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentDownloadException.kt index 26346f531a7..1bda6dc13fa 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentDownloadException.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentDownloadException.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments /** * Exception while downloading experiments from the server diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentEvaluator.kt similarity index 98% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentEvaluator.kt index aaaf37c2426..6ac36296d6c 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentEvaluator.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentEvaluator.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments import android.annotation.SuppressLint import android.content.Context @@ -183,6 +183,6 @@ internal class ExperimentEvaluator(private val valuesProvider: ValuesProvider = companion object { private const val MAX_BUCKET = 100L - private const val OVERRIDES_PREF_NAME = "mozilla.components.service.fretboard.overrides" + private const val OVERRIDES_PREF_NAME = "mozilla.components.service.experiments.overrides" } } diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentPayload.kt similarity index 98% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentPayload.kt index a6e4a681945..e2fe1c63820 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentPayload.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentPayload.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments /** * Class which represents an experiment associated data diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentSource.kt similarity index 86% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentSource.kt index bec219176ea..1fc88e8d671 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentSource.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentSource.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments /** * Represents a location where experiments are stored @@ -13,7 +13,7 @@ interface ExperimentSource { * Requests new experiments from the source, * parsing the response into experiments * - * @param client Http client to use, provided by Fretboard + * @param client Http client to use, provided by Experiments * @param snapshot list of already downloaded experiments * (in order to process a diff response, for example) * @return modified list of experiments diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentStorage.kt similarity index 93% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentStorage.kt index 91d7e3155d4..0fa31d3d3a9 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentStorage.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentStorage.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments /** * Represents a location where experiments diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentsSnapshot.kt similarity index 91% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentsSnapshot.kt index 753e95d4a10..d52e9a85cec 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ExperimentsSnapshot.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ExperimentsSnapshot.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments /** * Represents an experiment sync result diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/Fretboard.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/Fretboard.kt similarity index 98% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/Fretboard.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/Fretboard.kt index 86686468309..935b88718d4 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/Fretboard.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/Fretboard.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments import android.content.Context import mozilla.components.support.base.log.logger.Logger @@ -15,7 +15,7 @@ import mozilla.components.support.base.log.logger.Logger * @param valuesProvider provider for the device's values */ @Suppress("TooManyFunctions") -class Fretboard( +class Experiments( private val source: ExperimentSource, private val storage: ExperimentStorage, valuesProvider: ValuesProvider = ValuesProvider() @@ -196,6 +196,6 @@ class Fretboard( } companion object { - private const val LOG_TAG = "fretboard" + private const val LOG_TAG = "experiments" } } diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/JSONExperimentParser.kt similarity index 99% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/JSONExperimentParser.kt index e2a7571be1e..27fee2ec916 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/JSONExperimentParser.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/JSONExperimentParser.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments import mozilla.components.support.ktx.android.org.json.putIfNotNull import mozilla.components.support.ktx.android.org.json.sortKeys diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ValuesProvider.kt similarity index 98% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/ValuesProvider.kt index 6bb94420643..6b9cdc020ed 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/ValuesProvider.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/ValuesProvider.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments import android.content.Context import android.os.Build diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt similarity index 95% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt index 03b15e9c576..c471eb9f27f 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/scheduler/jobscheduler/JobSchedulerSyncScheduler.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.scheduler.jobscheduler +package mozilla.components.service.experiments.scheduler.jobscheduler import android.app.job.JobInfo import android.app.job.JobScheduler diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/scheduler/jobscheduler/SyncJob.kt similarity index 74% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/scheduler/jobscheduler/SyncJob.kt index 380ce4d7d7f..ee2a316685b 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/jobscheduler/SyncJob.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/scheduler/jobscheduler/SyncJob.kt @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.scheduler.jobscheduler +package mozilla.components.service.experiments.scheduler.jobscheduler import android.app.job.JobParameters import android.app.job.JobService -import mozilla.components.service.fretboard.Fretboard +import mozilla.components.service.experiments.Experiments import java.util.concurrent.Executors /** @@ -18,7 +18,7 @@ abstract class SyncJob : JobService() { override fun onStartJob(params: JobParameters): Boolean { executor.execute { try { - getFretboard().updateExperiments() + getExperiments().updateExperiments() } catch (e: InterruptedException) { // Cancel thread } finally { @@ -34,10 +34,10 @@ abstract class SyncJob : JobService() { } /** - * Used to provide the instance of Fretboard + * Used to provide the instance of Experiments * the app is using * - * @return current Fretboard instance + * @return current Experiments instance */ - abstract fun getFretboard(): Fretboard + abstract fun getExperiments(): Experiments } diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/scheduler/workmanager/SyncWorker.kt similarity index 58% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/scheduler/workmanager/SyncWorker.kt index 263da0692f7..0078fe675d3 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/SyncWorker.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/scheduler/workmanager/SyncWorker.kt @@ -2,23 +2,23 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.scheduler.workmanager +package mozilla.components.service.experiments.scheduler.workmanager import android.content.Context import androidx.work.Worker import androidx.work.WorkerParameters -import mozilla.components.service.fretboard.Fretboard +import mozilla.components.service.experiments.Experiments abstract class SyncWorker(context: Context, params: WorkerParameters) : Worker(context, params) { override fun doWork(): Result { - return if (fretboard.updateExperiments()) Result.success() else Result.retry() + return if (experiments.updateExperiments()) Result.success() else Result.retry() } /** - * Used to provide the instance of Fretboard + * Used to provide the instance of Experiments * the app is using * - * @return current Fretboard instance + * @return current Experiments instance */ - abstract val fretboard: Fretboard + abstract val experiments: Experiments } diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/scheduler/workmanager/WorkManagerSyncScheduler.kt similarity index 90% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/scheduler/workmanager/WorkManagerSyncScheduler.kt index 79948855c2c..1c38f520683 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/scheduler/workmanager/WorkManagerSyncScheduler.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/scheduler/workmanager/WorkManagerSyncScheduler.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.scheduler.workmanager +package mozilla.components.service.experiments.scheduler.workmanager import androidx.work.Constraints import androidx.work.ExistingPeriodicWorkPolicy @@ -37,6 +37,6 @@ class WorkManagerSyncScheduler { } companion object { - private const val TAG = "mozilla.components.service.fretboard" + private const val TAG = "mozilla.components.service.experiments" } } diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/source/kinto/KintoClient.kt similarity index 95% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/source/kinto/KintoClient.kt index 66ff8efab4f..47defdfed7d 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoClient.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/source/kinto/KintoClient.kt @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.source.kinto +package mozilla.components.service.experiments.source.kinto import mozilla.components.concept.fetch.Client import mozilla.components.concept.fetch.MutableHeaders import mozilla.components.concept.fetch.Request import mozilla.components.concept.fetch.success -import mozilla.components.service.fretboard.ExperimentDownloadException +import mozilla.components.service.experiments.ExperimentDownloadException import java.io.IOException /** diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/source/kinto/KintoExperimentSource.kt similarity index 91% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/source/kinto/KintoExperimentSource.kt index 5b5c4cedae9..8dfe64adfa2 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSource.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/source/kinto/KintoExperimentSource.kt @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.source.kinto +package mozilla.components.service.experiments.source.kinto import mozilla.components.concept.fetch.Client -import mozilla.components.service.fretboard.ExperimentDownloadException -import mozilla.components.service.fretboard.ExperimentSource -import mozilla.components.service.fretboard.ExperimentsSnapshot -import mozilla.components.service.fretboard.JSONExperimentParser +import mozilla.components.service.experiments.ExperimentDownloadException +import mozilla.components.service.experiments.ExperimentSource +import mozilla.components.service.experiments.ExperimentsSnapshot +import mozilla.components.service.experiments.JSONExperimentParser import org.json.JSONException import org.json.JSONObject diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/source/kinto/SignatureVerifier.kt similarity index 97% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/source/kinto/SignatureVerifier.kt index 42f5f58c9f0..21ed45af531 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifier.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/source/kinto/SignatureVerifier.kt @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.source.kinto +package mozilla.components.service.experiments.source.kinto import android.util.Base64 import mozilla.components.concept.fetch.Client import mozilla.components.concept.fetch.Request -import mozilla.components.service.fretboard.Experiment -import mozilla.components.service.fretboard.ExperimentDownloadException -import mozilla.components.service.fretboard.JSONExperimentParser +import mozilla.components.service.experiments.Experiment +import mozilla.components.service.experiments.ExperimentDownloadException +import mozilla.components.service.experiments.JSONExperimentParser import org.json.JSONArray import org.json.JSONObject import java.io.ByteArrayInputStream diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/storage/flatfile/ExperimentsSerializer.kt similarity index 89% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/storage/flatfile/ExperimentsSerializer.kt index 10cac94844e..07e88461517 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializer.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/storage/flatfile/ExperimentsSerializer.kt @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.storage.flatfile +package mozilla.components.service.experiments.storage.flatfile -import mozilla.components.service.fretboard.Experiment -import mozilla.components.service.fretboard.JSONExperimentParser -import mozilla.components.service.fretboard.ExperimentsSnapshot +import mozilla.components.service.experiments.Experiment +import mozilla.components.service.experiments.JSONExperimentParser +import mozilla.components.service.experiments.ExperimentsSnapshot import org.json.JSONArray import org.json.JSONException import org.json.JSONObject diff --git a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/storage/flatfile/FlatFileExperimentStorage.kt similarity index 89% rename from components/service/experiments/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/storage/flatfile/FlatFileExperimentStorage.kt index 5f704dcb830..f01c8c0294e 100644 --- a/components/service/experiments/src/main/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorage.kt +++ b/components/service/experiments/src/main/java/mozilla/components/service/experiments/storage/flatfile/FlatFileExperimentStorage.kt @@ -2,11 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.storage.flatfile +package mozilla.components.service.experiments.storage.flatfile import android.util.AtomicFile -import mozilla.components.service.fretboard.ExperimentStorage -import mozilla.components.service.fretboard.ExperimentsSnapshot +import mozilla.components.service.experiments.ExperimentStorage +import mozilla.components.service.experiments.ExperimentsSnapshot import org.json.JSONException import java.io.FileNotFoundException import java.io.File diff --git a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/DeviceUuidFactoryTest.kt similarity index 97% rename from components/service/experiments/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/DeviceUuidFactoryTest.kt index bafd21dc1a4..35ee7e8cf71 100644 --- a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/DeviceUuidFactoryTest.kt +++ b/components/service/experiments/src/test/java/mozilla/components/service/experiments/DeviceUuidFactoryTest.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments import android.content.Context import android.content.SharedPreferences diff --git a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentEvaluatorTest.kt similarity index 99% rename from components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentEvaluatorTest.kt index a6c11879fc7..34651b8b025 100644 --- a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentEvaluatorTest.kt +++ b/components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentEvaluatorTest.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments import android.content.Context import android.content.SharedPreferences diff --git a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentPayloadTest.kt similarity index 98% rename from components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentPayloadTest.kt index 2fa94bd64bc..dfb76c9c316 100644 --- a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentPayloadTest.kt +++ b/components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentPayloadTest.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments import org.junit.Assert.assertEquals import org.junit.Assert.assertNull diff --git a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentTest.kt similarity index 96% rename from components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentTest.kt index d11103b8d9b..8ac29520c19 100644 --- a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/ExperimentTest.kt +++ b/components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentTest.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse diff --git a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/FretboardTest.kt similarity index 82% rename from components/service/experiments/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/FretboardTest.kt index 49982756591..2841a1f10af 100644 --- a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/FretboardTest.kt +++ b/components/service/experiments/src/test/java/mozilla/components/service/experiments/FretboardTest.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments import android.content.Context import android.content.SharedPreferences @@ -10,7 +10,7 @@ import android.content.pm.PackageInfo import android.content.pm.PackageManager import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking -import mozilla.components.service.fretboard.storage.flatfile.FlatFileExperimentStorage +import mozilla.components.service.experiments.storage.flatfile.FlatFileExperimentStorage import mozilla.components.support.test.any import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse @@ -31,13 +31,13 @@ import kotlin.reflect.full.functions import kotlin.reflect.jvm.isAccessible @RunWith(RobolectricTestRunner::class) -class FretboardTest { +class ExperimentsTest { @Test fun loadExperiments() { val experimentSource = mock(ExperimentSource::class.java) val experimentStorage = mock(ExperimentStorage::class.java) - val fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.loadExperiments() + val instance = Experiments(experimentSource, experimentStorage) + instance.loadExperiments() verify(experimentStorage).retrieve() } @@ -45,10 +45,10 @@ class FretboardTest { fun updateExperimentsStorageNotLoaded() { val experimentSource = mock(ExperimentSource::class.java) val experimentStorage = mock(ExperimentStorage::class.java) - val fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.updateExperiments() + val instance = Experiments(experimentSource, experimentStorage) + instance.updateExperiments() verify(experimentStorage, times(1)).retrieve() - fretboard.updateExperiments() + instance.updateExperiments() verify(experimentStorage, times(1)).retrieve() } @@ -59,8 +59,8 @@ class FretboardTest { `when`(experimentSource.getExperiments(result)).thenReturn(ExperimentsSnapshot(listOf(Experiment("id", "name")), null)) val experimentStorage = mock(ExperimentStorage::class.java) `when`(experimentStorage.retrieve()).thenReturn(result) - val fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.updateExperiments() + val instance = Experiments(experimentSource, experimentStorage) + instance.updateExperiments() verify(experimentSource).getExperiments(result) verify(experimentStorage).save(ExperimentsSnapshot(listOf(Experiment("id", "name")), null)) } @@ -71,8 +71,8 @@ class FretboardTest { `when`(experimentSource.getExperiments(ExperimentsSnapshot(listOf(Experiment("id0", "name0")), null))).thenReturn(ExperimentsSnapshot(listOf(Experiment("id", "name")), null)) val experimentStorage = mock(ExperimentStorage::class.java) `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(listOf(Experiment("id0", "name0")), null)) - val fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.updateExperiments() + val instance = Experiments(experimentSource, experimentStorage) + instance.updateExperiments() verify(experimentSource).getExperiments(ExperimentsSnapshot(listOf(Experiment("id0", "name0")), null)) verify(experimentStorage).save(ExperimentsSnapshot(listOf(Experiment("id", "name")), null)) } @@ -86,11 +86,11 @@ class FretboardTest { Experiment("second-id", "second-name") ) `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(experiments, null)) - val fretboard = Fretboard(experimentSource, experimentStorage) - var returnedExperiments = fretboard.experiments + val instance = Experiments(experimentSource, experimentStorage) + var returnedExperiments = instance.experiments assertEquals(0, returnedExperiments.size) - fretboard.loadExperiments() - returnedExperiments = fretboard.experiments + instance.loadExperiments() + returnedExperiments = instance.experiments assertEquals(2, returnedExperiments.size) assertTrue(returnedExperiments.contains(experiments[0])) assertTrue(returnedExperiments.contains(experiments[1])) @@ -102,8 +102,8 @@ class FretboardTest { val experimentStorage = mock(ExperimentStorage::class.java) val experiments = listOf() `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(experiments, null)) - val fretboard = Fretboard(experimentSource, experimentStorage) - val returnedExperiments = fretboard.experiments + val instance = Experiments(experimentSource, experimentStorage) + val returnedExperiments = instance.experiments assertEquals(0, returnedExperiments.size) } @@ -134,8 +134,8 @@ class FretboardTest { ) ) `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(experiments, null)) - val fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.loadExperiments() + val instance = Experiments(experimentSource, experimentStorage) + instance.loadExperiments() val context = mock(Context::class.java) `when`(context.packageName).thenReturn("test.appId") @@ -152,7 +152,7 @@ class FretboardTest { `when`(packageManager.getPackageInfo(ArgumentMatchers.anyString(), ArgumentMatchers.anyInt())).thenReturn(packageInfo) `when`(context.packageManager).thenReturn(packageManager) - val activeExperiments = fretboard.getActiveExperiments(context) + val activeExperiments = instance.getActiveExperiments(context) assertEquals(2, activeExperiments.size) assertTrue(activeExperiments.any { it.id == "second-id" }) assertTrue(activeExperiments.any { it.id == "third-id" }) @@ -185,8 +185,8 @@ class FretboardTest { ) ) `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(experiments, null)) - val fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.loadExperiments() + val instance = Experiments(experimentSource, experimentStorage) + instance.loadExperiments() val context = mock(Context::class.java) `when`(context.packageName).thenReturn("test.appId") @@ -203,7 +203,7 @@ class FretboardTest { `when`(packageManager.getPackageInfo(ArgumentMatchers.anyString(), ArgumentMatchers.anyInt())).thenReturn(packageInfo) `when`(context.packageManager).thenReturn(packageManager) - val experimentsMap = fretboard.getExperimentsMap(context) + val experimentsMap = instance.getExperimentsMap(context) assertEquals(3, experimentsMap.size) println(experimentsMap.toString()) assertTrue(experimentsMap["first-name"] == false) @@ -224,8 +224,8 @@ class FretboardTest { ) ) `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(experiments, null)) - var fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.loadExperiments() + var instance = Experiments(experimentSource, experimentStorage) + instance.loadExperiments() val context = mock(Context::class.java) `when`(context.packageName).thenReturn("test.appId") @@ -242,7 +242,7 @@ class FretboardTest { `when`(packageManager.getPackageInfo(ArgumentMatchers.anyString(), ArgumentMatchers.anyInt())).thenReturn(packageInfo) `when`(context.packageManager).thenReturn(packageManager) - assertTrue(fretboard.isInExperiment(context, ExperimentDescriptor("first-name"))) + assertTrue(instance.isInExperiment(context, ExperimentDescriptor("first-name"))) experiments = listOf( Experiment("first-id", @@ -253,10 +253,10 @@ class FretboardTest { ) ) `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(experiments, null)) - fretboard = Fretboard(experimentSource, experimentStorage) + instance = Experiments(experimentSource, experimentStorage) - assertFalse(fretboard.isInExperiment(context, ExperimentDescriptor("first-name"))) - assertFalse(fretboard.isInExperiment(context, ExperimentDescriptor("other-name"))) + assertFalse(instance.isInExperiment(context, ExperimentDescriptor("first-name"))) + assertFalse(instance.isInExperiment(context, ExperimentDescriptor("other-name"))) } @Test @@ -272,8 +272,8 @@ class FretboardTest { ) ) `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(experiments, null)) - var fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.loadExperiments() + var instance = Experiments(experimentSource, experimentStorage) + instance.loadExperiments() val context = mock(Context::class.java) `when`(context.packageName).thenReturn("test.appId") @@ -291,7 +291,7 @@ class FretboardTest { `when`(context.packageManager).thenReturn(packageManager) var invocations = 0 - fretboard.withExperiment(context, ExperimentDescriptor("first-name")) { + instance.withExperiment(context, ExperimentDescriptor("first-name")) { invocations++ assertEquals(experiments[0], it) } @@ -306,16 +306,16 @@ class FretboardTest { ) ) `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(experiments, null)) - fretboard = Fretboard(experimentSource, experimentStorage) + instance = Experiments(experimentSource, experimentStorage) invocations = 0 - fretboard.withExperiment(context, ExperimentDescriptor("first-name")) { + instance.withExperiment(context, ExperimentDescriptor("first-name")) { invocations++ } assertEquals(0, invocations) invocations = 0 - fretboard.withExperiment(context, ExperimentDescriptor("other-name")) { + instance.withExperiment(context, ExperimentDescriptor("other-name")) { invocations++ } assertEquals(0, invocations) @@ -334,11 +334,11 @@ class FretboardTest { ) ) `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(experiments, null)) - val fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.loadExperiments() + val instance = Experiments(experimentSource, experimentStorage) + instance.loadExperiments() - assertEquals(experiments[0], fretboard.getExperiment(ExperimentDescriptor("first-name"))) - assertNull(fretboard.getExperiment(ExperimentDescriptor("other-name"))) + assertEquals(experiments[0], instance.getExperiment(ExperimentDescriptor("first-name"))) + assertNull(instance.getExperiment(ExperimentDescriptor("other-name"))) } @Test @@ -354,8 +354,8 @@ class FretboardTest { ) ) `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(experiments, null)) - val fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.loadExperiments() + val instance = Experiments(experimentSource, experimentStorage) + instance.loadExperiments() val context = mock(Context::class.java) `when`(context.packageName).thenReturn("test.appId") @@ -373,17 +373,17 @@ class FretboardTest { `when`(packageManager.getPackageInfo(ArgumentMatchers.anyString(), ArgumentMatchers.anyInt())).thenReturn(packageInfo) `when`(context.packageManager).thenReturn(packageManager) - assertTrue(fretboard.isInExperiment(context, ExperimentDescriptor("first-name"))) - fretboard.setOverride(context, ExperimentDescriptor("first-name"), false) + assertTrue(instance.isInExperiment(context, ExperimentDescriptor("first-name"))) + instance.setOverride(context, ExperimentDescriptor("first-name"), false) verify(prefsEditor).putBoolean("first-name", false) - fretboard.setOverride(context, ExperimentDescriptor("first-name"), true) + instance.setOverride(context, ExperimentDescriptor("first-name"), true) verify(prefsEditor).putBoolean("first-name", true) runBlocking(Dispatchers.Default) { - assertTrue(fretboard.isInExperiment(context, ExperimentDescriptor("first-name"))) - fretboard.setOverrideNow(context, ExperimentDescriptor("first-name"), false) + assertTrue(instance.isInExperiment(context, ExperimentDescriptor("first-name"))) + instance.setOverrideNow(context, ExperimentDescriptor("first-name"), false) verify(prefsEditor, times(2)).putBoolean("first-name", false) - fretboard.setOverrideNow(context, ExperimentDescriptor("first-name"), true) + instance.setOverrideNow(context, ExperimentDescriptor("first-name"), true) verify(prefsEditor, times(2)).putBoolean("first-name", true) } } @@ -401,8 +401,8 @@ class FretboardTest { ) ) `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(experiments, null)) - val fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.loadExperiments() + val instance = Experiments(experimentSource, experimentStorage) + instance.loadExperiments() val context = mock(Context::class.java) `when`(context.packageName).thenReturn("test.appId") @@ -421,14 +421,14 @@ class FretboardTest { `when`(packageManager.getPackageInfo(ArgumentMatchers.anyString(), ArgumentMatchers.anyInt())).thenReturn(packageInfo) `when`(context.packageManager).thenReturn(packageManager) - assertTrue(fretboard.isInExperiment(context, ExperimentDescriptor("first-name"))) - fretboard.setOverride(context, ExperimentDescriptor("first-name"), false) - fretboard.clearOverride(context, ExperimentDescriptor("first-name")) + assertTrue(instance.isInExperiment(context, ExperimentDescriptor("first-name"))) + instance.setOverride(context, ExperimentDescriptor("first-name"), false) + instance.clearOverride(context, ExperimentDescriptor("first-name")) verify(prefsEditor).remove("first-name") runBlocking(Dispatchers.Default) { - fretboard.setOverrideNow(context, ExperimentDescriptor("first-name"), false) - fretboard.clearOverrideNow(context, ExperimentDescriptor("first-name")) + instance.setOverrideNow(context, ExperimentDescriptor("first-name"), false) + instance.clearOverrideNow(context, ExperimentDescriptor("first-name")) verify(prefsEditor, times(2)).remove("first-name") } } @@ -446,8 +446,8 @@ class FretboardTest { ) ) `when`(experimentStorage.retrieve()).thenReturn(ExperimentsSnapshot(experiments, null)) - val fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.loadExperiments() + val instance = Experiments(experimentSource, experimentStorage) + instance.loadExperiments() val context = mock(Context::class.java) `when`(context.packageName).thenReturn("test.appId") @@ -466,14 +466,14 @@ class FretboardTest { `when`(packageManager.getPackageInfo(ArgumentMatchers.anyString(), ArgumentMatchers.anyInt())).thenReturn(packageInfo) `when`(context.packageManager).thenReturn(packageManager) - assertTrue(fretboard.isInExperiment(context, ExperimentDescriptor("first-name"))) - fretboard.setOverride(context, ExperimentDescriptor("first-name"), false) - fretboard.clearAllOverrides(context) + assertTrue(instance.isInExperiment(context, ExperimentDescriptor("first-name"))) + instance.setOverride(context, ExperimentDescriptor("first-name"), false) + instance.clearAllOverrides(context) verify(prefsEditor).clear() runBlocking(Dispatchers.Default) { - fretboard.setOverrideNow(context, ExperimentDescriptor("first-name"), false) - fretboard.clearAllOverridesNow(context) + instance.setOverrideNow(context, ExperimentDescriptor("first-name"), false) + instance.clearAllOverridesNow(context) verify(prefsEditor, times(2)).clear() } } @@ -486,8 +486,8 @@ class FretboardTest { }.`when`(source).getExperiments(any()) val storage = mock(ExperimentStorage::class.java) `when`(storage.retrieve()).thenReturn(ExperimentsSnapshot(listOf(), null)) - val fretboard = Fretboard(source, storage) - fretboard.updateExperiments() + val instance = Experiments(source, storage) + instance.updateExperiments() } @Test @@ -503,8 +503,8 @@ class FretboardTest { `when`(context.getSharedPreferences(ArgumentMatchers.anyString(), ArgumentMatchers.anyInt())).thenReturn(sharedPrefs) `when`(sharedPrefs.getString(ArgumentMatchers.anyString(), ArgumentMatchers.isNull())) .thenReturn("a94b1dab-030e-4b13-be15-cc80c1eda8b3") - val fretboard = Fretboard(experimentSource, experimentStorage) - assertTrue(fretboard.getUserBucket(context) == 54) + val instance = Experiments(experimentSource, experimentStorage) + assertTrue(instance.getUserBucket(context) == 54) } @Test @@ -512,17 +512,17 @@ class FretboardTest { val experimentSource = mock(ExperimentSource::class.java) val experimentStorage = mock(ExperimentStorage::class.java) - val fretboard1 = Fretboard(experimentSource, experimentStorage, object : ValuesProvider() { + val instance1 = Experiments(experimentSource, experimentStorage, object : ValuesProvider() { override fun getClientId(context: Context): String = "c641eacf-c30c-4171-b403-f077724e848a" }) - assertEquals(79, fretboard1.getUserBucket(RuntimeEnvironment.application)) + assertEquals(79, instance1.getUserBucket(RuntimeEnvironment.application)) - val fretboard2 = Fretboard(experimentSource, experimentStorage, object : ValuesProvider() { + val instance2 = Experiments(experimentSource, experimentStorage, object : ValuesProvider() { override fun getClientId(context: Context): String = "01a15650-9a5d-4383-a7ba-2f047b25c620" }) - assertEquals(55, fretboard2.getUserBucket(RuntimeEnvironment.application)) + assertEquals(55, instance2.getUserBucket(RuntimeEnvironment.application)) } @Test @@ -575,7 +575,7 @@ class FretboardTest { val experimentStorage = FlatFileExperimentStorage(file) - val fretboard = Fretboard(experimentSource, experimentStorage) - fretboard.loadExperiments() // Should not throw + val instance = Experiments(experimentSource, experimentStorage) + instance.loadExperiments() // Should not throw } } \ No newline at end of file diff --git a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/JSONExperimentParserTest.kt similarity index 99% rename from components/service/experiments/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/JSONExperimentParserTest.kt index 638948755a5..2f09fba2fbd 100644 --- a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/JSONExperimentParserTest.kt +++ b/components/service/experiments/src/test/java/mozilla/components/service/experiments/JSONExperimentParserTest.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments import org.json.JSONObject import org.junit.Assert.assertEquals diff --git a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/ValuesProviderTest.kt similarity index 97% rename from components/service/experiments/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/ValuesProviderTest.kt index 7905035d532..e96c145034b 100644 --- a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/ValuesProviderTest.kt +++ b/components/service/experiments/src/test/java/mozilla/components/service/experiments/ValuesProviderTest.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard +package mozilla.components.service.experiments import android.content.Context import org.junit.Assert.assertEquals diff --git a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/source/kinto/KintoClientTest.kt similarity index 95% rename from components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/source/kinto/KintoClientTest.kt index 353dcf0d71f..feb63680a65 100644 --- a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoClientTest.kt +++ b/components/service/experiments/src/test/java/mozilla/components/service/experiments/source/kinto/KintoClientTest.kt @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.source.kinto +package mozilla.components.service.experiments.source.kinto import mozilla.components.concept.fetch.Client import mozilla.components.concept.fetch.MutableHeaders import mozilla.components.concept.fetch.Response -import mozilla.components.service.fretboard.ExperimentDownloadException +import mozilla.components.service.experiments.ExperimentDownloadException import mozilla.components.support.test.any import mozilla.components.support.test.eq import org.junit.Assert.assertEquals diff --git a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/source/kinto/KintoExperimentSourceTest.kt similarity index 97% rename from components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/source/kinto/KintoExperimentSourceTest.kt index 1efc14783ab..7e7b457b67e 100644 --- a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/KintoExperimentSourceTest.kt +++ b/components/service/experiments/src/test/java/mozilla/components/service/experiments/source/kinto/KintoExperimentSourceTest.kt @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.source.kinto +package mozilla.components.service.experiments.source.kinto import mozilla.components.concept.fetch.Client import mozilla.components.concept.fetch.MutableHeaders import mozilla.components.concept.fetch.Response -import mozilla.components.service.fretboard.Experiment -import mozilla.components.service.fretboard.ExperimentsSnapshot +import mozilla.components.service.experiments.Experiment +import mozilla.components.service.experiments.ExperimentsSnapshot import mozilla.components.support.test.any import org.junit.Assert.assertEquals import org.junit.Assert.assertNull diff --git a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/source/kinto/SignatureVerifierTest.kt similarity index 99% rename from components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/source/kinto/SignatureVerifierTest.kt index f4548b7b586..ebb6608a210 100644 --- a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/source/kinto/SignatureVerifierTest.kt +++ b/components/service/experiments/src/test/java/mozilla/components/service/experiments/source/kinto/SignatureVerifierTest.kt @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.source.kinto +package mozilla.components.service.experiments.source.kinto import mozilla.components.lib.fetch.httpurlconnection.HttpURLConnectionClient -import mozilla.components.service.fretboard.Experiment -import mozilla.components.service.fretboard.ExperimentDownloadException -import mozilla.components.service.fretboard.JSONExperimentParser +import mozilla.components.service.experiments.Experiment +import mozilla.components.service.experiments.ExperimentDownloadException +import mozilla.components.service.experiments.JSONExperimentParser import okhttp3.mockwebserver.Dispatcher import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.MockWebServer diff --git a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/storage/flatfile/ExperimentsSerializerTest.kt similarity index 97% rename from components/service/experiments/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/storage/flatfile/ExperimentsSerializerTest.kt index 8d2040cba35..51094244f48 100644 --- a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/storage/flatfile/ExperimentsSerializerTest.kt +++ b/components/service/experiments/src/test/java/mozilla/components/service/experiments/storage/flatfile/ExperimentsSerializerTest.kt @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.storage.flatfile +package mozilla.components.service.experiments.storage.flatfile -import mozilla.components.service.fretboard.Experiment -import mozilla.components.service.fretboard.ExperimentsSnapshot +import mozilla.components.service.experiments.Experiment +import mozilla.components.service.experiments.ExperimentsSnapshot import org.json.JSONException import org.json.JSONObject import org.junit.Assert.assertEquals diff --git a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/storage/flatfile/FlatFileExperimentStorageTest.kt similarity index 96% rename from components/service/experiments/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/storage/flatfile/FlatFileExperimentStorageTest.kt index b5d64d35020..eb13cfdd452 100644 --- a/components/service/experiments/src/test/java/mozilla/components/service/fretboard/storage/flatfile/FlatFileExperimentStorageTest.kt +++ b/components/service/experiments/src/test/java/mozilla/components/service/experiments/storage/flatfile/FlatFileExperimentStorageTest.kt @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.service.fretboard.storage.flatfile +package mozilla.components.service.experiments.storage.flatfile -import mozilla.components.service.fretboard.Experiment -import mozilla.components.service.fretboard.ExperimentsSnapshot +import mozilla.components.service.experiments.Experiment +import mozilla.components.service.experiments.ExperimentsSnapshot import org.json.JSONObject import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse From 34a337cfb0c3adc259e51eddfbdf99eb3e8403e9 Mon Sep 17 00:00:00 2001 From: Georg Fritzsche Date: Fri, 8 Mar 2019 16:50:40 +0800 Subject: [PATCH 6/7] Add changelog entry --- docs/changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changelog.md b/docs/changelog.md index abbe3eb5d87..75cd11b2324 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -18,6 +18,9 @@ permalink: /changelog/ * **feature-downloads** * Fixing bug #2265. In some occasions, when trying to download a file, the download failed and the download notification shows "Unsuccessful download". +* **service-experiments** + * A new client-side experiments SDK for running segmenting user populations to run multi-branch experiments on them. This component is going to replace `service-fretboard`. The SDK is currently in development and the component is not ready to be used yet. + # 0.45.0 * [Commits](https://github.com/mozilla-mobile/android-components/compare/v0.44.0...v0.45.0) From b3b249afb6f5663c9acd4f4088db0749bdb1fc07 Mon Sep 17 00:00:00 2001 From: Georg Fritzsche Date: Fri, 8 Mar 2019 17:41:02 +0800 Subject: [PATCH 7/7] Fix file naming --- .../service/experiments/{Fretboard.kt => Experiments.kt} | 0 .../service/experiments/{FretboardTest.kt => ExperimentsTest.kt} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename components/service/experiments/src/main/java/mozilla/components/service/experiments/{Fretboard.kt => Experiments.kt} (100%) rename components/service/experiments/src/test/java/mozilla/components/service/experiments/{FretboardTest.kt => ExperimentsTest.kt} (100%) diff --git a/components/service/experiments/src/main/java/mozilla/components/service/experiments/Fretboard.kt b/components/service/experiments/src/main/java/mozilla/components/service/experiments/Experiments.kt similarity index 100% rename from components/service/experiments/src/main/java/mozilla/components/service/experiments/Fretboard.kt rename to components/service/experiments/src/main/java/mozilla/components/service/experiments/Experiments.kt diff --git a/components/service/experiments/src/test/java/mozilla/components/service/experiments/FretboardTest.kt b/components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentsTest.kt similarity index 100% rename from components/service/experiments/src/test/java/mozilla/components/service/experiments/FretboardTest.kt rename to components/service/experiments/src/test/java/mozilla/components/service/experiments/ExperimentsTest.kt