Skip to content

Commit 10cacef

Browse files
VinayGuthalVinayGuthal
authored
remove heartbeat unused apis (#3198)
* update * update * update
1 parent 64841c5 commit 10cacef

File tree

4 files changed

+0
-183
lines changed

4 files changed

+0
-183
lines changed

‎firebase-common/src/main/java/com/google/firebase/heartbeatinfo/DefaultHeartBeatInfo.java

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@
1717
import android.content.Context;
1818
import androidx.annotation.NonNull;
1919
import androidx.annotation.VisibleForTesting;
20-
import com.google.android.gms.tasks.Task;
21-
import com.google.android.gms.tasks.Tasks;
2220
import com.google.firebase.components.Component;
2321
import com.google.firebase.components.Dependency;
2422
import com.google.firebase.components.Lazy;
2523
import com.google.firebase.inject.Provider;
26-
import java.util.ArrayList;
27-
import java.util.List;
2824
import java.util.Set;
2925
import java.util.concurrent.Executor;
3026
import java.util.concurrent.LinkedBlockingQueue;
@@ -80,58 +76,6 @@ private DefaultHeartBeatInfo(Context context, Set<HeartBeatConsumer> consumers)
8076
return HeartBeat.NONE;
8177
}
8278

83-
@Override
84-
public Task<List<HeartBeatResult>> getAndClearStoredHeartBeatInfo() {
85-
return Tasks.call(
86-
backgroundExecutor,
87-
() -> {
88-
ArrayList<HeartBeatResult> heartBeatResults = new ArrayList<>();
89-
boolean shouldSendGlobalHeartBeat = false;
90-
HeartBeatInfoStorage storage = storageProvider.get();
91-
List<SdkHeartBeatResult> sdkHeartBeatResults = storage.getStoredHeartBeats(true);
92-
long lastGlobalHeartBeat = storage.getLastGlobalHeartBeat();
93-
HeartBeat heartBeat;
94-
for (SdkHeartBeatResult sdkHeartBeatResult : sdkHeartBeatResults) {
95-
shouldSendGlobalHeartBeat =
96-
HeartBeatInfoStorage.isSameDateUtc(
97-
lastGlobalHeartBeat, sdkHeartBeatResult.getMillis());
98-
if (shouldSendGlobalHeartBeat) {
99-
heartBeat = HeartBeat.COMBINED;
100-
} else {
101-
heartBeat = HeartBeat.SDK;
102-
}
103-
if (shouldSendGlobalHeartBeat) {
104-
lastGlobalHeartBeat = sdkHeartBeatResult.getMillis();
105-
}
106-
heartBeatResults.add(
107-
HeartBeatResult.create(
108-
sdkHeartBeatResult.getSdkName(), sdkHeartBeatResult.getMillis(), heartBeat));
109-
}
110-
if (lastGlobalHeartBeat > 0) {
111-
storage.updateGlobalHeartBeat(lastGlobalHeartBeat);
112-
}
113-
return heartBeatResults;
114-
});
115-
}
116-
117-
@Override
118-
public Task<Void> storeHeartBeatInfo(@NonNull String heartBeatTag) {
119-
if (consumers.size() <= 0) {
120-
return Tasks.forResult(null);
121-
}
122-
return Tasks.call(
123-
backgroundExecutor,
124-
() -> {
125-
long presentTime = System.currentTimeMillis();
126-
boolean shouldSendSdkHB =
127-
storageProvider.get().shouldSendSdkHeartBeat(heartBeatTag, presentTime);
128-
if (shouldSendSdkHB) {
129-
storageProvider.get().storeHeartBeatInformation(heartBeatTag, presentTime);
130-
}
131-
return null;
132-
});
133-
}
134-
13579
public static @NonNull Component<HeartBeatInfo> component() {
13680
return Component.builder(HeartBeatInfo.class)
13781
.add(Dependency.required(Context.class))

‎firebase-common/src/main/java/com/google/firebase/heartbeatinfo/HeartBeatInfo.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
package com.google.firebase.heartbeatinfo;
1616

1717
import androidx.annotation.NonNull;
18-
import com.google.android.gms.tasks.Task;
19-
import java.util.List;
2018

2119
/**
2220
* Class provides information about heartbeats.
@@ -49,10 +47,4 @@ public int getCode() {
4947

5048
@NonNull
5149
HeartBeat getHeartBeatCode(@NonNull String heartBeatTag);
52-
53-
@NonNull
54-
Task<Void> storeHeartBeatInfo(@NonNull String heartBeatTag);
55-
56-
@NonNull
57-
Task<List<HeartBeatResult>> getAndClearStoredHeartBeatInfo();
5850
}

‎firebase-common/src/test/java/com/google/firebase/heartbeatinfo/DefaultHeartBeatInfoTest.java

Lines changed: 0 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,14 @@
1515
package com.google.firebase.heartbeatinfo;
1616

1717
import static com.google.common.truth.Truth.assertThat;
18-
import static org.mockito.ArgumentMatchers.anyBoolean;
1918
import static org.mockito.ArgumentMatchers.anyLong;
2019
import static org.mockito.ArgumentMatchers.anyString;
2120
import static org.mockito.Mockito.mock;
22-
import static org.mockito.Mockito.times;
23-
import static org.mockito.Mockito.verify;
2421
import static org.mockito.Mockito.when;
2522

26-
import java.util.ArrayList;
2723
import java.util.HashSet;
2824
import java.util.List;
2925
import java.util.Set;
30-
import java.util.concurrent.ExecutionException;
3126
import java.util.concurrent.ExecutorService;
3227
import java.util.concurrent.LinkedBlockingQueue;
3328
import java.util.concurrent.ThreadPoolExecutor;
@@ -67,108 +62,6 @@ public void getHeartBeatCode_noHeartBeat() {
6762
assertThat(heartBeatInfo.getHeartBeatCode(testSdk).getCode()).isEqualTo(0);
6863
}
6964

70-
@Test
71-
public void whenNoSource_dontStoreHeartBeat() throws ExecutionException, InterruptedException {
72-
73-
DefaultHeartBeatInfo info = new DefaultHeartBeatInfo(() -> storage, new HashSet<>(), executor);
74-
info.storeHeartBeatInfo(testSdk).addOnCompleteListener(executor, storeOnCompleteListener);
75-
storeOnCompleteListener.await();
76-
verify(storage, times(0)).storeHeartBeatInformation(anyString(), anyLong());
77-
}
78-
79-
@Test
80-
public void storeHeartBeatCode_noHeartBeat() throws ExecutionException, InterruptedException {
81-
when(storage.shouldSendSdkHeartBeat(anyString(), anyLong())).thenReturn(Boolean.FALSE);
82-
when(storage.shouldSendGlobalHeartBeat(anyLong())).thenReturn(Boolean.FALSE);
83-
heartBeatInfo
84-
.storeHeartBeatInfo(testSdk)
85-
.addOnCompleteListener(executor, storeOnCompleteListener);
86-
storeOnCompleteListener.await();
87-
heartBeatInfo
88-
.getAndClearStoredHeartBeatInfo()
89-
.addOnCompleteListener(executor, getOnCompleteListener);
90-
List<HeartBeatResult> result = getOnCompleteListener.await();
91-
assertThat(result.size()).isEqualTo(0);
92-
}
93-
94-
@Test
95-
public void storeHeartBeatCode_sdkButNoGlobalHeartBeat()
96-
throws ExecutionException, InterruptedException {
97-
ArrayList<SdkHeartBeatResult> returnResults = new ArrayList<>();
98-
returnResults.add(SdkHeartBeatResult.create(testSdk, 1000000001));
99-
when(storage.shouldSendSdkHeartBeat(anyString(), anyLong())).thenReturn(Boolean.TRUE);
100-
when(storage.shouldSendGlobalHeartBeat(anyLong())).thenReturn(Boolean.FALSE);
101-
when(storage.getLastGlobalHeartBeat()).thenReturn((long) 1000000000);
102-
when(storage.getStoredHeartBeats(anyBoolean())).thenReturn(returnResults);
103-
heartBeatInfo
104-
.storeHeartBeatInfo(testSdk)
105-
.addOnCompleteListener(executor, storeOnCompleteListener);
106-
storeOnCompleteListener.await();
107-
heartBeatInfo
108-
.getAndClearStoredHeartBeatInfo()
109-
.addOnCompleteListener(executor, getOnCompleteListener);
110-
List<HeartBeatResult> results = getOnCompleteListener.await();
111-
verify(storage, times(1)).storeHeartBeatInformation(anyString(), anyLong());
112-
assertThat(results.size()).isEqualTo(1);
113-
assertThat(results.get(0))
114-
.isEqualTo(HeartBeatResult.create(testSdk, 1000000001, HeartBeatInfo.HeartBeat.SDK));
115-
verify(storage, times(1)).updateGlobalHeartBeat(1000000000);
116-
}
117-
118-
@Test
119-
public void storeHeartBeatCode_globalAndSDKHeartBeat()
120-
throws ExecutionException, InterruptedException {
121-
ArrayList<SdkHeartBeatResult> returnResults = new ArrayList<>();
122-
returnResults.add(SdkHeartBeatResult.create(testSdk, 100000000));
123-
when(storage.shouldSendSdkHeartBeat(anyString(), anyLong())).thenReturn(Boolean.TRUE);
124-
when(storage.shouldSendGlobalHeartBeat(anyLong())).thenReturn(Boolean.TRUE);
125-
when(storage.getLastGlobalHeartBeat()).thenReturn((long) 0);
126-
when(storage.getStoredHeartBeats(anyBoolean())).thenReturn(returnResults);
127-
heartBeatInfo
128-
.storeHeartBeatInfo(testSdk)
129-
.addOnCompleteListener(executor, storeOnCompleteListener);
130-
storeOnCompleteListener.await();
131-
heartBeatInfo
132-
.getAndClearStoredHeartBeatInfo()
133-
.addOnCompleteListener(executor, getOnCompleteListener);
134-
List<HeartBeatResult> results = getOnCompleteListener.await();
135-
verify(storage, times(1)).storeHeartBeatInformation(anyString(), anyLong());
136-
assertThat(results.size()).isEqualTo(1);
137-
assertThat(results.get(0))
138-
.isEqualTo(HeartBeatResult.create(testSdk, 100000000, HeartBeatInfo.HeartBeat.COMBINED));
139-
verify(storage, times(1)).updateGlobalHeartBeat(100000000);
140-
}
141-
142-
@Test
143-
public void storeHeartBeatCode_ThreeHeartBeats() throws ExecutionException, InterruptedException {
144-
ArrayList<SdkHeartBeatResult> returnResults = new ArrayList<>();
145-
returnResults.add(SdkHeartBeatResult.create(testSdk, 100000000));
146-
returnResults.add(SdkHeartBeatResult.create(testSdk, 200000000));
147-
returnResults.add(SdkHeartBeatResult.create(testSdk, 200002000));
148-
when(storage.shouldSendSdkHeartBeat(anyString(), anyLong())).thenReturn(Boolean.TRUE);
149-
when(storage.shouldSendGlobalHeartBeat(anyLong())).thenReturn(Boolean.TRUE);
150-
when(storage.getLastGlobalHeartBeat()).thenReturn((long) 0);
151-
when(storage.getStoredHeartBeats(anyBoolean())).thenReturn(returnResults);
152-
153-
heartBeatInfo
154-
.storeHeartBeatInfo(testSdk)
155-
.addOnCompleteListener(executor, storeOnCompleteListener);
156-
storeOnCompleteListener.await();
157-
heartBeatInfo
158-
.getAndClearStoredHeartBeatInfo()
159-
.addOnCompleteListener(executor, getOnCompleteListener);
160-
List<HeartBeatResult> results = getOnCompleteListener.await();
161-
verify(storage, times(1)).storeHeartBeatInformation(anyString(), anyLong());
162-
assertThat(results.size()).isEqualTo(3);
163-
assertThat(results.get(0))
164-
.isEqualTo(HeartBeatResult.create(testSdk, 100000000, HeartBeatInfo.HeartBeat.COMBINED));
165-
assertThat(results.get(1))
166-
.isEqualTo(HeartBeatResult.create(testSdk, 200000000, HeartBeatInfo.HeartBeat.COMBINED));
167-
assertThat(results.get(2))
168-
.isEqualTo(HeartBeatResult.create(testSdk, 200002000, HeartBeatInfo.HeartBeat.SDK));
169-
verify(storage, times(1)).updateGlobalHeartBeat(200000000);
170-
}
171-
17265
@Test
17366
public void getHeartBeatCode_sdkHeartBeat() {
17467
when(storage.shouldSendSdkHeartBeat(anyString(), anyLong())).thenReturn(Boolean.TRUE);

‎firebase-messaging/src/test/java/com/google/firebase/messaging/GmsRpcRoboTest.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import com.google.firebase.FirebaseApp;
3838
import com.google.firebase.FirebaseOptions;
3939
import com.google.firebase.heartbeatinfo.HeartBeatInfo;
40-
import com.google.firebase.heartbeatinfo.HeartBeatResult;
4140
import com.google.firebase.inject.Provider;
4241
import com.google.firebase.installations.FirebaseInstallationsApi;
4342
import com.google.firebase.installations.InstallationTokenResult;
@@ -47,7 +46,6 @@
4746
import com.google.firebase.messaging.testing.LibraryVersion;
4847
import com.google.firebase.platforminfo.UserAgentPublisher;
4948
import java.io.IOException;
50-
import java.util.List;
5149
import java.util.concurrent.TimeUnit;
5250
import org.junit.Before;
5351
import org.junit.Rule;
@@ -128,16 +126,6 @@ public void setUp() {
128126
public HeartBeat getHeartBeatCode(@NonNull String heartBeatTag) {
129127
return HeartBeat.GLOBAL;
130128
}
131-
132-
@Override
133-
public Task<Void> storeHeartBeatInfo(@NonNull String heartBeatTag) {
134-
return null;
135-
}
136-
137-
@Override
138-
public Task<List<HeartBeatResult>> getAndClearStoredHeartBeatInfo() {
139-
return null;
140-
}
141129
};
142130
Provider<HeartBeatInfo> heartBeatInfo = () -> heartBeatInfoObject;
143131
UserAgentPublisher userAgentPublisherObject = () -> USER_AGENT;

0 commit comments

Comments
 (0)