diff options
Diffstat (limited to 'server/src/main/java/org')
3 files changed, 12 insertions, 116 deletions
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java index 372a0c1b..bebc8121 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java @@ -778,14 +778,18 @@ public class IntentInstanceServiceImpl implements IntentInstanceService { } private IntentInstance assembleIntentInstanceFormSliceInfo(IntentInstance instance, Object body) { - JSONObject jsonObject = new JSONObject((Map) body); - JSONObject slicingOrderInfo = jsonObject.getJSONObject("slicing_order_info"); - String intent_content = slicingOrderInfo.getString("intentContent"); - slicingOrderInfo.remove("intentContent"); - instance.setIntentConfig(slicingOrderInfo.toJSONString()); - instance.setIntentContent(intent_content); - instance.setIntentName(slicingOrderInfo.getString("name")); - return instance; + if(body instanceof Map){ + Map map = (Map) body; + JSONObject jsonObject = new JSONObject(map); + JSONObject slicingOrderInfo = jsonObject.getJSONObject("slicing_order_info"); + String intent_content = slicingOrderInfo.getString("intentContent"); + slicingOrderInfo.remove("intentContent"); + instance.setIntentConfig(slicingOrderInfo.toJSONString()); + instance.setIntentContent(intent_content); + instance.setIntentName(slicingOrderInfo.getString("name")); + return instance; + } + return new IntentInstance(); } diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java index 9124cca0..ebebba6c 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java @@ -18,7 +18,6 @@ package org.onap.usecaseui.server.service.lcm.impl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import okhttp3.ResponseBody; -import org.json.simple.parser.JSONParser; import org.onap.usecaseui.server.bean.activateEdge.ServiceInstance; import org.onap.usecaseui.server.bean.lcm.sotne2eservice.ModelConfig; import org.onap.usecaseui.server.bean.lcm.sotne2eservicemonitor.ResponseServiceInstanceWrapper; @@ -65,7 +64,6 @@ public class SotnServiceQryServiceImpl implements SotnServiceQryService { //serviceType = "generic"; ObjectMapper mapper = new ObjectMapper(); - JSONParser parser = new JSONParser(); try { Response<ResponseBody> response = aaiService.listServiceInstances(customerid, serviceType).execute(); diff --git a/server/src/main/java/org/onap/usecaseui/server/util/ZipUtil.java b/server/src/main/java/org/onap/usecaseui/server/util/ZipUtil.java deleted file mode 100644 index e3a67751..00000000 --- a/server/src/main/java/org/onap/usecaseui/server/util/ZipUtil.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (C) 2017 CTC, Inc. and others. All rights reserved. - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.onap.usecaseui.server.util; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; - -import org.apache.commons.io.IOUtils; -import org.apache.tools.zip.ZipEntry; -import org.apache.tools.zip.ZipFile; -import org.apache.tools.zip.ZipOutputStream; - -public class ZipUtil { - - public static void zip(String src, String zip) throws IOException { - zip(new File(src), new File(zip)); - } - - public static void zip(String src, File zip) throws IOException { - zip(new File(src), zip); - } - - public static void zip(File src, String zip) throws IOException { - zip(src, new File(zip)); - } - - public static void zip(File src, File zip) throws IOException { - List<ZipEntry> list = foreach(src); - ZipOutputStream out = new ZipOutputStream(zip); - for (ZipEntry en : list) { - File fo = new File(src.getParent(), en.getName()); - out.putNextEntry(en); - FileInputStream in = new FileInputStream(fo); - byte[] buffer = new byte[1024*8]; - for(int len=0;(len=in.read(buffer))!=-1;){ - out.write(buffer, 0, len); - } - in.close(); - out.flush(); - } - out.close(); - } - - public static void unzip(String zip,String out) throws Exception { - unzip(new File(zip), new File(out)); - } - - public static void unzip(String zip,File out) throws Exception { - unzip(new File(zip), out); - } - - public static void unzip(File zip,String out) throws Exception { - unzip(zip, new File(out)); - } - - public static void unzip(File zip,File out) throws Exception { - ZipFile zipFile = new ZipFile(zip,"GB18030"); - for (Enumeration<ZipEntry> entries = zipFile.getEntries(); entries.hasMoreElements();) { - ZipEntry entry = entries.nextElement(); - File file = new File(out,entry.getName()); - if (entry.isDirectory()) { - file.mkdirs(); - } else { - File parent = file.getParentFile(); - if (!parent.exists()) { - parent.mkdirs(); - } - IOUtils.copy(zipFile.getInputStream(entry), new FileOutputStream(file)); - } - } - zipFile.close(); - } - private static List<ZipEntry> foreach(File file) { - return foreach(file, ""); - } - private static List<ZipEntry> foreach(File file, String path) { - List<ZipEntry> list = new ArrayList<ZipEntry>(); - if (file.isDirectory()) { - path += file.getName() + File.separator; - for (File fo : file.listFiles()) { - list.addAll(foreach(fo, path)); - } - } else if (file.isFile()) { - list.add(new ZipEntry(path + file.getName())); - } - return list; - } -} |