You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/09/06 04:15:35 UTC
[1/2] karaf git commit: Remove unnecessary suppress warnings
Repository: karaf
Updated Branches:
refs/heads/master 43aa7c397 -> c570eb5c1
Remove unnecessary suppress warnings
Signed-off-by: Aurélien Pupier <ap...@redhat.com>
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/716648f8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/716648f8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/716648f8
Branch: refs/heads/master
Commit: 716648f892d08048e99ac8c804a148a632d1df93
Parents: 43aa7c3
Author: Aurélien Pupier <ap...@redhat.com>
Authored: Tue Sep 5 12:26:11 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Sep 5 18:19:55 2017 +0200
----------------------------------------------------------------------
.../karaf/config/command/ConfigPropertyCommandSupport.java | 4 ----
.../apache/karaf/maven/command/MavenConfigurationSupport.java | 1 -
.../java/org/apache/karaf/scheduler/core/QuartzJobExecutor.java | 1 -
.../java/org/apache/karaf/scr/command/action/DetailsAction.java | 1 -
.../org/apache/karaf/scr/command/action/ScrActionSupport.java | 1 -
.../org/apache/karaf/service/command/ObjectClassCompleter.java | 1 -
.../apache/karaf/service/guard/impl/GuardProxyCatalogTest.java | 3 +--
.../shell/commands/impl/info/InfoBundleTrackerCustomizer.java | 1 -
.../org/apache/karaf/shell/commands/basic/ActionPreparator.java | 2 +-
.../apache/karaf/shell/console/completer/CommandsCompleter.java | 4 +---
.../karaf/shell/support/completers/AggregateCompleter.java | 1 -
11 files changed, 3 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/716648f8/config/src/main/java/org/apache/karaf/config/command/ConfigPropertyCommandSupport.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/karaf/config/command/ConfigPropertyCommandSupport.java b/config/src/main/java/org/apache/karaf/config/command/ConfigPropertyCommandSupport.java
index 9982099..0caa5f4 100644
--- a/config/src/main/java/org/apache/karaf/config/command/ConfigPropertyCommandSupport.java
+++ b/config/src/main/java/org/apache/karaf/config/command/ConfigPropertyCommandSupport.java
@@ -32,9 +32,6 @@ public abstract class ConfigPropertyCommandSupport extends ConfigCommandSupport
@Completion(ConfigurationCompleter.class)
protected String pid;
- @SuppressWarnings({
- "rawtypes", "unchecked"
- })
protected Object doExecute() throws Exception {
Dictionary<String, Object> props = getEditedProps();
if (props == null && pid == null) {
@@ -76,7 +73,6 @@ public abstract class ConfigPropertyCommandSupport extends ConfigCommandSupport
* @return the edited dictionary.
* @throws Exception in case of configuration failure.
*/
- @SuppressWarnings("rawtypes")
@Override
protected Dictionary<String, Object> getEditedProps() throws Exception {
Dictionary<String, Object> props = this.configRepository.getConfigProperties(pid);
http://git-wip-us.apache.org/repos/asf/karaf/blob/716648f8/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java
----------------------------------------------------------------------
diff --git a/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java b/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java
index c028530..5b471b4 100644
--- a/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java
+++ b/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java
@@ -457,7 +457,6 @@ public abstract class MavenConfigurationSupport implements Action {
* @param remote
* @return
*/
- @SuppressWarnings("unchecked")
protected MavenRepositoryURL[] repositories(Dictionary<String, Object> config, boolean remote) throws Exception {
String property = remote ? PID + "." + PROPERTY_REPOSITORIES : PID + "." + PROPERTY_DEFAULT_REPOSITORIES;
String[] repositories = listOfValues((String) config.get(property));
http://git-wip-us.apache.org/repos/asf/karaf/blob/716648f8/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzJobExecutor.java
----------------------------------------------------------------------
diff --git a/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzJobExecutor.java b/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzJobExecutor.java
index 9a07c1f..9d52a0a 100644
--- a/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzJobExecutor.java
+++ b/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzJobExecutor.java
@@ -45,7 +45,6 @@ public class QuartzJobExecutor implements Job {
try {
logger.debug("Executing job {} with name {}", job, data.get(QuartzScheduler.DATA_MAP_NAME));
if (job instanceof org.apache.karaf.scheduler.Job) {
- @SuppressWarnings("unchecked")
final InternalScheduleOptions options = (InternalScheduleOptions) data.get(QuartzScheduler.DATA_MAP_OPTIONS);
final String name = (String) data.get(QuartzScheduler.DATA_MAP_NAME);
http://git-wip-us.apache.org/repos/asf/karaf/blob/716648f8/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java b/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
index 572ece0..55f4133 100644
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
+++ b/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
@@ -48,7 +48,6 @@ public class DetailsAction extends ScrActionSupport {
@Completion(DetailsCompleter.class)
String name;
- @SuppressWarnings("rawtypes")
@Override
protected Object doScrAction(ServiceComponentRuntime serviceComponentRuntime) throws Exception {
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/716648f8/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java b/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java
index 998969c..2734d5b 100755
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java
+++ b/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java
@@ -70,7 +70,6 @@ public abstract class ScrActionSupport implements Action {
return arguments.contains(ScrActionSupport.SHOW_ALL_OPTION) || arguments.contains(ScrActionSupport.SHOW_ALL_ALIAS);
}
- @SuppressWarnings("rawtypes")
public static boolean isHiddenComponent(ComponentConfigurationDTO config) {
boolean answer = false;
if (config.properties != null) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/716648f8/service/core/src/main/java/org/apache/karaf/service/command/ObjectClassCompleter.java
----------------------------------------------------------------------
diff --git a/service/core/src/main/java/org/apache/karaf/service/command/ObjectClassCompleter.java b/service/core/src/main/java/org/apache/karaf/service/command/ObjectClassCompleter.java
index 31a7a76..9e8f28a 100644
--- a/service/core/src/main/java/org/apache/karaf/service/command/ObjectClassCompleter.java
+++ b/service/core/src/main/java/org/apache/karaf/service/command/ObjectClassCompleter.java
@@ -42,7 +42,6 @@ public class ObjectClassCompleter implements Completer {
this.context = context;
}
- @SuppressWarnings("rawtypes")
@Override
public int complete(final Session session, final CommandLine commandLine, final List<String> candidates) {
Map<String, Integer> serviceNamesMap = ListServices.getServiceNamesMap(context);
http://git-wip-us.apache.org/repos/asf/karaf/blob/716648f8/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java
----------------------------------------------------------------------
diff --git a/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java b/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java
index c1dfd34..d7acfc6 100644
--- a/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java
+++ b/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java
@@ -1167,12 +1167,11 @@ public class GuardProxyCatalogTest {
return proxyProps;
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings("unchecked")
public Object testCreateProxy(Class<?> [] objectClasses, Object testService) throws Exception {
return testCreateProxy(mockConfigAdminBundleContext(), objectClasses, objectClasses, testService, new HashMap<>());
}
- @SuppressWarnings("rawtypes")
public Object testCreateProxy(BundleContext bc, Class<?> [] objectClasses, Object testService) throws Exception {
return testCreateProxy(bc, objectClasses, objectClasses, testService, new HashMap<>());
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/716648f8/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java
index 020badd..d7faa36 100644
--- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java
+++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java
@@ -41,7 +41,6 @@ public class InfoBundleTrackerCustomizer implements BundleTrackerCustomizer<Serv
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
public ServiceRegistration<InfoProvider> addingBundle(Bundle bundle, BundleEvent event) {
Dictionary headers = bundle.getHeaders();
String headerEntry = (String) headers.get("Karaf-Info");
http://git-wip-us.apache.org/repos/asf/karaf/blob/716648f8/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/ActionPreparator.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/ActionPreparator.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/ActionPreparator.java
index 9914baa..e3eb512 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/ActionPreparator.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/ActionPreparator.java
@@ -38,6 +38,6 @@ public interface ActionPreparator {
* @return True if the action preparation succeed, false else.
* @throws Exception In case of preparation failure.
*/
- boolean prepare(@SuppressWarnings("deprecation") Action action, CommandSession session, List<Object> arguments) throws Exception;
+ boolean prepare(Action action, CommandSession session, List<Object> arguments) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/716648f8/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
index 9e822c8..ed39d5f 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
@@ -213,9 +213,7 @@ public class CommandsCompleter implements Completer {
return index > 0 ? name.substring(index + 1) : name;
}
- @SuppressWarnings({
- "unchecked", "deprecation"
- })
+ @SuppressWarnings("unchecked")
protected Map<String, Completer>[] checkData() {
// Copy the set to avoid concurrent modification exceptions
// TODO: fix that in gogo instead
http://git-wip-us.apache.org/repos/asf/karaf/blob/716648f8/shell/core/src/main/java/org/apache/karaf/shell/support/completers/AggregateCompleter.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/completers/AggregateCompleter.java b/shell/core/src/main/java/org/apache/karaf/shell/support/completers/AggregateCompleter.java
index 3a0b58c..8ef458b 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/support/completers/AggregateCompleter.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/support/completers/AggregateCompleter.java
@@ -41,7 +41,6 @@ public class AggregateCompleter implements Completer
this.completers = completers;
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
public int complete(final Session session, final CommandLine commandLine, final List<String> candidates) {
List<Candidate> cands = new ArrayList<>();
completeCandidates(session, commandLine, cands);
[2/2] karaf git commit: This closes #344
Posted by jb...@apache.org.
This closes #344
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c570eb5c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c570eb5c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c570eb5c
Branch: refs/heads/master
Commit: c570eb5c10ed943b19093bdbbb32fcd9ede4372d
Parents: 43aa7c3 716648f
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Sep 6 06:15:24 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Sep 6 06:15:24 2017 +0200
----------------------------------------------------------------------
.../karaf/config/command/ConfigPropertyCommandSupport.java | 4 ----
.../apache/karaf/maven/command/MavenConfigurationSupport.java | 1 -
.../java/org/apache/karaf/scheduler/core/QuartzJobExecutor.java | 1 -
.../java/org/apache/karaf/scr/command/action/DetailsAction.java | 1 -
.../org/apache/karaf/scr/command/action/ScrActionSupport.java | 1 -
.../org/apache/karaf/service/command/ObjectClassCompleter.java | 1 -
.../apache/karaf/service/guard/impl/GuardProxyCatalogTest.java | 3 +--
.../shell/commands/impl/info/InfoBundleTrackerCustomizer.java | 1 -
.../org/apache/karaf/shell/commands/basic/ActionPreparator.java | 2 +-
.../apache/karaf/shell/console/completer/CommandsCompleter.java | 4 +---
.../karaf/shell/support/completers/AggregateCompleter.java | 1 -
11 files changed, 3 insertions(+), 17 deletions(-)
----------------------------------------------------------------------