Skip to content

Commit

Permalink
Refactored usages of deprecated classes (#679)
Browse files Browse the repository at this point in the history
  • Loading branch information
@merlimat
merlimat committed Aug 14, 2017
1 parent 89a80f6 commit 80ddad6
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 83 deletions.
3 changes: 2 additions & 1 deletion managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/EntryCacheImpl.java
View file
Expand Up @@ -86,7 +86,8 @@ public String getName() {
11, // maxOrder 11, // maxOrder
64, // tinyCacheSize 64, // tinyCacheSize
32, // smallCacheSize 32, // smallCacheSize
8 // normalCacheSize 8, // normalCacheSize,
true // Use cache for all threads
); );


@Override @Override
Expand Down
1 change: 1 addition & 0 deletions managed-ledger/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
View file
Expand Up @@ -94,6 +94,7 @@ public void startServer() throws Exception {
zkc.create("/ledgers/available", new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); zkc.create("/ledgers/available", new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
} }


@SuppressWarnings("deprecation")
public void sleepServer(final int seconds, final CountDownLatch l) throws InterruptedException, IOException { public void sleepServer(final int seconds, final CountDownLatch l) throws InterruptedException, IOException {
Thread[] allthreads = new Thread[Thread.activeCount()]; Thread[] allthreads = new Thread[Thread.activeCount()];
Thread.enumerate(allthreads); Thread.enumerate(allthreads);
Expand Down
4 changes: 2 additions & 2 deletions managed-ledger/src/test/java/org/apache/zookeeper/MockZooKeeper.java
View file
Expand Up @@ -49,7 +49,6 @@
import com.google.common.collect.Sets; import com.google.common.collect.Sets;


import io.netty.util.concurrent.DefaultThreadFactory; import io.netty.util.concurrent.DefaultThreadFactory;
import sun.reflect.ReflectionFactory;


@SuppressWarnings({ "deprecation", "restriction", "rawtypes" }) @SuppressWarnings({ "deprecation", "restriction", "rawtypes" })
public class MockZooKeeper extends ZooKeeper { public class MockZooKeeper extends ZooKeeper {
Expand Down Expand Up @@ -78,7 +77,8 @@ public static MockZooKeeper newInstance(ExecutorService executor) {


public static MockZooKeeper newInstance(ExecutorService executor, int readOpDelayMs) { public static MockZooKeeper newInstance(ExecutorService executor, int readOpDelayMs) {
try { try {
ReflectionFactory rf = ReflectionFactory.getReflectionFactory();
sun.reflect.ReflectionFactory rf = sun.reflect.ReflectionFactory.getReflectionFactory();
Constructor objDef = Object.class.getDeclaredConstructor(new Class[0]); Constructor objDef = Object.class.getDeclaredConstructor(new Class[0]);
Constructor intConstr = rf.newConstructorForSerialization(MockZooKeeper.class, objDef); Constructor intConstr = rf.newConstructorForSerialization(MockZooKeeper.class, objDef);
MockZooKeeper zk = MockZooKeeper.class.cast(intConstr.newInstance()); MockZooKeeper zk = MockZooKeeper.class.cast(intConstr.newInstance());
Expand Down
60 changes: 4 additions & 56 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MockServletContext.java
View file
Expand Up @@ -44,290 +44,238 @@ public class MockServletContext extends AttributesMap implements ServletContext


@Override @Override
public String getContextPath() { public String getContextPath() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public ServletContext getContext(String uripath) { public ServletContext getContext(String uripath) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public int getMajorVersion() { public int getMajorVersion() {
// TODO Auto-generated method stub
return 0; return 0;
} }


@Override @Override
public int getMinorVersion() { public int getMinorVersion() {
// TODO Auto-generated method stub
return 0; return 0;
} }


@Override @Override
public int getEffectiveMajorVersion() { public int getEffectiveMajorVersion() {
// TODO Auto-generated method stub
return 0; return 0;
} }


@Override @Override
public int getEffectiveMinorVersion() { public int getEffectiveMinorVersion() {
// TODO Auto-generated method stub
return 0; return 0;
} }


@Override @Override
public String getMimeType(String file) { public String getMimeType(String file) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public Set<String> getResourcePaths(String path) { public Set<String> getResourcePaths(String path) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public URL getResource(String path) throws MalformedURLException { public URL getResource(String path) throws MalformedURLException {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public InputStream getResourceAsStream(String path) { public InputStream getResourceAsStream(String path) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public RequestDispatcher getRequestDispatcher(String path) { public RequestDispatcher getRequestDispatcher(String path) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public RequestDispatcher getNamedDispatcher(String name) { public RequestDispatcher getNamedDispatcher(String name) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
@Deprecated
public Servlet getServlet(String name) throws ServletException { public Servlet getServlet(String name) throws ServletException {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
@Deprecated
public Enumeration<Servlet> getServlets() { public Enumeration<Servlet> getServlets() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
@Deprecated
public Enumeration<String> getServletNames() { public Enumeration<String> getServletNames() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public void log(String msg) { public void log(String msg) {
// TODO Auto-generated method stub

} }


@Override @Override
@Deprecated
public void log(Exception exception, String msg) { public void log(Exception exception, String msg) {
// TODO Auto-generated method stub

} }


@Override @Override
public void log(String message, Throwable throwable) { public void log(String message, Throwable throwable) {
// TODO Auto-generated method stub


} }


@Override @Override
public String getRealPath(String path) { public String getRealPath(String path) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public String getServerInfo() { public String getServerInfo() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public String getInitParameter(String name) { public String getInitParameter(String name) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public Enumeration<String> getInitParameterNames() { public Enumeration<String> getInitParameterNames() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public boolean setInitParameter(String name, String value) { public boolean setInitParameter(String name, String value) {
// TODO Auto-generated method stub
return false; return false;
} }


@Override @Override
public String getServletContextName() { public String getServletContextName() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public Dynamic addServlet(String servletName, String className) { public Dynamic addServlet(String servletName, String className) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public Dynamic addServlet(String servletName, Servlet servlet) { public Dynamic addServlet(String servletName, Servlet servlet) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) { public Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException { public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public ServletRegistration getServletRegistration(String servletName) { public ServletRegistration getServletRegistration(String servletName) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public Map<String, ? extends ServletRegistration> getServletRegistrations() { public Map<String, ? extends ServletRegistration> getServletRegistrations() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) { public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) { public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException { public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public FilterRegistration getFilterRegistration(String filterName) { public FilterRegistration getFilterRegistration(String filterName) {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public Map<String, ? extends FilterRegistration> getFilterRegistrations() { public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public SessionCookieConfig getSessionCookieConfig() { public SessionCookieConfig getSessionCookieConfig() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) { public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) {
// TODO Auto-generated method stub

} }


@Override @Override
public Set<SessionTrackingMode> getDefaultSessionTrackingModes() { public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() { public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public void addListener(String className) { public void addListener(String className) {
// TODO Auto-generated method stub

} }


@Override @Override
public <T extends EventListener> void addListener(T t) { public <T extends EventListener> void addListener(T t) {
// TODO Auto-generated method stub

} }


@Override @Override
public void addListener(Class<? extends EventListener> listenerClass) { public void addListener(Class<? extends EventListener> listenerClass) {
// TODO Auto-generated method stub

} }


@Override @Override
public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException { public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public JspConfigDescriptor getJspConfigDescriptor() { public JspConfigDescriptor getJspConfigDescriptor() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public ClassLoader getClassLoader() { public ClassLoader getClassLoader() {
// TODO Auto-generated method stub
return null; return null;
} }


@Override @Override
public void declareRoles(String... roleNames) { public void declareRoles(String... roleNames) {
// TODO Auto-generated method stub

} }


@Override @Override
public String getVirtualServerName() { public String getVirtualServerName() {
// TODO Auto-generated method stub
return null; return null;
} }

} }
1 change: 1 addition & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
View file
Expand Up @@ -197,6 +197,7 @@ public void testConnectCommandWithEnum() throws Exception {
assertEquals(serverCnx.getState(), State.Start); assertEquals(serverCnx.getState(), State.Start);


// test server response to CONNECT // test server response to CONNECT
@SuppressWarnings("deprecation") // We're actually testing that the deprecated method still works
ByteBuf clientCommand = Commands.newConnect(AuthMethod.AuthMethodNone, ""); ByteBuf clientCommand = Commands.newConnect(AuthMethod.AuthMethodNone, "");
channel.writeInbound(clientCommand); channel.writeInbound(clientCommand);


Expand Down
7 changes: 4 additions & 3 deletions ...-broker/src/test/java/org/apache/pulsar/broker/stats/BookieClientsStatsGeneratorTest.java
View file
Expand Up @@ -55,7 +55,7 @@ public void testBookieClientStatsGenerator() throws Exception {
Map<String, Map<String, PendingBookieOpsStats>> stats = BookieClientStatsGenerator.generate(super.getPulsar()); Map<String, Map<String, PendingBookieOpsStats>> stats = BookieClientStatsGenerator.generate(super.getPulsar());
assertEquals((boolean) stats.isEmpty(), true); assertEquals((boolean) stats.isEmpty(), true);
} }

@Test @Test
public void testJvmDirectMemoryUsedMetric() throws Exception { public void testJvmDirectMemoryUsedMetric() throws Exception {
PooledByteBufAllocator allocator = new PooledByteBufAllocator( // PooledByteBufAllocator allocator = new PooledByteBufAllocator( //
Expand All @@ -66,7 +66,8 @@ public void testJvmDirectMemoryUsedMetric() throws Exception {
11, // maxOrder 11, // maxOrder
64, // tinyCacheSize 64, // tinyCacheSize
32, // smallCacheSize 32, // smallCacheSize
8 // normalCacheSize 8, // normalCacheSize
true // Cache all threads
); );
int allocateMemory = 17777216; int allocateMemory = 17777216;
long directMemory1 = JvmMetrics.getJvmDirectMemoryUsed(); long directMemory1 = JvmMetrics.getJvmDirectMemoryUsed();
Expand All @@ -82,6 +83,6 @@ public void testJvmDirectMemoryUsedMetric() throws Exception {
buf2.release(); buf2.release();
directMemory2 = JvmMetrics.getJvmDirectMemoryUsed(); directMemory2 = JvmMetrics.getJvmDirectMemoryUsed();
assertEquals(directMemory2, directMemory1); assertEquals(directMemory2, directMemory1);

} }
} }
11 changes: 5 additions & 6 deletions ...broker/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java
View file
Expand Up @@ -39,23 +39,22 @@
import org.apache.pulsar.common.policies.data.BundlesData; import org.apache.pulsar.common.policies.data.BundlesData;
import org.apache.pulsar.discovery.service.server.ServerManager; import org.apache.pulsar.discovery.service.server.ServerManager;
import org.apache.pulsar.discovery.service.server.ServiceConfig; import org.apache.pulsar.discovery.service.server.ServiceConfig;
import org.apache.pulsar.discovery.service.web.DiscoveryServiceServlet;
import org.apache.pulsar.zookeeper.ZooKeeperClientFactory; import org.apache.pulsar.zookeeper.ZooKeeperClientFactory;
import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.ZooKeeper;
import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.filter.LoggingFilter; import org.glassfish.jersey.logging.LoggingFeature;
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
import com.google.gson.JsonObject;
import org.testng.annotations.AfterMethod; import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;


import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;


public class DiscoveryServiceWebTest extends ProducerConsumerBase { public class DiscoveryServiceWebTest extends ProducerConsumerBase {


private Client client = ClientBuilder.newClient(new ClientConfig().register(LoggingFilter.class)); private Client client = ClientBuilder.newClient(new ClientConfig().register(LoggingFeature.class));


@BeforeMethod @BeforeMethod
@Override @Override
Expand Down

0 comments on commit 80ddad6

Please sign in to comment.