parent
4c25f49e3b
commit
c392288469
|
|
@ -55,7 +55,7 @@ public class MetaDataStorageService
|
|||
try {
|
||||
return openLanguages();
|
||||
} catch (FileNotFoundException e) {
|
||||
logger.log(Level.ALL,"LANGUAGE FILE NOT FOUND", e);
|
||||
logger.log(Level.ALL, "LANGUAGE FILE NOT FOUND", e);
|
||||
return new ArrayList<>();
|
||||
}
|
||||
}
|
||||
|
|
@ -66,7 +66,7 @@ public class MetaDataStorageService
|
|||
try {
|
||||
return openBrands();
|
||||
} catch (FileNotFoundException e) {
|
||||
logger.log(Level.ALL,"BRAND FILE NOT FOUND", e);
|
||||
logger.log(Level.ALL, "BRAND FILE NOT FOUND", e);
|
||||
return new ArrayList<>();
|
||||
}
|
||||
}
|
||||
|
|
@ -76,14 +76,14 @@ public class MetaDataStorageService
|
|||
|
||||
var path = storageService.load(FOLDER_MODELS);
|
||||
|
||||
return Arrays.stream(path.toFile().listFiles()).map(x-> x.getName()).collect(Collectors.toList());
|
||||
return Arrays.stream(path.toFile().listFiles()).map(x -> x.getName()).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> openAvailableDeviceArticles() {
|
||||
var path = storageService.load(FOLDER_DEVICES);
|
||||
|
||||
return Arrays.stream(path.toFile().listFiles()).map(x-> x.getName()).collect(Collectors.toList());
|
||||
return Arrays.stream(path.toFile().listFiles()).map(x -> x.getName()).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -94,11 +94,31 @@ public class MetaDataStorageService
|
|||
return gsonService.readJson(gsonService.getTypeTokenList(), file);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<VehicleModelDto> openModelsOrEmpty(String brand) {
|
||||
try {
|
||||
return openModels(brand);
|
||||
} catch (FileNotFoundException e) {
|
||||
e.printStackTrace();
|
||||
return new ArrayList<>();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DeviceDto> openDevices() throws FileNotFoundException {
|
||||
return openDevices(FILENAME_DEVICES);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DeviceDto> openDevicesOrEmpty() {
|
||||
try {
|
||||
return openDevices();
|
||||
} catch (FileNotFoundException e) {
|
||||
e.printStackTrace();
|
||||
return new ArrayList<>();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DeviceDto> openDevices(String filename) throws FileNotFoundException {
|
||||
|
||||
|
|
|
|||
|
|
@ -24,8 +24,10 @@ public interface IMetaDataStorage {
|
|||
List<String> openAvailableDeviceArticles();
|
||||
|
||||
List<VehicleModelDto> openModels(String brand) throws FileNotFoundException;
|
||||
List<VehicleModelDto> openModelsOrEmpty(String brand);
|
||||
|
||||
List<DeviceDto> openDevices() throws FileNotFoundException;
|
||||
List<DeviceDto> openDevicesOrEmpty();
|
||||
|
||||
List<DeviceDto> openDevices(String filename) throws FileNotFoundException;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,5 +6,9 @@
|
|||
{
|
||||
"brandId": "audi",
|
||||
"name": "Audi"
|
||||
},
|
||||
{
|
||||
"brandId": "hyundai",
|
||||
"name": "Hyundai"
|
||||
}
|
||||
]
|
||||
Loading…
Reference in New Issue