Skip to content

Commit c35ae5f

Browse files
jirkapinkasjirkapinkas
committed
fixed #4 
1 parent f8c8484 commit c35ae5f

File tree

3 files changed

+43
-44
lines changed

3 files changed

+43
-44
lines changed

‎.classpath

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src/main/java">
4-
<attributes>
5-
<attribute name="optional" value="true"/>
6-
<attribute name="maven.pomderived" value="true"/>
7-
</attributes>
8-
</classpathentry>
9-
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
10-
<attributes>
11-
<attribute name="maven.pomderived" value="true"/>
12-
</attributes>
13-
</classpathentry>
14-
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
15-
<attributes>
16-
<attribute name="optional" value="true"/>
17-
<attribute name="maven.pomderived" value="true"/>
18-
</attributes>
19-
</classpathentry>
20-
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
21-
<attributes>
22-
<attribute name="maven.pomderived" value="true"/>
23-
</attributes>
24-
</classpathentry>
25-
<classpathentry kind="src" path="src/site"/>
26-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
27-
<attributes>
28-
<attribute name="maven.pomderived" value="true"/>
29-
</attributes>
30-
</classpathentry>
31-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
32-
<attributes>
33-
<attribute name="maven.pomderived" value="true"/>
34-
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
35-
</attributes>
36-
</classpathentry>
37-
<classpathentry kind="output" path="target/classes"/>
38-
</classpath>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
10+
<attributes>
11+
<attribute name="maven.pomderived" value="true"/>
12+
</attributes>
13+
</classpathentry>
14+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
15+
<attributes>
16+
<attribute name="optional" value="true"/>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
20+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
21+
<attributes>
22+
<attribute name="maven.pomderived" value="true"/>
23+
</attributes>
24+
</classpathentry>
25+
<classpathentry kind="src" path="src/site"/>
26+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
27+
<attributes>
28+
<attribute name="maven.pomderived" value="true"/>
29+
</attributes>
30+
</classpathentry>
31+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
32+
<attributes>
33+
<attribute name="maven.pomderived" value="true"/>
34+
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
35+
</attributes>
36+
</classpathentry>
37+
<classpathentry kind="output" path="target/classes"/>
38+
</classpath>

‎src/main/java/cz/jiripinkas/jsitemapgenerator/generator/SitemapGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ public String[] constructSitemap() {
4545
ArrayList<WebPage> values = new ArrayList<WebPage>(urls.values());
4646
Collections.sort(values);
4747
for (WebPage webPage : values) {
48+
out.add("<url>\n");
4849
out.add(constructUrl(webPage));
4950
if (webPage.getImages() != null) {
5051
for (Image image : webPage.getImages()) {
5152
out.add(constructImage(image));
5253
}
5354
}
55+
out.add("</url>\n");
5456
}
5557
out.add("</urlset>");
5658
return out.toArray(new String[] {});
@@ -90,7 +92,6 @@ String constructImage(Image image) {
9092

9193
String constructUrl(WebPage webPage) {
9294
StringBuilder out = new StringBuilder();
93-
out.append("<url>\n");
9495
out.append("<loc>");
9596
try {
9697
if (webPage.getName() != null) {
@@ -123,7 +124,6 @@ String constructUrl(WebPage webPage) {
123124
out.append(webPage.getPriority());
124125
out.append("</priority>\n");
125126
}
126-
out.append("</url>\n");
127127
return out.toString();
128128
}
129129

‎src/test/java/cz/jiripinkas/jsitemapgenerator/generator/SitemapGeneratorTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import cz.jiripinkas.jsitemapgenerator.ImageBuilder;
1515
import cz.jiripinkas.jsitemapgenerator.WebPage;
1616
import cz.jiripinkas.jsitemapgenerator.WebPageBuilder;
17-
import cz.jiripinkas.jsitemapgenerator.generator.SitemapGenerator;
1817
import cz.jiripinkas.jsitemapgenerator.generator.SitemapGenerator.AdditionalNamespace;
1918
import cz.jiripinkas.jsitemapgenerator.util.TestUtil;
2019

@@ -52,19 +51,19 @@ public void testConstructSitemapWithImages() {
5251
webPage.addImage(new ImageBuilder().loc("http://www.javavids.com/favicon.ico").build());
5352
sitemapGenerator.addPage(webPage);
5453
String sitemapString = sitemapGenerator.constructSitemapString();
55-
Assert.assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:image=\"http://www.google.com/schemas/sitemap-image/1.1\" >\n<url>\n<loc>http://www.javavids.com/</loc>\n</url>\n<image:image>\n<image:loc>http://www.javavids.com/favicon.ico</image:loc>\n</image:image>\n</urlset>", sitemapString);
54+
Assert.assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:image=\"http://www.google.com/schemas/sitemap-image/1.1\" >\n<url>\n<loc>http://www.javavids.com/</loc>\n<image:image>\n<image:loc>http://www.javavids.com/favicon.ico</image:loc>\n</image:image>\n</url>\n</urlset>", sitemapString);
5655
}
5756

5857
@Test
5958
public void testConstructUrlEmptyPage() {
6059
String url = sitemapGenerator.constructUrl(new WebPage());
61-
Assert.assertEquals("<url>\n<loc>http://www.javavids.com/</loc>\n</url>\n", url);
60+
Assert.assertEquals("<loc>http://www.javavids.com/</loc>\n", url);
6261
}
6362

6463
@Test
6564
public void testConstructUrlNotEmptyPage() {
6665
String url = sitemapGenerator.constructUrl(new WebPage().setName("latest.php"));
67-
Assert.assertEquals("<url>\n<loc>http://www.javavids.com/latest.php</loc>\n</url>\n", url);
66+
Assert.assertEquals("<loc>http://www.javavids.com/latest.php</loc>\n", url);
6867
}
6968

7069
@Test

0 commit comments

Comments
 (0)