diff --git a/eo-runtime/pom.xml b/eo-runtime/pom.xml index a547512de58..0010cf42e38 100644 --- a/eo-runtime/pom.xml +++ b/eo-runtime/pom.xml @@ -254,13 +254,6 @@ ignore @to-do markers. See: https://github.com/objectionary/lints/issues/805 --> comment-not-capitalized - - object-has-data inconsistent-args diff --git a/eo-runtime/src/main/java/org/eolang/PhDefault.java b/eo-runtime/src/main/java/org/eolang/PhDefault.java index d640d20afc7..a5e8d0f78aa 100644 --- a/eo-runtime/src/main/java/org/eolang/PhDefault.java +++ b/eo-runtime/src/main/java/org/eolang/PhDefault.java @@ -40,11 +40,6 @@ public class PhDefault implements Phi, Cloneable { @SuppressWarnings("java:S5164") private static final ThreadLocal NESTING = ThreadLocal.withInitial(() -> 0); - /** - * From Java package name to forma. - */ - private static final Pattern TO_FORMA = Pattern.compile("(^|\\.)EO"); - /** * Data. * @checkstyle VisibilityModifierCheck (2 lines) @@ -210,13 +205,9 @@ public String forma() { if (PhDefault.class.getSimpleName().equals(name)) { form = "[]"; } else { - form = String.join( - ".", - PhPackage.GLOBAL, - PhDefault.TO_FORMA.matcher( - this.getClass().getPackageName() - ).replaceAll("$1"), - name + form = String.format( + "%s.%s", + PhPackage.GLOBAL, name ); } return form; diff --git a/eo-runtime/src/test/java/org/eolang/PhDefaultTest.java b/eo-runtime/src/test/java/org/eolang/PhDefaultTest.java index 2464dfebf79..fca00ebcd16 100644 --- a/eo-runtime/src/test/java/org/eolang/PhDefaultTest.java +++ b/eo-runtime/src/test/java/org/eolang/PhDefaultTest.java @@ -405,7 +405,7 @@ void rendersFormaProperly() { MatcherAssert.assertThat( "forma of 'number' is the full name of the 'number' object", new Data.ToPhi(42L).forma(), - Matchers.equalTo("Φ.org.eolang.number") + Matchers.equalTo("Φ.number") ); }