Reduce visibility of Convert class

tracing/src/main/java/com/palantir/remoting3/tracing/Convert.java

@@ -17,14 +17,13 @@
 package com.palantir.remoting3.tracing;
 
 import com.palantir.remoting.api.tracing.OpenSpan;
-import com.palantir.tracing.ExposedTrace;
 import com.palantir.tracing.TraceSampler;
 import com.palantir.tracing.api.Span;
 import com.palantir.tracing.api.SpanObserver;
 import com.palantir.tracing.api.SpanType;
 
 /** Utility functions to convert old remoting-api classes to the new tracing-java ones and vice-versa. */
-public final class Convert {
+final class Convert {
 
     private Convert() {}
 
@@ -105,7 +104,7 @@ static com.palantir.remoting.api.tracing.SpanType toRemotingSpanType(SpanType ty
         throw new UnsupportedOperationException("Unable to convert to Remoting SpanType");
     }
 
-    public static com.palantir.remoting.api.tracing.SpanObserver toRemotingSpanObserver(SpanObserver unsubscribe) {
+    static com.palantir.remoting.api.tracing.SpanObserver toRemotingSpanObserver(SpanObserver unsubscribe) {
         if (unsubscribe == null) {
             return null;
         }
@@ -118,17 +117,7 @@ public void consume(com.palantir.remoting.api.tracing.Span span) {
         };
     }
 
-    public static Trace toRemotingTrace(com.palantir.tracing.Trace newTrace) {
-        if (newTrace == null) {
-            return null;
-        }
-
-        // Warning - this is NOT a lossless copy - the newTrace actually contains a stack of OpenSpans,
-        // which we can't access.
-        return new Trace(ExposedTrace.isObservable(newTrace), ExposedTrace.getTraceId(newTrace));
-    }
-
-    public static Span span(com.palantir.remoting.api.tracing.Span old) {
+    static Span span(com.palantir.remoting.api.tracing.Span old) {
         if (old == null) {
             return null;
         }
@@ -145,7 +134,7 @@ public static Span span(com.palantir.remoting.api.tracing.Span old) {
                 .build();
     }
 
-    public static TraceSampler traceSampler(com.palantir.remoting3.tracing.TraceSampler sampler) {
+    static TraceSampler traceSampler(com.palantir.remoting3.tracing.TraceSampler sampler) {
         if (sampler == null) {
             return null;
         }

tracing/src/test/java/com/palantir/remoting3/tracing/TestConvert.java

@@ -0,0 +1,33 @@
+/*
+ * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.palantir.remoting3.tracing;
+
+import com.palantir.tracing.ExposedTrace;
+
+public final class TestConvert {
+
+    private TestConvert() {}
+
+    /** Warning - this is NOT a lossless copy, it loses the stack of OpenSpans in the original trace */
+    public static Trace toRemotingTraceIncompleteCopy(com.palantir.tracing.Trace newTrace) {
+        if (newTrace == null) {
+            return null;
+        }
+
+        return new Trace(ExposedTrace.isObservable(newTrace), ExposedTrace.getTraceId(newTrace));
+    }
+}

tracing/src/test/java/com/palantir/tracing/ExposedTracer.java

@@ -16,14 +16,13 @@
 
 package com.palantir.tracing;
 
-import com.palantir.remoting3.tracing.Convert;
+import com.palantir.remoting3.tracing.TestConvert;
 
 public final class ExposedTracer {
-
     private ExposedTracer() {}
 
     public static com.palantir.remoting3.tracing.Trace copyTrace() {
-        return Convert.toRemotingTrace(Tracer.copyTrace());
+        return TestConvert.toRemotingTraceIncompleteCopy(Tracer.copyTrace());
     }
 
     public static void setTrace(boolean isObservable, String traceId) {