dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31642
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16155: Removed unused property ValidationRule.type
------------------------------------------------------------
revno: 16155
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-07-17 14:43:25 +0200
message:
Removed unused property ValidationRule.type
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementDomain.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Operator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleStoreTest.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/CsvObjectUtils.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ValidationRuleConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ValidationRuleImporter.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ValidationRuleBatchHandler.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/AddValidationRuleAction.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementDomain.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementDomain.java 2014-06-27 15:01:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementDomain.java 2014-07-17 12:43:25 +0000
@@ -47,7 +47,7 @@
{
for ( DataElementDomain domainType : DataElementDomain.values() )
{
- if ( domainType.getValue().equalsIgnoreCase( value ) )
+ if ( domainType.value.equalsIgnoreCase( value ) )
{
return domainType;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Operator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Operator.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Operator.java 2014-07-17 12:43:25 +0000
@@ -1,5 +1,6 @@
package org.hisp.dhis.expression;
+
/*
* Copyright (c) 2004-2014, University of Oslo
* All rights reserved.
@@ -40,7 +41,7 @@
private final String mathematicalOperator;
- Operator( String mathematicalOperator )
+ private Operator( String mathematicalOperator )
{
this.mathematicalOperator = mathematicalOperator;
}
@@ -49,5 +50,22 @@
{
return mathematicalOperator;
}
+
+ public static Operator fromValue( String value )
+ {
+ for ( Operator operator : Operator.values() )
+ {
+ if ( operator.mathematicalOperator.equalsIgnoreCase( value ) )
+ {
+ return operator;
+ }
+ }
+ return null;
+ }
+
+ public static Operator safeValueOf( String name )
+ {
+ return name != null ? Operator.valueOf( name ) : null;
+ }
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java 2014-04-25 11:25:16 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java 2014-07-17 12:43:25 +0000
@@ -94,11 +94,6 @@
private String ruleType;
/**
- * Whether this is a STATISTICAL or ABSOLUTE rule (only ABSOLUTE rules are currently implemented!)
- */
- private String type;
-
- /**
* The comparison operator to compare left and right expressions in the rule.
*/
private Operator operator;
@@ -162,13 +157,12 @@
setAutoFields();
}
- public ValidationRule( String name, String description, String type,
+ public ValidationRule( String name, String description,
Operator operator, Expression leftSide, Expression rightSide )
{
this();
this.name = name;
this.description = description;
- this.type = type;
this.operator = operator;
this.leftSide = leftSide;
this.rightSide = rightSide;
@@ -443,19 +437,6 @@
@JsonProperty
@JsonView( {DetailedView.class, ExportView.class} )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
- public String getType()
- {
- return type;
- }
-
- public void setType( String type )
- {
- this.type = type;
- }
-
- @JsonProperty
- @JsonView( {DetailedView.class, ExportView.class} )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
public Expression getLeftSide()
{
return leftSide;
@@ -504,7 +485,6 @@
ValidationRule validationRule = (ValidationRule) other;
description = validationRule.getDescription() == null ? description : validationRule.getDescription();
- type = validationRule.getType() == null ? type : validationRule.getType();
operator = validationRule.getOperator() == null ? operator : validationRule.getOperator();
periodType = validationRule.getPeriodType() == null ? periodType : validationRule.getPeriodType();
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-07-10 15:06:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-07-17 12:43:25 +0000
@@ -153,6 +153,7 @@
executeSql( "ALTER TABLE orgunitgroup DROP COLUMN image" );
executeSql( "ALTER TABLE report DROP COLUMN usingorgunitgroupsets" );
executeSql( "ALTER TABLE eventchart DROP COLUMN datatype" );
+ executeSql( "ALTER TABLE validationrule DROP COLUMN type" );
executeSql( "DROP INDEX datamart_crosstab" );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml 2014-03-04 00:22:37 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml 2014-07-17 12:43:25 +0000
@@ -25,8 +25,6 @@
<property name="ruleType" column="ruletype" length="16" />
- <property name="type" />
-
<property name="operator" column="operator" type="org.hisp.dhis.expression.OperatorUserType" not-null="true" />
<many-to-one name="leftSide" column="leftexpressionid" class="org.hisp.dhis.expression.Expression"
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java 2014-05-27 02:41:16 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java 2014-07-17 12:43:25 +0000
@@ -1108,7 +1108,6 @@
assertEquals( "ValidationRuleA", validationRuleA.getName() );
assertEquals( "DescriptionA", validationRuleA.getDescription() );
- assertEquals( ValidationRule.TYPE_ABSOLUTE, validationRuleA.getType() );
assertEquals( equal_to, validationRuleA.getOperator() );
assertNotNull( validationRuleA.getLeftSide().getExpression() );
assertNotNull( validationRuleA.getRightSide().getExpression() );
@@ -1123,13 +1122,11 @@
assertEquals( "ValidationRuleA", validationRuleA.getName() );
assertEquals( "DescriptionA", validationRuleA.getDescription() );
- assertEquals( ValidationRule.TYPE_ABSOLUTE, validationRuleA.getType() );
assertEquals( equal_to, validationRuleA.getOperator() );
validationRuleA.setId( id );
validationRuleA.setName( "ValidationRuleB" );
validationRuleA.setDescription( "DescriptionB" );
- validationRuleA.setType( ValidationRule.TYPE_STATISTICAL );
validationRuleA.setOperator( greater_than );
validationRuleService.updateValidationRule( validationRuleA );
@@ -1137,7 +1134,6 @@
assertEquals( "ValidationRuleB", validationRuleA.getName() );
assertEquals( "DescriptionB", validationRuleA.getDescription() );
- assertEquals( ValidationRule.TYPE_STATISTICAL, validationRuleA.getType() );
assertEquals( greater_than, validationRuleA.getOperator() );
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleStoreTest.java 2014-04-28 15:43:02 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleStoreTest.java 2014-07-17 12:43:25 +0000
@@ -139,7 +139,6 @@
assertEquals( validationRule.getName(), "ValidationRuleA" );
assertEquals( validationRule.getDescription(), "DescriptionA" );
- assertEquals( validationRule.getType(), ValidationRule.TYPE_ABSOLUTE );
assertEquals( validationRule.getOperator(), equal_to );
assertNotNull( validationRule.getLeftSide().getExpression() );
assertNotNull( validationRule.getRightSide().getExpression() );
@@ -157,12 +156,10 @@
assertEquals( validationRule.getName(), "ValidationRuleA" );
assertEquals( validationRule.getDescription(), "DescriptionA" );
- assertEquals( validationRule.getType(), ValidationRule.TYPE_ABSOLUTE );
assertEquals( validationRule.getOperator(), equal_to );
validationRule.setName( "ValidationRuleB" );
validationRule.setDescription( "DescriptionB" );
- validationRule.setType( ValidationRule.TYPE_STATISTICAL );
validationRule.setOperator( greater_than );
validationRuleStore.update( validationRule );
@@ -171,7 +168,6 @@
assertEquals( validationRule.getName(), "ValidationRuleB" );
assertEquals( validationRule.getDescription(), "DescriptionB" );
- assertEquals( validationRule.getType(), ValidationRule.TYPE_STATISTICAL );
assertEquals( validationRule.getOperator(), greater_than );
}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/CsvObjectUtils.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/CsvObjectUtils.java 2014-06-29 22:17:35 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/CsvObjectUtils.java 2014-07-17 12:43:25 +0000
@@ -203,7 +203,7 @@
return list;
}
-
+
private static List<OrganisationUnit> organisationUnitsFromCsv( CsvReader reader, InputStream input )
throws IOException
{
@@ -302,6 +302,12 @@
// Supportive methods
// -------------------------------------------------------------------------
+ /**
+ * Sets the name, uid and code properties on the given object.
+ *
+ * @param object the object to set identifiable properties.
+ * @param values the array of property values.
+ */
private static void setIdentifiableObject( BaseIdentifiableObject object, String[] values )
{
object.setName( getSafe( values, 0, null, 230 ) );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ValidationRuleConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ValidationRuleConverter.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ValidationRuleConverter.java 2014-07-17 12:43:25 +0000
@@ -63,7 +63,6 @@
private static final String FIELD_CODE = "code";
private static final String FIELD_NAME = "name";
private static final String FIELD_DESCRIPTION = "description";
- private static final String FIELD_TYPE = "type";
private static final String FIELD_OPERATOR = "operator";
private static final String FIELD_LEFTSIDE_EXPRESSION = "leftSideExpression";
private static final String FIELD_LEFTSIDE_DESCRIPTION = "leftSideDescription";
@@ -130,7 +129,6 @@
writer.writeElement( FIELD_NAME, rule.getName() );
writer.writeElement( FIELD_DESCRIPTION, rule.getDescription() );
- writer.writeElement( FIELD_TYPE, rule.getType() );
writer.writeElement( FIELD_OPERATOR, rule.getOperator().toString() );
writer.writeElement( FIELD_LEFTSIDE_EXPRESSION, rule.getLeftSide().getExpression() );
writer.writeElement( FIELD_LEFTSIDE_DESCRIPTION, rule.getLeftSide().getDescription() );
@@ -167,7 +165,6 @@
validationRule.setName( values.get( FIELD_NAME ) );
validationRule.setDescription( values.get( FIELD_DESCRIPTION ) );
- validationRule.setType( values.get( FIELD_TYPE ) );
validationRule.setOperator( Operator.valueOf( values.get( FIELD_OPERATOR ) ) );
validationRule.getLeftSide().setExpression( values.get( FIELD_LEFTSIDE_EXPRESSION ) );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ValidationRuleImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ValidationRuleImporter.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ValidationRuleImporter.java 2014-07-17 12:43:25 +0000
@@ -76,7 +76,6 @@
{
match.setName( object.getName() );
match.setDescription( object.getDescription() );
- match.setType( object.getType() );
match.setOperator( object.getOperator() );
match.getLeftSide().setExpression( object.getLeftSide().getExpression() );
match.getLeftSide().setDescription( object.getLeftSide().getDescription() );
@@ -109,10 +108,6 @@
{
return false;
}
- if ( !isSimiliar( object.getType(), existing.getType() ) || ( isNotNull( object.getType(), existing.getType() ) && !object.getType().equals( existing.getType() ) ) )
- {
- return false;
- }
if ( !object.getOperator().equals( existing.getOperator() ) )
{
return false;
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ValidationRuleBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ValidationRuleBatchHandler.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ValidationRuleBatchHandler.java 2014-07-17 12:43:25 +0000
@@ -90,7 +90,6 @@
statementBuilder.setColumn( "code" );
statementBuilder.setColumn( "description" );
statementBuilder.setColumn( "operator" );
- statementBuilder.setColumn( "type" );
}
protected void setValues( ValidationRule validationRule )
@@ -100,7 +99,6 @@
statementBuilder.setValue( validationRule.getCode() );
statementBuilder.setValue( validationRule.getDescription() );
statementBuilder.setValue( validationRule.getOperator() );
- statementBuilder.setValue( validationRule.getType() );
}
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java 2014-06-26 09:29:30 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java 2014-07-17 12:43:25 +0000
@@ -653,9 +653,6 @@
table.addCell( getTextCell( validationRule.getDescription() ) );
}
- table.addCell( getItalicCell( i18n.getString( "type" ) ) );
- table.addCell( getTextCell( i18n.getString( validationRule.getType() ) ) );
-
table.addCell( getItalicCell( i18n.getString( "operator" ) ) );
table.addCell( getTextCell( i18n.getString( validationRule.getOperator().toString() ) ) );
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2014-07-12 21:07:29 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2014-07-17 12:43:25 +0000
@@ -984,7 +984,6 @@
validationRule.setName( "ValidationRule" + uniqueCharacter );
validationRule.setDescription( "Description" + uniqueCharacter );
- validationRule.setType( ValidationRule.TYPE_ABSOLUTE );
validationRule.setOperator( operator );
validationRule.setLeftSide( leftSide );
validationRule.setRightSide( rightSide );
@@ -1019,7 +1018,6 @@
validationRule.setName( "MonitoringRule" + uniqueCharacter );
validationRule.setDescription( "Description" + uniqueCharacter );
- validationRule.setType( ValidationRule.TYPE_ABSOLUTE );
validationRule.setRuleType( ValidationRule.RULE_TYPE_SURVEILLANCE );
validationRule.setOperator( operator );
validationRule.setLeftSide( leftSide );
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/AddValidationRuleAction.java'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/AddValidationRuleAction.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/AddValidationRuleAction.java 2014-07-17 12:43:25 +0000
@@ -232,7 +232,6 @@
validationRule.setInstruction( instruction );
validationRule.setImportance( importance );
validationRule.setRuleType( ruleType );
- validationRule.setType( ValidationRule.TYPE_ABSOLUTE );
validationRule.setOperator( Operator.valueOf(operator) );
validationRule.setLeftSide( leftSide );
validationRule.setRightSide( rightSide );
