clean ADPInstanceDAO api

metasfresh/metasfresh-webui-api-legacy#1134
metasfresh · Jan 28, 2019 · a9e8ec9 · a9e8ec9
1 parent eb3590d
commit a9e8ec9
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 29 deletions.
diff --git a/...dempiere.adempiere/base/src/main/java-legacy/org/adempiere/ad/dao/impl/TypedSqlQuery.java b/...dempiere.adempiere/base/src/main/java-legacy/org/adempiere/ad/dao/impl/TypedSqlQuery.java
@@ -1582,7 +1582,7 @@ public int createSelection(@NonNull final PInstanceId pinstanceId)
 	public PInstanceId createSelection()
 	{
 		// Create new AD_PInstance_ID for our selection
-		final PInstanceId newSelectionId = Services.get(IADPInstanceDAO.class).createPInstanceId();
+		final PInstanceId newSelectionId = Services.get(IADPInstanceDAO.class).createSelectionId();
 
 		// Populate the selection
 		final int count = createSelection(newSelectionId);
@@ -1822,7 +1822,7 @@ <ToModelType> QueryInsertExecutorResult executeInsert(
 		final String sql;
 		if (queryInserter.isCreateSelectionOfInsertedRows())
 		{
-			insertSelectionId = Services.get(IADPInstanceDAO.class).createPInstanceId();
+			insertSelectionId = Services.get(IADPInstanceDAO.class).createSelectionId();
 
 			final String toKeyColumnName = queryInserter.getToKeyColumnName();
 			sql = new StringBuilder()

diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/DB.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/DB.java
@@ -2247,7 +2247,7 @@ public static void createT_Selection(@NonNull final PInstanceId pinstanceId, Ite
 	 */
 	public static PInstanceId createT_Selection(Iterable<Integer> selection, String trxName)
 	{
-		final PInstanceId pinstanceId = Services.get(IADPInstanceDAO.class).createPInstanceId();
+		final PInstanceId pinstanceId = Services.get(IADPInstanceDAO.class).createSelectionId();
 		createT_Selection(pinstanceId, selection, trxName);
 		return pinstanceId;
 	}

diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/IADPInstanceDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/IADPInstanceDAO.java
@@ -84,19 +84,19 @@ public interface IADPInstanceDAO extends ISingletonService
 	List<ProcessInfoLog> retrieveProcessInfoLogs(PInstanceId pinstanceId);
 
 	/**
-	 * Creates a new AD_PInstance_ID.
+	 * Creates a new selection ID (AD_PInstance_ID).
 	 *
 	 * IMPORTANT: <b>this method is NOT creating an {@link I_AD_PInstance} record.</b>
-	 * If you want to create an {@link I_AD_PInstance}, please use {@link #createAD_PInstance(AdProcessId, int, int)}.
+	 * If you want to create an {@link I_AD_PInstance}, please use {@link #createAD_PInstance(AdProcessId)}.
 	 *
 	 * @return new AD_PInstance_ID
 	 */
-	PInstanceId createPInstanceId();
+	PInstanceId createSelectionId();
 
 	/**
 	 * Creates and saves a new AD_PInstance.
 	 */
-	I_AD_PInstance createAD_PInstance(AdProcessId adProcessId, int AD_Table_ID, int recordId);
+	I_AD_PInstance createAD_PInstance(AdProcessId adProcessId);
 
 	/**
 	 * @return process instance; never returns null

diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/impl/ADPInstanceDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/impl/ADPInstanceDAO.java
@@ -558,28 +558,21 @@ public void saveProcessInfoOnly(final ProcessInfo pi)
 	}
 
 	@Override
-	public PInstanceId createPInstanceId()
+	public PInstanceId createSelectionId()
 	{
 		final String trxName = ITrx.TRXNAME_None;
 		final int adPInstanceId = DB.getNextID(Env.getCtx(), I_AD_PInstance.Table_Name, trxName);
 		return PInstanceId.ofRepoId(adPInstanceId);
 	}
 
 	@Override
-	public I_AD_PInstance createAD_PInstance(@NonNull final AdProcessId adProcessId, final int AD_Table_ID, final int recordId)
+	public I_AD_PInstance createAD_PInstance(@NonNull final AdProcessId adProcessId)
 	{
 		final I_AD_PInstance adPInstance = newInstanceOutOfTrx(I_AD_PInstance.class);
 		adPInstance.setAD_Process_ID(adProcessId.getRepoId());
-		if (AD_Table_ID > 0)
-		{
-			adPInstance.setAD_Table_ID(AD_Table_ID);
-			adPInstance.setRecord_ID(recordId);
-		}
-		else
-		{
-			adPInstance.setAD_Table(null);
-			adPInstance.setRecord_ID(0); // mandatory
-		}
+
+		adPInstance.setAD_Table(null);
+		adPInstance.setRecord_ID(0); // mandatory
 
 		final Properties ctx = Env.getCtx();
 		adPInstance.setAD_User_ID(Env.getAD_User_ID(ctx));

diff --git a/...tas.adempiere.adempiere/base/src/main/java/de/metas/process/impl/PlainADPInstanceDAO.java b/...tas.adempiere.adempiere/base/src/main/java/de/metas/process/impl/PlainADPInstanceDAO.java
@@ -35,7 +35,7 @@
 public class PlainADPInstanceDAO extends ADPInstanceDAO
 {
 	@Override
-	public PInstanceId createPInstanceId()
+	public PInstanceId createSelectionId()
 	{
 		return PInstanceId.ofRepoId(POJOLookupMap.get().nextId(I_AD_PInstance.Table_Name));
 	}

diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/wrapper/POJOLookupMap.java b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/wrapper/POJOLookupMap.java
@@ -1093,7 +1093,7 @@ public void createSelection(@NonNull final PInstanceId selectionId, final Collec
 
 	private PInstanceId createSelectionPInstanceId()
 	{
-		return Services.get(IADPInstanceDAO.class).createPInstanceId();
+		return Services.get(IADPInstanceDAO.class).createSelectionId();
 	}
 
 	public PInstanceId createSelection(final Collection<Integer> selection)

diff --git a/de.metas.adempiere.adempiere/base/src/test/java/de/metas/process/JavaProcessTests.java b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/process/JavaProcessTests.java
@@ -240,9 +240,7 @@ private <T extends JavaProcess> ProcessInfo createProcessInfo(final Class<T> pro
 
 		// Create the AD_PInstance record
 		final AdProcessId adProcessId = createProcess(processClass);
-		final int AD_Table_ID = 0;
-		final int recordId = 0;
-		final I_AD_PInstance pinstance = pinstancesRepo.createAD_PInstance(adProcessId, AD_Table_ID, recordId);
+		final I_AD_PInstance pinstance = pinstancesRepo.createAD_PInstance(adProcessId);
 
 		//
 		// Create ProcessInfo descriptor

diff --git a/...sh/de.metas.fresh.base/src/main/java/de/metas/fresh/picking/form/SwingPickingOKPanel.java b/...sh/de.metas.fresh.base/src/main/java/de/metas/fresh/picking/form/SwingPickingOKPanel.java
@@ -409,7 +409,7 @@ private final synchronized PInstanceId getADPInstanceId()
 		PInstanceId pinstanceId = _pinstanceId;
 		if (pinstanceId == null)
 		{
-			_pinstanceId = pinstanceId = Services.get(IADPInstanceDAO.class).createPInstanceId();
+			_pinstanceId = pinstanceId = Services.get(IADPInstanceDAO.class).createSelectionId();
 		}
 		return pinstanceId;
 	}

diff --git a/...se/src/main/java/de/metas/printing/async/spi/impl/PDFDocPrintingWorkpackageProcessor.java b/...se/src/main/java/de/metas/printing/async/spi/impl/PDFDocPrintingWorkpackageProcessor.java
@@ -179,7 +179,7 @@ private byte[] createSummaryPage(final I_C_Print_Job_Instructions jobInstruction
 		final Properties ctx = InterfaceWrapperHelper.getCtx(jobInstructions);
 		final Language language = Services.get(ILanguageBL.class).getOrgLanguage(ctx, jobInstructions.getAD_Org_ID());
 
-		final I_AD_PInstance pinstance = Services.get(IADPInstanceDAO.class).createAD_PInstance(SummaryPdfPrinting_AD_Process_ID, 0, 0);
+		final I_AD_PInstance pinstance = Services.get(IADPInstanceDAO.class).createAD_PInstance(SummaryPdfPrinting_AD_Process_ID);
 		pinstance.setIsProcessing(true);
 		InterfaceWrapperHelper.save(pinstance);
 

diff --git a/...s.swat.base/src/main/java/de/metas/data/export/api/impl/ProcessLoggerExporterMonitor.java b/...s.swat.base/src/main/java/de/metas/data/export/api/impl/ProcessLoggerExporterMonitor.java
@@ -119,7 +119,7 @@ public void exportFinished(IExporter exporter)
 
 	private I_AD_PInstance createPInstance()
 	{
-		final I_AD_PInstance pinstance = Services.get(IADPInstanceDAO.class).createAD_PInstance(adProcessId, 0, 0);
+		final I_AD_PInstance pinstance = Services.get(IADPInstanceDAO.class).createAD_PInstance(adProcessId);
 		pinstance.setIsProcessing(true);
 		InterfaceWrapperHelper.save(pinstance);
 

diff --git a/...ava/de/metas/inoutcandidate/async/UpdateInvalidShipmentSchedulesWorkpackageProcessor.java b/...ava/de/metas/inoutcandidate/async/UpdateInvalidShipmentSchedulesWorkpackageProcessor.java
@@ -75,7 +75,7 @@ public Result processWorkPackage(final I_C_Queue_WorkPackage workpackage, final
 		final Properties ctx = InterfaceWrapperHelper.getCtx(workpackage);
 
 		final int adUserId = workpackage.getCreatedBy();
-		final PInstanceId pinstanceId = Services.get(IADPInstanceDAO.class).createPInstanceId();
+		final PInstanceId pinstanceId = Services.get(IADPInstanceDAO.class).createSelectionId();
 
 		final boolean updateOnlyLocked = true; // don't create missing schedules; for that we have CreateMissingShipmentSchedulesWorkpackageProcessor
 		final int updatedCount = shipmentScheduleUpdater.updateShipmentSchedule(ctx, adUserId, pinstanceId, updateOnlyLocked);

diff --git a/...t/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/api/impl/InvoiceCandDAO.java b/...t/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/api/impl/InvoiceCandDAO.java
@@ -847,7 +847,7 @@ public final Iterator<I_C_Invoice_Candidate> fetchInvalidInvoiceCandidates(
 	@Override
 	public InvoiceCandRecomputeTag generateNewRecomputeTag()
 	{
-		final PInstanceId pinstanceId = Services.get(IADPInstanceDAO.class).createPInstanceId();
+		final PInstanceId pinstanceId = Services.get(IADPInstanceDAO.class).createSelectionId();
 		return InvoiceCandRecomputeTag.ofPInstanceId(pinstanceId);
 	}