garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

Merge pull request #3 from Athou/master

Browse Source 
back up to date
This commit is contained in:
Hubcapp
2014-11-01 02:01:24 -04:00
parent 2744f8285c 0a2d2c3f43
commit 27f22f6094
2 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.commafeed</groupId> <groupId>com.commafeed</groupId>
<artifactId>commafeed</artifactId> <artifactId>commafeed</artifactId>
<version>2.0.3-SNAPSHOT</version> <version>2.0.3</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>CommaFeed</name> <name>CommaFeed</name>
@@ -15,6 +15,9 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dropwizard.version>0.7.1</dropwizard.version> <dropwizard.version>0.7.1</dropwizard.version>
<guice.version>3.0</guice.version>
<querydsl.version>3.5.0</querydsl.version>
<rome.version>1.5.0</rome.version>
</properties> </properties>
<scm> <scm>
@@ -44,7 +47,7 @@
<plugin> <plugin>
<groupId>pl.project13.maven</groupId> <groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId> <artifactId>git-commit-id-plugin</artifactId>
<version>2.1.10</version> <version>2.1.11</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@@ -178,12 +181,12 @@
<dependency> <dependency>
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId> <artifactId>guice</artifactId>
<version>3.0</version> <version>${guice.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.inject.extensions</groupId> <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId> <artifactId>guice-multibindings</artifactId>
<version>3.0</version> <version>${guice.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -217,33 +220,32 @@
<version>${dropwizard.version}</version> <version>${dropwizard.version}</version>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.wordnik</groupId> <groupId>com.wordnik</groupId>
<artifactId>swagger-jaxrs_2.10</artifactId> <artifactId>swagger-jaxrs_2.10</artifactId>
<version>1.3.10</version> <version>1.3.10</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>jsr311-api</artifactId>
<groupId>javax.ws.rs</groupId> <groupId>javax.ws.rs</groupId>
</exclusion> <artifactId>jsr311-api</artifactId>
<exclusion>
<artifactId>javassist</artifactId>
<groupId>javassist</groupId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.mysema.querydsl</groupId> <groupId>com.mysema.querydsl</groupId>
<artifactId>querydsl-apt</artifactId> <artifactId>querydsl-apt</artifactId>
<version>3.5.0</version> <version>${querydsl.version}</version>
<scope>provided</scope> <scope>provided</scope>
<classifier>hibernate</classifier> <classifier>hibernate</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.mysema.querydsl</groupId> <groupId>com.mysema.querydsl</groupId>
<artifactId>querydsl-jpa</artifactId> <artifactId>querydsl-jpa</artifactId>
<version>3.5.0</version> <version>${querydsl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
@@ -264,6 +266,7 @@
<artifactId>commons-math3</artifactId> <artifactId>commons-math3</artifactId>
<version>3.3</version> <version>3.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>redis.clients</groupId> <groupId>redis.clients</groupId>
<artifactId>jedis</artifactId> <artifactId>jedis</artifactId>
@@ -274,15 +277,16 @@
<artifactId>javax.mail</artifactId> <artifactId>javax.mail</artifactId>
<version>1.5.2</version> <version>1.5.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.rometools</groupId> <groupId>com.rometools</groupId>
<artifactId>rome</artifactId> <artifactId>rome</artifactId>
<version>1.5.0</version> <version>${rome.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.rometools</groupId> <groupId>com.rometools</groupId>
<artifactId>rome-opml</artifactId> <artifactId>rome-opml</artifactId>
<version>1.5.0</version> <version>${rome.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jsoup</groupId> <groupId>org.jsoup</groupId>
@@ -303,7 +307,7 @@
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>1.4.181</version> <version>1.4.182</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>

17
src/main/java/com/commafeed/backend/feed/FeedUtils.java
View File

@@ -130,7 +130,7 @@ public class FeedUtils {
public static String replaceHtmlEntitiesWithNumericEntities(String source) { public static String replaceHtmlEntitiesWithNumericEntities(String source) {
String result = source; String result = source;
for (String entity : HtmlEntities.NUMERIC_MAPPING.keySet()) { for (String entity : HtmlEntities.NUMERIC_MAPPING.keySet()) {
result = result.replace(entity, HtmlEntities.NUMERIC_MAPPING.get(entity)); result = StringUtils.replace(result, entity, HtmlEntities.NUMERIC_MAPPING.get(entity));
} }
return result; return result;
} }
@@ -517,19 +517,4 @@ public class FeedUtils {
} }
} }
} }
public static String parseForImageUrl(byte[] xml) {
String xmlString = null;
try {
String encoding = FeedUtils.guessEncoding(xml);
xmlString = FeedUtils.trimInvalidXmlCharacters(new String(xml, encoding));
/*if (xmlString == null) {
throw new FeedException("Input string is null for url " + feedUrl);
}*/
xmlString = FeedUtils.replaceHtmlEntitiesWithNumericEntities(xmlString);
} catch (Exception e) {
}
return xmlString;
}
} }