diff options
| author | Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at> | 2019-05-16 14:26:03 +0200 |
|---|---|---|
| committer | Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at> | 2019-05-16 14:26:03 +0200 |
| commit | aff7c021e37e64162ce4e3fe5abd419072fb464f (patch) | |
| tree | fdf3b0b7f609e6c9c42f436dda298095c7d2a5cb /src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java | |
| parent | f18a151a98482093118f3b728c514b918afda8c5 (diff) | |
| download | moa-zs-aff7c021e37e64162ce4e3fe5abd419072fb464f.tar.gz moa-zs-aff7c021e37e64162ce4e3fe5abd419072fb464f.tar.bz2 moa-zs-aff7c021e37e64162ce4e3fe5abd419072fb464f.zip | |
Refactor + Document in preprocess
- Refactor: Move ConfigType.merge's null check to caller.
- Revise documentation of preprocess' public methods.
Diffstat (limited to 'src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java')
| -rw-r--r-- | src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java b/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java index f3a05d1..057c3d4 100644 --- a/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java +++ b/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java @@ -49,7 +49,9 @@ public class DeliveryRequestAugmenter { } else { - var mergedConfig = util.merge(requestConfig, fallbackConfig); + var mergedConfig = (requestConfig == null) + ? fallbackConfig + : util.merge(requestConfig, fallbackConfig); if (util.isComplete(mergedConfig)) { return deliveryRequestTypeBuilder(request) |