#3058 reparations

#3058
metasfresh · Dec 4, 2017 · f10f0ae · f10f0ae
1 parent 403f74e
commit f10f0ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/...mpiere.adempiere/base/src/main/java/org/adempiere/ad/table/api/impl/TableRecordIdDAO.java b/...mpiere.adempiere/base/src/main/java/org/adempiere/ad/table/api/impl/TableRecordIdDAO.java
@@ -61,7 +61,7 @@ public List<TableRecordIdDescriptor> retrieveTableRecordIdReferences(final Strin
 	}
 
 	@Cached(cacheName = I_AD_Table.Table_Name + "#and#" + I_AD_Column.Table_Name + "#referencedTableId2TableRecordTableIDs")
-	List<TableRecordIdDescriptor> retrieveTableRecordIdReferences(@CacheCtx final Properties ctx, @CacheTrx final String trxName)
+	public List<TableRecordIdDescriptor> retrieveTableRecordIdReferences(@CacheCtx final Properties ctx, @CacheTrx final String trxName)
 	{
 		final PlainContextAware ctxAware = PlainContextAware.newWithTrxName(ctx, trxName);
 
@@ -75,7 +75,7 @@ public List<TableRecordIdDescriptor> retrieveAllTableRecordIdReferences()
 		return retrieveTableRecordIdReferences(Env.getCtx(), ITrx.TRXNAME_None);
 	}
 
-	List<TableRecordIdDescriptor> retrieveTableRecordIdReferences(final IContextAware ctxAware, final String tableName)
+	private List<TableRecordIdDescriptor> retrieveTableRecordIdReferences(final IContextAware ctxAware, final String tableName)
 	{
 		final IColumnBL columnBL = Services.get(IColumnBL.class);
 		final IQueryBL queryBL = Services.get(IQueryBL.class);

diff --git a/...e.adempiere/base/src/test/java/org/adempiere/ad/table/api/impl/TableRecordIdDAO_Test.java b/...e.adempiere/base/src/test/java/org/adempiere/ad/table/api/impl/TableRecordIdDAO_Test.java
@@ -10,7 +10,6 @@
 import org.adempiere.ad.table.TableRecordIdDescriptor;
 import org.adempiere.ad.table.api.IADTableDAO;
 import org.adempiere.ad.table.api.ITableRecordIdDAO;
-import org.adempiere.model.InterfaceWrapperHelper;
 import org.adempiere.test.AdempiereTestHelper;
 import org.adempiere.util.Services;
 import org.compiere.model.I_AD_ChangeLog;
@@ -46,12 +45,11 @@
 public class TableRecordIdDAO_Test
 {
 
-	final ITableRecordIdDAO tableRecordIdDAO = Services.get(ITableRecordIdDAO.class);
+	private static final ITableRecordIdDAO tableRecordIdDAO = Services.get(ITableRecordIdDAO.class);
 
 	@Before
 	public void init()
 	{
-
 		AdempiereTestHelper.get().init();
 
 	}
@@ -71,7 +69,7 @@ public void recordDescriptor_ChangeLog_Record_ID()
 		referencingChangeLog.setRecord_ID(referencedField.getAD_Field_ID());
 		save(referencingChangeLog);
 
-		final int adChangeLogTableID = InterfaceWrapperHelper.getTableId(I_AD_ChangeLog.class);
+		final int adChangeLogTableID = getTableId(I_AD_ChangeLog.class);
 
 		// for the unit test need to explicitly create AD_Column records for the two AD_Changelog properties
 		{
@@ -147,7 +145,7 @@ public void recordDescriptor_ChangeLog_RecordId_And_Prefix_RecordId()
 		originChangeLog.setAD_Field_Record_ID(referencedField.getAD_Field_ID());
 		save(originChangeLog);
 
-		final int adChangeLogTableID = InterfaceWrapperHelper.getTableId(I_AD_ChangeLog.class);
+		final int adChangeLogTableID = getTableId(I_AD_ChangeLog.class);
 
 		// for the unit test need to explicitly create AD_Column records for the two AD_Changelog properties
 		{
@@ -191,7 +189,7 @@ public void recordDescriptor_All_TableRecordIdDescriptors()
 		referencingChangeLog.setAD_Field_Record_ID(referencedField.getAD_Field_ID());
 		save(referencingChangeLog);
 
-		final int adChangeLogTableID = InterfaceWrapperHelper.getTableId(I_AD_ChangeLog.class);
+		final int adChangeLogTableID = getTableId(I_AD_ChangeLog.class);
 
 		// for the unit test need to explicitly create AD_Column records for the two AD_Changelog properties
 		{
@@ -268,7 +266,7 @@ private boolean containsTableRecordReferences(final List<TableRecordIdDescriptor
 
 	}
 
-	interface Mocked_I_AD_ChangeLog extends org.compiere.model.I_AD_ChangeLog
+	interface Mocked_I_AD_ChangeLog extends I_AD_ChangeLog
 	{
 		public void setAD_Field_AD_Table_ID(int AD_Table_ID);