Skip to content

Commit 45a833d

Browse files
committed
Deprecate Fix command enums.
To be removed in version 8.0.0.
1 parent 32ce7f1 commit 45a833d

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

metafix/src/main/java/org/metafacture/metafix/FixBind.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.List;
2323
import java.util.Map;
2424

25+
@Deprecated(since = "7.1.0", forRemoval = true)
2526
public enum FixBind implements FixContext {
2627

2728
list {

metafix/src/main/java/org/metafacture/metafix/FixConditional.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
import java.util.List;
2323
import java.util.Map;
2424

25-
public enum FixConditional implements FixPredicate { // checkstyle-disable-line ClassDataAbstractionCoupling|ClassFanOutComplexity
25+
@Deprecated(since = "7.1.0", forRemoval = true) // checkstyle-disable-line ClassDataAbstractionCoupling|ClassFanOutComplexity
26+
public enum FixConditional implements FixPredicate {
2627

2728
all_contain {
2829
@Override

metafix/src/main/java/org/metafacture/metafix/FixMethod.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
import java.util.List;
2525
import java.util.Map;
2626

27-
public enum FixMethod implements FixFunction { // checkstyle-disable-line ClassDataAbstractionCoupling|ClassFanOutComplexity
27+
@Deprecated(since = "7.1.0", forRemoval = true) // checkstyle-disable-line ClassDataAbstractionCoupling|ClassFanOutComplexity
28+
public enum FixMethod implements FixFunction {
2829

2930
// SCRIPT-LEVEL METHODS:
3031

metafix/src/test/java/org/metafacture/metafix/util/TestFunction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
package org.metafacture.metafix.util;
1818

19-
import org.metafacture.metafix.FixMethod;
2019
import org.metafacture.metafix.Metafix;
2120
import org.metafacture.metafix.Record;
2221
import org.metafacture.metafix.Value;
2322
import org.metafacture.metafix.api.FixFunction;
23+
import org.metafacture.metafix.method.record.AddField;
2424

2525
import java.util.List;
2626
import java.util.Map;
@@ -34,7 +34,7 @@ public TestFunction() {
3434
public void apply(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options) {
3535
params.add(params.get(0).toUpperCase());
3636
params.set(0, "test");
37-
FixMethod.add_field.apply(metafix, record, params, options);
37+
new AddField().apply(metafix, record, params, options);
3838

3939
options.forEach((k, v) -> record.set(k, new Value(v)));
4040
}

metafix/src/test/java/org/metafacture/metafix/util/TestPredicate.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
package org.metafacture.metafix.util;
1818

19-
import org.metafacture.metafix.FixConditional;
2019
import org.metafacture.metafix.Metafix;
2120
import org.metafacture.metafix.Record;
2221
import org.metafacture.metafix.api.FixPredicate;
22+
import org.metafacture.metafix.conditional.AnyEqual;
23+
import org.metafacture.metafix.conditional.Exists;
2324

2425
import java.util.List;
2526
import java.util.Map;
@@ -31,8 +32,8 @@ public TestPredicate() {
3132

3233
@Override
3334
public boolean test(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options) {
34-
return !FixConditional.exists.test(metafix, record, params, options) ||
35-
FixConditional.any_equal.test(metafix, record, params, options);
35+
return !new Exists().test(metafix, record, params, options) ||
36+
new AnyEqual().test(metafix, record, params, options);
3637
}
3738

3839
}

0 commit comments

Comments
 (0)