Skip to content

Commit

Permalink
apply java google code format
Browse files Browse the repository at this point in the history
  • Loading branch information
ale-axelor committed Jan 17, 2019
1 parent 3b6afd9 commit c935bac
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -323,15 +323,17 @@ public void addRawMaterials(
if (rawMaterials != null && !rawMaterials.isEmpty()) {
BillOfMaterial billOfMaterial = billOfMaterialRepo.find(billOfMaterialId);
int priority = 0;
if (billOfMaterial.getBillOfMaterialSet() != null && !billOfMaterial.getBillOfMaterialSet().isEmpty()) {
priority = Collections.max(
billOfMaterial
.getBillOfMaterialSet()
.stream()
.map(it -> it.getPriority())
.collect(Collectors.toSet()));
if (billOfMaterial.getBillOfMaterialSet() != null
&& !billOfMaterial.getBillOfMaterialSet().isEmpty()) {
priority =
Collections.max(
billOfMaterial
.getBillOfMaterialSet()
.stream()
.map(it -> it.getPriority())
.collect(Collectors.toSet()));
}

for (LinkedHashMap<String, Object> rawMaterial : rawMaterials) {
priority += 10;
BillOfMaterial newComponent =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public void addRawMaterials(ActionRequest request, ActionResponse response) {

if (rawMaterials != null && !rawMaterials.isEmpty()) {
billOfMaterialService.addRawMaterials(billOfMaterial.getId(), rawMaterials);

response.setReload(true);
}
} catch (Exception e) {
Expand Down

0 comments on commit c935bac

Please sign in to comment.