Skip to content
This repository has been archived by the owner on Oct 9, 2020. It is now read-only.

Removed lombok dependency from the project #2373

Merged
merged 1 commit into from
Mar 22, 2018
Merged

Removed lombok dependency from the project #2373

merged 1 commit into from
Mar 22, 2018

Conversation

sriramr98
Copy link
Contributor

Fixes #2371
Changes: Removed all Lombok annotations and replaced them with appropriate getters, setters, constructors, toString and hashCode methods.

@iamareebjamal
Copy link
Member

We don't want to just generate code and remove lombok. Adding boilerplate is not an option. A solution should be there. So in whichever class lombok was used except maybe for builder, should have kotlin specific methods to reduce boilerplate instead

@sriramr98
Copy link
Contributor Author

Yeah, I agree. I just thought that they should have separate PR's because they have two separate open issues. I made the Kotlin changes already and was gonna give a second PR after this was merged.

@iamareebjamal
Copy link
Member

I think there'd be no point to add boilerplate just to remove it. Because this commit will be dirty history then

@sriramr98
Copy link
Contributor Author

Alright Ill integrate Kotlin now

@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 14, 2018
@fossasia fossasia deleted a comment Mar 21, 2018
iamareebjamal
iamareebjamal approved these changes Mar 21, 2018
View reviewed changes
android/app/src/main/java/org/fossasia/openevent/core/auth/model/User.kt Outdated

@Type("user")
@JsonNaming(PropertyNamingStrategy.KebabCaseStrategy::class)
open class User(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be in data

android/data/src/main/java/org/fossasia/openevent/data/extras/Copyright.java Outdated
@@ -26,4 +26,4 @@
private int year;
private String logoUrl;
private String holder;
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add line feed

android/data/src/main/java/org/fossasia/openevent/data/extras/EventDates.java Outdated
@@ -15,4 +15,4 @@

@PrimaryKey
private String date;
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add line feed

android/data/src/main/java/org/fossasia/openevent/data/extras/SocialLink.java Outdated
@@ -26,4 +26,4 @@
private int id;
private String name;
private String link;
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add line feed

android/data/src/main/java/org/fossasia/openevent/data/extras/SpeakersCall.java Outdated
@@ -25,4 +25,4 @@
private String startsAt;
private String endsAt;
private String hash;
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add line feed

android/data/src/main/java/org/fossasia/openevent/data/Session.java Outdated
@@ -49,10 +50,12 @@
private String level;
@Index
private String startDate;
@JsonProperty("is-bookmarked")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove

android/data/src/main/java/org/fossasia/openevent/data/Session.java Outdated
private boolean isBookmarked;
private String createdAt;
private String deletedAt;
private String submittedAt;
@JsonProperty("is-mail-sent")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove

android/data/src/main/java/org/fossasia/openevent/data/Session.java Outdated
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove line below

android/data/src/main/java/org/fossasia/openevent/data/Speaker.java Outdated
@@ -47,6 +48,7 @@
private String github;
private String mobile;
private String website;
@JsonProperty("is-featured")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove

iamareebjamal
iamareebjamal suggested changes Mar 21, 2018
View reviewed changes
Copy link
Member

@iamareebjamal iamareebjamal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requested Changes

@iamareebjamal iamareebjamal force-pushed the development branch 2 times, most recently from 3b3e763 to 0e5d2a0 Compare March 21, 2018 14:20
@iamareebjamal
Copy link
Member

@sriramr98 I have streamlined everything to bare minimum changes. Do any further changes required and check if app is working as expected

@fossasia fossasia deleted a comment from open-event-bot bot Mar 21, 2018
@fossasia fossasia deleted a comment from open-event-bot bot Mar 21, 2018
@fossasia fossasia deleted a comment from open-event-bot bot Mar 21, 2018
@fossasia fossasia deleted a comment from open-event-bot bot Mar 21, 2018
@open-event-bot
Copy link

Hi @iamareebjamal!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

@open-event-bot
Copy link

Hi @iamareebjamal!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

@open-event-bot
Copy link

Hi @iamareebjamal!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

@open-event-bot
Copy link

Hi @sriramr98!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

@iamareebjamal iamareebjamal force-pushed the development branch 2 times, most recently from 0710190 to bf90474 Compare March 21, 2018 17:15
iamareebjamal
iamareebjamal previously approved these changes Mar 21, 2018
View reviewed changes
@iamareebjamal
Copy link
Member

@sriramr98 Please fix any intermediate error and update the PR

@sriramr98 @iamareebjamal
feat: Move lombok to another module
0a7aaae 
- Add kotlin support in main app
- Move JSONAPI models to another module data
- Update Realm and split using RealmModule
- Convert preleminary classes to data classes
- Balance classes of lombok and Kotlin within modules
- Fix kotlin properties and tests
- Add mockito extension inline for kotlin classes
@iamareebjamal iamareebjamal merged commit 235b34b into fossasia:development Mar 22, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@iamareebjamal iamareebjamal iamareebjamal approved these changes

Assignees

@sriramr98 sriramr98

Labels
ready-to-ship
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sriramr98 @iamareebjamal