Skip to content

Commit e9a7455

Browse files
vincentarnaud90vincentarnaud90
authored
Code formating
Revert changes from codestyle and generate data in CommandTest with loops
1 parent 2bccf4a commit e9a7455

File tree

3 files changed

+60
-91
lines changed

3 files changed

+60
-91
lines changed

‎mr/src/main/java/org/elasticsearch/hadoop/rest/InitializationUtils.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,7 @@ public static void validateSettingsForWriting(Settings settings) {
299299
throw new EsHadoopIllegalArgumentException("Cannot use TTL on index/update requests in ES 6.x and " +
300300
"above. Please remove the [" + ConfigurationOptions.ES_MAPPING_TTL + "] setting.");
301301
}
302-
}
303-
else {
302+
} else {
304303
if (StringUtils.hasText(settings.getMappingTtl())) {
305304
LOG.warn("Setting [" + ConfigurationOptions.ES_MAPPING_TTL + "] is deprecated! Support for [ttl] on " +
306305
"indexing and update requests has been removed in ES 6.x and above!");
@@ -387,7 +386,7 @@ private static void doCheckIndexExistence(Settings settings, RestRepository clie
387386
settings.getResourceWrite(), ConfigurationOptions.ES_INDEX_AUTO_CREATE, settings.getIndexAutoCreate()));
388387
}
389388
}
390-
389+
391390
public static boolean setMetadataExtractorIfNotSet(Settings settings, Class<? extends MetadataExtractor> clazz, Log log) {
392391
if (!StringUtils.hasText(settings.getMappingMetadataExtractorClassName())) {
393392
Log logger = (log != null ? log : LogFactory.getLog(clazz));

‎mr/src/main/java/org/elasticsearch/hadoop/serialization/bulk/DeleteBulkFactory.java

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,19 @@
1818
*/
1919
package org.elasticsearch.hadoop.serialization.bulk;
2020

21-
import org.apache.hadoop.io.*;
21+
import org.apache.hadoop.io.BooleanWritable;
22+
import org.apache.hadoop.io.ByteWritable;
23+
import org.apache.hadoop.io.BytesWritable;
24+
import org.apache.hadoop.io.DoubleWritable;
25+
import org.apache.hadoop.io.FloatWritable;
26+
import org.apache.hadoop.io.IntWritable;
27+
import org.apache.hadoop.io.LongWritable;
28+
import org.apache.hadoop.io.MD5Hash;
29+
import org.apache.hadoop.io.NullWritable;
30+
import org.apache.hadoop.io.Text;
31+
import org.apache.hadoop.io.UTF8;
32+
import org.apache.hadoop.io.VIntWritable;
33+
import org.apache.hadoop.io.VLongWritable;
2234
import org.elasticsearch.hadoop.cfg.ConfigurationOptions;
2335
import org.elasticsearch.hadoop.cfg.Settings;
2436
import org.elasticsearch.hadoop.serialization.Generator;
@@ -34,47 +46,35 @@ public static final class NoDataWriter implements ValueWriter<Object> {
3446

3547
@Override
3648
public Result write(Object writable, Generator generator) {
37-
///delete doesn't require any content but it needs to extract metadata associated to a document
49+
//delete doesn't require any content but it needs to extract metadata associated to a document
3850
if (writable == null || writable instanceof NullWritable) {
3951
generator.writeNull();
40-
}
41-
else if (writable instanceof Text) {
52+
} else if (writable instanceof Text) {
4253
Text text = (Text) writable;
4354
generator.writeUTF8String(text.getBytes(), 0, text.getLength());
44-
}
45-
else if (writable instanceof UTF8) {
55+
} else if (writable instanceof UTF8) {
4656
UTF8 utf8 = (UTF8) writable;
4757
generator.writeUTF8String(utf8.getBytes(), 0, utf8.getLength());
48-
}
49-
else if (writable instanceof IntWritable) {
58+
} else if (writable instanceof IntWritable) {
5059
generator.writeNumber(((IntWritable) writable).get());
51-
}
52-
else if (writable instanceof LongWritable) {
60+
} else if (writable instanceof LongWritable) {
5361
generator.writeNumber(((LongWritable) writable).get());
54-
}
55-
else if (writable instanceof VLongWritable) {
62+
} else if (writable instanceof VLongWritable) {
5663
generator.writeNumber(((VLongWritable) writable).get());
57-
}
58-
else if (writable instanceof VIntWritable) {
64+
} else if (writable instanceof VIntWritable) {
5965
generator.writeNumber(((VIntWritable) writable).get());
60-
}
61-
else if (writable instanceof ByteWritable) {
66+
} else if (writable instanceof ByteWritable) {
6267
generator.writeNumber(((ByteWritable) writable).get());
63-
}
64-
else if (writable instanceof DoubleWritable) {
68+
} else if (writable instanceof DoubleWritable) {
6569
generator.writeNumber(((DoubleWritable) writable).get());
66-
}
67-
else if (writable instanceof FloatWritable) {
70+
} else if (writable instanceof FloatWritable) {
6871
generator.writeNumber(((FloatWritable) writable).get());
69-
}
70-
else if (writable instanceof BooleanWritable) {
72+
} else if (writable instanceof BooleanWritable) {
7173
generator.writeBoolean(((BooleanWritable) writable).get());
72-
}
73-
else if (writable instanceof BytesWritable) {
74+
} else if (writable instanceof BytesWritable) {
7475
BytesWritable bw = (BytesWritable) writable;
7576
generator.writeBinary(bw.getBytes(), 0, bw.getLength());
76-
}
77-
else if (writable instanceof MD5Hash) {
77+
} else if (writable instanceof MD5Hash) {
7878
generator.writeString(writable.toString());
7979
}
8080
return Result.SUCCESFUL();

‎mr/src/test/java/org/elasticsearch/hadoop/serialization/CommandTest.java

Lines changed: 32 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
*/
1919
package org.elasticsearch.hadoop.serialization;
2020

21+
import java.util.ArrayList;
2122
import java.util.Arrays;
2223
import java.util.Collection;
24+
import java.util.Collections;
2325
import java.util.LinkedHashMap;
2426
import java.util.Map;
2527

@@ -65,56 +67,29 @@ public static Collection<Object[]> data() {
6567
throw new IllegalStateException("CommandTest needs new version updates.");
6668
}
6769

68-
return Arrays.asList(new Object[][]{
69-
{ConfigurationOptions.ES_OPERATION_INDEX, false, EsMajorVersion.V_1_X},
70-
{ConfigurationOptions.ES_OPERATION_CREATE, false, EsMajorVersion.V_1_X},
71-
{ConfigurationOptions.ES_OPERATION_UPDATE, false, EsMajorVersion.V_1_X},
72-
{ConfigurationOptions.ES_OPERATION_DELETE, false, EsMajorVersion.V_1_X},
73-
{ConfigurationOptions.ES_OPERATION_INDEX, true, EsMajorVersion.V_1_X},
74-
{ConfigurationOptions.ES_OPERATION_CREATE, true, EsMajorVersion.V_1_X},
75-
{ConfigurationOptions.ES_OPERATION_UPDATE, true, EsMajorVersion.V_1_X},
76-
{ConfigurationOptions.ES_OPERATION_DELETE, true, EsMajorVersion.V_1_X},
77-
{ConfigurationOptions.ES_OPERATION_INDEX, false, EsMajorVersion.V_2_X},
78-
{ConfigurationOptions.ES_OPERATION_CREATE, false, EsMajorVersion.V_2_X},
79-
{ConfigurationOptions.ES_OPERATION_UPDATE, false, EsMajorVersion.V_2_X},
80-
{ConfigurationOptions.ES_OPERATION_DELETE, false, EsMajorVersion.V_2_X},
81-
{ConfigurationOptions.ES_OPERATION_INDEX, true, EsMajorVersion.V_2_X},
82-
{ConfigurationOptions.ES_OPERATION_CREATE, true, EsMajorVersion.V_2_X},
83-
{ConfigurationOptions.ES_OPERATION_UPDATE, true, EsMajorVersion.V_2_X},
84-
{ConfigurationOptions.ES_OPERATION_DELETE, true, EsMajorVersion.V_2_X},
85-
{ConfigurationOptions.ES_OPERATION_INDEX, false, EsMajorVersion.V_5_X},
86-
{ConfigurationOptions.ES_OPERATION_CREATE, false, EsMajorVersion.V_5_X},
87-
{ConfigurationOptions.ES_OPERATION_UPDATE, false, EsMajorVersion.V_5_X},
88-
{ConfigurationOptions.ES_OPERATION_DELETE, false, EsMajorVersion.V_5_X},
89-
{ConfigurationOptions.ES_OPERATION_INDEX, true, EsMajorVersion.V_5_X},
90-
{ConfigurationOptions.ES_OPERATION_CREATE, true, EsMajorVersion.V_5_X},
91-
{ConfigurationOptions.ES_OPERATION_UPDATE, true, EsMajorVersion.V_5_X},
92-
{ConfigurationOptions.ES_OPERATION_DELETE, true, EsMajorVersion.V_5_X},
93-
{ConfigurationOptions.ES_OPERATION_INDEX, false, EsMajorVersion.V_6_X},
94-
{ConfigurationOptions.ES_OPERATION_CREATE, false, EsMajorVersion.V_6_X},
95-
{ConfigurationOptions.ES_OPERATION_UPDATE, false, EsMajorVersion.V_6_X},
96-
{ConfigurationOptions.ES_OPERATION_DELETE, false, EsMajorVersion.V_6_X},
97-
{ConfigurationOptions.ES_OPERATION_INDEX, true, EsMajorVersion.V_6_X},
98-
{ConfigurationOptions.ES_OPERATION_CREATE, true, EsMajorVersion.V_6_X},
99-
{ConfigurationOptions.ES_OPERATION_UPDATE, true, EsMajorVersion.V_6_X},
100-
{ConfigurationOptions.ES_OPERATION_DELETE, true, EsMajorVersion.V_6_X},
101-
{ConfigurationOptions.ES_OPERATION_INDEX, false, EsMajorVersion.V_7_X},
102-
{ConfigurationOptions.ES_OPERATION_CREATE, false, EsMajorVersion.V_7_X},
103-
{ConfigurationOptions.ES_OPERATION_UPDATE, false, EsMajorVersion.V_7_X},
104-
{ConfigurationOptions.ES_OPERATION_DELETE, false, EsMajorVersion.V_7_X},
105-
{ConfigurationOptions.ES_OPERATION_INDEX, true, EsMajorVersion.V_7_X},
106-
{ConfigurationOptions.ES_OPERATION_CREATE, true, EsMajorVersion.V_7_X},
107-
{ConfigurationOptions.ES_OPERATION_UPDATE, true, EsMajorVersion.V_7_X},
108-
{ConfigurationOptions.ES_OPERATION_DELETE, true, EsMajorVersion.V_7_X},
109-
{ConfigurationOptions.ES_OPERATION_INDEX, false, EsMajorVersion.V_8_X},
110-
{ConfigurationOptions.ES_OPERATION_CREATE, false, EsMajorVersion.V_8_X},
111-
{ConfigurationOptions.ES_OPERATION_UPDATE, false, EsMajorVersion.V_8_X},
112-
{ConfigurationOptions.ES_OPERATION_DELETE, false, EsMajorVersion.V_8_X},
113-
{ConfigurationOptions.ES_OPERATION_INDEX, true, EsMajorVersion.V_8_X},
114-
{ConfigurationOptions.ES_OPERATION_CREATE, true, EsMajorVersion.V_8_X},
115-
{ConfigurationOptions.ES_OPERATION_UPDATE, true, EsMajorVersion.V_8_X},
116-
{ConfigurationOptions.ES_OPERATION_DELETE, true, EsMajorVersion.V_8_X}
117-
});
70+
Collection<Object[]> result = new ArrayList<>();
71+
72+
String[] operations = new String[]{ConfigurationOptions.ES_OPERATION_INDEX,
73+
ConfigurationOptions.ES_OPERATION_CREATE,
74+
ConfigurationOptions.ES_OPERATION_UPDATE,
75+
ConfigurationOptions.ES_OPERATION_DELETE};
76+
boolean[] asJsons = new boolean[]{false, true};
77+
EsMajorVersion[] versions = new EsMajorVersion[]{EsMajorVersion.V_1_X,
78+
EsMajorVersion.V_2_X,
79+
EsMajorVersion.V_5_X,
80+
EsMajorVersion.V_6_X,
81+
EsMajorVersion.V_7_X,
82+
EsMajorVersion.V_8_X};
83+
84+
for (EsMajorVersion version : versions) {
85+
for (boolean asJson : asJsons) {
86+
for (String operation : operations) {
87+
result.add(new Object[]{ operation, asJson, version });
88+
}
89+
}
90+
}
91+
92+
return result;
11893
}
11994

12095
public CommandTest(String operation, boolean jsonInput, EsMajorVersion version) {
@@ -131,8 +106,7 @@ public void prepare() {
131106
map.put("n", 1);
132107
map.put("s", "v");
133108
data = map;
134-
}
135-
else {
109+
} else {
136110
data = "{\"n\":1,\"s\":\"v\"}";
137111
}
138112
}
@@ -287,17 +261,15 @@ public void testIdPattern() throws Exception {
287261
Settings settings = settings();
288262
if (version.onOrAfter(EsMajorVersion.V_8_X)) {
289263
settings.setResourceWrite("{n}");
290-
}
291-
else {
264+
} else {
292265
settings.setResourceWrite("foo/{n}");
293266
}
294267

295268
create(settings).write(data).copyTo(ba);
296269
String header;
297270
if (version.onOrAfter(EsMajorVersion.V_8_X)) {
298271
header = "{\"_index\":\"1\"" + (isUpdateOp() ? ",\"_id\":2" : "") + "}";
299-
}
300-
else {
272+
} else {
301273
header = "{\"_index\":\"foo\",\"_type\":\"1\"" + (isUpdateOp() ? ",\"_id\":2" : "") + "}";
302274
}
303275
String result = "{\"" + operation + "\":" + header + "}" + map();
@@ -345,7 +317,7 @@ public void testUpdateOnlyInlineScript5X() throws Exception {
345317
create(set).write(data).copyTo(ba);
346318
String result =
347319
"{\"" + operation + "\":{\"_id\":2,\"_retry_on_conflict\":3}}\n" +
348-
"{\"script\":{\"inline\":\"counter = 3\",\"lang\":\"groovy\"}}\n";
320+
"{\"script\":{\"inline\":\"counter = 3\",\"lang\":\"groovy\"}}\n";
349321
assertEquals(result, ba.toString());
350322
}
351323

@@ -475,7 +447,7 @@ public void testUpdateOnlyParamInlineScript5X() throws Exception {
475447

476448
String result =
477449
"{\"" + operation + "\":{\"_id\":1}}\n" +
478-
"{\"script\":{\"inline\":\"counter = param1; anothercounter = param2\",\"lang\":\"groovy\",\"params\":{\"param1\":1,\"param2\":1}}}\n";
450+
"{\"script\":{\"inline\":\"counter = param1; anothercounter = param2\",\"lang\":\"groovy\",\"params\":{\"param1\":1,\"param2\":1}}}\n";
479451

480452
assertEquals(result, ba.toString());
481453
}
@@ -553,8 +525,7 @@ private Settings settings() {
553525
set.setProperty(ConfigurationOptions.ES_INPUT_JSON, Boolean.toString(jsonInput));
554526
if (isDeleteOP()) {
555527
InitializationUtils.setValueWriterIfNotSet(set, DeleteBulkFactory.NoDataWriter.class, null);
556-
}
557-
else {
528+
} else {
558529
InitializationUtils.setValueWriterIfNotSet(set, JdkValueWriter.class, null);
559530
}
560531
InitializationUtils.setFieldExtractorIfNotSet(set, MapFieldExtractor.class, null);
@@ -564,8 +535,7 @@ private Settings settings() {
564535
set.setProperty(ConfigurationOptions.ES_WRITE_OPERATION, operation);
565536
if (version.onOrAfter(EsMajorVersion.V_8_X)) {
566537
set.setResourceWrite("foo");
567-
}
568-
else {
538+
} else {
569539
set.setResourceWrite("foo/bar");
570540
}
571541
if (isUpdateOp()) {

0 commit comments

Comments
 (0)