Change line width to 120

Author: Arne Augenstein

spotless.eclipseformat.xml

@@ -72,7 +72,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
 <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
@@ -307,7 +307,7 @@
 <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
 </profile>

src/main/java/io/kamax/matrix/client/AMatrixHttpClient.java

@@ -129,8 +129,7 @@ protected URI getMediaPath(String action) {
     }
 
     protected HttpEntity getJsonEntity(Object o) {
-        return EntityBuilder.create().setText(gson.toJson(o))
-                .setContentType(ContentType.APPLICATION_JSON).build();
+        return EntityBuilder.create().setText(gson.toJson(o)).setContentType(ContentType.APPLICATION_JSON).build();
     }
 
 }

src/main/java/io/kamax/matrix/client/MatrixClientContext.java

@@ -34,8 +34,7 @@ public MatrixClientContext(_MatrixHomeserver hs, _MatrixID user, String token) {
         this(hs, user, token, false);
     }
 
-    public MatrixClientContext(_MatrixHomeserver hs, _MatrixID user, String token,
-            boolean isVirtualUser) {
+    public MatrixClientContext(_MatrixHomeserver hs, _MatrixID user, String token, boolean isVirtualUser) {
         this.hs = hs;
         this.user = user;
         this.token = token;

src/main/java/io/kamax/matrix/client/MatrixHttpContent.java

@@ -68,8 +68,7 @@ private synchronized void load() {
 
         try {
             if (!StringUtils.equalsIgnoreCase("mxc", address.getScheme())) {
-                log.error("{} is not a supported protocol for avatars, ignoring",
-                        address.getScheme());
+                log.error("{} is not a supported protocol for avatars, ignoring", address.getScheme());
             } else {
                 URI path = getMediaPath("/download/" + address.getHost() + address.getPath());
                 try (CloseableHttpResponse res = client.execute(log(new HttpGet(path)))) {
@@ -78,13 +77,12 @@ private synchronized void load() {
                             log.info("Media {} does not exist on the HS {}", address.toString(),
                                     getContext().getHs().getDomain());
                         } else {
-                            Charset charset = ContentType.getOrDefault(res.getEntity())
-                                    .getCharset();
+                            Charset charset = ContentType.getOrDefault(res.getEntity()).getCharset();
                             String body = IOUtils.toString(res.getEntity().getContent(), charset);
 
                             MatrixErrorInfo info = gson.fromJson(body, MatrixErrorInfo.class);
-                            log.error("Couldn't get content data for {}: {} - {}",
-                                    address.toString(), info.getErrcode(), info.getError());
+                            log.error("Couldn't get content data for {}: {} - {}", address.toString(),
+                                    info.getErrcode(), info.getError());
                         }
                     } else {
                         HttpEntity entity = res.getEntity();
@@ -93,20 +91,17 @@ private synchronized void load() {
                         } else {
                             Header contentType = entity.getContentType();
                             if (contentType == null) {
-                                log.info(
-                                        "No content type was given, unable to process avatar data");
+                                log.info("No content type was given, unable to process avatar data");
                             } else {
                                 type = contentType.getValue();
                                 ByteArrayOutputStream outStream = new ByteArrayOutputStream();
                                 entity.writeTo(outStream);
                                 data = outStream.toByteArray();
                                 isValid = true;
 
-                                Header contentDisposition = res
-                                        .getFirstHeader("Content-Disposition");
+                                Header contentDisposition = res.getFirstHeader("Content-Disposition");
                                 if (contentDisposition != null) {
-                                    Matcher m = filenamePattern
-                                            .matcher(contentDisposition.getValue());
+                                    Matcher m = filenamePattern.matcher(contentDisposition.getValue());
                                     if (m.find()) {
                                         filename = m.group("filename");
                                     }

src/main/java/io/kamax/matrix/client/MatrixHttpRoom.java

@@ -92,12 +92,11 @@ public Optional<String> getName() {
                         log.warn("Request was rate limited", new Exception());
                     }
                     MatrixErrorInfo info = gson.fromJson(body, MatrixErrorInfo.class);
-                    throw new IOException("Couldn't get name for room " + roomId + " - "
-                            + info.getErrcode() + ": " + info.getError());
+                    throw new IOException("Couldn't get name for room " + roomId + " - " + info.getErrcode() + ": "
+                            + info.getError());
                 }
 
-                return Optional
-                        .of(jsonParser.parse(body).getAsJsonObject().get("name").getAsString());
+                return Optional.of(jsonParser.parse(body).getAsJsonObject().get("name").getAsString());
             }
         } catch (IOException e) {
             throw new MatrixClientRequestException(e);
@@ -124,12 +123,10 @@ public Optional<String> getTopic() {
                         log.warn("Request was rate limited", new Exception());
                     }
                     MatrixErrorInfo info = gson.fromJson(body, MatrixErrorInfo.class);
-                    throw new MatrixClientRequestException(info,
-                            "Couldn't get topic for room " + roomId);
+                    throw new MatrixClientRequestException(info, "Couldn't get topic for room " + roomId);
                 }
 
-                return Optional
-                        .of(jsonParser.parse(body).getAsJsonObject().get("topic").getAsString());
+                return Optional.of(jsonParser.parse(body).getAsJsonObject().get("topic").getAsString());
             }
         } catch (IOException e) {
             throw new MatrixClientRequestException(e);
@@ -157,8 +154,7 @@ public void join() {
                 MatrixErrorInfo info = gson.fromJson(body, MatrixErrorInfo.class);
 
                 if (res.getStatusLine().getStatusCode() == 403) {
-                    log.error("Failed to join room, we are not allowed: {} - {}", info.getErrcode(),
-                            info.getError());
+                    log.error("Failed to join room, we are not allowed: {} - {}", info.getErrcode(), info.getError());
                 } else {
                     throw new MatrixClientRequestException(info, "Error joining for " + getUser());
                 }
@@ -195,8 +191,7 @@ public void leave() {
                     MatrixErrorInfo info = gson.fromJson(body, MatrixErrorInfo.class);
 
                     if (res.getStatusLine().getStatusCode() == 403) {
-                        log.debug(
-                                "Failed to leave room, we are not allowed, most likely already left: {} - {}",
+                        log.debug("Failed to leave room, we are not allowed, most likely already left: {} - {}",
                                 info.getErrcode(), info.getError());
                     } else {
                         throw new MatrixClientRequestException(info,
@@ -211,8 +206,7 @@ public void leave() {
 
     private void sendMessage(RoomMessageTextPutBody content) {
         try {
-            URI path = getClientPath(
-                    "/rooms/{roomId}/send/m.room.message/" + System.currentTimeMillis());
+            URI path = getClientPath("/rooms/{roomId}/send/m.room.message/" + System.currentTimeMillis());
             HttpPut req = new HttpPut(path);
             req.setEntity(getJsonEntity(content));
 
@@ -232,8 +226,8 @@ private void sendMessage(RoomMessageTextPutBody content) {
                     if (res.getStatusLine().getStatusCode() == 403) {
                         log.error("Failed send message, we are not allowed: {}", info.getError());
                     } else {
-                        throw new IOException("Error sending message for " + getUser() + " - "
-                                + info.getErrcode() + ": " + info.getError());
+                        throw new IOException("Error sending message for " + getUser() + " - " + info.getErrcode()
+                                + ": " + info.getError());
                     }
                 }
             }
@@ -285,12 +279,11 @@ public List<_MatrixID> getJoinedUsers() {
                         log.warn("Request was rate limited", new Exception());
                     }
                     MatrixErrorInfo info = gson.fromJson(body, MatrixErrorInfo.class);
-                    throw new IOException("Couldn't list joined users in " + roomId + " - "
-                            + info.getErrcode() + ": " + info.getError());
+                    throw new IOException("Couldn't list joined users in " + roomId + " - " + info.getErrcode() + ": "
+                            + info.getError());
                 }
 
-                JsonObject joinedUsers = jsonParser.parse(body).getAsJsonObject().get("joined")
-                        .getAsJsonObject();
+                JsonObject joinedUsers = jsonParser.parse(body).getAsJsonObject().get("joined").getAsJsonObject();
                 List<_MatrixID> ids = new ArrayList<>();
                 for (Map.Entry<String, JsonElement> entry : joinedUsers.entrySet()) {
                     ids.add(new MatrixID(entry.getKey()));

src/main/java/io/kamax/matrix/client/MatrixHttpUser.java

@@ -78,8 +78,7 @@ public Optional<String> getName() {
                     }
 
                     MatrixErrorInfo info = gson.fromJson(body, MatrixErrorInfo.class);
-                    log.error("Couldn't get the displayname of {}: {} - {}", mxId,
-                            info.getErrcode(), info.getError());
+                    log.error("Couldn't get the displayname of {}: {} - {}", mxId, info.getErrcode(), info.getError());
                     return Optional.empty();
                 }
 
@@ -117,8 +116,7 @@ public Optional<_MatrixContent> getAvatar() {
                     }
 
                     MatrixErrorInfo info = gson.fromJson(body, MatrixErrorInfo.class);
-                    log.error("Couldn't get the avatar_url of {}: {} - {}", mxId, info.getErrcode(),
-                            info.getError());
+                    log.error("Couldn't get the avatar_url of {}: {} - {}", mxId, info.getErrcode(), info.getError());
                     return Optional.empty();
                 }
 

src/main/java/io/kamax/matrix/client/as/MatrixApplicationServiceClient.java

@@ -40,8 +40,7 @@
 import java.net.URI;
 import java.nio.charset.Charset;
 
-public class MatrixApplicationServiceClient extends MatrixHttpClient
-        implements _MatrixApplicationServiceClient {
+public class MatrixApplicationServiceClient extends MatrixHttpClient implements _MatrixApplicationServiceClient {
 
     private Logger log = LoggerFactory.getLogger(MatrixApplicationServiceClient.class);
 
@@ -50,8 +49,8 @@ public MatrixApplicationServiceClient(_MatrixHomeserver hs, String token, String
     }
 
     private MatrixHttpClient createClient(String localpart) {
-        return new MatrixHttpClient(new MatrixClientContext(getHomeserver(), getMatrixId(localpart),
-                getAccessToken(), true));
+        return new MatrixHttpClient(
+                new MatrixClientContext(getHomeserver(), getMatrixId(localpart), getAccessToken(), true));
     }
 
     @Override
@@ -73,8 +72,7 @@ public _MatrixClient createUser(String localpart) {
                         log.warn("User {} already exists, ignoring", localpart);
                     } else {
                         // TODO turn into dedicated exceptions, following the Spec distinct errors
-                        throw new MatrixClientRequestException(info,
-                                "Error creating the new user " + localpart);
+                        throw new MatrixClientRequestException(info, "Error creating the new user " + localpart);
                     }
                 }
             }

src/main/java/io/kamax/matrix/client/regular/MatrixHttpClient.java

@@ -70,8 +70,7 @@ public void setDisplayName(String name) {
                     Charset charset = ContentType.getOrDefault(res.getEntity()).getCharset();
                     String body = IOUtils.toString(res.getEntity().getContent(), charset);
                     MatrixErrorInfo info = gson.fromJson(body, MatrixErrorInfo.class);
-                    throw new MatrixClientRequestException(info,
-                            "Error changing display name for " + getUser());
+                    throw new MatrixClientRequestException(info, "Error changing display name for " + getUser());
                 }
             }
         } catch (IOException e) {

src/main/java/io/kamax/matrix/json/event/MatrixJsonRoomMembershipEvent.java

@@ -29,8 +29,7 @@
 
 import java.util.Optional;
 
-public class MatrixJsonRoomMembershipEvent extends MatrixJsonRoomEvent
-        implements _RoomMembershipEvent {
+public class MatrixJsonRoomMembershipEvent extends MatrixJsonRoomEvent implements _RoomMembershipEvent {
 
     private Content content;
     private _MatrixID invitee;