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
Move Widget attribute data to the mappings JSON
[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
..
e993c88
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,18
+18,20
@@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aai.babel.xml.generator.model;
import java.util.Collections;
import java.util.List;
import java.util.Map;
package org.onap.aai.babel.xml.generator.model;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import org.onap.aai.babel.xml.generator.XmlArtifactGenerationException;
import org.onap.aai.babel.xml.generator.model.Widget.Type;
public class Resource extends Model {
private Type type;
private boolean deleteFlag;
import org.onap.aai.babel.xml.generator.model.Widget.Type;
public class Resource extends Model {
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;
@@
-56,17
+58,12
@@
public class Resource extends Model {
return false;
}
return false;
}
+ @Override
public boolean getDeleteFlag() {
return deleteFlag;
}
public boolean getDeleteFlag() {
return deleteFlag;
}
- public String getWidgetInvariantId() {
- return Widget.getWidget(getWidgetType()).getWidgetId();
- }
- public String getWidgetId() {
- return Widget.getWidget(getWidgetType()).getId();
- }
public void setProperties(Map<String, Object> properties) {
this.properties = properties;
public void setProperties(Map<String, Object> properties) {
this.properties = properties;
@@
-99,25
+96,25
@@
public class Resource extends Model {
* Adds a Widget.
*
* @param widget
* Adds a Widget.
*
* @param widget
- *
the widget
+ * the widget
* @return the boolean
* @return the boolean
+ * @throws XmlArtifactGenerationException
*/
@Override
*/
@Override
- public boolean addWidget(Widget widget) {
+ public boolean addWidget(Widget widget)
throws XmlArtifactGenerationException
{
if (type == Type.VFMODULE) {
if (widget.memberOf(members)) {
if (type == Type.VFMODULE) {
if (widget.memberOf(members)) {
- if (vserver == null && widget.get
Id().equals(new VServerWidget().getId())
) {
+ if (vserver == null && widget.get
WidgetType() == Type.VSERVER
) {
addVserverWidget(widget);
addVserverWidget(widget);
- } else if (widget.get
Id().equals(new LIntfWidget().getId())
) {
+ } else if (widget.get
WidgetType() == Type.LINT
) {
return addLIntfWidget(widget);
return addLIntfWidget(widget);
- } else if (widget.get
Id().equals(new VolumeWidget().getId())
) {
+ } else if (widget.get
WidgetType() == Type.VOLUME
) {
addVolumeWidget(widget);
return true;
}
addVolumeWidget(widget);
return true;
}
- if (widget.get
Id().equals(new OamNetwork().getId())
) {
- return
false
;
+ if (widget.get
WidgetType() != Type.OAM_NETWORK
) {
+ return
widgets.add(widget)
;
}
}
- return widgets.add(widget);
}
return false;
} else {
}
return false;
} else {
@@
-129,6
+126,11
@@
public class Resource extends Model {
return type;
}
return type;
}
+ @Override
+ public String toString() {
+ return "Widget type " + getWidgetType() + ", isResource=" + isResource() + ", deleteFlag=" + deleteFlag;
+ }
+
private void addVolumeWidget(Widget widget) {
if (vserver != null) {
vserver.addWidget(widget);
private void addVolumeWidget(Widget widget) {
if (vserver != null) {
vserver.addWidget(widget);
@@
-151,13
+153,13
@@
public class Resource extends Model {
}
}
}
}
- private void addVserverWidget(Widget widget) {
+ private void addVserverWidget(Widget widget)
throws XmlArtifactGenerationException
{
vserver = widget;
if (addlintf) {
vserver = widget;
if (addlintf) {
- vserver.addWidget(
new LIntfWidget(
));
+ vserver.addWidget(
Widget.getWidget(Type.LINT
));
}
if (addvolume) {
}
if (addvolume) {
- vserver.addWidget(
new VolumeWidget(
));
+ vserver.addWidget(
Widget.getWidget(Type.VOLUME
));
}
}
}
}