Skip to content

Commit f6dae9c

Browse files
smarcetsmarcet
committed
[smarcet] - #14795
* upgrade to latest realm version * refactoring
1 parent 461b199 commit f6dae9c

26 files changed

+41
-78
lines changed

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/AbstractFeedback2FeedbackDTO.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.openstack.android.summit.common.DTOs.FeedbackDTO;
1111
import org.openstack.android.summit.common.entities.Feedback;
1212
import org.openstack.android.summit.common.entities.Member;
13-
import org.openstack.android.summit.common.entities.SummitAttendee;
1413
import org.openstack.android.summit.common.entities.SummitEvent;
1514

1615
/**

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/AbstractPresentationSpeaker2PersonListIemDTO.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.modelmapper.AbstractConverter;
88
import org.openstack.android.summit.common.Constants;
99
import org.openstack.android.summit.common.DTOs.PersonListItemDTO;
10-
import org.openstack.android.summit.common.entities.IPerson;
1110
import org.openstack.android.summit.common.entities.PresentationSpeaker;
1211

1312
/**

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/AbstractVenueRoom2VenueRoomDTO.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
2+
23
import android.util.Log;
34
import com.crashlytics.android.Crashlytics;
45
import org.modelmapper.AbstractConverter;

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/Feedback2FeedbackDTO.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
22

3-
import org.modelmapper.AbstractConverter;
43
import org.openstack.android.summit.common.entities.Feedback;
54

65
/**

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/FeedbackRealmProxy2FeedbackDTO.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
22

3-
import io.realm.FeedbackRealmProxy;
4-
53
/**
64
* Created by Claudio Redi on 1/29/2016.
75
*/
8-
public class FeedbackRealmProxy2FeedbackDTO extends AbstractFeedback2FeedbackDTO<FeedbackRealmProxy> {
6+
public class FeedbackRealmProxy2FeedbackDTO extends AbstractFeedback2FeedbackDTO<io.realm.org_openstack_android_summit_common_entities_FeedbackRealmProxy> {
97

108
}

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/MemberRealmProxy2MemberDTO.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
22

3-
import org.openstack.android.summit.common.entities.Member;
4-
import org.openstack.android.summit.common.entities.PresentationSpeaker;
5-
import org.openstack.android.summit.common.entities.SummitAttendee;
6-
7-
import io.realm.MemberRealmProxy;
8-
import io.realm.PresentationSpeakerRealmProxy;
9-
import io.realm.SummitAttendeeRealmProxy;
10-
113
/**
124
* Created by Claudio Redi on 1/27/2016.
135
*/
14-
public class MemberRealmProxy2MemberDTO extends AbstractMember2MemberDTO<MemberRealmProxy, SummitAttendeeRealmProxy, PresentationSpeakerRealmProxy> {
6+
public class MemberRealmProxy2MemberDTO extends AbstractMember2MemberDTO<io.realm.org_openstack_android_summit_common_entities_MemberRealmProxy, io.realm.org_openstack_android_summit_common_entities_SummitAttendeeRealmProxy, io.realm.org_openstack_android_summit_common_entities_PresentationSpeakerRealmProxy> {
157

168
public MemberRealmProxy2MemberDTO() {
179
abstractSummitAttendee2PersonDTO = new SummitAttendeeRealmProxy2PersonDTO();

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/PresentationSpeakerRealmProxy2PersonDTO.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
22

3-
import io.realm.PresentationSpeakerRealmProxy;
3+
import io.realm.org_openstack_android_summit_common_entities_PresentationSpeakerRealmProxy;
44

55
/**
66
* Created by Claudio Redi on 1/27/2016.
77
*/
8-
public class PresentationSpeakerRealmProxy2PersonDTO extends AbstractPresentationSpeaker2PersonDTO<PresentationSpeakerRealmProxy> {
8+
public class PresentationSpeakerRealmProxy2PersonDTO extends AbstractPresentationSpeaker2PersonDTO<org_openstack_android_summit_common_entities_PresentationSpeakerRealmProxy> {
99
}

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/PresentationSpeakerRealmProxy2PersonListItemDTO.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import org.openstack.android.summit.common.DTOs.PersonListItemDTO;
44

5-
import io.realm.PresentationSpeakerRealmProxy;
6-
75
/**
86
* Created by Claudio Redi on 1/13/2016.
97
*/
10-
public class PresentationSpeakerRealmProxy2PersonListItemDTO extends AbstractPresentationSpeaker2PersonListIemDTO<PresentationSpeakerRealmProxy, PersonListItemDTO> {
8+
public class PresentationSpeakerRealmProxy2PersonListItemDTO extends AbstractPresentationSpeaker2PersonListIemDTO<io.realm.org_openstack_android_summit_common_entities_PresentationSpeakerRealmProxy, PersonListItemDTO> {
119
}

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/PushNotificationRealmProxy2PushNotificationDetailDTO.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import org.openstack.android.summit.common.DTOs.PushNotificationDetailDTO;
44

5-
import io.realm.PushNotificationRealmProxy;
5+
import io.realm.org_openstack_android_summit_common_entities_notifications_PushNotificationRealmProxy;
66

77
/**
88
* Created by sebastian on 8/22/2016.
99
*/
10-
public class PushNotificationRealmProxy2PushNotificationDetailDTO extends AbstractPushNotification2PushNotificationListItemDTO<PushNotificationRealmProxy, PushNotificationDetailDTO> {
10+
public class PushNotificationRealmProxy2PushNotificationDetailDTO extends AbstractPushNotification2PushNotificationListItemDTO<org_openstack_android_summit_common_entities_notifications_PushNotificationRealmProxy, PushNotificationDetailDTO> {
1111

1212
@Override
1313
protected PushNotificationDetailDTO createDTO() {

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/PushNotificationRealmProxy2PushNotificationListItemDTO.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
import org.openstack.android.summit.common.DTOs.PushNotificationListItemDTO;
44

5-
import io.realm.PushNotificationRealmProxy;
6-
75
/**
86
* Created by sebastian on 8/20/2016.
97
*/
10-
public class PushNotificationRealmProxy2PushNotificationListItemDTO extends AbstractPushNotification2PushNotificationListItemDTO<PushNotificationRealmProxy, PushNotificationListItemDTO> {
8+
public class PushNotificationRealmProxy2PushNotificationListItemDTO extends AbstractPushNotification2PushNotificationListItemDTO<io.realm.org_openstack_android_summit_common_entities_notifications_PushNotificationRealmProxy, PushNotificationListItemDTO> {
119

1210
@Override
1311
protected PushNotificationListItemDTO createDTO() {

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/SummitAttendeeRealmProxy2PersonDTO.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
22

3-
import io.realm.SummitAttendeeRealmProxy;
4-
53
/**
64
* Created by Claudio Redi on 1/27/2016.
75
*/
8-
public class SummitAttendeeRealmProxy2PersonDTO extends AbstractSummitAttendee2PersonDTO<SummitAttendeeRealmProxy> {
6+
public class SummitAttendeeRealmProxy2PersonDTO extends AbstractSummitAttendee2PersonDTO<io.realm.org_openstack_android_summit_common_entities_SummitAttendeeRealmProxy> {
97
}

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/SummitEvent2ScheduleItemDTO.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
22

3-
import org.modelmapper.AbstractConverter;
43
import org.openstack.android.summit.common.DTOs.ScheduleItemDTO;
5-
import org.openstack.android.summit.common.entities.Company;
64
import org.openstack.android.summit.common.entities.SummitEvent;
7-
import org.openstack.android.summit.common.entities.SummitType;
8-
9-
import java.text.DateFormat;
10-
import java.text.SimpleDateFormat;
11-
import java.util.TimeZone;
12-
13-
import io.realm.SummitEventRealmProxy;
145

156
/**
167
* Created by Claudio Redi on 12/19/2015.

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/SummitEventRealmProxy2EventDetailDTO.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
22

3-
import org.openstack.android.summit.common.entities.PresentationVideo;
4-
5-
import io.realm.PresentationSpeakerRealmProxy;
6-
import io.realm.PresentationVideoRealmProxy;
7-
import io.realm.SummitEventRealmProxy;
83

94
/**
105
* Created by Claudio Redi on 1/21/2016.
116
*/
12-
public class SummitEventRealmProxy2EventDetailDTO extends AbstractSummitEvent2EventDetailDTO<SummitEventRealmProxy, PresentationSpeakerRealmProxy, PresentationVideoRealmProxy> {
7+
public class SummitEventRealmProxy2EventDetailDTO extends AbstractSummitEvent2EventDetailDTO<io.realm.org_openstack_android_summit_common_entities_SummitEventRealmProxy, io.realm.org_openstack_android_summit_common_entities_PresentationSpeakerRealmProxy, io.realm.org_openstack_android_summit_common_entities_PresentationVideoRealmProxy> {
138
public SummitEventRealmProxy2EventDetailDTO() {
149
presentationSpeaker2PersonListIemDTO = new PresentationSpeakerRealmProxy2PersonListItemDTO();
15-
video2VideoDTO = new AbstractPresentationVideo2VideoDTO<PresentationVideoRealmProxy>();
10+
video2VideoDTO = new AbstractPresentationVideo2VideoDTO<io.realm.org_openstack_android_summit_common_entities_PresentationVideoRealmProxy>();
1611
}
1712
}

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/SummitEventRealmProxy2ScheduleItemDTO.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
22

3-
import org.modelmapper.AbstractConverter;
43
import org.openstack.android.summit.common.DTOs.ScheduleItemDTO;
5-
import org.openstack.android.summit.common.entities.Company;
6-
import org.openstack.android.summit.common.entities.SummitEvent;
7-
import org.openstack.android.summit.common.entities.SummitType;
8-
9-
import java.text.DateFormat;
10-
import java.text.SimpleDateFormat;
11-
import java.util.TimeZone;
12-
13-
import io.realm.SummitEventRealmProxy;
144

155
/**
166
* Created by Claudio Redi on 12/19/2015.
177
*/
18-
public class SummitEventRealmProxy2ScheduleItemDTO extends AbstractSummitEvent2ScheduleItemDTO<SummitEventRealmProxy, ScheduleItemDTO> {
8+
public class SummitEventRealmProxy2ScheduleItemDTO extends AbstractSummitEvent2ScheduleItemDTO<io.realm.org_openstack_android_summit_common_entities_SummitEventRealmProxy, ScheduleItemDTO> {
199
}

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/VenueFloorRealmProxy2VenueFloorDTO.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
22

3-
import io.realm.VenueFloorRealmProxy;
4-
53
/**
64
* Created by sebastian on 8/9/2016.
75
*/
8-
public class VenueFloorRealmProxy2VenueFloorDTO extends AbstractVenueFloor2VenueFloorDTO<VenueFloorRealmProxy> {
6+
public class VenueFloorRealmProxy2VenueFloorDTO extends AbstractVenueFloor2VenueFloorDTO<io.realm.org_openstack_android_summit_common_entities_VenueFloorRealmProxy> {
97

108
}

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/VenueRealmProxy2VenueDTO.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
22

3-
import io.realm.VenueRealmProxy;
4-
53
/**
64
* Created by Claudio Redi on 2/15/2016.
75
*/
8-
public class VenueRealmProxy2VenueDTO extends AbstractVenue2VenueDTO<VenueRealmProxy> {
6+
public class VenueRealmProxy2VenueDTO extends AbstractVenue2VenueDTO<io.realm.org_openstack_android_summit_common_entities_VenueRealmProxy> {
97
}

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/VenueRealmProxy2VenueFilterDTO.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
22

3-
import io.realm.VenueRealmProxy;
4-
5-
public class VenueRealmProxy2VenueFilterDTO extends AbstractVenue2VenueFilterDTO<VenueRealmProxy> {
3+
public class VenueRealmProxy2VenueFilterDTO extends AbstractVenue2VenueFilterDTO<io.realm.org_openstack_android_summit_common_entities_VenueRealmProxy> {
64
}

‎app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/VenueRoomRealmProxy2VenueRoomDTO.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package org.openstack.android.summit.common.DTOs.Assembler.Converters;
22

3-
import io.realm.VenueRoomRealmProxy;
4-
53
/**
64
* Created by sebastian on 8/9/2016.
75
*/
8-
public class VenueRoomRealmProxy2VenueRoomDTO extends AbstractVenueRoom2VenueRoomDTO<VenueRoomRealmProxy> {
6+
public class VenueRoomRealmProxy2VenueRoomDTO extends AbstractVenueRoom2VenueRoomDTO<io.realm.org_openstack_android_summit_common_entities_VenueRoomRealmProxy> {
97

108
}

‎app/src/main/java/org/openstack/android/summit/common/data_access/repositories/impl/SummitDataStore.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ public SummitDataStore( ISaveOrUpdateStrategy saveOrUpdateStrategy, IDeleteStrat
2727

2828
@Override
2929
public Summit getLatest() {
30-
List<Summit> summits = RealmFactory.getSession().where(Summit.class).findAllSorted("startDate", Sort.DESCENDING);
30+
List<Summit> summits = RealmFactory.getSession().where(Summit.class)
31+
.sort("startDate", Sort.DESCENDING)
32+
.findAll();
3133
return summits.size() > 0 ? summits.get(0) : null;
3234
}
3335

‎app/src/main/java/org/openstack/android/summit/common/data_access/repositories/impl/SummitEventDataStore.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public List<SummitEvent> getByFilter(DateRangeCondition dateRangeCondition, Filt
244244
query = query.isNotEmpty("presentation.videos");
245245
}
246246

247-
return query.findAllSorted(new String[] { "start", "end", "name"}, new Sort[] { Sort.ASCENDING, Sort.ASCENDING, Sort.ASCENDING });
247+
return query.sort(new String[] { "start", "end", "name"}, new Sort[] { Sort.ASCENDING, Sort.ASCENDING, Sort.ASCENDING }).findAll();
248248
}
249249

250250
@Override
@@ -291,7 +291,9 @@ public List<SummitEvent> getSpeakerEvents(int speakerId, DateTime startDate, Dat
291291
.equalTo("presentation.moderator.id", speakerId)
292292
.endGroup();
293293

294-
return query.findAllSorted(new String[] { "start", "end", "name"}, new Sort[] { Sort.ASCENDING, Sort.ASCENDING, Sort.ASCENDING });
294+
return query
295+
.sort(new String[] { "start", "end", "name"}, new Sort[] { Sort.ASCENDING, Sort.ASCENDING, Sort.ASCENDING })
296+
.findAll();
295297
}
296298

297299
@Override

‎app/src/main/java/org/openstack/android/summit/common/data_access/repositories/impl/TrackDataStore.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public TrackDataStore(ISaveOrUpdateStrategy saveOrUpdateStrategy, IDeleteStrateg
1919

2020
@Override
2121
public List<Track> getAllOrderedByName(int summitId) {
22-
return RealmFactory.getSession().where(Track.class).equalTo("summit.id", summitId).findAllSorted("name", Sort.ASCENDING);
22+
return RealmFactory.getSession().where(Track.class).equalTo("summit.id", summitId)
23+
.sort("name", Sort.ASCENDING).findAll();
2324
}
2425

2526
}

‎app/src/main/java/org/openstack/android/summit/common/data_access/repositories/impl/TrackGroupDataStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public Void callback(Realm session) throws Exception {
6262

6363
@Override
6464
public List<TrackGroup> getAllBySummit(int summitId) {
65-
return RealmFactory.getSession().where(TrackGroup.class).equalTo("summit.id", summitId).findAllSorted("name");
65+
return RealmFactory.getSession().where(TrackGroup.class).equalTo("summit.id", summitId).sort("name").findAll();
6666
}
6767

6868
}

‎app/src/main/java/org/openstack/android/summit/common/data_access/repositories/impl/VenueDataStore.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,23 @@ public VenueDataStore(ISaveOrUpdateStrategy saveOrUpdateStrategy, IDeleteStrateg
1616

1717
@Override
1818
public List<Venue> getInternalsBySummit(int summitId) {
19-
return RealmFactory.getSession().where(Venue.class).equalTo("summit.id", summitId).equalTo("isInternal", true).findAllSorted("name");
19+
return RealmFactory.getSession().where(Venue.class).equalTo("summit.id", summitId).equalTo("isInternal", true)
20+
.sort("name")
21+
.findAll();
2022
}
2123

2224
@Override
2325
public List<Venue> getExternalBySummit(int summitId) {
24-
return RealmFactory.getSession().where(Venue.class).equalTo("summit.id", summitId).equalTo("isInternal", false).findAllSorted("name");
26+
return RealmFactory.getSession().where(Venue.class).equalTo("summit.id", summitId).equalTo("isInternal", false)
27+
.sort("name")
28+
.findAll();
2529
}
2630

2731
@Override
2832
public List<Venue> getAllBySummit(int summitId) {
29-
return RealmFactory.getSession().where(Venue.class).equalTo("summit.id", summitId).findAllSorted("name");
33+
return RealmFactory.getSession().where(Venue.class).equalTo("summit.id", summitId)
34+
.sort("name")
35+
.findAll();
3036
}
3137

3238
}

‎app/src/main/java/org/openstack/android/summit/modules/favorites_schedule/business_logic/FavoritesScheduleInteractor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public List<ScheduleItemDTO> getCurrentMemberFavoritesEvents(Date startDate, Dat
5454
.where()
5555
.greaterThanOrEqualTo("start", startDate)
5656
.lessThanOrEqualTo("end", endDate)
57-
.findAllSorted(new String[]{"start", "end", "name"}, new Sort[]{Sort.ASCENDING, Sort.ASCENDING, Sort.ASCENDING});
57+
.sort(new String[]{"start", "end", "name"}, new Sort[]{Sort.ASCENDING, Sort.ASCENDING, Sort.ASCENDING})
58+
.findAll();
5859

5960
return postProcessScheduleEventList(createDTOList(favoriteEvents, ScheduleItemDTO.class));
6061

‎app/src/main/java/org/openstack/android/summit/modules/personal_schedule/business_logic/PersonalScheduleInteractor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public List<ScheduleItemDTO> getCurrentMemberScheduledEvents(Date startDate, Dat
4040
.where()
4141
.greaterThanOrEqualTo("start", startDate)
4242
.lessThanOrEqualTo("end", endDate)
43-
.findAllSorted(new String[]{"start", "end", "name"}, new Sort[]{Sort.ASCENDING, Sort.ASCENDING, Sort.ASCENDING});
43+
.sort(new String[]{"start", "end", "name"}, new Sort[]{Sort.ASCENDING, Sort.ASCENDING, Sort.ASCENDING})
44+
.findAll();
4445

4546
return postProcessScheduleEventList(createDTOList(scheduleEvents, ScheduleItemDTO.class));
4647
}

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ buildscript {
1515
// in the individual module build.gradle files
1616
// Realm
1717
// https://github.com/realm/realm-java/blob/master/CHANGELOG.md
18-
classpath "io.realm:realm-gradle-plugin:4.3.3"
18+
classpath "io.realm:realm-gradle-plugin:5.11.0"
1919
//GCM
2020
classpath 'com.google.gms:google-services:4.2.0'
2121

0 commit comments

Comments
 (0)