diff --git a/docs-core/pom.xml b/docs-core/pom.xml index 3c1730c1..498aee4b 100644 --- a/docs-core/pom.xml +++ b/docs-core/pom.xml @@ -5,7 +5,7 @@ com.sismics.docs docs-parent - 1.0-SNAPSHOT + 1.4-SNAPSHOT .. diff --git a/docs-core/src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java b/docs-core/src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java index a00ee16a..c9a74f01 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java +++ b/docs-core/src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java @@ -1,6 +1,12 @@ package com.sismics.docs.core.dao.jpa; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import javax.persistence.EntityManager; import javax.persistence.NoResultException; @@ -8,11 +14,8 @@ import javax.persistence.Query; import com.google.common.base.Joiner; import com.sismics.docs.core.constant.AuditLogType; -import com.sismics.docs.core.dao.jpa.criteria.GroupCriteria; import com.sismics.docs.core.dao.jpa.criteria.TagCriteria; -import com.sismics.docs.core.dao.jpa.dto.GroupDto; import com.sismics.docs.core.dao.jpa.dto.TagDto; -import com.sismics.docs.core.dao.jpa.dto.TagStatDto; import com.sismics.docs.core.model.jpa.DocumentTag; import com.sismics.docs.core.model.jpa.Tag; import com.sismics.docs.core.util.AuditLogUtil; diff --git a/docs-core/src/main/java/com/sismics/util/jpa/DbOpenHelper.java b/docs-core/src/main/java/com/sismics/util/jpa/DbOpenHelper.java index dac8b80c..fcc4f3f2 100644 --- a/docs-core/src/main/java/com/sismics/util/jpa/DbOpenHelper.java +++ b/docs-core/src/main/java/com/sismics/util/jpa/DbOpenHelper.java @@ -5,7 +5,6 @@ import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.Writer; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/docs-core/src/test/java/com/sismics/docs/core/util/TestFileUtil.java b/docs-core/src/test/java/com/sismics/docs/core/util/TestFileUtil.java index 8ce18dc4..4f7a58d9 100644 --- a/docs-core/src/test/java/com/sismics/docs/core/util/TestFileUtil.java +++ b/docs-core/src/test/java/com/sismics/docs/core/util/TestFileUtil.java @@ -9,7 +9,6 @@ import org.junit.Assert; import org.junit.Test; import com.google.common.collect.Lists; -import com.google.common.io.ByteStreams; import com.google.common.io.Resources; import com.sismics.docs.core.dao.jpa.dto.DocumentDto; import com.sismics.docs.core.model.jpa.File; diff --git a/docs-stress/pom.xml b/docs-stress/pom.xml index 6c917af7..e6cb862b 100644 --- a/docs-stress/pom.xml +++ b/docs-stress/pom.xml @@ -5,7 +5,7 @@ com.sismics.docs docs-parent - 1.0-SNAPSHOT + 1.4-SNAPSHOT .. diff --git a/docs-web-common/pom.xml b/docs-web-common/pom.xml index 427999c7..1a736939 100644 --- a/docs-web-common/pom.xml +++ b/docs-web-common/pom.xml @@ -5,7 +5,7 @@ com.sismics.docs docs-parent - 1.0-SNAPSHOT + 1.4-SNAPSHOT .. diff --git a/docs-web/pom.xml b/docs-web/pom.xml index e4f2420a..a3cba6c6 100644 --- a/docs-web/pom.xml +++ b/docs-web/pom.xml @@ -5,7 +5,7 @@ com.sismics.docs docs-parent - 1.0-SNAPSHOT + 1.4-SNAPSHOT .. diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java index 82dc70d3..46032995 100644 --- a/docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java +++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java @@ -37,10 +37,6 @@ import java.util.Map; */ @Path("/theme") public class ThemeResource extends BaseResource { - // Filenames for images in theme directory - private static final String LOGO_IMAGE = "logo"; - private static final String BACKGROUND_IMAGE = "background"; - /** * Returns custom CSS stylesheet. * @@ -162,7 +158,7 @@ public class ThemeResource extends BaseResource { if (Files.exists(filePath)) { inputStream = Files.newInputStream(filePath); } else { - inputStream = getClass().getResource("/image/" + (type.equals(LOGO_IMAGE) ? "logo.png" : "background.jpg")).openStream(); + inputStream = getClass().getResource("/image/" + (type.equals("logo") ? "logo.png" : "background.jpg")).openStream(); } ByteStreams.copy(inputStream, outputStream); } finally { diff --git a/docs-web/src/test/java/com/sismics/docs/rest/TestTagResource.java b/docs-web/src/test/java/com/sismics/docs/rest/TestTagResource.java index c7d61e80..efd09d02 100644 --- a/docs-web/src/test/java/com/sismics/docs/rest/TestTagResource.java +++ b/docs-web/src/test/java/com/sismics/docs/rest/TestTagResource.java @@ -2,7 +2,6 @@ package com.sismics.docs.rest; import javax.json.JsonArray; import javax.json.JsonObject; -import javax.json.JsonValue; import javax.ws.rs.client.Entity; import javax.ws.rs.core.Form; import javax.ws.rs.core.Response; diff --git a/pom.xml b/pom.xml index 64c8b8e7..cbd0371d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.sismics.docs docs-parent pom - 1.0-SNAPSHOT + 1.4-SNAPSHOT Docs Parent