Skip to content

Commit bbbb744

Browse files
committed
refactor method name for posting conflict checks
Former-commit-id: 6222198cf1c03c1c8d6c8bf82a0a2eabbff2092b
1 parent 42e4dcb commit bbbb744

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public static List<String> getPatchesFor(String category, String version, List<S
120120
}
121121
return results;
122122
}
123-
123+
124124
/**
125125
*
126126
* @param patches A list of patches number
@@ -144,7 +144,7 @@ public static boolean validatePatches(List<String> patches, String category, Str
144144
}
145145
payload.append("</conflict_check_request>");
146146

147-
Document result = HttpUtil.checkConflicts(CONFLICTCHECKER_URL, payload.toString(), userId, password);
147+
Document result = HttpUtil.postCheckConflictRequest(CONFLICTCHECKER_URL, payload.toString(), userId, password);
148148

149149
try {
150150
NodeList conflictSets = XPathUtil.applyXPathReturnNodeList(result, "/conflict_sets");

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,17 +153,17 @@ public static void downloadFile(String url, String fileName, UserSession userSes
153153
}
154154

155155
/**
156-
* Check conflicts - probably need to
156+
* Check conflicts post method
157157
*
158158
* @param url url for conflict checker api
159159
* @param payload payload containing patches to check for conflicts
160160
* @param username user name for support
161161
* @param password password for support
162-
* @return
162+
* @return dom document result of the conflict checker
163163
* @throws IOException
164164
*/
165165

166-
public static Document checkConflicts(String url, String payload, String username, String password)
166+
public static Document postCheckConflictRequest(String url, String payload, String username, String password)
167167
throws IOException {
168168
RequestConfig.Builder config = RequestConfig.custom();
169169
config.setCircularRedirectsAllowed(true);

0 commit comments

Comments
 (0)