From 83163c2a77fa8d35b6c2789e1715a1b610a1a4cf Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Fri, 1 Oct 2021 12:44:31 -0700 Subject: [PATCH] Replace more usages of TypeToken#toString --- .../cloud/commandframework/meta/SimpleCommandMeta.java | 2 +- .../commandframework/services/ServiceFilterHandler.java | 3 ++- .../cloud/commandframework/services/ServicePipeline.java | 6 +++--- .../commandframework/services/ServiceRepository.java | 9 +++++---- .../cloud/commandframework/services/ServiceSpigot.java | 6 ++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java b/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java index 9a8d907b..bcdb57e8 100644 --- a/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java +++ b/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java @@ -104,7 +104,7 @@ public class SimpleCommandMeta extends CommandMeta { } if (!GenericTypeReflector.isSuperType(key.getValueType().getType(), value.getClass())) { throw new IllegalArgumentException("Conflicting argument types between key type of " - + key.getValueType().getType() + " and value type of " + value.getClass()); + + key.getValueType().getType().getTypeName() + " and value type of " + value.getClass()); } return Optional.of((V) value); diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java b/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java index 29df805d..41f86d1e 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java @@ -24,6 +24,7 @@ package cloud.commandframework.services; import cloud.commandframework.services.types.Service; +import io.leangen.geantyref.TypeToken; import org.checkerframework.checker.nullness.qual.NonNull; import java.util.function.Predicate; @@ -44,7 +45,7 @@ enum ServiceFilterHandler { } catch (final Exception e) { throw new PipelineException(String .format("Failed to evaluate filter '%s' for '%s'", - predicate.getClass().getCanonicalName(), service.toString() + TypeToken.get(predicate.getClass()).getType().getTypeName(), service ), e); } } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java b/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java index c4932ee1..b236d72a 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java @@ -80,7 +80,7 @@ public final class ServicePipeline { throw new IllegalArgumentException(String .format( "Service of type '%s' has already been registered", - type.toString() + type.getType().getTypeName() )); } final ServiceRepository repository = new ServiceRepository<>(type); @@ -121,7 +121,7 @@ public final class ServicePipeline { final ServiceRepository repository = this.repositories.get(type.getType()); if (repository == null) { throw new IllegalArgumentException( - String.format("No service registered for type '%s'", type.toString())); + String.format("No service registered for type '%s'", type.getType().getTypeName())); } repository.registerImplementation( serviceEntry.getKey(), @@ -199,7 +199,7 @@ public final class ServicePipeline { (ServiceRepository) this.repositories.get(type.getType()); if (repository == null) { throw new IllegalArgumentException( - String.format("No service registered for type '%s'", type.toString())); + String.format("No service registered for type '%s'", type.getType().getTypeName())); } return repository; } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java b/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java index 4432db04..74405768 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java @@ -138,10 +138,11 @@ public final class ServiceRepository { @Override public String toString() { - return String - .format("ServiceWrapper{type=%s,implementation=%s}", ServiceRepository.this.serviceType.toString(), - TypeToken.get(this.implementation.getClass()).toString() - ); + return String.format( + "ServiceWrapper{type=%s,implementation=%s}", + ServiceRepository.this.serviceType.getType().getTypeName(), + TypeToken.get(this.implementation.getClass()).getType().getTypeName() + ); } @Override diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java b/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java index d0f880de..5dafe485 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java @@ -94,13 +94,11 @@ public final class ServiceSpigot { try { result = wrapper.getImplementation().handle(this.context); } catch (final Exception e) { - throw new PipelineException( - String.format("Failed to retrieve result from %s", wrapper.toString()), e); + throw new PipelineException(String.format("Failed to retrieve result from %s", wrapper), e); } if (wrapper.getImplementation() instanceof SideEffectService) { if (result == null) { - throw new IllegalStateException( - String.format("SideEffectService '%s' returned null", wrapper.toString())); + throw new IllegalStateException(String.format("SideEffectService '%s' returned null", wrapper)); } else if (result == State.ACCEPTED) { return result; }