Skip to content

Last changes #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pivovarit merged 11 commits into from
Jun 28, 2016
Merged

Last changes #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b156886
dom4j
Asheara Jun 14, 2016
c93e1b0
added more parsers
Asheara Jun 16, 2016
7d14348
Merge branch 'master' of https://github.com/eugenp/tutorials
Asheara Jun 16, 2016
711ab68
StaxParser
Asheara Jun 18, 2016
d969cc6
Jaxb binding
Asheara Jun 19, 2016
13e4aff
Jaxb binding
Asheara Jun 19, 2016
8466bc0
Finish article
Asheara Jun 19, 2016
4305aea
Merge branch 'master' of https://github.com/eugenp/tutorials
Asheara Jun 26, 2016
e9827bf
apply some changes
Asheara Jun 28, 2016
ed595a9
Merge remote-tracking branch 'BaeldungTutorials/master'
Asheara Jun 28, 2016
e2e32dc
Organize imports
Asheara Jun 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions xml/src/main/java/com/baeldung/xml/JaxbParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.io.File;
import java.util.ArrayList;
import java.util.Date;

import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
Expand Down Expand Up @@ -40,7 +39,7 @@ public void createNewDocument() {
tut.setType("XML");
tut.setTitle("XML with Jaxb");
tut.setDescription("XML Binding with Jaxb");
tut.setDate(new Date());
tut.setDate("04/02/2015");
tut.setAuthor("Jaxb author");
tutorials.getTutorial().add(tut);

Expand Down
2 changes: 1 addition & 1 deletion xml/src/main/java/com/baeldung/xml/StaxParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;

import com.baeldung.xml.model.Tutorial;
import com.baeldung.xml.binding.Tutorial;

public class StaxParser {

Expand Down
8 changes: 3 additions & 5 deletions xml/src/main/java/com/baeldung/xml/binding/Tutorial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.baeldung.xml.binding;

import java.util.Date;

import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;

Expand All @@ -11,7 +9,7 @@ public class Tutorial {
private String type;
private String title;
private String description;
private Date date;
private String date;
private String author;


Expand Down Expand Up @@ -44,11 +42,11 @@ public String getDescription() {
public void setDescription(String description) {
this.description = description;
}
public Date getDate() {
public String getDate() {
return date;
}
@XmlElement
public void setDate(Date date) {
public void setDate(String date) {
this.date = date;
}
public String getAuthor() {
Expand Down
49 changes: 0 additions & 49 deletions xml/src/main/java/com/baeldung/xml/model/Tutorial.java
View file
Open in desktop

This file was deleted.

20 changes: 9 additions & 11 deletions xml/src/test/java/com/baeldung/xml/DefaultParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
package com.baeldung.xml;

import org.junit.Test;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import static org.junit.Assert.*;

import java.io.File;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

public class DefaultParserTest {

private final String fileName = "src/test/resources/example.xml";
final String fileName = "src/test/resources/example.xml";

private final String fileNameSpace = "src/test/resources/example_namespace.xml";
final String fileNameSpace = "src/test/resources/example_namespace.xml";

private DefaultParser parser;
DefaultParser parser;

@Test
public void getFirstLevelNodeListTest() {
Expand All @@ -32,7 +30,7 @@ public void getNodeListByTitleTest() {
parser = new DefaultParser(new File(fileName));
NodeList list = parser.getNodeListByTitle("XML");

for (int i = 0; i < list.getLength(); i++) {
for (int i = 0; null != list && i < list.getLength(); i++) {
Node nod = list.item(i);
assertEquals("java", nod.getAttributes().getNamedItem("type").getTextContent());
assertEquals("02", nod.getAttributes().getNamedItem("tutId").getTextContent());
Expand All @@ -58,7 +56,7 @@ public void getNodeByIdTest() {
public void getNodeListByDateTest(){
parser = new DefaultParser(new File(fileName));
NodeList list = parser.getNodeListByTitle("04022016");
for (int i = 0; i < list.getLength(); i++) {
for (int i = 0; null != list && i < list.getLength(); i++) {
Node nod = list.item(i);
assertEquals("java", nod.getAttributes().getNamedItem("type").getTextContent());
assertEquals("04", nod.getAttributes().getNamedItem("tutId").getTextContent());
Expand Down
28 changes: 14 additions & 14 deletions xml/src/test/java/com/baeldung/xml/Dom4JParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
package com.baeldung.xml;

import org.dom4j.Element;
import org.dom4j.Node;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.io.File;
import java.util.List;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.dom4j.Element;
import org.dom4j.Node;
import org.junit.Test;

public class Dom4JParserTest {

private static final String FILE_NAME = "src/test/resources/example.xml";
final String fileName = "src/test/resources/example.xml";

private Dom4JParser parser;
Dom4JParser parser;

@Test
public void getRootElementTest() {
parser = new Dom4JParser(new File(FILE_NAME));
parser = new Dom4JParser(new File(fileName));
Element root = parser.getRootElement();

assertNotNull(root);
Expand All @@ -28,7 +28,7 @@ public void getRootElementTest() {

@Test
public void getFirstElementListTest() {
parser = new Dom4JParser(new File(FILE_NAME));
parser = new Dom4JParser(new File(fileName));
List<Element> firstList = parser.getFirstElementList();

assertNotNull(firstList);
Expand All @@ -38,7 +38,7 @@ public void getFirstElementListTest() {

@Test
public void getElementByIdTest() {
parser = new Dom4JParser(new File(FILE_NAME));
parser = new Dom4JParser(new File(fileName));
Node element = parser.getNodeById("03");

String type = element.valueOf("@type");
Expand All @@ -47,7 +47,7 @@ public void getElementByIdTest() {

@Test
public void getElementsListByTitleTest() {
parser = new Dom4JParser(new File(FILE_NAME));
parser = new Dom4JParser(new File(fileName));
Node element = parser.getElementsListByTitle("XML");

assertEquals("java", element.valueOf("@type"));
Expand All @@ -58,7 +58,7 @@ public void getElementsListByTitleTest() {

@Test
public void generateModifiedDocumentTest() {
parser = new Dom4JParser(new File(FILE_NAME));
parser = new Dom4JParser(new File(fileName));
parser.generateModifiedDocument();

File generatedFile = new File("src/test/resources/example_updated.xml");
Expand All @@ -73,7 +73,7 @@ public void generateModifiedDocumentTest() {

@Test
public void generateNewDocumentTest() {
parser = new Dom4JParser(new File(FILE_NAME));
parser = new Dom4JParser(new File(fileName));
parser.generateNewDocument();

File newFile = new File("src/test/resources/example_new.xml");
Expand Down
14 changes: 7 additions & 7 deletions xml/src/test/java/com/baeldung/xml/JDomParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package com.baeldung.xml;

import org.jdom2.Element;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.io.File;
import java.util.List;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.jdom2.Element;
import org.junit.Test;

public class JDomParserTest {

private final String fileName = "src/test/resources/example.xml";
final String fileName = "src/test/resources/example.xml";

private JDomParser parser;
JDomParser parser;

@Test
public void getFirstElementListTest() {
Expand Down
13 changes: 7 additions & 6 deletions xml/src/test/java/com/baeldung/xml/JaxbParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
package com.baeldung.xml;

import com.baeldung.xml.binding.Tutorials;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.io.File;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;

import com.baeldung.xml.binding.Tutorials;

public class JaxbParserTest {


private final String fileName = "src/test/resources/example.xml";
final String fileName = "src/test/resources/example.xml";

private JaxbParser parser;
JaxbParser parser;

@Test
public void getFullDocumentTest(){
Expand Down
10 changes: 5 additions & 5 deletions xml/src/test/java/com/baeldung/xml/JaxenDemoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package com.baeldung.xml;

import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.io.File;
import java.util.List;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;

public class JaxenDemoTest {

private final String fileName = "src/test/resources/example.xml";
final String fileName = "src/test/resources/example.xml";

private JaxenDemo jaxenDemo;
JaxenDemo jaxenDemo;

@Test
public void getFirstLevelNodeListTest() {
Expand Down
13 changes: 7 additions & 6 deletions xml/src/test/java/com/baeldung/xml/StaxParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
package com.baeldung.xml;

import com.baeldung.xml.model.Tutorial;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.io.File;
import java.util.List;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;

import com.baeldung.xml.binding.Tutorial;

public class StaxParserTest {

private final String fileName = "src/test/resources/example.xml";
final String fileName = "src/test/resources/example.xml";

private StaxParser parser;
StaxParser parser;

@Test
public void getAllTutorialsTest(){
Expand Down