#1747 - Refactor tidy tighten access on ebeaninternal/server/deploy

Adds PropertyAssocMany to ensure public access on BeanPropertyAssocMany helper methods for ebean-elastic integration.

src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java

@@ -9,6 +9,7 @@ import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebean.bean.BeanCollectionAdd;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
+import io.ebean.plugin.PropertyAssocMany;
 import io.ebean.text.PathProperties;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiExpressionRequest;
@@ -37,7 +38,7 @@ import java.util.Map;
 /**
  * Property mapped to a List Set or Map.
  */
-public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements STreePropertyAssocMany {
+public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements STreePropertyAssocMany, PropertyAssocMany {
 
   private static final Logger logger = LoggerFactory.getLogger(BeanPropertyAssocMany.class);
 
@@ -105,7 +106,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Property on the 'child' bean that links back to the 'master'.
    */
-  protected BeanPropertyAssocOne<?> childMasterProperty;
+  private BeanPropertyAssocOne<?> childMasterProperty;
 
   private String childMasterIdProperty;
 
@@ -201,7 +202,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Initialise after the target bean descriptors have been all set.
    */
-  public void initialisePostTarget() {
+  void initialisePostTarget() {
     if (childMasterProperty != null) {
       BeanProperty masterId = childMasterProperty.getTargetDescriptor().getIdProperty();
       if (masterId != null) { // in docstore only, the master-id may be not available
@@ -348,6 +349,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
    *
    * Helper method used by Elastic integration when loading with a persistence context.
    */
+  @Override
   public void lazyLoadMany(EntityBean current) {
     EntityBean parentBean = childMasterProperty.getValueAsEntityBean(current);
     if (parentBean != null) {
@@ -636,8 +638,8 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     return help.createEmpty(parentBean);
   }
 
-  public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
-    return help.getBeanCollectionAdd(bc, mapKey);
+  private BeanCollectionAdd getBeanCollectionAdd(Object bc) {
+    return help.getBeanCollectionAdd(bc, null);
   }
 
   public Object getParentId(EntityBean parentBean) {
@@ -782,7 +784,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Register the mapping of intersection table to associated draft table.
    */
-  public void registerDraftIntersectionTable(BeanDescriptorInitContext initContext) {
+  void registerDraftIntersectionTable(BeanDescriptorInitContext initContext) {
     if (hasDraftIntersection()) {
       initContext.addDraftIntersection(intersectionPublishTable, intersectionDraftTable);
     }
@@ -883,7 +885,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   }
 
   @SuppressWarnings("unchecked")
-  public void publishMany(EntityBean draft, EntityBean live) {
+  void publishMany(EntityBean draft, EntityBean live) {
 
     // collections will not be null due to enhancement
     BeanCollection<T> draftVal = (BeanCollection<T>) getValueIntercept(draft);
@@ -959,11 +961,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     return help;
   }
 
-  public void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
+  void jsonWriteMapEntry(SpiJsonWriter ctx, Map.Entry<?, ?> entry) throws IOException {
     elementDescriptor.jsonWriteMapEntry(ctx, entry);
   }
 
-  public void jsonWriteElementValue(SpiJsonWriter ctx, Object element) {
+  void jsonWriteElementValue(SpiJsonWriter ctx, Object element) {
     elementDescriptor.jsonWriteElement(ctx, element);
   }
 
@@ -1011,7 +1013,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Read the collection as JSON.
    */
-  public Object jsonReadCollection(String json) throws IOException {
+  private Object jsonReadCollection(String json) throws IOException {
     SpiJsonReader ctx = descriptor.createJsonReader(json);
     JsonParser parser = ctx.getParser();
     JsonToken event = parser.nextToken();
@@ -1024,7 +1026,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   /**
    * Write the collection to JSON.
    */
-  public void jsonWriteCollection(SpiJsonWriter ctx, String name, Object value, boolean explicitInclude) throws IOException {
+  private void jsonWriteCollection(SpiJsonWriter ctx, String name, Object value, boolean explicitInclude) throws IOException {
     help.jsonWrite(ctx, name, value, explicitInclude);
   }
 
@@ -1038,7 +1040,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     }
 
     BeanCollection<?> collection = createEmpty(parentBean);
-    BeanCollectionAdd add = getBeanCollectionAdd(collection, null);
+    BeanCollectionAdd add = getBeanCollectionAdd(collection);
     do {
       EntityBean detailBean = (EntityBean) targetDescriptor.jsonRead(readJson, name);
       if (detailBean == null) {