cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [1/2] cxf git commit: Remove more eclipse warnings of usage of deprecated stuff
Date Wed, 15 Mar 2017 16:30:23 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 7fa67da19 -> cf806d5cb


Remove more eclipse warnings of usage of deprecated stuff


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

Branch: refs/heads/master
Commit: f51d7557791a6d3ae0bcf7f81ceda30a2c0029d3
Parents: 7fa67da
Author: Daniel Kulp <dkulp@apache.org>
Authored: Wed Mar 15 10:18:26 2017 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed Mar 15 10:18:26 2017 -0400

----------------------------------------------------------------------
 .../service/factory/OldLoggingFactoryBeanListener.java    | 10 +++++-----
 .../cxf/management/interceptor/PersistOutInterceptor.java |  8 ++++----
 .../org/apache/cxf/systest/exception/GenericsEcho.java    |  2 +-
 .../cxf/systest/schema_validation/ValidationServer.java   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f51d7557/core/src/main/java/org/apache/cxf/service/factory/OldLoggingFactoryBeanListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/factory/OldLoggingFactoryBeanListener.java
b/core/src/main/java/org/apache/cxf/service/factory/OldLoggingFactoryBeanListener.java
index bef3c38..11e9c60 100644
--- a/core/src/main/java/org/apache/cxf/service/factory/OldLoggingFactoryBeanListener.java
+++ b/core/src/main/java/org/apache/cxf/service/factory/OldLoggingFactoryBeanListener.java
@@ -23,7 +23,6 @@ package org.apache.cxf.service.factory;
 import java.util.logging.Logger;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.annotations.Logging;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.Server;
@@ -35,6 +34,7 @@ public class OldLoggingFactoryBeanListener implements FactoryBeanListener
{
     static final Logger LOG = LogUtils.getL7dLogger(OldLoggingFactoryBeanListener.class);
 
     /** {@inheritDoc}*/
+    @SuppressWarnings("deprecation")
     public void handleEvent(Event ev, AbstractServiceFactoryBean factory, Object... args)
{
         switch (ev) {
         case ENDPOINT_SELECTED: {
@@ -45,7 +45,7 @@ public class OldLoggingFactoryBeanListener implements FactoryBeanListener
{
             if (cls == null) {
                 return;
             }
-            addLoggingSupport(ep, bus, cls.getAnnotation(Logging.class));
+            addLoggingSupport(ep, bus, cls.getAnnotation(org.apache.cxf.annotations.Logging.class));
             break;
         }
         case SERVER_CREATED: {
@@ -55,7 +55,7 @@ public class OldLoggingFactoryBeanListener implements FactoryBeanListener
{
             }
             Server server = (Server)args[0];
             Bus bus = factory.getBus();
-            addLoggingSupport(server.getEndpoint(), bus, cls.getAnnotation(Logging.class));
+            addLoggingSupport(server.getEndpoint(), bus, cls.getAnnotation(org.apache.cxf.annotations.Logging.class));
             break;
         }
         default:
@@ -64,9 +64,9 @@ public class OldLoggingFactoryBeanListener implements FactoryBeanListener
{
     }
 
 
-    private void addLoggingSupport(Endpoint endpoint, Bus bus, Logging annotation) {
+    @SuppressWarnings("deprecation")
+    private void addLoggingSupport(Endpoint endpoint, Bus bus, org.apache.cxf.annotations.Logging
annotation) {
         if (annotation != null) {
-            @SuppressWarnings("deprecation")
             org.apache.cxf.feature.LoggingFeature lf = new org.apache.cxf.feature.LoggingFeature(annotation);
             LOG.warning("Deprecated logging interceptors being used, switch to cxf-rt-ext-logging
based logging.");
             lf.initialize(endpoint, bus);

http://git-wip-us.apache.org/repos/asf/cxf/blob/f51d7557/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java
b/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java
index 07ee016..5d1491b 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java
@@ -25,9 +25,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.LoggingMessage;
 import org.apache.cxf.io.CacheAndWriteOutputStream;
 import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.io.CachedOutputStreamCallback;
@@ -68,10 +68,10 @@ public class PersistOutInterceptor extends AbstractPhaseInterceptor<Message>
{
         }
 
         public void onClose(CachedOutputStream cos) {
-            String id = (String)this.message.getExchange().get(LoggingMessage.ID_KEY);
+            String id = (String)this.message.getExchange().get("exchangeId");
             if (id == null) {
-                id = LoggingMessage.nextId();
-                this.message.getExchange().put(LoggingMessage.ID_KEY, id);
+                id = UUID.randomUUID().toString();
+                this.message.getExchange().put("exchangeId", id);
             }
             try {
                 StringBuilder buffer = new StringBuilder();

http://git-wip-us.apache.org/repos/asf/cxf/blob/f51d7557/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericsEcho.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericsEcho.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericsEcho.java
index 5e72bac..da4fd43 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericsEcho.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericsEcho.java
@@ -20,7 +20,7 @@ package org.apache.cxf.systest.exception;
 
 import javax.jws.WebService;
 
-import org.apache.cxf.annotations.Logging;
+import org.apache.cxf.ext.logging.Logging;
 
 @WebService(targetNamespace = "http://cxf.apache.org/test/HelloService", name = "HelloService")
 @Logging

http://git-wip-us.apache.org/repos/asf/cxf/blob/f51d7557/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/ValidationServer.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/ValidationServer.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/ValidationServer.java
index f2e7bff..fb38ebb 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/ValidationServer.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/ValidationServer.java
@@ -37,8 +37,8 @@ import javax.xml.ws.WebServiceProvider;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import org.apache.cxf.annotations.Logging;
 import org.apache.cxf.annotations.SchemaValidation;
+import org.apache.cxf.ext.logging.Logging;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;


Mime
View raw message