Correction on the auto-input. AutoInput executor was still alive after an...

Correction on the auto-input. AutoInput executor was still alive after an init. Adding the possibility to express the precision in percent. And to check the difference between the last read value or the last write value (default).

pom.xml

@@ -12,7 +12,7 @@
 	
 	<groupId>fr.soleil.deviceservers</groupId>
 	<artifactId>TangoParser</artifactId>
-	<version>3.3.5</version>
+	<version>3.3.6</version>
 	<name>TangoParser</name>
 	<description>TangoParser Device</description>
 	

src/main/java/fr/soleil/tango/parser/autoinput/AutoInputActivatorAttribute.java

@@ -10,7 +10,6 @@ import fr.esrf.Tango.AttrWriteType;
 import fr.esrf.Tango.DevFailed;
 import fr.esrf.Tango.DispLevel;
 import fr.esrf.TangoDs.TangoConst;
-import fr.soleil.tango.clientapi.util.TypeConversionUtil;
 
 public class AutoInputActivatorAttribute implements IAttributeBehavior {
 	private final AttributeValue value = new AttributeValue();
@@ -22,8 +21,8 @@ public class AutoInputActivatorAttribute implements IAttributeBehavior {
 		config.setName(name);
 		config.setTangoType(TangoConst.Tango_DEV_BOOLEAN, AttrDataFormat.SCALAR);
 		config.setWritable(AttrWriteType.READ_WRITE);
-		config.setDispLevel(DispLevel.EXPERT);
-		value.setValue(TypeConversionUtil.castToType(config.getType(), activated));
+		config.setDispLevel(DispLevel.OPERATOR);
+		//value.setValue(TypeConversionUtil.castToType(config.getType(), activated));
 		this.autoInputAttributeManager = autoInputAttributeManager;
 	}
 
@@ -34,6 +33,8 @@ public class AutoInputActivatorAttribute implements IAttributeBehavior {
 
 	@Override
 	public AttributeValue getValue() throws DevFailed {
+		this.value.setValue(autoInputAttributeManager.isRunning());
+		//return autoInputAttributeManager.isRunning();
 		return value;
 	}
 
@@ -56,7 +57,7 @@ public class AutoInputActivatorAttribute implements IAttributeBehavior {
 			} else {
 				autoInputAttributeManager.stop();
 			}
-			this.value.setValue(newValue);
+			//this.value.setValue(newValue);
 		}
 	}
 

src/main/java/fr/soleil/tango/parser/autoinput/AutoInputAttributeManager.java

 package fr.soleil.tango.parser.autoinput;
 
 import java.lang.reflect.Array;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
@@ -16,7 +17,8 @@ public class AutoInputAttributeManager {
 
 	private class TaskRunner implements Runnable {
 
-		private Object prevValue = null;
+		private Object prevValueRead = null;
+		private Object prevValueWrite = null;
 		private boolean numeric = false;
 		private boolean array = false;
 
@@ -24,6 +26,8 @@ public class AutoInputAttributeManager {
 		public void run() {
 			Object newValue = readValue();
 
+			Object prevValue = properties.isLastRead() ? prevValueRead : prevValueWrite;
+
 			if (prevValue != null && newValue != null) {
 				boolean equal = false;
 				if (array) {
@@ -39,6 +43,7 @@ public class AutoInputAttributeManager {
 				}
 				if (!equal) {
 					writeValue(newValue);
+					prevValueWrite = newValue;
 				}
 			} else if (newValue != null) {
 				// First value at start or after a shutdown.
@@ -54,10 +59,11 @@ public class AutoInputAttributeManager {
 				}
 				if (newValue != null) {
 					writeValue(newValue);
+					prevValueWrite = newValue;
 				}
 			}
 
-			prevValue = newValue;
+			prevValueRead = newValue;
 		}
 	}
 
@@ -67,7 +73,8 @@ public class AutoInputAttributeManager {
 	private final IWriteLockAttributeBehaviour attribute;
 	private final AutoInputProperties properties;
 
-	public AutoInputAttributeManager(final IWriteLockAttributeBehaviour attribute, final AutoInputProperties properties) {
+	public AutoInputAttributeManager(final IWriteLockAttributeBehaviour attribute,
+			final AutoInputProperties properties) {
 		super();
 		this.attribute = attribute;
 		this.properties = properties;
@@ -85,9 +92,14 @@ public class AutoInputAttributeManager {
 		if (numeric) {
 			double newValDbl = ((Number) newValue).doubleValue();
 			double prevValDbl = ((Number) prevValue).doubleValue();
-			double absDiff = Math.abs(newValDbl - prevValDbl);
-
+			double diff = newValDbl - prevValDbl;
+			if (properties.isPercentPrecision()) {
+				double pctDiff = Math.abs(diff / prevValDbl);
+				equal = pctDiff < properties.getPrecision();
+			} else {
+				double absDiff = Math.abs(diff);
 				equal = absDiff < properties.getPrecision();
+			}
 		} else {
 			// For boolean or strings, precision is useless.
 			equal = prevValue.equals(newValue);
@@ -124,7 +136,7 @@ public class AutoInputAttributeManager {
 		}
 	}
 
-	public void start() {
+	public synchronized void start() {
 		if (taskRunner == null) {
 			attribute.blockExternalWriting();
 			long periodMS = (long) (properties.getPoolingPeriod() * 1000.0 + 0.5);
@@ -135,7 +147,11 @@ public class AutoInputAttributeManager {
 		}
 	}
 
-	public void stop() {
+	public synchronized boolean isRunning() {
+		return executor != null;
+	}
+
+	public synchronized void stop() {
 		if (executor != null) {
 			attribute.releaseExternalWriting();
 			executor.shutdown();

src/main/java/fr/soleil/tango/parser/autoinput/AutoInputProperties.java

@@ -12,6 +12,8 @@ public class AutoInputProperties {
 	private boolean activated;
 	private double poolingPeriod;
 	private double precision;
+	private boolean percentPrecision;
+	private boolean lastRead;
 
 	public static List<AutoInputProperties> parseProperty(String[] tangoParserProperty) {
 		List<AutoInputProperties> result = new ArrayList<>();
@@ -40,7 +42,15 @@ public class AutoInputProperties {
 					}
 
 					double precision = 0.0;
+					boolean percentPrecision = false;
+					boolean lastRead = false;
 					if (splittedLine.length > 3) {
+						String precisionStr = splittedLine[3].trim();
+						if (precisionStr.length() > 0) {
+							if (precisionStr.charAt(precisionStr.length() - 1) == '%') {
+								precisionStr = precisionStr.substring(0, precisionStr.length() - 1);
+								percentPrecision = true;
+							}
 							try {
 								precision = Double.parseDouble(splittedLine[3].trim());
 							} catch (NumberFormatException ex) {
@@ -49,10 +59,17 @@ public class AutoInputProperties {
 								error = true;
 							}
 						}
+						if (splittedLine.length > 4) {
+							String lastReadStr = splittedLine[4].trim();
+							if (lastReadStr.length() > 0) {
+								lastRead = lastReadStr.toLowerCase().equals("last_read");
+							}
+						}
+					}
 
 					if (!error) {
 						AutoInputProperties autoInputProperties = new AutoInputProperties(name, activated, pooling,
-								precision);
+								precision, percentPrecision, lastRead);
 						result.add(autoInputProperties);
 					}
 				}
@@ -62,12 +79,15 @@ public class AutoInputProperties {
 		return result;
 	}
 
-	private AutoInputProperties(String inputAttributeName, boolean activated, double poolingPeriod, double precision) {
+	private AutoInputProperties(String inputAttributeName, boolean activated, double poolingPeriod, double precision,
+			boolean percentPrecision, boolean lastRead) {
 		super();
 		this.inputAttributeName = inputAttributeName;
 		this.activated = activated;
 		this.poolingPeriod = poolingPeriod;
 		this.precision = precision;
+		this.percentPrecision = percentPrecision;
+		this.lastRead = lastRead;
 	}
 
 	public double getPoolingPeriod() {
@@ -85,4 +105,13 @@ public class AutoInputProperties {
 	public boolean isActivated() {
 		return activated;
 	}
+
+	public boolean isPercentPrecision() {
+		return percentPrecision;
+	}
+
+	public boolean isLastRead() {
+		return lastRead;
+	}
+
 }

src/main/java/fr/soleil/tango/server/tangoparser/TangoParser.java

@@ -205,6 +205,8 @@ public final class TangoParser {
 	private String status = "";
 
 	private List<AJepParser> variablesJep = new ArrayList<AJepParser>();
+	
+	private List<AutoInputAttributeManager> autoInputAttributeManagerList = null;
 	/**
 	 * A single datasource manager per server. When scanMode==false, all cache is
 	 * managed per server
@@ -321,6 +323,11 @@ public final class TangoParser {
 			stateResolver.stop();
 		}
 
+		if(autoInputAttributeManagerList!=null) {
+			autoInputAttributeManagerList.forEach(autoInputAttrMgr ->autoInputAttrMgr.stop());
+			autoInputAttributeManagerList.clear();
+			autoInputAttributeManagerList = null;
+		}
 		xlogger.exit();
 	}
 
@@ -517,6 +524,7 @@ public final class TangoParser {
 				}
 			}
 
+			autoInputAttributeManagerList = new ArrayList<>(autoInputPropertiesList.size());
 			for (AutoInputProperties autoInputProperties : autoInputPropertiesList) {
 				DynamicAttributeParser dynAttrParser = dynAttributesMaps
 						.get(autoInputProperties.getInputAttributeName().toLowerCase());
@@ -530,6 +538,7 @@ public final class TangoParser {
 					String attr_activator_name = autoInputProperties.getInputAttributeName() + autoInputActivatorTag;
 					AutoInputActivatorAttribute activatorAttribute = new AutoInputActivatorAttribute(
 							attr_activator_name, autoInputProperties.isActivated(), autoInputAttributeManager);
+					autoInputAttributeManagerList.add(autoInputAttributeManager);
 					dynMngt.addAttribute(activatorAttribute);
 				} else {
 					logger.error("The auto input configuration '" + autoInputProperties.getInputAttributeName()

src/test/java/fr/soleil/tango/server/tangoparser/testserver/TangoParserTest.java

@@ -140,7 +140,8 @@ public class TangoParserTest {
 
 	private static final String wDoubleSQRTParser = "C";
 
-    //private static TangoSource mockSource = Mockito.mock(TangoSource.class, withSettings().verboseLogging());
+	// private static TangoSource mockSource = Mockito.mock(TangoSource.class,
+	// withSettings().verboseLogging());
 	private static TangoSource mockSource = Mockito.mock(TangoSource.class);
 
 	private static SourceManager mngr = Mockito.spy(SourceManager.class);
@@ -158,7 +159,8 @@ public class TangoParserTest {
 			@Override
 			public Boolean answer(final InvocationOnMock invocation) {
 				System.out.println("mock add source " + invocation);
-                @SuppressWarnings("unchecked") final Map<String, String> arg = invocation.getArgumentAt(1, Map.class);
+				@SuppressWarnings("unchecked")
+				final Map<String, String> arg = invocation.getArgumentAt(1, Map.class);
 				for (final String s : arg.keySet()) {
 					if (s.contains("spec")) {
 						return true;
@@ -188,7 +190,8 @@ public class TangoParserTest {
 		// create device in tangodb
 		System.out.println("create device in tango db");
 		final Database db = ApiUtil.get_db_obj();
-        db.add_device(deviceNameParser, TangoParser.class.getSimpleName(), TangoParser.class.getSimpleName() + "/" + INSTANCE_NAME);
+		db.add_device(deviceNameParser, TangoParser.class.getSimpleName(),
+				TangoParser.class.getSimpleName() + "/" + INSTANCE_NAME);
 
 		// configure properties
 		final DbDatum[] dbDatum = new DbDatum[7];
@@ -201,14 +204,11 @@ public class TangoParserTest {
 				"value1FloatSpec," + floatSpectrumPub, "value1ShortSpec," + shortSpectrumPub,
 				"value1IntSpec," + intSpectrumPub, };
 
-        final String[] propOutputNames = new String[]{
-                doubleParser + ",value1Double>2",
+		final String[] propOutputNames = new String[] { doubleParser + ",value1Double>2",
 				"DevString " + stringParser + ",value1String+\"test\"",
-                "DevBoolean " + booleanParser + ",!value1Boolean",
-                "DevShort " + shortParser + ",value1Short*2",
+				"DevBoolean " + booleanParser + ",!value1Boolean", "DevShort " + shortParser + ",value1Short*2",
 				"DevBoolean " + shortParserBooleanExtract + ",boolextract(value1Short,3)",
-                "DevLong " + longParser + ",value1Long^5",
-                "DevFloat " + floatParser + ",value1Float+2",
+				"DevLong " + longParser + ",value1Long^5", "DevFloat " + floatParser + ",value1Float+2",
 
 				"SPECTRUM DevString " + stringSpectrumParser + ",add(value1StringSpec,\"aa\")",
 				// "IMAGE DevDouble " + doubleImgParser + ",value1DoubleIm*2",
@@ -231,7 +231,8 @@ public class TangoParserTest {
 				"SPECTRUM DevShort " + shortSpectrumParserMul + ",mul(value1ShortSpec,value1ShortSpec)",
 				// Spectrum manipulation
 				"DevDouble " + doubleSpectrumParserElem + ",getSpectrumElem(value1DoubleSpec, value1Short)",
-                "SPECTRUM DevDouble " + doubleSpectrumParserSet + ",setSpectrumElem(value1DoubleSpec,value1Short,value1Double)",
+				"SPECTRUM DevDouble " + doubleSpectrumParserSet
+						+ ",setSpectrumElem(value1DoubleSpec,value1Short,value1Double)",
 				"DevLong " + doubleSpectrumParserSize + ",getSpectrumSize(value1DoubleSpec)",
 				"SPECTRUM DevDouble " + doubleSpectrumParserRep + ",replicate(value1Double,value1Short)",
 				// Soustraction
@@ -272,22 +273,18 @@ public class TangoParserTest {
 				// Std
 				"DevDouble " + doubleSpectrumParserStd + ",std(1,2,3,4,5,6,7,8,9,10)",
 				// Test Order
-                orderParser + ",value1DoubleW/value2DoubleW",
-                orderComplexeParser
-                        + ",(42*(value1DoubleW/(value1DoubleW*value2DoubleW))*(value1Short-value1Long+(value1Short/value1Long)))/(value1DoubleW/value2DoubleW*value1Short/value1Long)"
-        };
+				orderParser + ",value1DoubleW/value2DoubleW", orderComplexeParser
+						+ ",(42*(value1DoubleW/(value1DoubleW*value2DoubleW))*(value1Short-value1Long+(value1Short/value1Long)))/(value1DoubleW/value2DoubleW*value1Short/value1Long)" };
 
-        final String[] propInputNames = new String[]{"A,value1DoubleW=A+1", "SPECTRUM DevDouble B,value1DoubleWSpec=B*2",
-                "C,value1DoubleW=sqrt(C)", "D,value2DoubleW=(((D^2)/2)>2) || 0", "X,value1DoubleW=X+2",
-                "X,value2DoubleW=X+2"};
+		final String[] propInputNames = new String[] { "A,value1DoubleW=A+1",
+				"SPECTRUM DevDouble B,value1DoubleWSpec=B*2", "C,value1DoubleW=sqrt(C)",
+				"D,value2DoubleW=(((D^2)/2)>2) || 0", "X,value1DoubleW=X+2", "X,value2DoubleW=X+2" };
 
-        final String[] propIONames = new String[]{
-		                "DevDouble IO;value1DoubleW+value1Short; value1DoubleW=IO+1",
+		final String[] propIONames = new String[] { "DevDouble IO;value1DoubleW+value1Short; value1DoubleW=IO+1",
 				ioParserComplex
 						+ ";0.5*12398.42/lambda/(sin(0.5*atan(150.0/value1DoubleW)));lambda=12398.42/(value2DoubleW*1000.0);value1DoubleW=150.0/tan(2.0*asin(lambda/2.0/IOComplex))",
 				"SPECTRUM DevDouble IOSpectrum;[1, 2, 3, 4, 5, 6];value1DoubleWSpec=IOSpectrum/2",
-                        "DevDouble IOSpectrumFactor;A;value1DoubleWSpec=[1, 2, 3, 4, 5, 6]*IOSpectrumFactor"
-        };
+				"DevDouble IOSpectrumFactor;A;value1DoubleWSpec=[1, 2, 3, 4, 5, 6]*IOSpectrumFactor" };
 
 		dbDatum[0] = new DbDatum("AttributeNames", propAttributeNames);
 		dbDatum[1] = new DbDatum("OutputNames", propOutputNames);
@@ -318,10 +315,9 @@ public class TangoParserTest {
 			try {
 				final TangoAttribute tangoParser = new TangoAttribute(deviceNameParser + "/state");
 				startState = (DevState) tangoParser.read();
-		        System.out.println("State readed !");
-		        launched = true;
-        	}
-        	catch (DevFailed e) {
+				System.out.println("State readed : " + startState);
+				launched = startState == DevState.ON;
+			} catch (DevFailed e) {
 				launched = false;
 			}
 			timer -= stepTime;
@@ -350,7 +346,8 @@ public class TangoParserTest {
 		// System.err.println("device is not ON, status:\n" + status);
 		// System.err.println("errors attribute value:\n"
 		// + Arrays.toString(proxy.read_attribute("errors").extractStringArray()));
-        // DevFailedUtils.throwDevFailed("INIT_ERROR", DeviceState.toString(state) + ":" + status);
+		// DevFailedUtils.throwDevFailed("INIT_ERROR", DeviceState.toString(state) + ":"
+		// + status);
 		// }
 	}
 
@@ -969,8 +966,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadIntSpecAdd() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub),
-                AttrDataFormat.SPECTRUM, intSpectrumParserAdd);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub), AttrDataFormat.SPECTRUM,
+				intSpectrumParserAdd);
 		r.setValue(new Integer[] { 1, 2, 3, 4, 5 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(intSpectrumPub));
 
@@ -1012,8 +1009,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadIntSpecCos() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub),
-                AttrDataFormat.SPECTRUM, intSpectrumParserCos);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub), AttrDataFormat.SPECTRUM,
+				intSpectrumParserCos);
 		r.setValue(new Integer[] { 0, 1 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(intSpectrumPub));
 		// final TangoAttribute pub = new TangoAttribute(intSpectrumPub);
@@ -1027,8 +1024,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadIntSpecDiv() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub),
-                AttrDataFormat.SPECTRUM, intSpectrumParserDiv);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub), AttrDataFormat.SPECTRUM,
+				intSpectrumParserDiv);
 		r.setValue(new Integer[] { 2, 4, 6, 8, 10 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(intSpectrumPub));
 		// final TangoAttribute pub = new TangoAttribute(intSpectrumPub);
@@ -1042,8 +1039,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadIntSpecFft() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub),
-                AttrDataFormat.SPECTRUM, intSpectrumParserFft);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub), AttrDataFormat.SPECTRUM,
+				intSpectrumParserFft);
 		r.setValue(new Integer[] { 1, 2, 3, 4 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(intSpectrumPub));
 
@@ -1077,8 +1074,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadIntSpecLog() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub),
-                AttrDataFormat.SPECTRUM, intSpectrumParserLog);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub), AttrDataFormat.SPECTRUM,
+				intSpectrumParserLog);
 		r.setValue(new Integer[] { 1, 2 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(intSpectrumPub));
 
@@ -1093,8 +1090,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadIntSpecMul() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub),
-                AttrDataFormat.SPECTRUM, intSpectrumParserMul);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub), AttrDataFormat.SPECTRUM,
+				intSpectrumParserMul);
 		r.setValue(new Integer[] { 2, 4, 6, 8, 10 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(intSpectrumPub));
 
@@ -1109,8 +1106,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadIntSpecSin() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub),
-                AttrDataFormat.SPECTRUM, intSpectrumParserSin);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub), AttrDataFormat.SPECTRUM,
+				intSpectrumParserSin);
 		r.setValue(new Integer[] { 0, 1 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(intSpectrumPub));
 		// final TangoAttribute pub = new TangoAttribute(intSpectrumPub);
@@ -1124,8 +1121,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadIntSpecSub() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub),
-                AttrDataFormat.SPECTRUM, intSpectrumParserSub);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(intSpectrumPub), AttrDataFormat.SPECTRUM,
+				intSpectrumParserSub);
 		r.setValue(new Integer[] { 2, 4, 6, 8, 10 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(intSpectrumPub));
 		// final TangoAttribute pub = new TangoAttribute(intSpectrumPub);
@@ -1213,8 +1210,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadShortSpecAdd() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub),
-                AttrDataFormat.SCALAR, shortSpectrumParserAdd);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub), AttrDataFormat.SCALAR,
+				shortSpectrumParserAdd);
 		r.setValue(new Short[] { 1, 2, 3, 4, 5 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(shortSpectrumPub));
 		// final TangoAttribute pub = new TangoAttribute(shortSpectrumPub);
@@ -1228,8 +1225,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadShortSpecCos() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub),
-                AttrDataFormat.SCALAR, shortSpectrumParserCos);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub), AttrDataFormat.SCALAR,
+				shortSpectrumParserCos);
 		r.setValue(new Short[] { 0, 1 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(shortSpectrumPub));
 		// final TangoAttribute pub = new TangoAttribute(shortSpectrumPub);
@@ -1243,8 +1240,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadShortSpecDiv() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub),
-                AttrDataFormat.SCALAR, shortSpectrumParserDiv);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub), AttrDataFormat.SCALAR,
+				shortSpectrumParserDiv);
 		r.setValue(new Short[] { 2, 4, 6, 8, 10 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(shortSpectrumPub));
 
@@ -1259,8 +1256,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadShortSpecFft() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub),
-                AttrDataFormat.SCALAR, shortSpectrumParserFft);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub), AttrDataFormat.SCALAR,
+				shortSpectrumParserFft);
 		r.setValue(new Short[] { 1, 2 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(shortSpectrumPub));
 
@@ -1276,8 +1273,8 @@ public class TangoParserTest {
 	@Test
 	public void testReadShortSpecLog() throws DevFailed {
 
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub),
-                AttrDataFormat.SCALAR, shortSpectrumParserLog);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub), AttrDataFormat.SCALAR,
+				shortSpectrumParserLog);
 		r.setValue(new Short[] { 1, 2 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(shortSpectrumPub));
 
@@ -1292,8 +1289,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadShortSpecMul() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub),
-                AttrDataFormat.SCALAR, shortSpectrumParserMul);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub), AttrDataFormat.SCALAR,
+				shortSpectrumParserMul);
 		r.setValue(new Short[] { 2, 4, 6, 8, 10 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(shortSpectrumPub));
 
@@ -1309,8 +1306,8 @@ public class TangoParserTest {
 	@Test
 	public void testReadShortSpecSin() throws DevFailed {
 
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub),
-                AttrDataFormat.SCALAR, shortSpectrumParserSin);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub), AttrDataFormat.SCALAR,
+				shortSpectrumParserSin);
 		r.setValue(new Short[] { 0, 1 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(shortSpectrumPub));
 
@@ -1325,8 +1322,8 @@ public class TangoParserTest {
 
 	@Test
 	public void testReadShortSpecSub() throws DevFailed {
-        final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub),
-                AttrDataFormat.SCALAR, shortSpectrumParserSub);
+		final AttributeResult r = new AttributeResult(deviceNameParser, getAtt(shortSpectrumPub), AttrDataFormat.SCALAR,
+				shortSpectrumParserSub);
 		r.setValue(new Short[] { 2, 3, 4, 5, 6 });
 		doReturn(r).when(mockSource).getResult(deviceNameParser, getAtt(shortSpectrumPub));
 
@@ -1446,8 +1443,8 @@ public class TangoParserTest {
 	}
 
 	/**
-     * Test command setExpression for READ attribute. The name of the test start
-     * by z because we want execute it at the end to not affect other test.
+	 * Test command setExpression for READ attribute. The name of the test start by
+	 * z because we want execute it at the end to not affect other test.
 	 *
 	 * @throws DevFailed
 	 */
@@ -1474,9 +1471,8 @@ public class TangoParserTest {
 	}
 
 	/**
-     * Test command setExpression for WRITE attribute. The name of the test
-     * start by z because we want execute it at the end to not affect other
-     * test.
+	 * Test command setExpression for WRITE attribute. The name of the test start by
+	 * z because we want execute it at the end to not affect other test.
 	 *
 	 * @throws DevFailed
 	 */