From 1058339e061fa3b8c3be78d78f2a48fb4bf5fbfe Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 19 Oct 2010 21:35:41 +0000
Subject: [PATCH] TODO cleanup
SVN: 18364
---
.../parser/AbstractParserObjectFactory.java | 10 +++----
.../parser/NewSampleParserObjectFactory.java | 2 +-
.../server/calculator/RowCalculatorTest.java | 27 +++++++------------
3 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/AbstractParserObjectFactory.java b/common/source/java/ch/systemsx/cisd/common/parser/AbstractParserObjectFactory.java
index 3b4a391e0da..b34e81efdbc 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/AbstractParserObjectFactory.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/AbstractParserObjectFactory.java
@@ -134,8 +134,8 @@ public abstract class AbstractParserObjectFactory<E> implements IParserObjectFac
}
if (propertyCodes.size() > 0 && ignoreUnmatchedProperties() == false)
{
- throw new UnmatchedPropertiesException(mandatoryPropertyCodes, beanAnalyzer
- .getOptionalProperties(), propertyCodes);
+ throw new UnmatchedPropertiesException(mandatoryPropertyCodes,
+ beanAnalyzer.getOptionalProperties(), propertyCodes);
}
unmatchedProperties = propertyCodes;
}
@@ -149,7 +149,7 @@ public abstract class AbstractParserObjectFactory<E> implements IParserObjectFac
throw new IndexOutOfBoundsException(column, lineTokens);
}
String value = lineTokens[column];
- // TODO this check doesn't work for <DELETE>
+ // TODO 2010-09-17, Piotr Buczek: this check doesn't work for <DELETE>
checkMandatory(value, propertyModel.getCode());
return value;
}
@@ -218,8 +218,8 @@ public abstract class AbstractParserObjectFactory<E> implements IParserObjectFac
if (propertyModel != null)
{
final String propertyValue = getPropertyValue(lineTokens, propertyModel);
- ClassUtils.invokeMethod(writeMethod, object, convert(propertyValue, writeMethod
- .getParameterTypes()[0]));
+ ClassUtils.invokeMethod(writeMethod, object,
+ convert(propertyValue, writeMethod.getParameterTypes()[0]));
}
}
return object;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/NewSampleParserObjectFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/NewSampleParserObjectFactory.java
index c6fe7e804d2..67ea36da33a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/NewSampleParserObjectFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/NewSampleParserObjectFactory.java
@@ -113,7 +113,7 @@ class NewSampleParserObjectFactory extends AbstractParserObjectFactory<NewSample
+ "' should be removed from the file.");
}
newSample.setSampleType(sampleType);
- setProperties(newSample, lineTokens); // TODO new placeholders for dynamic properties
+ setProperties(newSample, lineTokens);
newSample
.setContainerIdentifier(StringUtils.trimToNull(newSample.getContainerIdentifier()));
newSample.setParentIdentifier(StringUtils.trimToNull(newSample.getParentIdentifier()));
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java
index 950558f7e64..1ca59ae8858 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java
@@ -63,7 +63,6 @@ public class RowCalculatorTest extends AssertJUnit
public List<String> getAllColumnTitles()
{
- // TODO Auto-generated method stub
return null;
}
@@ -72,7 +71,7 @@ public class RowCalculatorTest extends AssertJUnit
return null;
}
}
-
+
private ITableDataProvider dataProvider;
@BeforeMethod
@@ -99,8 +98,7 @@ public class RowCalculatorTest extends AssertJUnit
{
Set<ParameterWithValue> parameters = createParameters("x", "10");
parameters.addAll(createParameters("y", "1"));
- RowCalculator calculator =
- createCalculator(parameters, "${x} * row.col('VALUE') + ${y}");
+ RowCalculator calculator = createCalculator(parameters, "${x} * row.col('VALUE') + ${y}");
calculator.setRowData(Arrays.asList(2.5));
assertEquals(26.0, calculator.evalToDouble());
@@ -126,8 +124,7 @@ public class RowCalculatorTest extends AssertJUnit
public void testEvalToInt()
{
Set<ParameterWithValue> parameters = createParameters("x", "42");
- RowCalculator calculator =
- createCalculator(parameters, "int(row.col('VALUE') * ${x})");
+ RowCalculator calculator = createCalculator(parameters, "int(row.col('VALUE') * ${x})");
calculator.setRowData(Arrays.asList(2.5));
assertEquals(105, calculator.evalToInt());
@@ -140,8 +137,7 @@ public class RowCalculatorTest extends AssertJUnit
public void testEvalToBigInt()
{
Set<ParameterWithValue> parameters = createParameters("x", "10");
- RowCalculator calculator =
- createCalculator(parameters, "${x} ** int(row.col('VALUE'))");
+ RowCalculator calculator = createCalculator(parameters, "${x} ** int(row.col('VALUE'))");
calculator.setRowData(Arrays.asList(10));
assertEquals(new BigInteger("10000000000"), calculator.evalToBigInt());
@@ -151,8 +147,7 @@ public class RowCalculatorTest extends AssertJUnit
public void testEvalAsString()
{
Set<ParameterWithValue> parameters = createParameters("x", "42");
- RowCalculator calculator =
- createCalculator(parameters, "str(${x} + row.col('VALUE'))");
+ RowCalculator calculator = createCalculator(parameters, "str(${x} + row.col('VALUE'))");
calculator.setRowData(Arrays.asList(10));
assertEquals("52", calculator.evalAsString());
@@ -179,8 +174,7 @@ public class RowCalculatorTest extends AssertJUnit
public void testIntFunctionOverloaded()
{
Set<ParameterWithValue> parameters = createParameters("x", "0.0");
- RowCalculator calculator =
- createCalculator(parameters, "map(int, [${x},' ',2,2.5,'3'])");
+ RowCalculator calculator = createCalculator(parameters, "map(int, [${x},' ',2,2.5,'3'])");
assertEquals("[0, -2147483648, 2, 2, 3]", calculator.evalAsString());
@@ -201,8 +195,7 @@ public class RowCalculatorTest extends AssertJUnit
public void testMinFunctionOverloaded()
{
Set<ParameterWithValue> parameters = createParameters("x", "0.0");
- RowCalculator calculator =
- createCalculator(parameters, "min([${x},None,' ',-2,'-3'])");
+ RowCalculator calculator = createCalculator(parameters, "min([${x},None,' ',-2,'-3'])");
assertEquals(-3.0, calculator.evalToDouble());
@@ -212,8 +205,7 @@ public class RowCalculatorTest extends AssertJUnit
public void testMaxFunctionOverloaded()
{
Set<ParameterWithValue> parameters = createParameters("x", "0.0");
- RowCalculator calculator =
- createCalculator(parameters, "max([${x},None,' ',-2,'-3'])");
+ RowCalculator calculator = createCalculator(parameters, "max([${x},None,' ',-2,'-3'])");
assertEquals(0.0, calculator.evalToDouble());
@@ -267,8 +259,7 @@ public class RowCalculatorTest extends AssertJUnit
assertEquals(38.6, calculator.evalToDouble());
}
- private RowCalculator createCalculator(Set<ParameterWithValue> parameters,
- String expression)
+ private RowCalculator createCalculator(Set<ParameterWithValue> parameters, String expression)
{
if (parameters != null)
{
--
GitLab