Code Review
/
aai
/
babel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix checkstyle issues including javadoc
[aai/babel.git]
/
src
/
main
/
java
/
org
/
onap
/
aai
/
babel
/
xml
/
generator
/
model
/
Resource.java
diff --git
a/src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java
b/src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java
index
121bc19
..
dffff62
100644
(file)
--- a/
src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java
+++ b/
src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java
@@
-18,6
+18,7
@@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aai.babel.xml.generator.model;
import java.util.Collections;
package org.onap.aai.babel.xml.generator.model;
import java.util.Collections;
@@
-29,7
+30,7
@@
public class Resource extends Model {
private Type type;
private boolean deleteFlag;
private Type type;
private boolean deleteFlag;
- private boolean isResource = true;
+ private boolean isResource = true;
private Map<String, Object> properties = Collections.emptyMap();
Widget vserver = null;
private Map<String, Object> properties = Collections.emptyMap();
Widget vserver = null;
@@
-106,18
+107,17
@@
public class Resource extends Model {
public boolean addWidget(Widget widget) {
if (type == Type.VFMODULE) {
if (widget.memberOf(members)) {
public boolean addWidget(Widget widget) {
if (type == Type.VFMODULE) {
if (widget.memberOf(members)) {
- if (vserver == null && widget
.getId().equals(new VServerWidget().getId())
) {
+ if (vserver == null && widget
instanceof VServerWidget
) {
addVserverWidget(widget);
addVserverWidget(widget);
- } else if (widget
.getId().equals(new LIntfWidget().getId())
) {
+ } else if (widget
instanceof LIntfWidget
) {
return addLIntfWidget(widget);
return addLIntfWidget(widget);
- } else if (widget
.getId().equals(new VolumeWidget().getId())
) {
+ } else if (widget
instanceof VolumeWidget
) {
addVolumeWidget(widget);
return true;
}
addVolumeWidget(widget);
return true;
}
- if (
widget.getId().equals(new OamNetwork().getId()
)) {
- return
false
;
+ if (
!(widget instanceof OamNetwork
)) {
+ return
widgets.add(widget)
;
}
}
- return widgets.add(widget);
}
return false;
} else {
}
return false;
} else {