diff options
Diffstat (limited to 'ecomp-portal-BE-common/src/main/java')
3 files changed, 19 insertions, 13 deletions
diff --git a/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java b/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java index 50e2720e..1cba2d0d 100644 --- a/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java +++ b/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java @@ -38,7 +38,6 @@ package jarutil; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -48,27 +47,29 @@ import java.io.Writer; import java.net.URL; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; + public class ExtractJar { - public static int bufferSize = 8192; - public static String JARFILE = "raptor_upgrade.jar"; + public static final int bufferSize = 8192; + public static final String jarFile = "raptor_upgrade.jar"; + private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ExtractJar.class); public static void main(String[] args) throws Exception { if (args.length > 0 && args[0] != null && args[0].length() > 0) extractFilesFromJar(args[0]); else { - System.out.println("Current Directory is taken as webapp path"); + logger.info("Current Directory is taken as webapp path"); String currentDir = new File(".").getAbsolutePath(); extractFilesFromJar(currentDir); } } public static void extractFilesFromJar(String directory) throws IOException { - // JarFile jar = new JarFile(jarFile); + Class clazz = ExtractJar.class; String classContainer = clazz.getProtectionDomain().getCodeSource().getLocation().toString(); - // System.out.println("classContainer ---------> " + classContainer); URL jarUrl = clazz.getProtectionDomain().getCodeSource().getLocation(); JarInputStream entryStream = new JarInputStream(jarUrl.openStream()); @@ -78,7 +79,7 @@ public class ExtractJar { if (entry == null) break; if (entry.getName().indexOf("jarutil") < 0) { - System.out.println(entry.getName()); + logger.info(entry.getName()); File file = new File(directory, entry.getName()); if (entry.isDirectory()) { if (!file.exists()) @@ -115,7 +116,7 @@ public class ExtractJar { } public static void copy(InputStream in, OutputStream out, long byteCount) throws IOException { - byte buffer[] = new byte[bufferSize]; + byte[] buffer = new byte[bufferSize]; int len = bufferSize; if (byteCount >= 0) { while (byteCount > 0) { @@ -144,7 +145,7 @@ public class ExtractJar { * Copy Reader to Writer for byteCount bytes or until EOF or exception. */ public static void copy(Reader in, Writer out, long byteCount) throws IOException { - char buffer[] = new char[bufferSize]; + char[] buffer = new char[bufferSize]; int len = bufferSize; if (byteCount >= 0) { while (byteCount > 0) { diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/command/PostSearchBean.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/command/PostSearchBean.java index 6fc8f2a5..f376d6da 100644 --- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/command/PostSearchBean.java +++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/command/PostSearchBean.java @@ -91,8 +91,7 @@ public class PostSearchBean extends SearchBase { setSortBy1(""); setSortBy1Orig(""); - - //setSortByList(...); + } // PostSearchBean @@ -365,6 +364,7 @@ public class PostSearchBean extends SearchBase { this.postFinancialLocCode = postFinancialLocCode; } + @Override public void resetSearch() { super.resetSearch(); setUser(new EPUser()); diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java index 678672b1..a2226944 100644 --- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java @@ -1507,7 +1507,12 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic return roleFunc; roleFunc = checkIfPipesExitsInFunctionCode(cenV2RoleFunction); } else { - roleFunc = getRoleFuncList.get(0); + // Check even if single record have pipes + if (!getRoleFuncList.isEmpty() && getRoleFuncList.get(0).getCode().contains(FUNCTION_PIPE)) { + roleFunc = checkIfPipesExitsInFunctionCode(getRoleFuncList.get(0)); + } else { + roleFunc = getRoleFuncList.get(0); + } } } catch (Exception e) { logger.error(EELFLoggerDelegate.errorLogger, "getRoleFunction: failed", e); @@ -3434,8 +3439,8 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic @Override public List<CentralRole> convertV2CentralRoleListToOldVerisonCentralRoleList(List<CentralV2Role> v2CenRoleList) { List<CentralRole> cenRoleList = new ArrayList<>(); - SortedSet<CentralRoleFunction> cenRoleFuncList = new TreeSet<>(); for(CentralV2Role v2CenRole : v2CenRoleList){ + SortedSet<CentralRoleFunction> cenRoleFuncList = new TreeSet<>(); for(CentralV2RoleFunction v2CenRoleFunc: v2CenRole.getRoleFunctions()){ CentralRoleFunction roleFunc = new CentralRoleFunction(v2CenRoleFunc.getCode(), v2CenRoleFunc.getName()); cenRoleFuncList.add(roleFunc); |