Skip to content

Commit efe3cb7

Browse files
committed
update validatePatches to take optional opatch lsinventory file contents
Former-commit-id: 196f1fa1f94e109ea5555d63274f6cb73549991d
1 parent fc0f0f7 commit efe3cb7

File tree

1 file changed

+2
-4
lines changed
  • src/main/java/com/oracle/weblogicx/imagebuilder/builder/util

1 file changed

+2
-4
lines changed

src/main/java/com/oracle/weblogicx/imagebuilder/builder/util/ARUUtil.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
package com.oracle.weblogicx.imagebuilder.builder.util;
44

55
import java.io.File;
6-
import java.io.FileDescriptor;
7-
import java.io.FileInputStream;
86
import java.io.IOException;
97
import java.nio.file.Files;
108
import java.nio.file.Paths;
@@ -24,9 +22,9 @@
2422
import org.w3c.dom.Node;
2523
import org.w3c.dom.NodeList;
2624

25+
import static com.oracle.weblogicx.imagebuilder.builder.api.meta.MetaDataResolver.CACHE_KEY_SEPARATOR;
2726
import static com.oracle.weblogicx.imagebuilder.builder.impl.meta.FileMetaDataResolver.META_RESOLVER;
2827
import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.ARU_LANG_URL;
29-
import static com.oracle.weblogicx.imagebuilder.builder.api.meta.MetaDataResolver.CACHE_KEY_SEPARATOR;
3028
import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.CONFLICTCHECKER_URL;
3129
import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.FMW_PROD_ID;
3230
import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.GET_LSINVENTORY_URL;
@@ -191,7 +189,7 @@ public static ValidationResult validatePatches(String lsInventoryPath, List<Stri
191189
String inventoryContent = new String(Files.readAllBytes(Paths.get(lsInventoryPath)));
192190
String upiPayload = "<inventory_upi_request><lsinventory_output>" + inventoryContent +
193191
"</lsinventory_output></inventory_upi_request>";
194-
192+
195193
Document upiResult = HttpUtil.postCheckConflictRequest(GET_LSINVENTORY_URL, upiPayload, userId,
196194
password);
197195

0 commit comments

Comments
 (0)