update revisions-log functionality

3 files changed, 170 insertions, 2 deletions

diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralRevisionLogTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralRevisionLogTask.java
new file mode 100644
index 000000000..35f1e5228
--- /dev/null
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralRevisionLogTask.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egovernment.moa.id.config.webgui.validation.task.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.gv.egiz.components.configuration.api.Configuration;
+import at.gv.egovernment.moa.id.commons.config.MOAIDConfigurationConstants;
+import at.gv.egovernment.moa.id.commons.utils.KeyValueUtils;
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
+import at.gv.egovernment.moa.id.config.webgui.exception.ConfigurationTaskValidationException;
+import at.gv.egovernment.moa.id.config.webgui.exception.ValidationObjectIdentifier;
+import at.gv.egovernment.moa.id.config.webgui.helper.LanguageHelper;
+import at.gv.egovernment.moa.id.config.webgui.validation.task.AbstractTaskValidator;
+import at.gv.egovernment.moa.id.config.webgui.validation.task.IDynamicLoadableTaskValidator;
+import at.gv.egovernment.moa.util.MiscUtil;
+
+/**
+ * @author tlenz
+ *
+ */
+public class GeneralRevisionLogTask extends AbstractTaskValidator implements IDynamicLoadableTaskValidator {
+	private static final Logger log = LoggerFactory.getLogger(GeneralRevisionLogTask.class);
+	private static final List<String> KEYWHITELIST;
+		
+	static {
+		ArrayList<String> temp = new ArrayList<String>();		
+		KEYWHITELIST = Collections.unmodifiableList(temp);
+	}
+	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.config.webgui.validation.task.ITaskValidator#getKeyPrefix()
+	 */
+	@Override
+	public String getKeyPrefix() {
+		return MOAIDConfigurationConstants.SERVICE_REVERSION;
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.config.webgui.validation.task.ITaskValidator#getName()
+	 */
+	@Override
+	public String getName() {
+		return "General - Reversion Logging Task";
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.config.webgui.validation.task.ITaskValidator#postProcessing(java.util.Map, java.util.List, at.gv.egiz.components.configuration.api.Configuration)
+	 */
+	@Override
+	public Map<String, String> postProcessing(Map<String, String> input,
+			List<String> keysToDelete, Configuration dbconfig) {
+		Map<String, String> newConfigValues = new HashMap<String, String>();
+		 
+		String eventCodes = input.get(MOAIDConfigurationConstants.GENERAL_REVERSION_LOGS_EVENTCODES);
+		if (MiscUtil.isNotEmpty(eventCodes)) {		
+			newConfigValues.put(MOAIDConfigurationConstants.GENERAL_REVERSION_LOGS_EVENTCODES, 
+					KeyValueUtils.normalizeCSVValueString(eventCodes));
+			
+		}
+		
+		if (newConfigValues.isEmpty())
+			return null;
+		else
+			return newConfigValues;
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.config.webgui.validation.task.AbstractTaskValidator#tastValidate(java.util.Map)
+	 */
+	@Override
+	protected void taskValidate(Map<String, String> input)
+			throws ConfigurationTaskValidationException {				
+		List<ValidationObjectIdentifier> errors = new ArrayList<ValidationObjectIdentifier>();
+		
+		String eventCodes = input.get(MOAIDConfigurationConstants.GENERAL_REVERSION_LOGS_EVENTCODES);		
+		if (MiscUtil.isNotEmpty(eventCodes)) {
+			String[] codes = eventCodes.split(",");
+			for (String el: codes) {
+				try {
+					Integer.parseInt(el.trim());
+					
+				} catch (NumberFormatException e) {
+					log.info("Revisions-Log eventcode(s) are not valid", e);
+					errors.add(new ValidationObjectIdentifier(
+							MOAIDConfigurationConstants.GENERAL_REVERSION_LOGS_EVENTCODES, 
+							"Reversion - Logger Enabled",
+							LanguageHelper.getErrorString("error.oa.reversion.log.eventcodes")));
+					break;
+					
+				}
+				
+			}
+			
+		} 
+
+		
+		if (!errors.isEmpty())
+			throw new ConfigurationTaskValidationException(errors);
+				
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.config.webgui.validation.task.AbstractTaskValidator#getAllAllowedKeys()
+	 */
+	@Override
+	public List<Pattern> getAllAllowedPatterns() {
+		return generatePatternsFromKeys(KEYWHITELIST);
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.config.webgui.validation.task.IDynamicLoadableTaskValidator#getModulValidatorPrefix()
+	 */
+	@Override
+	public List<String> getModulValidatorPrefix() {
+		return Arrays.asList(
+				MOAIDConfigurationConstants.PREFIX_MOAID_GENERAL
+				);
+	}
+
+}
diff --git a/id/moa-id-webgui/src/main/resources/gui/types/general.json b/id/moa-id-webgui/src/main/resources/gui/types/general.json
index f7861332d..f10fac06c 100644
--- a/id/moa-id-webgui/src/main/resources/gui/types/general.json
+++ b/id/moa-id-webgui/src/main/resources/gui/types/general.json
@@ -442,6 +442,22 @@
                       }
                 }
             }
+        },
+        "reversion.log": {
+            "id": "http://www.egiz.gv.at/dynUI/general/reversion/log",
+            "type": "object",
+            "title": "Revision Logging",
+            "description": "Default Revisions-Logging",
+            "options": {
+    						"collapsed": true
+    				},
+            "properties": {
+                "eventcodes": {
+            				"id": "http://www.egiz.gv.at/dynUI/general/reversion/log/eventcodes",
+            				"type": "string",
+            				"title": "EventCodes (CSV)"
+                }
+            }
         }                                           
     },
     "required": ["publicURLPrefix"]
diff --git a/id/moa-id-webgui/src/main/resources/gui/types/oa.json b/id/moa-id-webgui/src/main/resources/gui/types/oa.json
index 517327626..deba5d610 100644
--- a/id/moa-id-webgui/src/main/resources/gui/types/oa.json
+++ b/id/moa-id-webgui/src/main/resources/gui/types/oa.json
@@ -541,8 +541,8 @@
 				"reversion.log": {
             "id": "http://www.egiz.gv.at/dynUI/oa/reversion/log",
             "type": "object",
-            "title": "Reversion Logging",
-            "description": "Service specific reversion logging",
+            "title": "Revisions-Logging",
+            "description": "Service specific Revision-Logging",
             "options": {
     						"collapsed": true
     				},