diff options
9 files changed, 16 insertions, 25 deletions
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/nwrest/UpdateNetworkRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/nwrest/UpdateNetworkRequest.java index 8dee54701d..a7976840b7 100644 --- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/nwrest/UpdateNetworkRequest.java +++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/nwrest/UpdateNetworkRequest.java @@ -31,7 +31,6 @@ import java.util.Map; import javax.xml.bind.annotation.XmlRootElement; import org.onap.so.entity.MsoRequest; -import org.onap.so.logger.MsoLogger; import org.onap.so.openstack.beans.Subnet; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/VfRollback.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/VfRollback.java index 5dca8696ef..3736669094 100644 --- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/VfRollback.java +++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/VfRollback.java @@ -95,11 +95,6 @@ public class VfRollback { public void setRequestType(String requestType) { this.requestType = requestType; } - /* - private String volumeGroupHeatStackId; - private String baseGroupHeatStackId; - private boolean isBase = false; - */ public String getVolumeGroupHeatStackId() { return this.volumeGroupHeatStackId; } diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/async/client/CreateVnfNotification.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/async/client/CreateVnfNotification.java index 39bd3ebf61..ba301b10fe 100644 --- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/async/client/CreateVnfNotification.java +++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/async/client/CreateVnfNotification.java @@ -319,7 +319,7 @@ public class CreateVnfNotification { */ public List<CreateVnfNotification.Outputs.Entry> getEntry() { if (entry == null) { - entry = new ArrayList<CreateVnfNotification.Outputs.Entry>(); + entry = new ArrayList<>(); } return this.entry; } diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/impl/RequestTunables.java b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/impl/RequestTunables.java index 515f1980d4..6947b870d7 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/impl/RequestTunables.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/impl/RequestTunables.java @@ -22,9 +22,6 @@ package org.onap.so.adapters.sdnc.impl; - - -import org.onap.so.logger.MsoLogger; public class RequestTunables { diff --git a/docs/developer_info/BPMN_Main_Process_Flows.rst b/docs/developer_info/BPMN_Main_Process_Flows.rst index 43e08ffd9c..35f43cfa23 100644 --- a/docs/developer_info/BPMN_Main_Process_Flows.rst +++ b/docs/developer_info/BPMN_Main_Process_Flows.rst @@ -37,4 +37,4 @@ Characteristics Example: CreateVfModuleVolumeInfraV1.bpmn ------------------------------------------ -.. image:: images/BPMN_Main_Process_Flows_1.png
\ No newline at end of file +.. image:: ../images/BPMN_Main_Process_Flows_1.png
\ No newline at end of file diff --git a/docs/developer_info/BPMN_Project_Structure.rst b/docs/developer_info/BPMN_Project_Structure.rst index 209ec727c3..23916093c2 100644 --- a/docs/developer_info/BPMN_Project_Structure.rst +++ b/docs/developer_info/BPMN_Project_Structure.rst @@ -12,7 +12,7 @@ A BPMN main process flow is a top-level flow. All main process flows are under CreateVfModuleVolumeInfraV1 is a main process flow. -.. image:: images/bpmn_project_structure_1.png +.. image:: ../images/bpmn_project_structure_1.png Open BPMN files with the camunda modeler (standalone application). To launch the modeler from eclipse, right-click→open-with→Other→Browse. Select Check the boxes on the dialog so that eclipse will open all .bpmn files with the camunda-modeler executable. @@ -23,25 +23,25 @@ A BPMN subprocess flow is meant to be invoked by other flows (either main proces The CreateVfModuleVolumeInfraV1 process flow is delivered with two custom subflows: DoCreateVfModuleVolumeV2 and DoCreateVfModuleVolumeRollback. -.. image:: images/bpmn_project_structure_2.png +.. image:: ../images/bpmn_project_structure_2.png Groovy scripts --------------- There is one groovy script for each BPMN file. Groovy scripts are invoked by script tasks within the BPMN flows. -.. image:: images/bpmn_project_structure_3.png +.. image:: ../images/bpmn_project_structure_3.png Unit Tests ----------- Normally, we create a unit test class for every flow. This one is missing a unit test for its rollback flow. -.. image:: images/bpmn_project_structure_4.png +.. image:: ../images/bpmn_project_structure_4.png Unit Test Resource Files ------------------------ Any files needed by the unit tests are kept under the src/test/resources/__files folder. -.. image:: images/bpmn_project_structure_5.png
\ No newline at end of file +.. image:: ../images/bpmn_project_structure_5.png
\ No newline at end of file diff --git a/docs/developer_info/Camunda_Cockpit_Community_Edition.rst b/docs/developer_info/Camunda_Cockpit_Community_Edition.rst index a9379decc9..7597159708 100644 --- a/docs/developer_info/Camunda_Cockpit_Community_Edition.rst +++ b/docs/developer_info/Camunda_Cockpit_Community_Edition.rst @@ -26,19 +26,19 @@ If you can use a browser on the docker host system, then use a localhost address The user is "admin" and the password is the same as the jboss admin password, which is not displayed here. -.. image:: images/Camunda_Cockpit_1.png +.. image:: ../images/Camunda_Cockpit_1.png Viewing Process Definitions --------------------------- Use the drop-down menu next to the home icon and select the "Cockpit" option: -.. image:: images/Camunda_Cockpit_2.png +.. image:: ../images/Camunda_Cockpit_2.png The number of deployed process definitions should be displayed. Click on it. -.. image:: images/Camunda_Cockpit_3.png +.. image:: ../images/Camunda_Cockpit_3.png Now you should see an actual list of deployed process definitions. You can click on any of them to view them. -.. image:: images/Camunda_Cockpit_4.png +.. image:: ../images/Camunda_Cockpit_4.png diff --git a/docs/developer_info/Camunda_Cockpit_Enterprise_Edition.rst b/docs/developer_info/Camunda_Cockpit_Enterprise_Edition.rst index 3e2d15bf15..0066475db8 100644 --- a/docs/developer_info/Camunda_Cockpit_Enterprise_Edition.rst +++ b/docs/developer_info/Camunda_Cockpit_Enterprise_Edition.rst @@ -140,4 +140,4 @@ If you can use a browser on the docker host system, then use a localhost address The user is "admin" and the password is the same as the jboss admin password, which is not displayed here. -.. image:: images/Camunda_Cockpit_Enterprise_1.png +.. image:: ../images/Camunda_Cockpit_Enterprise_1.png diff --git a/docs/installconfigure/Workspace_and_Development_Tools.rst b/docs/installconfigure/Workspace_and_Development_Tools.rst index 598439f75f..2fca64e4ac 100644 --- a/docs/installconfigure/Workspace_and_Development_Tools.rst +++ b/docs/installconfigure/Workspace_and_Development_Tools.rst @@ -81,7 +81,7 @@ In the eclipse directory, edit eclipse.ini Example: -.. image:: images/Workspace_and_Development_Tools.png +.. image:: ../images/Workspace_and_Development_Tools.png Eclipse Settings ---------------- @@ -93,15 +93,15 @@ Eclipse Settings Click "Finish" -.. image:: images/Workspace_and_Development_Tools_2.png +.. image:: ../images/Workspace_and_Development_Tools_2.png Make sure the external installation is selected: -.. image:: images/Workspace_and_Development_Tools_3.png +.. image:: ../images/Workspace_and_Development_Tools_3.png **Configure eclipse to use your settings.xml** Go to Window→Preferences→Maven→User Settings Type the full path to your settings.xml file into the "User Settings" box and click "OK". -.. image:: images/Workspace_and_Development_Tools_4.png
\ No newline at end of file +.. image:: ../images/Workspace_and_Development_Tools_4.png
\ No newline at end of file |