-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
improved effect/modifier support and configurable validation
* error for castable non-fictional persons * configurable new thread id/genre validation level * configurable triggered news uniqueness flag validation * more contries * add database normalizer code * configurable enable effect validator (expensive and buggy) * improve (configurable) validation of unsupported attributes * (configurable) person name validation
- Loading branch information
Showing
43 changed files
with
817 additions
and
144 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> | ||
| <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> | ||
| <stringAttribute key="M2_GOALS" value="package"/> | ||
| <booleanAttribute key="M2_NON_RECURSIVE" value="false"/> | ||
| <booleanAttribute key="M2_OFFLINE" value="false"/> | ||
| <stringAttribute key="M2_PROFILES" value=""/> | ||
| <listAttribute key="M2_PROPERTIES"/> | ||
| <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> | ||
| <booleanAttribute key="M2_SKIP_TESTS" value="true"/> | ||
| <intAttribute key="M2_THREADS" value="1"/> | ||
| <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> | ||
| <stringAttribute key="M2_USER_SETTINGS" value=""/> | ||
| <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> | ||
| <stringAttribute key="bad_container_name" value="\org.tvtower.db.parent\package"/> | ||
| <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/> | ||
| <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-13.0.1"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.tvtower.db.parent}"/> | ||
| </launchConfiguration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> | ||
| <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> | ||
| <stringAttribute key="M2_GOALS" value="org.eclipse.tycho:tycho-versions-plugin:2.2.0:set-version"/> | ||
| <booleanAttribute key="M2_NON_RECURSIVE" value="false"/> | ||
| <booleanAttribute key="M2_OFFLINE" value="false"/> | ||
| <stringAttribute key="M2_PROFILES" value=""/> | ||
| <listAttribute key="M2_PROPERTIES"> | ||
| <listEntry value="newVersion=1.3.0-SNAPSHOT"/> | ||
| <listEntry value="tycho.mode=maven"/> | ||
| </listAttribute> | ||
| <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> | ||
| <booleanAttribute key="M2_SKIP_TESTS" value="true"/> | ||
| <intAttribute key="M2_THREADS" value="1"/> | ||
| <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> | ||
| <stringAttribute key="M2_USER_SETTINGS" value=""/> | ||
| <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> | ||
| <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/> | ||
| <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-13.0.1"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.tvtower.db.parent}"/> | ||
| </launchConfiguration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| The set version call does not update the MANIFEST.MF of org.tvtower.db.product. | ||
| It is not part of the multi-module build... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
170 changes: 170 additions & 0 deletions
170
org.tvtower.db.tests/src/org/tvtower/db/tests/DbNormalizeForRefacotring.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,170 @@ | ||
| package org.tvtower.db.tests; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileInputStream; | ||
| import java.io.FileOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.TreeMap; | ||
|
|
||
| import javax.xml.parsers.DocumentBuilder; | ||
| import javax.xml.parsers.DocumentBuilderFactory; | ||
|
|
||
| import org.junit.Ignore; | ||
| import org.junit.Test; | ||
| import org.w3c.dom.Document; | ||
| import org.w3c.dom.Element; | ||
| import org.w3c.dom.NamedNodeMap; | ||
| import org.w3c.dom.Node; | ||
| import org.w3c.dom.NodeList; | ||
| import org.xml.sax.InputSource; | ||
|
|
||
| import com.google.common.io.Files; | ||
|
|
||
| @Ignore | ||
| public class DbNormalizeForRefacotring { | ||
|
|
||
| TreeMap<String, Node> persons = new TreeMap<>(); | ||
| TreeMap<String, Node> programmes = new TreeMap<>(); | ||
| TreeMap<String, Node> ads = new TreeMap<>(); | ||
| TreeMap<String, Node> news = new TreeMap<>(); | ||
| TreeMap<String, Node> scripts = new TreeMap<>(); | ||
|
|
||
| @Test | ||
| public void iterateFolder() throws IOException { | ||
| File parent = new File(".").getAbsoluteFile().getParentFile().getParentFile().getParentFile(); | ||
| File baseDir = new File(parent,"TVTower/res/database/default"); | ||
|
|
||
| Iterable<File> iterable = Files.fileTraverser().breadthFirst(baseDir); | ||
| for (File file : iterable) { | ||
| if(file.isFile() && file.getName().endsWith("xml") && ! file.getParentFile().getName().startsWith("lang")) { | ||
| parseFile(file.getAbsolutePath(), "person", persons); | ||
| parseFile(file.getAbsolutePath(), "programme", programmes); | ||
| parseFile(file.getAbsolutePath(), "ad", ads); | ||
| parseFile(file.getAbsolutePath(), "news", news); | ||
| parseFile(file.getAbsolutePath(), "scripttemplate", scripts); | ||
| } | ||
| } | ||
|
|
||
| String normName="normalizedOrig.txt"; | ||
| write(persons, "persons/"+normName); | ||
| write(programmes, "progs/"+normName); | ||
| write(ads, "ads/"+normName); | ||
| write(news, "news/"+normName); | ||
| write(scripts, "scripts/"+normName); | ||
| } | ||
|
|
||
| @Test | ||
| public void normalizePersons() throws IOException { | ||
| parsePersonFile("persons/db_orig.xml"); | ||
| write(persons, "persons/normOrig.txt"); | ||
| persons.clear(); | ||
|
|
||
| parsePersonFile("persons/db_new.xml"); | ||
| parsePersonFile("persons/db_new2.xml"); | ||
| write(persons, "persons/normNew.txt"); | ||
| } | ||
|
|
||
| @Test | ||
| public void normalizeProgrammes() throws IOException { | ||
| parseProgrammeFile("progs/dborig1.xml"); | ||
| parseProgrammeFile("progs/dborig2.xml"); | ||
| write(programmes, "progs/normOrig.txt"); | ||
| programmes.clear(); | ||
|
|
||
| parseProgrammeFile("progs/dbnew1.xml"); | ||
| parseProgrammeFile("progs/dbnew2.xml"); | ||
| write(programmes, "progs/normNew.txt"); | ||
| } | ||
|
|
||
|
|
||
| private void parsePersonFile(String fileName) { | ||
| parseFile(fileName, "person", persons); | ||
| } | ||
|
|
||
| private void parseProgrammeFile(String fileName) { | ||
| parseFile(fileName, "programme", programmes); | ||
| } | ||
|
|
||
|
|
||
| private void write(TreeMap<String, Node> map, String targetFile) throws IOException { | ||
| String target="target/dbcompare/"+targetFile; | ||
| File parent=new File(target).getParentFile(); | ||
| if(!parent.exists()) { | ||
| parent.getParentFile().mkdir(); | ||
| parent.mkdir(); | ||
| } | ||
| FileOutputStream f = new FileOutputStream(target); | ||
| for (String id : map.keySet()) { | ||
| f.write(toString(map.get(id)).getBytes()); | ||
| f.write("\n".getBytes()); | ||
| } | ||
| f.flush(); | ||
| f.close(); | ||
| } | ||
|
|
||
| public void parseFile(String fileName, String baseTag, TreeMap<String, Node> map) { | ||
| try { | ||
| DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); | ||
| DocumentBuilder db = dbf.newDocumentBuilder(); | ||
| InputSource is = new InputSource(new FileInputStream(new File(fileName))); | ||
|
|
||
| Document doc = db.parse(is); | ||
| NodeList nodes = doc.getElementsByTagName(baseTag); | ||
|
|
||
| // iterate the employees | ||
| for (int i = 0; i < nodes.getLength(); i++) { | ||
| Node node = nodes.item(i); | ||
| String id = ((Element) node).getAttribute(baseTag=="scripttemplate"?"guid":"id"); | ||
| if (map.containsKey(id)) { | ||
| throw new IllegalStateException("duplicate id '" + id +"' in "+fileName ); | ||
| } else { | ||
| map.put(id, node); | ||
| } | ||
| } | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| private String toString(Node n) { | ||
| StringBuilder b = new StringBuilder(n.getNodeName()); | ||
| b.append(" - "); | ||
| String nodeValue = n.getNodeValue(); | ||
| if (nodeValue != null && nodeValue.length() > 0) { | ||
| b.append(nodeValue); | ||
| b.append(" - "); | ||
| } | ||
|
|
||
| TreeMap<String, String> attMap = new TreeMap<>(); | ||
| NamedNodeMap attributes = n.getAttributes(); | ||
| if (attributes != null) { | ||
| for (int i = 0; i < attributes.getLength(); i++) { | ||
| Node att = attributes.item(i); | ||
| String value = att.getNodeValue(); | ||
| if (value != null && value.length() > 0) { | ||
| attMap.put(att.getNodeName(), value); | ||
| } | ||
| } | ||
| if (!attMap.isEmpty()) { | ||
| b.append("attributes: "); | ||
| b.append(attMap); | ||
| } | ||
| } | ||
| NodeList children = n.getChildNodes(); | ||
| if (children != null) { | ||
| for (int i = 0; i < children.getLength(); i++) { | ||
| Node child = children.item(i); | ||
| if (child != null) { | ||
| String childText = toString(child); | ||
| if (childText != null && childText.length() > 0) { | ||
| b.append("; child: " + childText); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // System.out.println(attMap); | ||
| return b.toString(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.