fix: rename DynamicModel methods to match Map method names - get/put

Author: padamstx

src/main/java/com/ibm/cloud/sdk/core/service/model/DynamicModel.java

@@ -50,7 +50,7 @@ public TypeToken<T> getAdditionalPropertyTypeToken() {
    *          the value of the property to be set
    * @return the previous value of the property, or null if the property was not previously set
    */
-  public T setProperty(String key, T value) {
+  public T put(String key, T value) {
     return this.dynamicProperties.put(key, value);
   }
 
@@ -61,7 +61,7 @@ public T setProperty(String key, T value) {
    *          the name of the property to get
    * @return the value of the property, or null if the property is not set
    */
-  public T getProperty(String key) {
+  public T get(String key) {
     return this.dynamicProperties.get(key);
   }
 

src/main/java/com/ibm/cloud/sdk/core/util/DynamicModelTypeAdapterFactory.java

@@ -329,7 +329,7 @@ public void write(JsonWriter out, T value) throws IOException {
         // Next, serialize each of the map entries.
         for (String key : ((DynamicModel<?>) value).getPropertyNames()) {
           out.name(String.valueOf(key));
-          mapValueTypeAdapter.write(out, ((DynamicModel<?>) value).getProperty(key));
+          mapValueTypeAdapter.write(out, ((DynamicModel<?>) value).get(key));
         }
       } catch (IllegalAccessException e) {
         throw new AssertionError(e);
@@ -383,7 +383,7 @@ public T read(JsonReader in) throws IOException {
             // Otherwise, it must be an additional property so it belongs in the map.
             String key = name;
             Object value = mapValueTypeAdapter.read(in);
-            Object replaced = ((DynamicModel) instance).setProperty(key, value);
+            Object replaced = ((DynamicModel) instance).put(key, value);
 
             // If this new map entry is replacing an existing entry, then we must have a duplicate.
             if (replaced != null) {

src/test/java/com/ibm/cloud/sdk/core/test/model/DynamicModelSerializationTest.java

@@ -75,8 +75,8 @@ private ModelAPFoo createModelAPFoo() {
     ModelAPFoo model = new ModelAPFoo();
     model.setProp1("value1");
     model.setProp2(Long.valueOf(33));
-    model.setProperty("baseball", foo1);
-    model.setProperty("football", foo2);
+    model.put("baseball", foo1);
+    model.put("football", foo2);
     return model;
   }
 
@@ -86,8 +86,8 @@ private ModelAPFooNullTypeToken createModelAPFooNullTypeToken() {
     ModelAPFooNullTypeToken model = new ModelAPFooNullTypeToken();
     model.setProp1("value1");
     model.setProp2(Long.valueOf(33));
-    model.setProperty("baseball", foo1);
-    model.setProperty("football", foo2);
+    model.put("baseball", foo1);
+    model.put("football", foo2);
     return model;
   }
 
@@ -97,8 +97,8 @@ private ModelAPFooNoCtor createModelAPFooNoCtor() {
     ModelAPFooNoCtor model = new ModelAPFooNoCtor("x");
     model.setProp1("value1");
     model.setProp2(Long.valueOf(33));
-    model.setProperty("baseball", foo1);
-    model.setProperty("football", foo2);
+    model.put("baseball", foo1);
+    model.put("football", foo2);
     return model;
   }
 
@@ -108,26 +108,26 @@ private ModelAPFooBad createModelAPFooBad() {
     ModelAPFooBad model = new ModelAPFooBad();
     model.setProp1("value1");
     model.setProp2(Long.valueOf(33));
-    model.setProperty("baseball", foo1);
-    model.setProperty("football", foo2);
+    model.put("baseball", foo1);
+    model.put("football", foo2);
     return model;
   }
 
   private ModelAPInteger createModelAPInteger() {
     ModelAPInteger model = new ModelAPInteger();
     model.setProp1("value1");
     model.setProp2(Long.valueOf(33));
-    model.setProperty("baseball", Long.valueOf(44));
-    model.setProperty("football", Long.valueOf(74));
+    model.put("baseball", Long.valueOf(44));
+    model.put("football", Long.valueOf(74));
     return model;
   }
 
   private ModelAPString createModelAPString() {
     ModelAPString model = new ModelAPString();
     model.setProp1("value1");
     model.setProp2(Long.valueOf(33));
-    model.setProperty("baseball", "C");
-    model.setProperty("football", "LT");
+    model.put("baseball", "C");
+    model.put("football", "LT");
     return model;
   }
 
@@ -144,17 +144,17 @@ private ModelAPObject createModelAPObject() {
     ModelAPObject model = new ModelAPObject();
     model.setProp1("value1");
     model.setProp2(Long.valueOf(33));
-    model.setProperty("baseball", foo1);
-    model.setProperty("football", foo2);
-    model.setProperty("basketball", "PF");
-    model.setProperty("age", Integer.valueOf(25));
+    model.put("baseball", foo1);
+    model.put("football", foo2);
+    model.put("basketball", "PF");
+    model.put("age", Integer.valueOf(25));
     return model;
   }
 
   @Test
   public void testModelAPFoo() {
     ModelAPFoo model = createModelAPFoo();
-    // model.setProperty("basketball", "foo");
+    // model.put("basketball", "foo");
     testSerDeser(model, ModelAPFoo.class, false);
   }
 
@@ -197,7 +197,7 @@ public void testNoCtor() {
   public void testNullValues() {
     ModelAPFoo model = createModelAPFoo();
     model.setProp1(null);
-    // model.setProperty("basketball", "foo");
+    // model.put("basketball", "foo");
     testSerDeser(model, ModelAPFoo.class, false);
   }
 
@@ -232,7 +232,7 @@ public void testCtorExcp() {
   @Test
   public void testModelAPInteger() {
     ModelAPInteger model = createModelAPInteger();
-    // model.setProperty("basketball", "foo");
+    // model.put("basketball", "foo");
     testSerDeser(model, ModelAPInteger.class, false);
   }
 
@@ -245,7 +245,7 @@ public void testModelAPObject() {
   @Test
   public void testModelAPString() {
     ModelAPString model = createModelAPString();
-    // model.setProperty("basketball", Integer.valueOf(33));
+    // model.put("basketball", Integer.valueOf(33));
     testSerDeser(model, ModelAPString.class, false);
   }
 
@@ -282,13 +282,13 @@ public void testDynamicModelMethods() {
     ModelAPFoo model = createModelAPFoo();
     assertEquals(model.getPropertyNames(), Arrays.asList("baseball", "football"));
 
-    Foo foo = model.getProperty("baseball");
+    Foo foo = model.get("baseball");
     assertNotNull(foo);
-    model.setProperty("baseball2", foo);
+    model.put("baseball2", foo);
     assertEquals(model.getPropertyNames(), Arrays.asList("baseball", "football", "baseball2"));
 
     Foo newFoo = createFoo("1B", 44);
-    Foo previous = model.setProperty("baseball", newFoo);
+    Foo previous = model.put("baseball", newFoo);
     assertNotNull(previous);
 
     Map<String, Foo> props = model.getProperties();