[SONAR]

KnowageLabs · Jan 18, 2024 · 420aa44 · 420aa44
1 parent 5ecf89a
commit 420aa44
Show file tree

Hide file tree

Showing 22 changed files with 601 additions and 525 deletions.
diff --git a/knowage-core/src/main/java/it/eng/spagobi/api/SelfServiceDataSetCRUD.java b/knowage-core/src/main/java/it/eng/spagobi/api/SelfServiceDataSetCRUD.java
@@ -2026,8 +2026,8 @@ private String guessColumnType(IDataStore dataStore, int columnIndex) {
 		boolean foundLong = false;
 		boolean foundInteger = false;
 		for (int i = 0; i < Math.min(ROWS_LIMIT_GUESS_TYPE_HEURISTIC, dataStore.getRecordsCount()); i++) {
-			IRecord record = dataStore.getRecordAt(i);
-			IField field = record.getFieldAt(columnIndex);
+			IRecord currRecord = dataStore.getRecordAt(i);
+			IField field = currRecord.getFieldAt(columnIndex);
 			Object value = field.getValue();
 			if ((value == null) || (value.toString().isEmpty())) {
 				continue;
@@ -2067,8 +2067,8 @@ private String guessColumnType(IDataStore dataStore, int columnIndex) {
 	private boolean isADate(JSONObject jsonConf, IDataStore dataStore, int columnIndex) throws JSONException {
 		String dateFormat = jsonConf.get(DataSetConstants.FILE_DATE_FORMAT).toString();
 		for (int i = 0; i < Math.min(10, dataStore.getRecordsCount()); i++) {
-			IRecord record = dataStore.getRecordAt(i);
-			IField field = record.getFieldAt(columnIndex);
+			IRecord currRecord = dataStore.getRecordAt(i);
+			IField field = currRecord.getFieldAt(columnIndex);
 			Object value = field.getValue();
 			if (value instanceof Date) {
 				if (value instanceof Timestamp)
@@ -2098,8 +2098,8 @@ private boolean isADate(JSONObject jsonConf, IDataStore dataStore, int columnInd
 	private boolean isATimestamp(JSONObject jsonConf, IDataStore dataStore, int columnIndex) throws JSONException {
 		String timestampFormat = jsonConf.get(DataSetConstants.FILE_TIMESTAMP_FORMAT).toString();
 		for (int i = 0; i < Math.min(10, dataStore.getRecordsCount()); i++) {
-			IRecord record = dataStore.getRecordAt(i);
-			IField field = record.getFieldAt(columnIndex);
+			IRecord currRecord = dataStore.getRecordAt(i);
+			IField field = currRecord.getFieldAt(columnIndex);
 			Object value = field.getValue();
 			if (value instanceof Timestamp) {
 				continue;

diff --git a/knowage-core/src/main/java/it/eng/spagobi/commons/serializer/DataStoreJSONSerializer.java b/knowage-core/src/main/java/it/eng/spagobi/commons/serializer/DataStoreJSONSerializer.java
@@ -44,7 +44,7 @@ public Object serialize(Object o, Locale locale) throws SerializationException {
 		IField field;
 		JSONArray fieldsMetaDataJSON;		
 		JSONObject fieldMetaDataJSON;
-		IRecord record;
+		IRecord currRecord;
 		JSONObject recordJSON;
 		int recNo;
 		IDataStore dataStore;
@@ -103,12 +103,12 @@ public Object serialize(Object o, Locale locale) throws SerializationException {
 			recNo = 0;
 			Iterator records = dataStore.iterator();
 			while(records.hasNext()) {
-				record = (IRecord)records.next();
+				currRecord = (IRecord)records.next();
 				recordJSON = new JSONObject();
 				recordJSON.put("id", ++recNo);
 
 				for(int i = 0; i < metadata.getJSONArray("fields").length(); i++) {
-					field = record.getFieldAt(i);
+					field = currRecord.getFieldAt(i);
 					recordJSON.put("column-" + (i+1), field.getValue().toString());
 				}
 

diff --git a/...src/main/java/it/eng/spagobi/tools/dataset/cache/impl/sqldbcache/DataStoreStatistics.java b/...src/main/java/it/eng/spagobi/tools/dataset/cache/impl/sqldbcache/DataStoreStatistics.java
@@ -109,7 +109,7 @@ private BigDecimal[] extimateFieldsMemorySize() {
 		return fieldsMemorySize;
 	}
 
-	private BigDecimal[] extimateFieldsMemorySize(IRecord record, BigDecimal[] fieldsMaxMemorySize) {
+	private BigDecimal[] extimateFieldsMemorySize(IRecord currRecord, BigDecimal[] fieldsMaxMemorySize) {
 
 		BigDecimal[] fieldsMemorySize = null;
 
@@ -128,8 +128,8 @@ private BigDecimal[] extimateFieldsMemorySize(IRecord record, BigDecimal[] field
 					if (fieldTypeName.contains("String") && extimateVarCharMemorySize) {
 						String value = "";
 
-						if (!(record.getFieldAt(i).getValue() instanceof String)) {
-							Object nonStringValue = record.getFieldAt(i).getValue();
+						if (!(currRecord.getFieldAt(i).getValue() instanceof String)) {
+							Object nonStringValue = currRecord.getFieldAt(i).getValue();
 							if (nonStringValue != null) {
 								value = nonStringValue.toString();
 							} else {
@@ -138,7 +138,7 @@ private BigDecimal[] extimateFieldsMemorySize(IRecord record, BigDecimal[] field
 							logger.debug("An unexpected error occured while extimating field [" + fmd.getName() + "] memory size whose type is equal to ["
 									+ fmd.getType().toString() + "]. Field forced to String");
 						} else {
-							value = (String) record.getFieldAt(i).getValue();
+							value = (String) currRecord.getFieldAt(i).getValue();
 						}
 
 						int valueLength = value != null ? value.length() : 0;

diff --git a/...java/it/eng/spagobi/tools/dataset/measurecatalogue/materializer/InMemoryMaterializer.java b/...java/it/eng/spagobi/tools/dataset/measurecatalogue/materializer/InMemoryMaterializer.java
@@ -619,7 +619,7 @@ public InMemoryAggregator(IAggregationFunction aggreationFunction, int measureCo
 		public InMemoryAggregator() {
 		};
 
-		public void addRecord(IRecord record) {
+		public void addRecord(IRecord recordToAdd) {
 
 			// check if the record already exists
 			boolean recordFound = false;
@@ -628,22 +628,22 @@ public void addRecord(IRecord record) {
 				for (int j = 0; j < records.get(i).getFields().size(); j++) {
 
 					if (j != measureColumnIndex && !// checks only dimensions
-					(records.get(i).getFieldAt(j).equals(record.getFieldAt(j)))) {// if a dimension is not equal
+					(records.get(i).getFieldAt(j).equals(recordToAdd.getFieldAt(j)))) {// if a dimension is not equal
 						recordFound = false;
 						break;
 					}
 				}
 				if (recordFound) {
 					List<Object> recordsMeasuresValue = recordsMeasuresValues.get(i);
-					recordsMeasuresValue.add(record.getFieldAt(measureColumnIndex).getValue());// record found
+					recordsMeasuresValue.add(recordToAdd.getFieldAt(measureColumnIndex).getValue());// record found
 					break;
 				}
 			}
 
 			if (!recordFound) {
-				records.add(record);
+				records.add(recordToAdd);
 				List<Object> recordsMeasuresValue = new ArrayList<Object>();
-				recordsMeasuresValue.add(record.getFieldAt(measureColumnIndex).getValue());
+				recordsMeasuresValue.add(recordToAdd.getFieldAt(measureColumnIndex).getValue());
 				recordsMeasuresValues.add(recordsMeasuresValue);
 			}
 		}

diff --git a/...java/it/eng/spagobi/tools/dataset/normalization/GeoSpatialDimensionDatasetNormalizer.java b/...java/it/eng/spagobi/tools/dataset/normalization/GeoSpatialDimensionDatasetNormalizer.java
@@ -115,8 +115,8 @@ public void checkCurrentHierarchyLevel(MetaModelWrapper metaModelWrapper, Hierar
 		// Get the first value of the datastore to validate
 		Iterator it = datastoreToValidate.iterator();
 		int columnIndex = datastoreToValidate.getMetaData().getFieldIndex(columnNameOnDataset);
-		IRecord record = (IRecord) it.next();
-		IField field = record.getFieldAt(columnIndex);
+		IRecord currRecord = (IRecord) it.next();
+		IField field = currRecord.getFieldAt(columnIndex);
 		fieldValue = field.getValue();
 
 		// then check if the value is ammissible for the Level members (default values used as identifiers values)

diff --git a/...src/main/java/it/eng/spagobi/tools/dataset/strategy/SolrFacetPivotEvaluationStrategy.java b/...src/main/java/it/eng/spagobi/tools/dataset/strategy/SolrFacetPivotEvaluationStrategy.java
@@ -238,7 +238,7 @@ private IDataStore appendCalculatedFieldColumnToSummaryRow(AbstractSelectionFiel
 
 	}
 
-	public String transformFormula(Record record, IMetaData metadata, String formula) {
+	public String transformFormula(Record currRecord, IMetaData metadata, String formula) {
 		formula = formula.replaceAll("\"", "");
 
 		for (int i = 0; i < metadata.getFieldCount(); i++) {
@@ -255,15 +255,15 @@ public String transformFormula(Record record, IMetaData metadata, String formula
 				Matcher m = r.matcher(formula);
 
 				while (m.find()) {
-					formula = formula.replace(m.group(), record.getFieldAt(i).getValue().toString());
+					formula = formula.replace(m.group(), currRecord.getFieldAt(i).getValue().toString());
 				}
 
 				pattern = "((?:AVG|MIN|MAX|SUM|COUNT_DISTINCT|COUNT|DISTINCT COUNT)\\()([a-zA-Z0-9\\-\\+\\/\\*\\_\\s\\$\\{\\}\\\"]*)(\\))";
 				r = Pattern.compile(pattern);
 				m = r.matcher(formula);
 
 				while (m.find()) {
-					formula = formula.replace(m.group(), record.getFieldAt(i).getValue().toString());
+					formula = formula.replace(m.group(), currRecord.getFieldAt(i).getValue().toString());
 				}
 
 			}
@@ -274,7 +274,7 @@ public String transformFormula(Record record, IMetaData metadata, String formula
 
 	}
 
-	public Map<String, Object> findBindings(Record record, IMetaData metadata, String formula) {
+	public Map<String, Object> findBindings(Record currRecord, IMetaData metadata, String formula) {
 
 		Map<String, Object> bindings = new HashMap<>();
 		bindings.put("parameters", new HashMap());
@@ -283,7 +283,7 @@ public Map<String, Object> findBindings(Record record, IMetaData metadata, Strin
 
 			if (formula.contains(metadata.getFieldName(i))) {
 
-				BigDecimal value = new BigDecimal(record.getFieldAt(i).getValue().toString());
+				BigDecimal value = new BigDecimal(currRecord.getFieldAt(i).getValue().toString());
 
 				bindings.put(metadata.getFieldName(i), value);
 

diff --git a/...ain/java/it/eng/spagobi/tools/dataset/validation/GeoSpatialDimensionDatasetValidator.java b/...ain/java/it/eng/spagobi/tools/dataset/validation/GeoSpatialDimensionDatasetValidator.java
@@ -94,8 +94,8 @@ public ValidationErrors doValidateDataset(IDataStore dataStore,Map<String, Hiera
 					    			int columnIndex = dataStore.getMetaData().getFieldIndex(columnName); 
 					    			int rowNumber = 0;
 					    			while( it.hasNext() ) {
-					    	    		IRecord record = (IRecord)it.next();
-					    	    		IField field = record.getFieldAt(columnIndex);
+					    	    		IRecord currRecord = (IRecord)it.next();
+					    	    		IField field = currRecord.getFieldAt(columnIndex);
 					    	    		Object fieldValue = field.getValue(); 
 					    	    		if(fieldValue != null)  {
 					    	    			if (fieldValue instanceof String){
@@ -178,8 +178,8 @@ public Set<String> testValidationCriteria(MetaModelWrapper metaModelWrapper, Hie
 		Iterator it = datastoreToValidate.iterator();
 		int columnIndex = datastoreToValidate.getMetaData().getFieldIndex(columnNameOnDataset); 
 		while( it.hasNext() ) {
-	   		IRecord record = (IRecord)it.next();
-	    	IField field = record.getFieldAt(columnIndex);
+	   		IRecord currRecord = (IRecord)it.next();
+	    	IField field = currRecord.getFieldAt(columnIndex);
 	    	fieldValue = field.getValue();   	
 	    	if (fieldValue != null){
 	    		if (fieldValue instanceof String){

diff --git a/...ge-core/src/main/java/it/eng/spagobi/tools/dataset/validation/NumericColumnValidator.java b/...ge-core/src/main/java/it/eng/spagobi/tools/dataset/validation/NumericColumnValidator.java
@@ -60,8 +60,8 @@ public ValidationErrors doValidateDataset(IDataStore dataStore,
 				int columnIndex = dataStore.getMetaData().getFieldIndex(columnName); 
 				int rowNumber = 0;
 				while( it.hasNext() ) {
-					IRecord record = (IRecord)it.next();
-		    		IField field = record.getFieldAt(columnIndex);
+					IRecord currRecord = (IRecord)it.next();
+		    		IField field = currRecord.getFieldAt(columnIndex);
 		    		Object fieldValue = field.getValue(); 
 		    		if(fieldValue != null)  {
 		    			if (!fieldValue.toString().isEmpty()){

diff --git a/.../src/main/java/it/eng/spagobi/tools/dataset/validation/TimeDimensionDatasetValidator.java b/.../src/main/java/it/eng/spagobi/tools/dataset/validation/TimeDimensionDatasetValidator.java
@@ -86,8 +86,8 @@ public ValidationErrors doValidateDataset(IDataStore dataStore,Map<String, Hiera
 					    			int columnIndex = dataStore.getMetaData().getFieldIndex(columnName); 
 					    			int rowNumber = 0;
 					    			while( it.hasNext() ) {
-					    	    		IRecord record = (IRecord)it.next();
-					    	    		IField field = record.getFieldAt(columnIndex);
+					    	    		IRecord currRecord = (IRecord)it.next();
+					    	    		IField field = currRecord.getFieldAt(columnIndex);
 					    	    		Object fieldValue = field.getValue(); 
 					    	    		if(fieldValue != null)  {
 					    	    			if (!admissibleValues.contains(fieldValue))

diff --git a/knowage-core/src/main/java/it/eng/spagobi/tools/hierarchiesmanagement/HierarchyTreeNode.java b/knowage-core/src/main/java/it/eng/spagobi/tools/hierarchiesmanagement/HierarchyTreeNode.java
@@ -241,15 +241,15 @@ public List<String> getChildrensKeys() {
 	 * @return the node
 	 */
 	public HierarchyTreeNode getHierarchyNode(String key, boolean theLast, Integer levelToCheck,
-			HierarchyTreeNodeData data, IRecord record, IMetaData dsMeta, String prefix) {
+			HierarchyTreeNodeData data, IRecord currRecord, IMetaData dsMeta, String prefix) {
 
 		/* As default, node toReturn is assigned to root. If toReturn will not be overridden, current node/leaf is attached to root. */
 		HierarchyTreeNode toReturn = this;
 
 		String recordCdLev = null;
 		if (levelToCheck > 0) {
 			/* Retrieving record CD LEV for record when node is not root */
-			recordCdLev = ((String) record
+			recordCdLev = ((String) currRecord
 					.getFieldAt(dsMeta.getFieldIndex(prefix + HierarchyConstants.SUFFIX_CD_LEV + levelToCheck))
 					.getValue()).trim();
 		}