Reformat openecomp-be

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3449
Change-Id: I13e02322f8e00820cc5a1d85752caaeda9bf10d1

4 files changed, 81 insertions, 82 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictDto.java
index 004517434e..e7179fd6a3 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictDto.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,28 +17,28 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.conflict.types;
 
 import java.util.Map;
 
 public class ConflictDto extends ConflictInfoDto {
-  private Map<String, Object> yours;
-  private Map<String, Object> theirs;
 
-  public Map<String, Object> getYours() {
-    return yours;
-  }
+    private Map<String, Object> yours;
+    private Map<String, Object> theirs;
+
+    public Map<String, Object> getYours() {
+        return yours;
+    }
 
-  public void setYours(Map<String, Object> yours) {
-    this.yours = yours;
-  }
+    public void setYours(Map<String, Object> yours) {
+        this.yours = yours;
+    }
 
-  public Map<String, Object> getTheirs() {
-    return theirs;
-  }
+    public Map<String, Object> getTheirs() {
+        return theirs;
+    }
 
-  public void setTheirs(Map<String, Object> theirs) {
-    this.theirs = theirs;
-  }
+    public void setTheirs(Map<String, Object> theirs) {
+        this.theirs = theirs;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictInfoDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictInfoDto.java
index 659ca46c8f..320fc3de61 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictInfoDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictInfoDto.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,37 +17,37 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.conflict.types;
 
 import org.openecomp.sdc.datatypes.model.ElementType;
 
 public class ConflictInfoDto {
-  private String id;
-  private ElementType type;
-  private String name;
 
-  public String getId() {
-    return id;
-  }
+    private String id;
+    private ElementType type;
+    private String name;
+
+    public String getId() {
+        return id;
+    }
 
-  public void setId(String id) {
-    this.id = id;
-  }
+    public void setId(String id) {
+        this.id = id;
+    }
 
-  public ElementType getType() {
-    return type;
-  }
+    public ElementType getType() {
+        return type;
+    }
 
-  public void setType(ElementType type) {
-    this.type = type;
-  }
+    public void setType(ElementType type) {
+        this.type = type;
+    }
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public void setName(String name) {
-    this.name = name;
-  }
+    public void setName(String name) {
+        this.name = name;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictResolutionDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictResolutionDto.java
index 8983c91924..6d3ca38a03 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictResolutionDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictResolutionDto.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,31 +17,30 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.conflict.types;
 
-import org.openecomp.conflicts.types.Resolution;
-
 import java.util.Map;
+import org.openecomp.conflicts.types.Resolution;
 
 public class ConflictResolutionDto {
-  private Resolution resolution;
-  // sits in lower level...
-  private Map<String, Object> otherResolution;
 
-  public Resolution getResolution() {
-    return resolution;
-  }
+    private Resolution resolution;
+    // sits in lower level...
+    private Map<String, Object> otherResolution;
+
+    public Resolution getResolution() {
+        return resolution;
+    }
 
-  public void setResolution(Resolution resolution) {
-    this.resolution = resolution;
-  }
+    public void setResolution(Resolution resolution) {
+        this.resolution = resolution;
+    }
 
-  public Map<String, Object> getOtherResolution() {
-    return otherResolution;
-  }
+    public Map<String, Object> getOtherResolution() {
+        return otherResolution;
+    }
 
-  public void setOtherResolution(Map<String, Object> otherResolution) {
-    this.otherResolution = otherResolution;
-  }
+    public void setOtherResolution(Map<String, Object> otherResolution) {
+        this.otherResolution = otherResolution;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ItemVersionConflictDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ItemVersionConflictDto.java
index 005689450a..2eea6edc7a 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ItemVersionConflictDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ItemVersionConflictDto.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,33 +17,33 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.conflict.types;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-public class ItemVersionConflictDto{
-  private ConflictDto conflict;
-  private Collection<ConflictInfoDto> conflictInfoList = new ArrayList<>();
+public class ItemVersionConflictDto {
+
+    private ConflictDto conflict;
+    private Collection<ConflictInfoDto> conflictInfoList = new ArrayList<>();
 
-  public ConflictDto getConflict() {
-    return conflict;
-  }
+    public ConflictDto getConflict() {
+        return conflict;
+    }
 
-  public void setConflict(ConflictDto conflict) {
-    this.conflict = conflict;
-  }
+    public void setConflict(ConflictDto conflict) {
+        this.conflict = conflict;
+    }
 
-  public Collection<ConflictInfoDto> getConflictInfoList() {
-    return conflictInfoList;
-  }
+    public Collection<ConflictInfoDto> getConflictInfoList() {
+        return conflictInfoList;
+    }
 
-  public void setConflictInfoList(Collection<ConflictInfoDto> conflictInfoList) {
-    this.conflictInfoList = conflictInfoList;
-  }
+    public void setConflictInfoList(Collection<ConflictInfoDto> conflictInfoList) {
+        this.conflictInfoList = conflictInfoList;
+    }
 
-  public void addConflictInfo(ConflictInfoDto conflictInfo){
-    conflictInfoList.add(conflictInfo);
-  }
+    public void addConflictInfo(ConflictInfoDto conflictInfo) {
+        conflictInfoList.add(conflictInfo);
+    }
 }