cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject cxf git commit: Fix remaining eclipse warnings
Date Tue, 14 Mar 2017 20:16:17 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 94060fc02 -> 4bfd87f8d


Fix remaining eclipse warnings


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4bfd87f8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4bfd87f8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4bfd87f8

Branch: refs/heads/master
Commit: 4bfd87f8d3d07161606428463934cc4a95ea5ce9
Parents: 94060fc
Author: Daniel Kulp <dkulp@apache.org>
Authored: Tue Mar 14 16:16:01 2017 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Tue Mar 14 16:16:01 2017 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/cxf/bus/spring/NamespaceHandler.java   | 4 ++--
 .../java/org/apache/cxf/internal/CXFAPINamespaceHandler.java    | 5 +++--
 .../java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java | 5 ++---
 .../org/apache/cxf/ext/logging/LoggingFactoryBeanListener.java  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4bfd87f8/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java b/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java
index a2b0511..202a0d0 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java
@@ -22,18 +22,18 @@ import org.w3c.dom.Element;
 
 import org.apache.cxf.configuration.spring.SimpleBeanDefinitionParser;
 import org.apache.cxf.feature.FastInfosetFeature;
-import org.apache.cxf.feature.LoggingFeature;
 import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 import org.springframework.beans.factory.xml.ParserContext;
 
 public class NamespaceHandler extends NamespaceHandlerSupport {
+    @SuppressWarnings("deprecation")
     public void init() {
         registerBeanDefinitionParser("bus",
                                      new BusDefinitionParser());
         registerBeanDefinitionParser("logging",
-                                     new SimpleBeanDefinitionParser(LoggingFeature.class));
+                                     new SimpleBeanDefinitionParser(org.apache.cxf.feature.LoggingFeature.class));
         registerBeanDefinitionParser("fastinfoset",
                                      new SimpleBeanDefinitionParser(FastInfosetFeature.class));
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4bfd87f8/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java b/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
index d76d0f8..870894a 100644
--- a/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
+++ b/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
@@ -32,7 +32,6 @@ import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
 import org.apache.cxf.bus.blueprint.BusDefinitionParser;
 import org.apache.cxf.configuration.blueprint.SimpleBPBeanDefinitionParser;
 import org.apache.cxf.feature.FastInfosetFeature;
-import org.apache.cxf.feature.LoggingFeature;
 import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
 import org.osgi.service.blueprint.reflect.ComponentMetadata;
 import org.osgi.service.blueprint.reflect.Metadata;
@@ -80,6 +79,7 @@ public class CXFAPINamespaceHandler implements NamespaceHandler {
     }
 
 
+    @SuppressWarnings("deprecation")
     public Metadata parse(Element element, ParserContext context) {
         String s = element.getLocalName();
         if ("bus".equals(s)) {
@@ -87,7 +87,8 @@ public class CXFAPINamespaceHandler implements NamespaceHandler {
             return new BusDefinitionParser().parse(element, context);
         } else if ("logging".equals(s)) {
             //logging feature
-            return new SimpleBPBeanDefinitionParser(LoggingFeature.class).parse(element,
context);
+            return new SimpleBPBeanDefinitionParser(org.apache.cxf.feature.LoggingFeature.class)
+                .parse(element, context);
         } else if ("fastinfoset".equals(s)) {
             //fastinfosetfeature
             return new SimpleBPBeanDefinitionParser(FastInfosetFeature.class).parse(element,
context);

http://git-wip-us.apache.org/repos/asf/cxf/blob/4bfd87f8/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
index 7377566..b4f5e14 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.buslifecycle.BusLifeCycleManager;
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.feature.Feature;
 import org.apache.cxf.interceptor.Interceptor;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.message.Message;
 
 import org.junit.Assert;
@@ -49,7 +48,7 @@ public class BusDefinitionParserTest extends Assert {
         List<Interceptor<? extends Message>> in = bus.getInInterceptors();
         boolean found = false;
         for (Interceptor<? extends Message> i : in) {
-            if (i instanceof LoggingInInterceptor) {
+            if (i.getClass().getSimpleName().equals("LoggingInInterceptor")) {
                 found = true;
             }
         }
@@ -133,7 +132,7 @@ public class BusDefinitionParserTest extends Assert {
         List<Interceptor<? extends Message>> in = bus.getInInterceptors();
         boolean found = false;
         for (Interceptor<? extends Message> i : in) {
-            if (i instanceof LoggingInInterceptor) {
+            if (i.getClass().getSimpleName().equals("LoggingInInterceptor")) {
                 found = true;
             }
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/4bfd87f8/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFactoryBeanListener.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFactoryBeanListener.java
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFactoryBeanListener.java
index 6e0e66a..fd03de0 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFactoryBeanListener.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFactoryBeanListener.java
@@ -66,7 +66,7 @@ public class LoggingFactoryBeanListener implements FactoryBeanListener {
             lf.setPrettyLogging(annotation.pretty());
             lf.setLimit(annotation.limit());
             lf.setLogBinary(annotation.logBinary());
-            lf.setLogMultipart(annotation.logBinary());
+            lf.setLogMultipart(annotation.logMultipart());
             lf.initialize(endpoint, bus);
         }
     }


Mime
View raw message