Skip to content

Commit b2c2267

Browse files
authored
[automatic-failover] Fix formatting for anticipated AA Failover changes (#4183)
* fix formatting for anticipated failover changes * additional formatting to cover given folders
1 parent 8a44d44 commit b2c2267

18 files changed

+1143
-1146
lines changed

hbase-formatter.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
4141
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
4242
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
43-
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
43+
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
4444
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
4545
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="20"/>
4646
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
@@ -74,15 +74,15 @@
7474
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
7575
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
7676
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
77-
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
77+
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
7878
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
7979
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
8080
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
8181
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
8282
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
8383
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
8484
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
85-
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
85+
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
8686
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
8787
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
8888
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
@@ -145,7 +145,7 @@
145145
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
146146
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
147147
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
148-
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
148+
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
149149
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
150150
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
151151
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
@@ -205,7 +205,7 @@
205205
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
206206
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
207207
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
208-
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
208+
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
209209
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
210210
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
211211
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>

pom.xml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,18 @@
333333
<configuration>
334334
<configFile>${project.basedir}/hbase-formatter.xml</configFile>
335335
<directories>
336-
<directory>${project.basedir}/src/main/java/redis/clients/jedis/annots</directory>
337-
<directory>${project.basedir}/src/main/java/redis/clients/jedis/mcf</directory>
338-
<directory>${project.basedir}/src/test/java/redis/clients/jedis/misc/AutomaticFailoverTest.java</directory>
339-
<directory>${project.basedir}/src/test/java/redis/clients/jedis/failover</directory>
336+
<directory>${project.basedir}</directory>
340337
</directories>
338+
<includes>
339+
<!-- Specific files -->
340+
<include>src/main/java/redis/clients/jedis/annots/*.java</include>
341+
<include>src/main/java/redis/clients/jedis/mcf/*.java</include>
342+
<include>src/test/java/redis/clients/jedis/failover/*.java</include>
343+
<include>src/test/java/redis/clients/jedis/misc/AutomaticFailoverTest.java</include>
344+
<include>src/main/java/redis/clients/jedis/providers/MultiClusterPooledConnectionProvider.java</include>
345+
<include>src/main/java/redis/clients/jedis/MultiClusterClientConfig.java</include>
346+
<include>src/main/java/redis/clients/jedis/HostAndPort.java</include>
347+
</includes>
341348
</configuration>
342349
<executions>
343350
<execution>

src/main/java/redis/clients/jedis/HostAndPort.java

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,52 @@
44

55
public class HostAndPort implements Serializable {
66

7-
private static final long serialVersionUID = -519876229978427751L;
8-
9-
private final String host;
10-
private final int port;
11-
12-
public HostAndPort(String host, int port) {
13-
this.host = host;
14-
this.port = port;
15-
}
16-
17-
public String getHost() {
18-
return host;
19-
}
20-
21-
public int getPort() {
22-
return port;
23-
}
24-
25-
@Override
26-
public boolean equals(Object obj) {
27-
if (obj == null) return false;
28-
if (obj == this) return true;
29-
if (!(obj instanceof HostAndPort)) return false;
30-
HostAndPort other = (HostAndPort) obj;
31-
return this.port == other.port && this.host.equals(other.host);
32-
}
33-
34-
@Override
35-
public int hashCode() {
36-
return 31 * host.hashCode() + port;
37-
}
38-
39-
@Override
40-
public String toString() {
41-
return host + ":" + port;
42-
}
43-
44-
/**
45-
* Creates HostAndPort with <i>unconverted</i> host.
46-
* @param string String to parse. Must be in <b>"host:port"</b> format. Port is mandatory.
47-
* @return parsed HostAndPort
48-
*/
49-
public static HostAndPort from(String string) {
50-
int lastColon = string.lastIndexOf(":");
51-
String host = string.substring(0, lastColon);
52-
int port = Integer.parseInt(string.substring(lastColon + 1));
53-
return new HostAndPort(host, port);
54-
}
7+
private static final long serialVersionUID = -519876229978427751L;
8+
9+
private final String host;
10+
private final int port;
11+
12+
public HostAndPort(String host, int port) {
13+
this.host = host;
14+
this.port = port;
15+
}
16+
17+
public String getHost() {
18+
return host;
19+
}
20+
21+
public int getPort() {
22+
return port;
23+
}
24+
25+
@Override
26+
public boolean equals(Object obj) {
27+
if (obj == null) return false;
28+
if (obj == this) return true;
29+
if (!(obj instanceof HostAndPort)) return false;
30+
HostAndPort other = (HostAndPort) obj;
31+
return this.port == other.port && this.host.equals(other.host);
32+
}
33+
34+
@Override
35+
public int hashCode() {
36+
return 31 * host.hashCode() + port;
37+
}
38+
39+
@Override
40+
public String toString() {
41+
return host + ":" + port;
42+
}
43+
44+
/**
45+
* Creates HostAndPort with <i>unconverted</i> host.
46+
* @param string String to parse. Must be in <b>"host:port"</b> format. Port is mandatory.
47+
* @return parsed HostAndPort
48+
*/
49+
public static HostAndPort from(String string) {
50+
int lastColon = string.lastIndexOf(":");
51+
String host = string.substring(0, lastColon);
52+
int port = Integer.parseInt(string.substring(lastColon + 1));
53+
return new HostAndPort(host, port);
54+
}
5555
}

0 commit comments

Comments
 (0)