From 13c718977e0621db4df3715c9af0adcd35b11018 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Fri, 19 Jan 2018 19:26:25 +0000 Subject: [PATCH] Delombokify: remove RequiredArgsConstructor usages. --- .../syncadapter/journalmanager/Crypto.java | 7 ++++-- .../syncadapter/ContactsSyncManager.java | 2 -- .../etesync/syncadapter/ui/AboutActivity.java | 12 ++++++--- .../syncadapter/ui/AddMemberFragment.java | 11 +++++--- .../ui/CollectionMembersListFragment.java | 8 +++--- .../syncadapter/ui/RemoveMemberFragment.java | 8 +++--- .../ui/setup/BaseConfigurationFinder.java | 25 +++++++++++++------ .../ui/setup/LoginCredentials.java | 7 +++--- .../ui/setup/SetupUserInfoFragment.java | 9 ++++--- 9 files changed, 56 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/etesync/syncadapter/journalmanager/Crypto.java b/app/src/main/java/com/etesync/syncadapter/journalmanager/Crypto.java index 2fb13213..2f7a9804 100644 --- a/app/src/main/java/com/etesync/syncadapter/journalmanager/Crypto.java +++ b/app/src/main/java/com/etesync/syncadapter/journalmanager/Crypto.java @@ -44,7 +44,6 @@ import java.util.Locale; import lombok.AccessLevel; import lombok.Getter; -import lombok.RequiredArgsConstructor; public class Crypto { public static String deriveKey(String salt, String password) { @@ -68,12 +67,16 @@ public class Crypto { return null; } - @RequiredArgsConstructor public static class AsymmetricKeyPair implements Serializable { @Getter(AccessLevel.PUBLIC) private final byte[] privateKey; @Getter(AccessLevel.PUBLIC) private final byte[] publicKey; + + public AsymmetricKeyPair(final byte[] privateKey, final byte[] publicKey) { + this.privateKey = privateKey; + this.publicKey = publicKey; + } } public static class AsymmetricCryptoManager { diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java index 392a9961..33ff0ba0 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java @@ -50,7 +50,6 @@ import at.bitfire.vcard4android.BatchOperation; import at.bitfire.vcard4android.Contact; import at.bitfire.vcard4android.ContactsStorageException; import lombok.Cleanup; -import lombok.RequiredArgsConstructor; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -240,7 +239,6 @@ public class ContactsSyncManager extends SyncManager { // downloader helper class - @RequiredArgsConstructor private class ResourceDownloader implements Contact.Downloader { @Override public byte[] download(String url, String accepts) { diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.java index 9f71258f..a74de701 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.java @@ -43,7 +43,6 @@ import java.util.logging.Level; import ezvcard.Ezvcard; import lombok.Cleanup; -import lombok.RequiredArgsConstructor; public class AboutActivity extends BaseActivity { @@ -62,12 +61,19 @@ public class AboutActivity extends BaseActivity { tabLayout.setupWithViewPager(viewPager); } - - @RequiredArgsConstructor private static class ComponentInfo { final String title, version, website, copyright; final int licenseInfo; final String licenseTextFile; + + ComponentInfo(final String title, final String version, final String website, final String copyright, final int licenseInfo, final String licenseTextFile) { + this.title = title; + this.version = version; + this.website = website; + this.copyright = copyright; + this.licenseInfo = licenseInfo; + this.licenseTextFile = licenseTextFile; + } } private final static ComponentInfo components[] = { diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.java index d3bbe91d..f2532de5 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.java @@ -23,7 +23,6 @@ import com.etesync.syncadapter.journalmanager.JournalManager; import com.etesync.syncadapter.journalmanager.UserInfoManager; import com.etesync.syncadapter.model.CollectionInfo; -import lombok.RequiredArgsConstructor; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; @@ -131,9 +130,12 @@ public class AddMemberFragment extends DialogFragment { } } - @RequiredArgsConstructor class AddResult { final Throwable throwable; + + AddResult(final Throwable throwable) { + this.throwable = throwable; + } } } @@ -174,9 +176,12 @@ public class AddMemberFragment extends DialogFragment { dismiss(); } - @RequiredArgsConstructor class AddResultSecond { final Throwable throwable; + + AddResultSecond(final Throwable throwable) { + this.throwable = throwable; + } } } } diff --git a/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.java index 1ef7202e..79c34ff6 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.java @@ -23,7 +23,6 @@ import com.etesync.syncadapter.HttpClient; import com.etesync.syncadapter.R; import com.etesync.syncadapter.journalmanager.JournalManager; import com.etesync.syncadapter.model.CollectionInfo; -import com.etesync.syncadapter.model.EntryEntity; import com.etesync.syncadapter.model.JournalEntity; import com.etesync.syncadapter.model.JournalModel; @@ -31,7 +30,6 @@ import java.util.List; import io.requery.Persistable; import io.requery.sql.EntityDataStore; -import lombok.RequiredArgsConstructor; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; @@ -163,10 +161,14 @@ public class CollectionMembersListFragment extends ListFragment implements Adapt } } - @RequiredArgsConstructor class MembersResult { final List members; final Throwable throwable; + + MembersResult(final List members, final Throwable throwable) { + this.members = members; + this.throwable = throwable; + } } } } diff --git a/app/src/main/java/com/etesync/syncadapter/ui/RemoveMemberFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/RemoveMemberFragment.java index e61799ee..e152379d 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/RemoveMemberFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/RemoveMemberFragment.java @@ -15,14 +15,11 @@ import com.etesync.syncadapter.Constants; import com.etesync.syncadapter.HttpClient; import com.etesync.syncadapter.InvalidAccountException; import com.etesync.syncadapter.R; -import com.etesync.syncadapter.journalmanager.Crypto; import com.etesync.syncadapter.journalmanager.JournalManager; -import com.etesync.syncadapter.journalmanager.UserInfoManager; import com.etesync.syncadapter.model.CollectionInfo; import org.apache.commons.codec.Charsets; -import lombok.RequiredArgsConstructor; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; @@ -108,9 +105,12 @@ public class RemoveMemberFragment extends DialogFragment { dismiss(); } - @RequiredArgsConstructor class RemoveResult { final Throwable throwable; + + RemoveResult(final Throwable throwable) { + this.throwable = throwable; + } } } } diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.java index 957e6c41..52386a90 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.java @@ -10,6 +10,13 @@ package com.etesync.syncadapter.ui.setup; import android.content.Context; import android.support.annotation.NonNull; +import com.etesync.syncadapter.HttpClient; +import com.etesync.syncadapter.journalmanager.Crypto; +import com.etesync.syncadapter.journalmanager.Exceptions; +import com.etesync.syncadapter.journalmanager.JournalAuthenticator; +import com.etesync.syncadapter.log.StringHandler; +import com.etesync.syncadapter.model.CollectionInfo; + import java.io.IOException; import java.io.Serializable; import java.net.URI; @@ -18,14 +25,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import com.etesync.syncadapter.HttpClient; -import com.etesync.syncadapter.journalmanager.Crypto; -import com.etesync.syncadapter.journalmanager.Exceptions; -import com.etesync.syncadapter.journalmanager.JournalAuthenticator; -import com.etesync.syncadapter.log.StringHandler; -import com.etesync.syncadapter.model.CollectionInfo; import lombok.Getter; -import lombok.RequiredArgsConstructor; import lombok.ToString; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; @@ -85,11 +85,20 @@ public class BaseConfigurationFinder { // data classes - @RequiredArgsConstructor @ToString(exclude={"logs", "authtoken", "rawPassword", "password"}) public static class Configuration implements Serializable { // We have to use URI here because HttpUrl is not serializable! + public Configuration(final URI url, final String userName, final String authtoken, final ServiceInfo cardDAV, final ServiceInfo calDAV, final String logs, final boolean failed) { + this.url = url; + this.userName = userName; + this.authtoken = authtoken; + this.cardDAV = cardDAV; + this.calDAV = calDAV; + this.logs = logs; + this.failed = failed; + } + @ToString public static class ServiceInfo implements Serializable { public final Map collections = new HashMap<>(); diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.java index e7f5c7f8..fd6eee51 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.java @@ -11,12 +11,11 @@ package com.etesync.syncadapter.ui.setup; import android.os.Parcel; import android.os.Parcelable; -import java.net.URI; -import java.net.URISyntaxException; - import com.etesync.syncadapter.App; import com.etesync.syncadapter.Constants; -import lombok.RequiredArgsConstructor; + +import java.net.URI; +import java.net.URISyntaxException; public class LoginCredentials implements Parcelable { public final URI uri; diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.java index 2dd2fb23..62a668b2 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.java @@ -9,9 +9,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; import android.support.v7.app.AlertDialog; -import android.widget.TextView; import com.etesync.syncadapter.AccountSettings; import com.etesync.syncadapter.App; @@ -22,7 +20,6 @@ import com.etesync.syncadapter.journalmanager.Constants; import com.etesync.syncadapter.journalmanager.Crypto; import com.etesync.syncadapter.journalmanager.UserInfoManager; -import lombok.RequiredArgsConstructor; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; @@ -137,10 +134,14 @@ public class SetupUserInfoFragment extends DialogFragment { dismissAllowingStateLoss(); } - @RequiredArgsConstructor class SetupUserInfoResult { final Crypto.AsymmetricKeyPair keyPair; final Exception exception; + + SetupUserInfoResult(final Crypto.AsymmetricKeyPair keyPair, final Exception exception) { + this.keyPair = keyPair; + this.exception = exception; + } } } }