Skip to content

Commit 5ab17af

Browse files
committed
Replace deprecated AccessController
Signed-off-by: Daniel Widdis <widdis@gmail.com>
1 parent f76d2b8 commit 5ab17af

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/main/java/org/opensearch/flowframework/workflow/CreateConnectorStep.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@
2323
import org.opensearch.ml.common.connector.ConnectorAction.ActionType;
2424
import org.opensearch.ml.common.transport.connector.MLCreateConnectorInput;
2525
import org.opensearch.ml.common.transport.connector.MLCreateConnectorResponse;
26+
import org.opensearch.secure_sm.AccessController;
2627

27-
import java.security.AccessController;
28-
import java.security.PrivilegedActionException;
29-
import java.security.PrivilegedExceptionAction;
3028
import java.util.ArrayList;
3129
import java.util.Collections;
3230
import java.util.HashMap;
@@ -142,9 +140,9 @@ public void onFailure(Exception ex) {
142140
} catch (IllegalArgumentException iae) {
143141
logger.error("IllegalArgumentException in connector configuration", iae);
144142
throw new FlowFrameworkException("IllegalArgumentException in connector configuration", RestStatus.BAD_REQUEST);
145-
} catch (PrivilegedActionException pae) {
146-
logger.error("PrivilegedActionException in connector configuration", pae);
147-
throw new FlowFrameworkException("PrivilegedActionException in connector configuration", RestStatus.UNAUTHORIZED);
143+
} catch (Exception e) {
144+
logger.error("Exception in connector configuration", e);
145+
throw new FlowFrameworkException("Exception in connector configuration", RestStatus.UNAUTHORIZED);
148146
}
149147

150148
MLCreateConnectorInput mlInput = MLCreateConnectorInput.builder()
@@ -170,10 +168,10 @@ public String getName() {
170168
return NAME;
171169
}
172170

173-
private static Map<String, String> getParameterMap(Object parameterMap) throws PrivilegedActionException {
171+
private static Map<String, String> getParameterMap(Object parameterMap) throws Exception {
174172
Map<String, String> parameters = new HashMap<>();
175173
for (Entry<String, String> entry : getStringToStringMap(parameterMap, PARAMETERS_FIELD).entrySet()) {
176-
AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
174+
AccessController.doPrivilegedChecked(() -> {
177175
parameters.put(entry.getKey(), entry.getValue());
178176
return null;
179177
});

0 commit comments

Comments
 (0)