if (mandatory && (soneId == null)) {
throw new FcpException("Could not load Sone ID from “" + parameterName + "”.");
}
- Optional<Sone> sone = core.getSone(soneId);
- if ((mandatory && !sone.isPresent()) || (mandatory && sone.isPresent() && (localOnly && !sone.get().isLocal()))) {
+ Sone sone = core.getSone(soneId);
+ if ((mandatory && (sone == null)) || ((sone != null) && localOnly && !sone.isLocal())) {
throw new FcpException("Could not load Sone from “" + soneId + "”.");
}
- return sone;
+ return Optional.fromNullable(sone);
}
/**
protected static SimpleFieldSet encodeSone(Sone sone, String prefix, Optional<Sone> localSone) {
SimpleFieldSetBuilder soneBuilder = new SimpleFieldSetBuilder();
+ soneBuilder.put(prefix + "ID", sone.getId());
soneBuilder.put(prefix + "Name", sone.getName());
soneBuilder.put(prefix + "NiceName", SoneAccessor.getNiceName(sone));
soneBuilder.put(prefix + "LastUpdated", sone.getTime());
soneBuilder.put(prefix + "Count", sones.size());
for (Sone sone : sones) {
String sonePrefix = prefix + soneIndex++ + ".";
- soneBuilder.put(sonePrefix + "ID", sone.getId());
- soneBuilder.put(sonePrefix + "Name", sone.getName());
- soneBuilder.put(sonePrefix + "NiceName", SoneAccessor.getNiceName(sone));
- soneBuilder.put(sonePrefix + "Time", sone.getTime());
+ soneBuilder.put(encodeSone(sone, sonePrefix, Optional.<Sone>absent()));
}
return soneBuilder.get();