diff options
author | xg353y <xg353y@intl.att.com> | 2017-04-11 13:30:42 +0200 |
---|---|---|
committer | xg353y <xg353y@intl.att.com> | 2017-04-11 15:34:19 +0200 |
commit | b6b7bef8bdcad15af01ac88a038dd763ce59f68f (patch) | |
tree | 399d39da23aaa37701e487df064e3e0c27709ef3 /packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator | |
parent | 19340cad94eeaa1b580f7c0c99531de499e8ca14 (diff) |
[MSO-8] Update the maven dependency
Update the maven depenency for sdc-distribution-client to cooperate with the sdc changes.
Change-Id: I2da936e5c40cb68c7181bb78307192dd5655b5dc
Signed-off-by: xg353y <xg353y@intl.att.com>
Diffstat (limited to 'packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator')
2 files changed, 44 insertions, 34 deletions
diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java index f2fabc09ce..54be7cdc90 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java @@ -16,6 +16,9 @@ import org.openecomp.sdc.api.consumer.IDistributionStatusMessage; import org.openecomp.sdc.api.consumer.INotificationCallback; import org.openecomp.sdc.api.notification.IArtifactInfo; import org.openecomp.sdc.api.notification.IVfModuleMetadata; +import org.openecomp.mso.asdc.installer.IVfModuleData; +import org.openecomp.mso.asdc.installer.VfModuleMetaData; +import org.openecomp.mso.asdc.client.ASDCConfiguration; import org.openecomp.sdc.api.results.IDistributionClientDownloadResult; import org.openecomp.sdc.api.results.IDistributionClientResult; import org.openecomp.sdc.impl.DistributionClientDownloadResultImpl; @@ -25,59 +28,51 @@ import org.openecomp.sdc.utils.DistributionActionResultEnum; public class DistributionClientEmulator implements IDistributionClient { private String resourcePath; - - private List<IVfModuleMetadata> listVFModuleMetaData; - + + private List<IVfModuleData> listVFModuleMetaData; + private List<IDistributionStatusMessage> distributionMessageReceived = new LinkedList<>(); - + public DistributionClientEmulator(String notifFolderInResource) { - + resourcePath = notifFolderInResource; } public List<IDistributionStatusMessage> getDistributionMessageReceived() { return distributionMessageReceived; } - - @Override + @Deprecated public List<IVfModuleMetadata> decodeVfModuleArtifact(byte[] arg0) { - try { - listVFModuleMetaData = new ObjectMapper().readValue(arg0, new TypeReference<List<JsonVfModuleMetaData>>(){}); - return listVFModuleMetaData; - - } catch (JsonParseException e) { - e.printStackTrace(); - } catch (JsonMappingException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } + + return null; } - - public List<IVfModuleMetadata> getListVFModuleMetaData() { + + public List<IVfModuleData> getListVFModuleMetaData() { return listVFModuleMetaData; } - @Override + @Override public IDistributionClientDownloadResult download (IArtifactInfo arg0) { - - + //String filename = resourcePath+"/artifacts/"+arg0.getArtifactURL(); String filename = arg0.getArtifactURL(); System.out.println("Emulating the download from resources files:"+filename); InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourcePath+"/artifacts/"+filename); - + if (inputStream == null) { System.out.println("InputStream is NULL for:"+filename); } try { - return new DistributionClientDownloadResultImpl(DistributionActionResultEnum.SUCCESS, DistributionActionResultEnum.SUCCESS.name(),arg0.getArtifactName(),IOUtils.toByteArray(inputStream)); + byte[] bytes = IOUtils.toByteArray(inputStream); + if (arg0.getArtifactType().equals(ASDCConfiguration.VF_MODULES_METADATA)) { + listVFModuleMetaData = new ObjectMapper().readValue(bytes, new TypeReference<List<VfModuleMetaData>>() { + }); + } + return new DistributionClientDownloadResultImpl(DistributionActionResultEnum.SUCCESS, DistributionActionResultEnum.SUCCESS.name(),arg0.getArtifactName(),bytes); } catch (IOException e) { - - e.printStackTrace(); + return null; } - return null; } @Override @@ -122,7 +117,7 @@ public class DistributionClientEmulator implements IDistributionClient { @Override public IDistributionClientResult stop() { return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name()); - + } @Override diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java index e30bb5fcd0..79dcaed0c8 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java @@ -16,15 +16,15 @@ public class JsonResourceInfo implements IResourceInstance { @JsonIgnore private Map<String,Object> attributesMap = new HashMap<>(); - + @JsonProperty("artifacts") @JsonDeserialize(using=JsonArtifactInfoDeserializer.class) private List<IArtifactInfo> artifacts; - + public JsonResourceInfo() { - + } - + @Override public List<IArtifactInfo> getArtifacts() { return artifacts; @@ -59,7 +59,22 @@ public class JsonResourceInfo implements IResourceInstance { public String getResourceVersion() { return (String)attributesMap.get("resourceVersion"); } - + + @Override + public String getResourceCustomizationUUID() { + return (String)attributesMap.get("resourceCustomizationUUID"); + } + + @Override + public String getSubcategory() { + return (String)attributesMap.get("subCategory"); + } + + @Override + public String getCategory() { + return (String)attributesMap.get("category"); + } + @SuppressWarnings("unused") @JsonAnySetter public final void setAttribute(String attrName, Object attrValue) { |