#5392 cleanup

#5392
metasfresh · Jul 24, 2019 · c5de84c · c5de84c
1 parent 97acea1
commit c5de84c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/...s/src/main/java/de/metas/pricing/conditions/service/impl/PricingConditionsRepository.java b/...s/src/main/java/de/metas/pricing/conditions/service/impl/PricingConditionsRepository.java
@@ -33,7 +33,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Stream;
 
@@ -52,7 +51,6 @@
 import org.compiere.model.I_M_DiscountSchemaBreak;
 import org.compiere.model.I_M_DiscountSchemaLine;
 import org.compiere.model.X_M_DiscountSchemaBreak;
-import org.compiere.util.Env;
 import org.compiere.util.TimeUtil;
 import org.slf4j.Logger;
 
@@ -121,7 +119,7 @@ PricingConditions retrievePricingConditionsById(@NonNull final PricingConditions
 	{
 		final int discountSchemaId = id.getDiscountSchemaId();
 		final I_M_DiscountSchema discountSchemaRecord = loadOutOfTrx(discountSchemaId, I_M_DiscountSchema.class);
-		final List<I_M_DiscountSchemaBreak> schemaBreakRecords = streamSchemaBreakRecords(Env.getCtx(), ImmutableList.of(discountSchemaId), ITrx.TRXNAME_None)
+		final List<I_M_DiscountSchemaBreak> schemaBreakRecords = streamSchemaBreakRecords(ImmutableList.of(discountSchemaId))
 				.collect(ImmutableList.toImmutableList());
 
 		return toPricingConditions(discountSchemaRecord, schemaBreakRecords);
@@ -136,7 +134,7 @@ private Map<PricingConditionsId, PricingConditions> retrievePricingConditionsByI
 
 		final Set<Integer> discountSchemaIds = PricingConditionsId.toDiscountSchemaIds(ids);
 
-		final ListMultimap<Integer, I_M_DiscountSchemaBreak> schemaBreakRecords = streamSchemaBreakRecords(Env.getCtx(), discountSchemaIds, ITrx.TRXNAME_None)
+		final ListMultimap<Integer, I_M_DiscountSchemaBreak> schemaBreakRecords = streamSchemaBreakRecords(discountSchemaIds)
 				.collect(GuavaCollectors.toImmutableListMultimap(I_M_DiscountSchemaBreak::getM_DiscountSchema_ID));
 
 		return Services.get(IQueryBL.class).createQueryBuilderOutOfTrx(I_M_DiscountSchema.class)
@@ -293,15 +291,15 @@ private static CurrencyId extractCurrencyId(final I_M_DiscountSchemaBreak discou
 	}
 
 	@VisibleForTesting
-	/* package */ Stream<I_M_DiscountSchemaBreak> streamSchemaBreakRecords(final Properties ctx, final Collection<Integer> discountSchemaIds, final String trxName)
+	/* package */ Stream<I_M_DiscountSchemaBreak> streamSchemaBreakRecords(final Collection<Integer> discountSchemaIds)
 	{
 		if (discountSchemaIds.isEmpty())
 		{
 			return Stream.empty();
 		}
 
 		return Services.get(IQueryBL.class)
-				.createQueryBuilder(I_M_DiscountSchemaBreak.class, ctx, trxName)
+				.createQueryBuilder(I_M_DiscountSchemaBreak.class)
 				.addOnlyActiveRecordsFilter()
 				.addInArrayFilter(I_M_DiscountSchemaBreak.COLUMNNAME_M_DiscountSchema_ID, discountSchemaIds)
 				.orderBy(I_M_DiscountSchemaBreak.COLUMNNAME_M_DiscountSchema_ID)
@@ -312,10 +310,10 @@ private static CurrencyId extractCurrencyId(final I_M_DiscountSchemaBreak discou
 	}
 
 	@VisibleForTesting
-	/* package */ List<I_M_DiscountSchemaLine> retrieveLines(final Properties ctx, final int discountSchemaId, final String trxName)
+	/* package */ List<I_M_DiscountSchemaLine> retrieveLines(final int discountSchemaId)
 	{
 		return Services.get(IQueryBL.class)
-				.createQueryBuilder(I_M_DiscountSchemaLine.class, ctx, trxName)
+				.createQueryBuilder(I_M_DiscountSchemaLine.class)
 				.addOnlyActiveRecordsFilter()
 				.addEqualsFilter(I_M_DiscountSchemaLine.COLUMNNAME_M_DiscountSchema_ID, discountSchemaId)
 				.orderBy(I_M_DiscountSchemaLine.COLUMNNAME_SeqNo)
@@ -336,7 +334,7 @@ private int resequenceLines(final int discountSchemaId)
 	{
 		int countUpdated = 0;
 
-		final List<I_M_DiscountSchemaLine> lines = retrieveLines(Env.getCtx(), discountSchemaId, ITrx.TRXNAME_ThreadInherited);
+		final List<I_M_DiscountSchemaLine> lines = retrieveLines(discountSchemaId);
 		int i = 0;
 		for (final I_M_DiscountSchemaLine currentLine : lines)
 		{
@@ -357,7 +355,7 @@ private int resequenceBreaks(final int discountSchemaId)
 	{
 		int countUpdated = 0;
 
-		final List<I_M_DiscountSchemaBreak> breaks = streamSchemaBreakRecords(Env.getCtx(), ImmutableList.of(discountSchemaId), ITrx.TRXNAME_ThreadInherited)
+		final List<I_M_DiscountSchemaBreak> breaks = streamSchemaBreakRecords(ImmutableList.of(discountSchemaId))
 				.collect(ImmutableList.toImmutableList());
 		int i = 0;
 		for (final I_M_DiscountSchemaBreak br : breaks)
@@ -540,7 +538,7 @@ public void copyDiscountSchemaBreaks(
 			@NonNull final IQueryFilter<I_M_DiscountSchemaBreak> queryFilter)
 	{
 		final IQueryBL queryBL = Services.get(IQueryBL.class);
-		ICompositeQueryFilter<I_M_DiscountSchemaBreak> breaksFromOtherDiscountSchemas = queryBL.createCompositeQueryFilter(I_M_DiscountSchemaBreak.class)
+		final ICompositeQueryFilter<I_M_DiscountSchemaBreak> breaksFromOtherDiscountSchemas = queryBL.createCompositeQueryFilter(I_M_DiscountSchemaBreak.class)
 				.setJoinAnd()
 				.addFilter(queryFilter)
 				.addNotEqualsFilter(I_M_DiscountSchemaBreak.COLUMNNAME_M_DiscountSchema_ID, discountSchemaId);
@@ -551,7 +549,6 @@ public void copyDiscountSchemaBreaks(
 		{
 			copyDiscountSchemaBreak(schemaBreak, discountSchemaId);
 		}
-
 	}
 
 	private List<I_M_DiscountSchemaBreak> retrieveDiscountSchemaBreakRecords(@NonNull final IQueryFilter<I_M_DiscountSchemaBreak> queryFilter)
@@ -567,16 +564,12 @@ private void copyDiscountSchemaBreak(
 			@NonNull final I_M_DiscountSchemaBreak from,
 			@NonNull final DiscountSchemaId toDiscountSchemaId)
 	{
-
 		final I_M_DiscountSchemaBreak newBreak = copy()
-				.setSkipCalculatedColumns(true)
-				.addTargetColumnNameToSkip(I_M_DiscountSchemaLine.COLUMNNAME_M_DiscountSchema_ID)
 				.setFrom(from)
 				.copyToNew(I_M_DiscountSchemaBreak.class);
 
 		newBreak.setM_DiscountSchema_ID(toDiscountSchemaId.getRepoId());
 
 		saveRecord(newBreak);
 	}
-
 }
diff --git a/...usiness/src/test/java/de/metas/pricing/conditions/service/impl/PricingConditionsTest.java b/...usiness/src/test/java/de/metas/pricing/conditions/service/impl/PricingConditionsTest.java
@@ -39,7 +39,6 @@
 import java.util.List;
 import java.util.function.Function;
 
-import org.adempiere.ad.trx.api.ITrx;
 import org.adempiere.ad.wrapper.POJOWrapper;
 import org.adempiere.mm.attributes.api.ImmutableAttributeSet;
 import org.adempiere.test.AdempiereTestHelper;
@@ -52,7 +51,6 @@
 import org.compiere.model.I_M_Product;
 import org.compiere.model.I_M_Product_Category;
 import org.compiere.model.X_M_DiscountSchema;
-import org.compiere.util.Env;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -109,7 +107,7 @@ public void testRetrieveBreaks()
 
 		final I_M_DiscountSchemaBreak schemaBreak3 = PricingConditionsTestUtils.createBreak(schema2, 10);
 
-		final List<I_M_DiscountSchemaBreak> breaks = repo.streamSchemaBreakRecords(Env.getCtx(), ImmutableList.of(schema1.getM_DiscountSchema_ID()), ITrx.TRXNAME_ThreadInherited)
+		final List<I_M_DiscountSchemaBreak> breaks = repo.streamSchemaBreakRecords(ImmutableList.of(schema1.getM_DiscountSchema_ID()))
 				.collect(ImmutableList.toImmutableList());
 
 		assertThat(breaks).hasSize(2);
@@ -128,7 +126,7 @@ public void testRetrieveLines()
 
 		final I_M_DiscountSchemaLine schemaLine3 = createLine(schema2, 10);
 
-		final List<I_M_DiscountSchemaLine> lines = repo.retrieveLines(Env.getCtx(), schema1.getM_DiscountSchema_ID(), ITrx.TRXNAME_ThreadInherited);
+		final List<I_M_DiscountSchemaLine> lines = repo.retrieveLines(schema1.getM_DiscountSchema_ID());
 
 		assertThat(lines).hasSize(2);
 		assertThat(lines).contains(schemaLine1, schemaLine2);