Merge pull request #830 from nextcloud/lombok

Remove some lombok

Author: AlvaroBrey

library/src/main/java/com/nextcloud/android/lib/resources/directediting/DirectEditingCreateFileRemoteOperation.java

@@ -36,13 +36,10 @@
 import org.apache.commons.httpclient.methods.Utf8PostMethod;
 import org.json.JSONObject;
 
-import lombok.AllArgsConstructor;
-
 /**
  * Create file with direct editing api
  */
 
-@AllArgsConstructor
 public class DirectEditingCreateFileRemoteOperation extends RemoteOperation<String> {
     private static final String TAG = DirectEditingCreateFileRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
@@ -51,10 +48,20 @@ public class DirectEditingCreateFileRemoteOperation extends RemoteOperation<Stri
 
     private static final String JSON_FORMAT = "?format=json";
 
-    private String path;
-    private String editor;
-    private String creator;
-    private String template;
+    private final String path;
+    private final String editor;
+    private final String creator;
+    private final String template;
+
+    public DirectEditingCreateFileRemoteOperation(String path,
+                                                  String editor,
+                                                  String creator,
+                                                  String template) {
+        this.path = path;
+        this.editor = editor;
+        this.creator = creator;
+        this.template = template;
+    }
 
     public DirectEditingCreateFileRemoteOperation(String path, String editor, String creator) {
         this(path, editor, creator, "");
@@ -94,8 +101,8 @@ protected RemoteOperationResult<String> run(OwnCloudClient client) {
             }
         } catch (Exception e) {
             result = new RemoteOperationResult<>(e);
-            Log_OC.e(TAG, "Get all direct editing informations failed: " + result.getLogMessage(),
-                     result.getException());
+            Log_OC.e(TAG, "Get all direct editing information failed: " + result.getLogMessage(),
+                    result.getException());
         } finally {
             if (postMethod != null) {
                 postMethod.releaseConnection();

library/src/main/java/com/nextcloud/android/lib/resources/directediting/DirectEditingObtainListOfTemplatesRemoteOperation.java

@@ -38,13 +38,10 @@
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
 
-import lombok.AllArgsConstructor;
-
 /**
  * Get templates for an editor
  */
 
-@AllArgsConstructor
 public class DirectEditingObtainListOfTemplatesRemoteOperation extends OCSRemoteOperation<TemplateList> {
     private static final String TAG = DirectEditingObtainListOfTemplatesRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
@@ -56,6 +53,11 @@ public class DirectEditingObtainListOfTemplatesRemoteOperation extends OCSRemote
     private final String editor;
     private final String template;
 
+    public DirectEditingObtainListOfTemplatesRemoteOperation(String editor, String template) {
+        this.editor = editor;
+        this.template = template;
+    }
+
     protected RemoteOperationResult<TemplateList> run(OwnCloudClient client) {
         RemoteOperationResult<TemplateList> result;
         GetMethod getMethod = null;

library/src/main/java/com/nextcloud/android/lib/resources/directediting/DirectEditingOpenFileRemoteOperation.java

@@ -36,13 +36,10 @@
 import org.apache.commons.httpclient.methods.Utf8PostMethod;
 import org.json.JSONObject;
 
-import lombok.AllArgsConstructor;
-
 /**
  * open file for direct editing
  */
 
-@AllArgsConstructor
 public class DirectEditingOpenFileRemoteOperation extends RemoteOperation {
     private static final String TAG = DirectEditingOpenFileRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
@@ -51,8 +48,13 @@ public class DirectEditingOpenFileRemoteOperation extends RemoteOperation {
 
     private static final String JSON_FORMAT = "?format=json";
 
-    private String filePath;
-    private String editor;
+    private final String filePath;
+    private final String editor;
+
+    public DirectEditingOpenFileRemoteOperation(String filePath, String editor) {
+        this.filePath = filePath;
+        this.editor = editor;
+    }
 
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result;

library/src/main/java/com/nextcloud/android/lib/richWorkspace/RichWorkspaceDirectEditingRemoteOperation.java

@@ -41,13 +41,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import lombok.AllArgsConstructor;
-
 /**
  * Get direct editing url for rich workspace
  */
 
-@AllArgsConstructor
 public class RichWorkspaceDirectEditingRemoteOperation extends RemoteOperation {
     private static final String TAG = RichWorkspaceDirectEditingRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
@@ -58,6 +55,10 @@ public class RichWorkspaceDirectEditingRemoteOperation extends RemoteOperation {
 
     private String path;
 
+    public RichWorkspaceDirectEditingRemoteOperation(String path) {
+        this.path = path;
+    }
+
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result;
         Utf8PostMethod postMethod = null;

library/src/main/java/com/owncloud/android/lib/common/Quota.kt

@@ -29,14 +29,12 @@ package com.owncloud.android.lib.common
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
-import lombok.ToString
 
 /**
  * Quota data model
  */
 
 @Parcelize
-@ToString
 data class Quota(
     val free: Long = 0,
     val used: Long = 0,

library/src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java

@@ -153,6 +153,7 @@ public RemoteOperationResult run(NextcloudClient client) {
                 Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
             }
         } catch (Exception e) {
+            Log_OC.e(TAG, "Error getting user activities", e);
             return new RemoteOperationResult(e);
         } finally {
             if (get != null) {

library/src/main/java/com/owncloud/android/lib/resources/activities/model/Activity.java renamed to library/src/main/java/com/owncloud/android/lib/resources/activities/model/Activity.kt

@@ -23,47 +23,43 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.lib.resources.activities.model;
+package com.owncloud.android.lib.resources.activities.model
 
-import com.google.gson.annotations.SerializedName;
-import com.owncloud.android.lib.resources.activities.models.PreviewObject;
-
-import java.util.Date;
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import com.google.gson.annotations.SerializedName
+import com.owncloud.android.lib.resources.activities.models.PreviewObject
+import java.util.Date
 
 /**
  * Activity Data Model
  */
-@Getter
-@AllArgsConstructor
-@NoArgsConstructor
-public class Activity {
-
+data class Activity(
     @SerializedName("activity_id")
-    private int activityId;
-    private Date datetime;
+    val activityId: Int,
+    val datetime: Date,
+
     // legacy purposes
-    private Date date;
-    private String app;
-    private String type;
-    private String user;
+    val date: Date,
+    val app: String,
+    val type: String,
+    val user: String,
+
     @SerializedName("affecteduser")
-    private String affectedUser;
-    private String subject;
-    private String message;
-    private String icon;
-    private String link;
+    val affectedUser: String,
+    val subject: String,
+    val message: String,
+    val icon: String,
+    val link: String,
+
     @SerializedName("object_type")
-    private String objectType;
+    val objectType: String,
+
     @SerializedName("object_id")
-    private String objectId;
+    val objectId: String,
+
     @SerializedName("object_name")
-    private String objectName;
-    private List<PreviewObject> previews;
+    val objectName: String,
+    val previews: List<PreviewObject>,
+
     @SerializedName("subject_rich")
-    private RichElement richSubjectElement;
-}
+    val richSubjectElement: RichElement
+)

library/src/main/java/com/owncloud/android/lib/resources/activities/model/RichElement.java renamed to library/src/main/java/com/owncloud/android/lib/resources/activities/model/RichElement.kt

@@ -23,23 +23,14 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.lib.resources.activities.model;
-
-import java.util.ArrayList;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+package com.owncloud.android.lib.resources.activities.model
 
 /**
  * RichElement Data Model
  */
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-public class RichElement {
-    private String richSubject;
-    private ArrayList<RichObject> richObjectList = new ArrayList<>();
+data class RichElement(
+    var richSubject: String,
+    var richObjectList: MutableList<RichObject>
+) {
+    constructor() : this("", mutableListOf())
 }

library/src/test/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperationTest.java

@@ -27,22 +27,22 @@
 
 package com.owncloud.android.lib.resources.activities;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import com.owncloud.android.lib.resources.activities.model.Activity;
 
 import org.junit.Test;
 
 import java.util.ArrayList;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 public class GetActivitiesRemoteOperationTest {
 
     @Test
     public void testParseActivities() {
         String activities = "{\"ocs\":{\"meta\":{\"status\":\"ok\",\"statuscode\":200," +
                 "\"message\":\"OK\"},\"data\":[{\"activity_id\":1,\"app\":\"core\",\"type\":" +
-                "\"security\",\"user\":\"test\",\"subject\":" +
+                "\"security\",\"user\":\"test\",\"affecteduser\":\"Test User\",\"subject\":" +
                 "\"You logged in success with your two factor device (U2F device)\"," +
                 "\"subject_rich\":[\"\",[]],\"message\":\"\",\"message_rich\":[\"\",[]]," +
                 "\"object_type\":\"\",\"object_id\":0,\"object_name\":\"\",\"objects\":[\"\"]," +
@@ -55,6 +55,12 @@ public void testParseActivities() {
         ArrayList<Activity> activityList = sut.parseResult(activities);
 
         assertTrue(activityList.size() > 0);
+
+        Activity firstItem = activityList.get(0);
+        assertEquals("test", firstItem.getUser());
+        assertEquals("Test User", firstItem.getAffectedUser());
+        assertEquals("You logged in success with your two factor device (U2F device)", firstItem.getSubject());
+        assertEquals("0", firstItem.getObjectId());
     }
 
     @Test

scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-170
+163