You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2017/03/07 22:42:53 UTC
svn commit: r1785903 - in /sling/trunk/tooling/maven/maven-sling-plugin:
pom.xml
src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
Author: sseifert
Date: Tue Mar 7 22:42:53 2017
New Revision: 1785903
URL: http://svn.apache.org/viewvc?rev=1785903&view=rev
Log:
eliminate some warnings
Modified:
sling/trunk/tooling/maven/maven-sling-plugin/pom.xml
sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
Modified: sling/trunk/tooling/maven/maven-sling-plugin/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/pom.xml?rev=1785903&r1=1785902&r2=1785903&view=diff
==============================================================================
--- sling/trunk/tooling/maven/maven-sling-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/maven-sling-plugin/pom.xml Tue Mar 7 22:42:53 2017
@@ -84,6 +84,12 @@
<dependencies>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
Modified: sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java?rev=1785903&r1=1785902&r2=1785903&view=diff
==============================================================================
--- sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java (original)
+++ sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java Tue Mar 7 22:42:53 2017
@@ -559,7 +559,7 @@ abstract class AbstractBundleInstallMojo
throw new MojoExecutionException("No resources configured for this project.");
}
// now get current configurations
- final Map oldConfigs = this.getCurrentFileProviderConfigs(targetURL, client);
+ final Map<String,String[]> oldConfigs = this.getCurrentFileProviderConfigs(targetURL, client);
final Entry[] entries = header.getEntries();
for(final Entry entry : entries) {
@@ -608,10 +608,10 @@ abstract class AbstractBundleInstallMojo
// check if this is already configured
boolean found = false;
- final Iterator entryIterator = oldConfigs.entrySet().iterator();
+ final Iterator<Map.Entry<String,String[]>> entryIterator = oldConfigs.entrySet().iterator();
while ( !found && entryIterator.hasNext() ) {
- final Map.Entry current = (Map.Entry) entryIterator.next();
- final String[] value = (String[])current.getValue();
+ final Map.Entry<String,String[]> current = entryIterator.next();
+ final String[] value = current.getValue();
getLog().debug("Comparing " + dir.getAbsolutePath() + " with " + value[0] + " (" + value[1] + ")");
if ( dir.getAbsolutePath().equals(value[0]) ) {
if ( installPath.equals(value[1]) ) {
@@ -631,10 +631,10 @@ abstract class AbstractBundleInstallMojo
}
}
// finally remove old configs
- final Iterator entryIterator = oldConfigs.entrySet().iterator();
+ final Iterator<Map.Entry<String,String[]>> entryIterator = oldConfigs.entrySet().iterator();
while ( entryIterator.hasNext() ) {
- final Map.Entry current = (Map.Entry) entryIterator.next();
- final String[] value = (String[])current.getValue();
+ final Map.Entry<String,String[]> current = entryIterator.next();
+ final String[] value = current.getValue();
getLog().debug("Removing old configuration for " + value[0] + " and " + value[1]);
// remove old config
removeConfiguration(client, targetURL, current.getKey().toString());
@@ -713,10 +713,10 @@ abstract class AbstractBundleInstallMojo
* containing the path and the root
* @throws MojoExecutionException
*/
- protected Map getCurrentFileProviderConfigs(final String targetURL, final HttpClient client)
+ protected Map<String,String[]> getCurrentFileProviderConfigs(final String targetURL, final HttpClient client)
throws MojoExecutionException {
getLog().debug("Getting current file provider configurations.");
- final Map result = new HashMap();
+ final Map<String,String[]> result = new HashMap<>();
final String getUrl = targetURL + "/configMgr/(service.factoryPid=" + FS_FACTORY + ").json";
final GetMethod get = new GetMethod(getUrl);
Modified: sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java?rev=1785903&r1=1785902&r2=1785903&view=diff
==============================================================================
--- sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java (original)
+++ sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java Tue Mar 7 22:42:53 2017
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.util.Iterator;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.CharEncoding;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -111,7 +112,7 @@ public class ValidationMojo extends Abst
String json = null;
try {
fis = new FileInputStream(file);
- json = IOUtils.toString(fis);
+ json = IOUtils.toString(fis, CharEncoding.UTF_8);
} catch (IOException e) {
throw new MojoExecutionException("An Error occured while validating the file '"+fileName+"'", e);
} finally {