Author: solomax
Date: Tue Feb 21 05:44:02 2017
New Revision: 1783828
URL: http://svn.apache.org/viewvc?rev=1783828&view=rev
Log:
no jira: code clean-up
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1783828&r1=1783827&r2=1783828&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Tue Feb 21 05:44:02 2017
@@ -102,7 +102,7 @@ public class MobileService {
* @return - List of all available Languages
*/
public List<Language> getLanguages() {
- List<Language> result = new ArrayList<Language>();
+ List<Language> result = new ArrayList<>();
for (Map.Entry<Long, Locale> e : LabelDao.languages.entrySet())
{
result.add(new Language(e.getKey(),
e.getValue().toLanguageTag(), e.getValue().getDisplayName(Locale.ENGLISH)));
}
@@ -253,14 +253,14 @@ public class MobileService {
}
public List<Map<String, Object>> getVideoStreams() {
- List<Map<String, Object>> result = new
ArrayList<Map<String,Object>>();
+ List<Map<String, Object>> result = new ArrayList<>();
// Notify all clients of the same scope (room)
IConnection current = Red5.getConnectionLocal();
for (IConnection conn :
current.getScope().getClientConnections()) {
if (conn != null && conn instanceof
IServiceCapableConnection) {
Client c =
sessionManager.getClientByStreamId(conn.getClient().getId(), null);
if (!Strings.isEmpty(c.getAvsettings()) &&
!c.isScreenClient()) {
- Map<String, Object> map = new
HashMap<String, Object>();
+ Map<String, Object> map = new
HashMap<>();
add(map, "streamId", c.getStreamid());
add(map, "broadCastId",
c.getBroadCastID());
add(map, "userId", c.getUserId());
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java?rev=1783828&r1=1783827&r2=1783828&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
Tue Feb 21 05:44:02 2017
@@ -35,8 +35,6 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getAllFiles", query = "SELECT c FROM
FileExplorerItem c ORDER BY c.id")
, @NamedQuery(name = "getFileById", query = "SELECT c FROM
FileExplorerItem c WHERE c.id = :id")
, @NamedQuery(name = "getFileByHash", query = "SELECT c FROM
FileExplorerItem c WHERE c.hash = :hash")
- , @NamedQuery(name = "getFilesByRoomAndOwner", query = "SELECT c FROM
FileExplorerItem c WHERE c.deleted = false "
- + " AND c.roomId = :roomId AND c.ownerId = :ownerId
ORDER BY c.type ASC, c.name ")
, @NamedQuery(name = "getFilesByRoom", query = "SELECT c FROM
FileExplorerItem c WHERE c.deleted = false AND c.roomId = :roomId " +
"AND c.ownerId IS NULL AND c.parentId IS NULL ORDER BY
c.type ASC, c.name ")
, @NamedQuery(name = "getFilesByOwner", query = "SELECT c FROM
FileExplorerItem c WHERE c.deleted = false AND c.ownerId = :ownerId "
Modified:
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml?rev=1783828&r1=1783827&r2=1783828&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
Tue Feb 21 05:44:02 2017
@@ -61,6 +61,9 @@
<source>mvn versions:display-plugin-updates</source>
<source>mvn versions:display-property-updates</source>
</section>
+ <section name="Check dependencies">
+ <source>mvn
org.apache.maven.plugins:maven-dependency-plugin:3.0.0:analyze-only</source>
+ </section>
<section name="Tips and Gotchas">
<p>To compile only client you can run following
command: </p>
<source>
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1783828&r1=1783827&r2=1783828&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Tue Feb 21 05:44:02 2017
@@ -102,7 +102,7 @@ public class MobileService {
* @return - List of all available Languages
*/
public List<Language> getLanguages() {
- List<Language> result = new ArrayList<Language>();
+ List<Language> result = new ArrayList<>();
for (Map.Entry<Long, Locale> e : LabelDao.languages.entrySet())
{
result.add(new Language(e.getKey(),
e.getValue().toLanguageTag(), e.getValue().getDisplayName(Locale.ENGLISH)));
}
@@ -253,14 +253,14 @@ public class MobileService {
}
public List<Map<String, Object>> getVideoStreams() {
- List<Map<String, Object>> result = new
ArrayList<Map<String,Object>>();
+ List<Map<String, Object>> result = new ArrayList<>();
// Notify all clients of the same scope (room)
IConnection current = Red5.getConnectionLocal();
for (IConnection conn :
current.getScope().getClientConnections()) {
if (conn != null && conn instanceof
IServiceCapableConnection) {
Client c =
sessionManager.getClientByStreamId(conn.getClient().getId(), null);
if (!Strings.isEmpty(c.getAvsettings()) &&
!c.isScreenClient()) {
- Map<String, Object> map = new
HashMap<String, Object>();
+ Map<String, Object> map = new
HashMap<>();
add(map, "streamId", c.getStreamid());
add(map, "broadCastId",
c.getBroadCastID());
add(map, "userId", c.getUserId());
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java?rev=1783828&r1=1783827&r2=1783828&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
Tue Feb 21 05:44:02 2017
@@ -35,8 +35,6 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getAllFiles", query = "SELECT c FROM
FileExplorerItem c ORDER BY c.id")
, @NamedQuery(name = "getFileById", query = "SELECT c FROM
FileExplorerItem c WHERE c.id = :id")
, @NamedQuery(name = "getFileByHash", query = "SELECT c FROM
FileExplorerItem c WHERE c.hash = :hash")
- , @NamedQuery(name = "getFilesByRoomAndOwner", query = "SELECT c FROM
FileExplorerItem c WHERE c.deleted = false "
- + " AND c.roomId = :roomId AND c.ownerId = :ownerId
ORDER BY c.type ASC, c.name ")
, @NamedQuery(name = "getFilesByRoom", query = "SELECT c FROM
FileExplorerItem c WHERE c.deleted = false AND c.roomId = :roomId " +
"AND c.ownerId IS NULL AND c.parentId IS NULL ORDER BY
c.type ASC, c.name ")
, @NamedQuery(name = "getFilesByOwner", query = "SELECT c FROM
FileExplorerItem c WHERE c.deleted = false AND c.ownerId = :ownerId "
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml?rev=1783828&r1=1783827&r2=1783828&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml
Tue Feb 21 05:44:02 2017
@@ -61,6 +61,9 @@
<source>mvn versions:display-plugin-updates</source>
<source>mvn versions:display-property-updates</source>
</section>
+ <section name="Check dependencies">
+ <source>mvn
org.apache.maven.plugins:maven-dependency-plugin:3.0.0:analyze-only</source>
+ </section>
<section name="Tips and Gotchas">
<p>To compile only client you can run following
command: </p>
<source>
