Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite6cc1e4

Browse files
committed
deprecate break from core
1 parent6ab0532 commite6cc1e4

File tree

28 files changed

+199
-86
lines changed

28 files changed

+199
-86
lines changed

‎zap/src/main/java/org/parosproxy/paros/extension/option/OptionsViewPanel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,14 @@
7575
importorg.parosproxy.paros.model.OptionsParam;
7676
importorg.parosproxy.paros.view.AbstractParamPanel;
7777
importorg.parosproxy.paros.view.WorkbenchPanel;
78-
importorg.zaproxy.zap.extension.brk.BreakpointsParam;
7978
importorg.zaproxy.zap.utils.FontUtils;
8079
importorg.zaproxy.zap.utils.TimeStampUtils;
8180
importorg.zaproxy.zap.utils.ZapNumberSpinner;
8281
importorg.zaproxy.zap.view.LayoutHelper;
8382

8483
// ZAP: 2011: added more configuration options
8584

86-
@SuppressWarnings("serial")
85+
@SuppressWarnings({"serial","removal"})
8786
publicclassOptionsViewPanelextendsAbstractParamPanel {
8887

8988
privatestaticfinallongserialVersionUID =1L;
@@ -852,7 +851,8 @@ public void saveParam(Object obj) throws Exception {
852851
options.getViewParam().setResponsePanelPosition(selectedItem.getPosition().name());
853852
options.getViewParam().setBrkPanelViewOption(brkPanelViewSelect.getSelectedIndex());
854853
if (brkPanelViewSelect.getSelectedIndex() ==BreakLocation.TOOL_BAR_ONLY.getValue()) {
855-
options.getParamSet(BreakpointsParam.class).setShowIgnoreFilesButtons(false);
854+
options.getParamSet(org.zaproxy.zap.extension.brk.BreakpointsParam.class)
855+
.setShowIgnoreFilesButtons(false);
856856
}
857857
options.getViewParam().setShowMainToolbar(getChkShowMainToolbar().isSelected());
858858
options.getViewParam().setAdvancedViewOption(getChkAdvancedView().isSelected() ?1 :0);

‎zap/src/main/java/org/zaproxy/zap/control/CoreFunctionality.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
importorg.parosproxy.paros.model.SiteMapEventPublisher;
2929
importorg.zaproxy.zap.extension.alert.AlertEventPublisher;
3030
importorg.zaproxy.zap.extension.ascan.ActiveScanEventPublisher;
31-
importorg.zaproxy.zap.extension.brk.BreakEventPublisher;
3231
importorg.zaproxy.zap.extension.pscan.PluginPassiveScanner;
3332

3433
/**
@@ -55,7 +54,6 @@ public final class CoreFunctionality {
5554
// Register core event bus publishers asap
5655
ActiveScanEventPublisher.getPublisher();
5756
AlertEventPublisher.getPublisher();
58-
BreakEventPublisher.getPublisher();
5957
HistoryReferenceEventPublisher.getPublisher();
6058
ProxyListenerLogEventPublisher.getPublisher();
6159
SiteMapEventPublisher.getPublisher();
@@ -87,7 +85,6 @@ private static synchronized void createExtensions() {
8785
extensions.add(neworg.zaproxy.zap.extension.authentication.ExtensionAuthentication());
8886
extensions.add(neworg.zaproxy.zap.extension.authorization.ExtensionAuthorization());
8987
extensions.add(neworg.zaproxy.zap.extension.autoupdate.ExtensionAutoUpdate());
90-
extensions.add(neworg.zaproxy.zap.extension.brk.ExtensionBreak());
9188
extensions.add(neworg.zaproxy.zap.extension.compare.ExtensionCompare());
9289
extensions.add(neworg.zaproxy.zap.extension.ext.ExtensionExtension());
9390
extensions.add(neworg.zaproxy.zap.extension.forceduser.ExtensionForcedUser());

‎zap/src/main/java/org/zaproxy/zap/extension/api/ApiGeneratorUtils.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
importorg.zaproxy.zap.extension.authorization.AuthorizationAPI;
3131
importorg.zaproxy.zap.extension.autoupdate.AutoUpdateAPI;
3232
importorg.zaproxy.zap.extension.autoupdate.OptionsParamCheckForUpdates;
33-
importorg.zaproxy.zap.extension.brk.BreakAPI;
3433
importorg.zaproxy.zap.extension.forceduser.ForcedUserAPI;
3534
importorg.zaproxy.zap.extension.httpsessions.HttpSessionsAPI;
3635
importorg.zaproxy.zap.extension.params.ParamsAPI;
@@ -87,8 +86,6 @@ public static List<ApiImplementor> getAllImplementors() {
8786

8887
imps.add(newHttpSessionsAPI(null));
8988

90-
imps.add(newBreakAPI(null));
91-
9289
imps.add(newAuthenticationAPI(null));
9390

9491
imps.add(newAuthorizationAPI());

‎zap/src/main/java/org/zaproxy/zap/extension/brk/AbstractBreakPointMessage.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
*/
2020
packageorg.zaproxy.zap.extension.brk;
2121

22+
/**
23+
* @deprecated (2.15.0) See the break add-on in zap-extensions instead.
24+
*/
25+
@Deprecated(since ="2.15.0",forRemoval =true)
26+
@SuppressWarnings("removal")
2227
publicabstractclassAbstractBreakPointMessageimplementsBreakpointMessageInterface {
2328

2429
privatebooleanisEnabled =true;

‎zap/src/main/java/org/zaproxy/zap/extension/brk/BreakAPI.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
importorg.zaproxy.zap.extension.httppanel.Message;
3838
importorg.zaproxy.zap.utils.ApiUtils;
3939

40+
/**
41+
* @deprecated (2.15.0) See the break add-on in zap-extensions instead.
42+
*/
43+
@Deprecated(since ="2.15.0",forRemoval =true)
44+
@SuppressWarnings("removal")
4045
publicclassBreakAPIextendsApiImplementor {
4146

4247
privatestaticfinalStringPREFIX ="break";

‎zap/src/main/java/org/zaproxy/zap/extension/brk/BreakEventPublisher.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
importorg.zaproxy.zap.extension.httppanel.Message;
2929

3030
/**
31-
* @since 2.8.0
31+
* @deprecated (2.15.0) See the break add-on in zap-extensions instead.
3232
*/
33+
@Deprecated(since ="2.15.0",forRemoval =true)
3334
publicclassBreakEventPublisherimplementsEventPublisher {
3435

3536
privatestaticBreakEventPublisherpublisher =null;

‎zap/src/main/java/org/zaproxy/zap/extension/brk/BreakPanel.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@
5353
importorg.zaproxy.zap.utils.DisplayUtils;
5454
importorg.zaproxy.zap.view.ZapToggleButton;
5555

56-
@SuppressWarnings("serial")
56+
@SuppressWarnings({"serial","removal"})
57+
/**
58+
* @deprecated (2.15.0) See the break add-on in zap-extensions instead.
59+
*/
60+
@Deprecated(since ="2.15.0",forRemoval =true)
5761
publicclassBreakPanelextendsAbstractPanelimplementsBreakpointManagementInterface {
5862

5963
privatestaticfinallongserialVersionUID =1L;

‎zap/src/main/java/org/zaproxy/zap/extension/brk/BreakPanelToolbarFactory.java‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
importorg.parosproxy.paros.control.Control;
3535
importorg.parosproxy.paros.view.TabbedPanel;
3636
importorg.parosproxy.paros.view.View;
37-
importorg.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage;
3837
importorg.zaproxy.zap.utils.DisplayUtils;
3938
importorg.zaproxy.zap.utils.Stats;
4039
importorg.zaproxy.zap.view.TabbedPanel2;
@@ -50,6 +49,11 @@
5049
// If BreakReq & Resp both selected Step and Continue buttons have same effect
5150
//
5251

52+
/**
53+
* @deprecated (2.15.0) See the break add-on in zap-extensions instead.
54+
*/
55+
@Deprecated(since ="2.15.0",forRemoval =true)
56+
@SuppressWarnings("removal")
5357
publicclassBreakPanelToolbarFactory {
5458

5559
privatestaticfinalStringICON_RESOURCE_PATH ="/resource/icon/";
@@ -85,9 +89,12 @@ public class BreakPanelToolbarFactory {
8589
privateintmode =0;
8690

8791
privateList<BreakpointMessageInterface>ignoreRulesEnable;
88-
privateHttpBreakpointMessageignoreJavascriptBreakpointMessage;
89-
privateHttpBreakpointMessageignoreCssAndFontsBreakpointMessage;
90-
privateHttpBreakpointMessageignoreMultimediaBreakpointMessage;
92+
privateorg.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage
93+
ignoreJavascriptBreakpointMessage;
94+
privateorg.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage
95+
ignoreCssAndFontsBreakpointMessage;
96+
privateorg.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage
97+
ignoreMultimediaBreakpointMessage;
9198

9299
/**
93100
* A counter to keep track of how many messages are currently caught, to disable the break
@@ -137,28 +144,28 @@ public BreakPanelToolbarFactory(
137144
this.ignoreRulesEnable =newArrayList<>(3);
138145

139146
ignoreJavascriptBreakpointMessage =
140-
newHttpBreakpointMessage(
147+
neworg.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage(
141148
breakpointsParams.getJavascriptUrlRegex(),
142-
HttpBreakpointMessage.Location.url,
143-
HttpBreakpointMessage.Match.regex,
149+
org.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage.Location.url,
150+
org.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage.Match.regex,
144151
false,
145152
true);
146153
ignoreRulesEnable.add(ignoreJavascriptBreakpointMessage);
147154

148155
ignoreCssAndFontsBreakpointMessage =
149-
newHttpBreakpointMessage(
156+
neworg.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage(
150157
breakpointsParams.getCssAndFontsUrlRegex(),
151-
HttpBreakpointMessage.Location.url,
152-
HttpBreakpointMessage.Match.regex,
158+
org.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage.Location.url,
159+
org.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage.Match.regex,
153160
false,
154161
true);
155162
ignoreRulesEnable.add(ignoreCssAndFontsBreakpointMessage);
156163

157164
ignoreMultimediaBreakpointMessage =
158-
newHttpBreakpointMessage(
165+
neworg.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage(
159166
breakpointsParams.getMultimediaUrlRegex(),
160-
HttpBreakpointMessage.Location.url,
161-
HttpBreakpointMessage.Match.regex,
167+
org.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage.Location.url,
168+
org.zaproxy.zap.extension.brk.impl.http.HttpBreakpointMessage.Match.regex,
162169
false,
163170
true);
164171
ignoreRulesEnable.add(ignoreMultimediaBreakpointMessage);

‎zap/src/main/java/org/zaproxy/zap/extension/brk/BreakpointManagementInterface.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
importorg.parosproxy.paros.control.Control.Mode;
2323
importorg.zaproxy.zap.extension.httppanel.Message;
2424

25+
/**
26+
* @deprecated (2.15.0) See the break add-on in zap-extensions instead.
27+
*/
28+
@Deprecated(since ="2.15.0",forRemoval =true)
2529
publicinterfaceBreakpointManagementInterface {
2630

2731
booleanisBreakRequest();

‎zap/src/main/java/org/zaproxy/zap/extension/brk/BreakpointMessageHandler2.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
importorg.zaproxy.zap.extension.httppanel.Message;
2929
importorg.zaproxy.zap.utils.Stats;
3030

31+
/**
32+
* @deprecated (2.15.0) See the break add-on in zap-extensions instead.
33+
*/
34+
@Deprecated(since ="2.15.0",forRemoval =true)
35+
@SuppressWarnings("removal")
3136
publicclassBreakpointMessageHandler2 {
3237

3338
privatestaticfinalLoggerLOGGER =LogManager.getLogger(BreakpointMessageHandler2.class);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp