Fix api conflict

Author: slawekjaranowski

src/main/java/org/codehaus/mojo/extraenforcer/model/RequirePropertyDiverges.java

@@ -93,7 +93,7 @@ public void execute() throws EnforcerRuleException {
 
  ParentReference parentReference = getParentReference();
 
- getLog().debug(() -> getRuleName() + ": checking property '" + property + "' for project " + project);
+ getLog().debug(() -> ruleName() + ": checking property '" + property + "' for project " + project);
 
  final MavenProject parent = findParent(project, parentReference);
 
@@ -104,7 +104,7 @@ public void execute() throws EnforcerRuleException {
 
  if (project.equals(parent)) {
  getLog().debug(() ->
- getRuleName() + ": skip for property '" + property + "' as " + project + " defines rule.");
+ ruleName() + ": skip for property '" + property + "' as " + project + " defines rule.");
  } else {
  getLog().debug(() -> "Check configuration defined in " + parent);
  if (regex == null) {
@@ -256,7 +256,7 @@ final boolean isDefiningProject(final List<Xpp3Dom> rulesFromModel, final Xpp3Do
  *
  * @return configuration name.
  */
- static final String getRuleName() {
+ static String ruleName() {
  return RULE_NAME;
  }
 
@@ -318,7 +318,7 @@ private void addRules(final Xpp3Dom configuration, final List<Xpp3Dom> ruleConfi
  if (configuration != null) {
  final Xpp3Dom rules = configuration.getChild("rules");
  if (rules != null) {
- final List<Xpp3Dom> originalListFromPom = Arrays.asList(rules.getChildren(getRuleName()));
+ final List<Xpp3Dom> originalListFromPom = Arrays.asList(rules.getChildren(ruleName()));
  ruleConfigurations.addAll(createRuleListWithNameSortedChildren(originalListFromPom));
  }
  }
@@ -334,7 +334,7 @@ private void addRules(final Xpp3Dom configuration, final List<Xpp3Dom> ruleConfi
  private List<Xpp3Dom> createRuleListWithNameSortedChildren(final List<Xpp3Dom> originalListFromPom) {
  final List<Xpp3Dom> listWithSortedEntries = new ArrayList<>(originalListFromPom.size());
  for (Xpp3Dom unsortedXpp3Dom : originalListFromPom) {
- final Xpp3Dom sortedXpp3Dom = new Xpp3Dom(getRuleName());
+ final Xpp3Dom sortedXpp3Dom = new Xpp3Dom(ruleName());
  final SortedMap<String, Xpp3Dom> childrenMap = new TreeMap<>();
  final Xpp3Dom[] children = unsortedXpp3Dom.getChildren();
  for (Xpp3Dom child : children) {
@@ -468,7 +468,7 @@ private static class CreateInvokingRuleDom {
 
  /** Real work is done in the constructor */
  CreateInvokingRuleDom(RequirePropertyDiverges rule) {
- ruleDom = new Xpp3Dom(getRuleName());
+ ruleDom = new Xpp3Dom(ruleName());
  addToMapWhenNotNull(rule.property, "property");
  addToMapWhenNotNull(rule.message, "message");
  addToMapWhenNotNull(rule.regex, "regex");

src/test/java/org/codehaus/mojo/extraenforcer/model/RequirePropertyDivergesTest.java

@@ -201,8 +201,8 @@ public void testCreateResultingErrorMessageReturningDefaultMessage() {
  }
 
  @Test
- public void testGetRuleName() {
- assertEquals("requirePropertyDiverges", RequirePropertyDiverges.getRuleName());
+ public void testRuleName() {
+ assertEquals("requirePropertyDiverges", RequirePropertyDiverges.ruleName());
  }
 
  @Test(expected = EnforcerRuleException.class)
@@ -345,7 +345,7 @@ void setUpHelper(final MavenProject project, final String propertyValue) throws
  Xpp3Dom createPluginConfiguration() {
  final Xpp3Dom configuration = new Xpp3Dom("configuration");
  final Xpp3Dom rules = new Xpp3Dom("rules");
- final Xpp3Dom rule = new Xpp3Dom(RequirePropertyDiverges.getRuleName());
+ final Xpp3Dom rule = new Xpp3Dom(RequirePropertyDiverges.ruleName());
  rules.addChild(rule);
  final Xpp3Dom property = new Xpp3Dom("property");
  property.setValue("checkedProperty");