Skip to content

Commit 227b824

Browse files
return empty list of instruments if no image detected
1 parent 6bebf8c commit 227b824

File tree

10 files changed

+31
-2
lines changed

10 files changed

+31
-2
lines changed

src/main/java/ru/r2cloud/model/Observation.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,9 @@ public static Observation fromJson(JsonObject meta) {
357357
}
358358
instrumentsObj.add(cur);
359359
}
360-
result.setInstruments(instrumentsObj);
360+
if (!instrumentsObj.isEmpty()) {
361+
result.setInstruments(instrumentsObj);
362+
}
361363
}
362364
return result;
363365
}
@@ -408,7 +410,7 @@ public JsonObject toJson(SignedURL signed) {
408410
if (device != null) {
409411
json.add("device", device.toJson());
410412
}
411-
if (getInstruments() != null) {
413+
if (getInstruments() != null && !getInstruments().isEmpty()) {
412414
JsonArray instrumentsArray = new JsonArray();
413415
for (Instrument cur : getInstruments()) {
414416
instrumentsArray.add(cur.toJson(signed));

src/main/java/ru/r2cloud/satellite/decoder/FoxDecoder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ protected List<Instrument> decodeImage(Satellite satellite, List<? extends Beaco
9696
}
9797
series.add(imageFile);
9898
}
99+
if (series.isEmpty()) {
100+
return Collections.emptyList();
101+
}
99102
Instrument result = new Instrument(camera);
100103
result.setImageSeries(series);
101104
return Collections.singletonList(result);

src/main/java/ru/r2cloud/satellite/decoder/GaspacsDecoder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ protected List<Instrument> decodeImage(Satellite satellite, List<? extends Beaco
5454
}
5555
series.add(imageFile);
5656
}
57+
if (series.isEmpty()) {
58+
return Collections.emptyList();
59+
}
5760
Instrument result = new Instrument(camera);
5861
result.setImageSeries(series);
5962
return Collections.singletonList(result);

src/main/java/ru/r2cloud/satellite/decoder/Geoscan2Decoder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ protected List<Instrument> decodeImage(Satellite satellite, List<? extends Beaco
5050
}
5151
series.add(imageFile);
5252
}
53+
if (series.isEmpty()) {
54+
return Collections.emptyList();
55+
}
5356
Instrument result = new Instrument(camera);
5457
result.setImageSeries(series);
5558
return Collections.singletonList(result);

src/main/java/ru/r2cloud/satellite/decoder/Jy1satDecoder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ protected List<Instrument> decodeImage(Satellite satellite, List<? extends Beaco
4646
}
4747
series.add(imageFile);
4848
}
49+
if (series.isEmpty()) {
50+
return Collections.emptyList();
51+
}
4952
Instrument result = new Instrument(camera);
5053
result.setImageSeries(series);
5154
return Collections.singletonList(result);

src/main/java/ru/r2cloud/satellite/decoder/Lucky7Decoder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ protected List<Instrument> decodeImage(Satellite satellite, List<? extends Beaco
4747
}
4848
series.add(imageFile);
4949
}
50+
if (series.isEmpty()) {
51+
return Collections.emptyList();
52+
}
5053
Instrument result = new Instrument(camera);
5154
result.setImageSeries(series);
5255
return Collections.singletonList(result);

src/main/java/ru/r2cloud/satellite/decoder/RoseyDecoder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ protected List<Instrument> decodeImage(Satellite satellite, List<? extends Beaco
4141
}
4242
series.add(imageFile);
4343
}
44+
if (series.isEmpty()) {
45+
return Collections.emptyList();
46+
}
4447
Instrument result = new Instrument(camera);
4548
result.setImageSeries(series);
4649
return Collections.singletonList(result);

src/main/java/ru/r2cloud/satellite/decoder/Sharjahsat1Decoder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ protected List<Instrument> decodeImage(Satellite satellite, List<? extends Beaco
4141
}
4242
series.add(imageFile);
4343
}
44+
if (series.isEmpty()) {
45+
return Collections.emptyList();
46+
}
4447
Instrument result = new Instrument(camera);
4548
result.setImageSeries(series);
4649
return Collections.singletonList(result);

src/main/java/ru/r2cloud/satellite/decoder/SputnixDecoder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ protected List<Instrument> decodeImage(Satellite satellite, List<? extends Beaco
4141
}
4242
series.add(imageFile);
4343
}
44+
if (series.isEmpty()) {
45+
return Collections.emptyList();
46+
}
4447
Instrument result = new Instrument(camera);
4548
result.setImageSeries(series);
4649
return Collections.singletonList(result);

src/main/java/ru/r2cloud/satellite/decoder/StratosatTk1Decoder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ protected List<Instrument> decodeImage(Satellite satellite, List<? extends Beaco
4545
}
4646
series.add(imageFile);
4747
}
48+
if (series.isEmpty()) {
49+
return Collections.emptyList();
50+
}
4851
Instrument result = new Instrument(camera);
4952
result.setImageSeries(series);
5053
return Collections.singletonList(result);

0 commit comments

Comments
 (0)