fixed OAP extension mechanizm when option is overwritten

oap-stdlib/src/main/java/oap/json/ext/ExtDeserializer.java

@@ -69,8 +69,9 @@ public class ExtDeserializer extends StdDeserializer<Ext> {
 
                 for( var cc : conf.ext ) {
                     String key = extensionKey( cc.clazz, cc.field );
+                    var oldConf = extmap.get( key );
+                    if ( oldConf != null && oldConf.disableOverwrite ) continue;
                     extmap.put( key, cc );
-
                     log.debug( "add ext rule: {} = {}", key, cc.implementation );
                 }
             }
@@ -138,6 +139,7 @@ public static class ClassConfiguration {
             @JsonDeserialize( using = ClassDeserializer.class )
             public Class<?> clazz;
             public String field;
+            public boolean disableOverwrite;
             @JsonDeserialize( using = ClassDeserializer.class )
             public Class<?> implementation;
             @JsonProperty( "abstract" )

oap-stdlib/src/test/java/oap/json/ext/ExtDeserializerTest.java

@@ -34,10 +34,19 @@
 @SuppressWarnings( "unused" )
 public class ExtDeserializerTest {
     @Test
-    public void ext() {
+    public void extOk() {
         var aaa = new Bean( TestExt.newExt( "aaa" ) );
         var json = "{\"ext\":{\"value\":\"aaa\"}}";
         assertThat( Binder.json.marshal( aaa ) ).isEqualTo( json );
+        assertThat( Binder.json.unmarshal( Bean.class, json ) )
+                .isEqualTo( aaa );
+    }
+
+    @Test
+    public void extOverwritten() {
+        var aaa = new Bean( TestExtOverwritten.newExt( "aaa" ) );
+        var json = "{\"ext\":{\"value\":\"aaa\"}}";
+        assertThat( Binder.json.marshal( aaa ) ).isEqualTo( json );
         assertThat( Binder.json.unmarshal( Bean.class, json ) )
             .isEqualTo( aaa );
     }
@@ -72,6 +81,28 @@ public abstract static class Ext2 extends Ext {
 
     }
 
+
+    @EqualsAndHashCode( callSuper = true )
+    @ToString
+    public static class TestExtOverwritten extends TestExt {
+        String valueNew;
+
+        public TestExtOverwritten() {
+        }
+
+        public TestExtOverwritten( String value ) {
+            this.valueNew = value;
+        }
+
+        public static TestExt newExt() {
+            return newExt( Bean.class, "ext", new Class[0], new Object[0] );
+        }
+
+        public static TestExt newExt( String value ) {
+            return newExt( Bean.class, "ext", new Class[] { String.class }, new Object[] { value } );
+        }
+    }
+
     @EqualsAndHashCode( callSuper = true )
     @ToString
     public static class TestExt extends Ext2 {

oap-stdlib/src/test/resources/META-INF/json-ext.conf

@@ -3,6 +3,12 @@ ext = [
     class = oap.json.ext.ExtDeserializerTest.Bean
     field = ext
     implementation = oap.json.ext.ExtDeserializerTest.TestExt
+    disableOverwrite = true
+  }
+  {
+    class = oap.json.ext.ExtDeserializerTest.Bean
+    field = ext
+    implementation = oap.json.ext.ExtDeserializerTest.TestExtOverwritten
   }
   {
     class = oap.json.ext.ExtDeserializerTest.Bean
@@ -15,8 +21,6 @@ ext = [
     field = ext
     implementation = oap.json.ext.NpeExt
   }
-
-
   {
     class = oap.json.TestTemplateBean
     field = ext

pom.xml

@@ -37,7 +37,7 @@
 
     <properties>
 
-        <oap.project.version>18.11.9</oap.project.version>
+        <oap.project.version>18.11.10</oap.project.version>
 
         <oap.deps.testng.version>7.8.0</oap.deps.testng.version>
         <oap.deps.assertj.version>3.24.2</oap.deps.assertj.version>