From 11118005431844bb57a3d01d33bca83a02f91808 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Wed, 21 Jul 2021 15:15:53 +0000 Subject: [PATCH] Restyled by google-java-format --- .../ChipDeviceController.java | 9 ++- .../NsdManagerServiceResolver.java | 61 +++++++++++-------- .../devicecontroller/ServiceResolver.java | 3 +- 3 files changed, 43 insertions(+), 30 deletions(-) diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java index 68248983610961..db2e8ea75d5741 100644 --- a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java +++ b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java @@ -242,9 +242,14 @@ private native void enableThreadNetwork( public static native void setKeyValueStoreManager(KeyValueStoreManager manager); public static native void setServiceResolver(ServiceResolver resolver); + public static native void handleServiceResolve( - String instanceName, String serviceType, String address, int port, - long callback, long context); + String instanceName, + String serviceType, + String address, + int port, + long callback, + long context); static { System.loadLibrary("CHIPController"); diff --git a/src/controller/java/src/chip/devicecontroller/NsdManagerServiceResolver.java b/src/controller/java/src/chip/devicecontroller/NsdManagerServiceResolver.java index 818b2848ff8531..b4194c8463b27a 100644 --- a/src/controller/java/src/chip/devicecontroller/NsdManagerServiceResolver.java +++ b/src/controller/java/src/chip/devicecontroller/NsdManagerServiceResolver.java @@ -22,8 +22,7 @@ import android.net.nsd.NsdServiceInfo; import android.util.Log; -public class NsdManagerServiceResolver implements ServiceResolver -{ +public class NsdManagerServiceResolver implements ServiceResolver { private final String TAG = NsdManagerServiceResolver.class.getSimpleName(); private final NsdManager nsdManager; @@ -32,35 +31,43 @@ public NsdManagerServiceResolver(Context context) { } @Override - public void resolve(final String instanceName, final String serviceType, final long callbackHandle, final long contextHandle) { + public void resolve( + final String instanceName, + final String serviceType, + final long callbackHandle, + final long contextHandle) { NsdServiceInfo serviceInfo = new NsdServiceInfo(); serviceInfo.setServiceName(instanceName); serviceInfo.setServiceType(serviceType); - this.nsdManager.resolveService(serviceInfo, new NsdManager.ResolveListener() { - @Override - public void onResolveFailed(NsdServiceInfo serviceInfo, int errorCode) { - Log.w(TAG, "Failed to resolve service '" + serviceInfo.getServiceName() + "': " + errorCode); - ChipDeviceController.handleServiceResolve( - instanceName, - serviceType, - null, - 0, - callbackHandle, - contextHandle); - } + this.nsdManager.resolveService( + serviceInfo, + new NsdManager.ResolveListener() { + @Override + public void onResolveFailed(NsdServiceInfo serviceInfo, int errorCode) { + Log.w( + TAG, + "Failed to resolve service '" + serviceInfo.getServiceName() + "': " + errorCode); + ChipDeviceController.handleServiceResolve( + instanceName, serviceType, null, 0, callbackHandle, contextHandle); + } - @Override - public void onServiceResolved(NsdServiceInfo serviceInfo) { - Log.i(TAG, "Resolved service '" + serviceInfo.getServiceName() + "' to " + serviceInfo.getHost()); - ChipDeviceController.handleServiceResolve( - instanceName, - serviceType, - serviceInfo.getHost().getHostAddress(), - serviceInfo.getPort(), - callbackHandle, - contextHandle); - } - }); + @Override + public void onServiceResolved(NsdServiceInfo serviceInfo) { + Log.i( + TAG, + "Resolved service '" + + serviceInfo.getServiceName() + + "' to " + + serviceInfo.getHost()); + ChipDeviceController.handleServiceResolve( + instanceName, + serviceType, + serviceInfo.getHost().getHostAddress(), + serviceInfo.getPort(), + callbackHandle, + contextHandle); + } + }); } } diff --git a/src/controller/java/src/chip/devicecontroller/ServiceResolver.java b/src/controller/java/src/chip/devicecontroller/ServiceResolver.java index 2dbf9d8c3dc52a..66a44e072cc7fd 100644 --- a/src/controller/java/src/chip/devicecontroller/ServiceResolver.java +++ b/src/controller/java/src/chip/devicecontroller/ServiceResolver.java @@ -18,5 +18,6 @@ package chip.devicecontroller; public interface ServiceResolver { - public void resolve(String instanceName, String serviceType, long callbackHandle, long contextHandle); + public void resolve( + String instanceName, String serviceType, long callbackHandle, long contextHandle); }