RemappingService logic improving

Author: N1nt4nd0

src/main/java/ru/feodorkek/dev/mcremapper/exception/RemapperProviderException.java

@@ -10,8 +10,6 @@ public interface RemappingService {
 
     void registerProvider( RemapperProvider provider );
 
-    void setCurrentProvider( String providerName );
-    
-    RemapResult maybeRemap( String mappedSource );
+    RemapResult maybeRemap( String providerName, String mappedSource );
 
 }

src/main/java/ru/feodorkek/dev/mcremapper/service/RemappingService.java

@@ -5,11 +5,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
-import ru.feodorkek.dev.mcremapper.dto.EntryPosition;
-import ru.feodorkek.dev.mcremapper.dto.RemapResult;
 import ru.feodorkek.dev.mcremapper.domain.RemapperProvider;
+import ru.feodorkek.dev.mcremapper.dto.EntryPosition;
 import ru.feodorkek.dev.mcremapper.dto.RemapEntry;
-import ru.feodorkek.dev.mcremapper.exception.RemapperProviderException;
+import ru.feodorkek.dev.mcremapper.dto.RemapResult;
 import ru.feodorkek.dev.mcremapper.exception.RemappingException;
 import ru.feodorkek.dev.mcremapper.properties.RemapperProperties;
 import ru.feodorkek.dev.mcremapper.service.RemappingService;
@@ -18,7 +17,6 @@ public class RemappingServiceImpl implements RemappingService {
 
     private final Map<String, RemapperProvider> providers;
     private final RemapperProperties properties;
-    private RemapperProvider currentProvider;
 
     public RemappingServiceImpl( final RemapperProperties properties ) {
         this.providers = new HashMap<>();
@@ -40,24 +38,8 @@ public void registerProvider( final RemapperProvider provider ) {
     }
 
     @Override
-    public void setCurrentProvider( final String providerName ) {
-        if( providerName == null || providerName.isBlank() ) {
-            throw new RemapperProviderException( "Minecraft version name cannot be blank" );
-        }
-        
-        if( !providers.containsKey( providerName ) ) {
-            throw new RemapperProviderException( "Minecraft remapper provider {0} not registered", providerName );
-        }
-        
-        currentProvider = providers.get( providerName );
-    }
-    
-    @Override
-    public RemapResult maybeRemap( final String mappedSource ) {
-        if( currentProvider == null ) {
-            throw new RemappingException( "Current provider not set" );
-        }
-        
+    public RemapResult maybeRemap( final String providerName,
+                                   final String mappedSource ) {
         if( mappedSource == null || mappedSource.isBlank() ) {
             throw new RemappingException( "Mapped source cannot be blank" );
         }
@@ -68,6 +50,16 @@ public RemapResult maybeRemap( final String mappedSource ) {
             throw new RemappingException( "Mapped source length should be less than {0} chars", properties.getRemapSourceMaxLen() );
         }
 
+        if( providerName == null || providerName.isBlank() ) {
+            throw new RemappingException( "Minecraft remapper provider name cannot be blank" );
+        }
+        
+        if( !providers.containsKey( providerName ) ) {
+            throw new RemappingException( "Minecraft remapper provider {0} not registered", providerName );
+        }
+        
+        final var provider = providers.get( providerName );
+        
         final var result = new StringBuilder();
         final var remapEntries = new ArrayList<RemapEntry>();
         final var lines = mappedSource.split( "\n" );
@@ -76,13 +68,13 @@ public RemapResult maybeRemap( final String mappedSource ) {
             for( int lineNumber = 0; lineNumber < lines.length; lineNumber++ ) {
                 final var line = lineNumber < lines.length - 1 ? lines[ lineNumber ] + "\n" : lines[ lineNumber ];
 
-                final var matcher = currentProvider.getRemapPattern().matcher( line );
+                final var matcher = provider.getRemapPattern().matcher( line );
 
                 var offset = 0;
 
                 while( matcher.find() ) {
                     var mappedValue = matcher.group();
-                    var remappedValue = currentProvider.getMappings().getOrDefault( mappedValue, mappedValue );
+                    var remappedValue = provider.getMappings().getOrDefault( mappedValue, mappedValue );
                     matcher.appendReplacement( result, Matcher.quoteReplacement( remappedValue ) );
 
                     if( !mappedValue.equals( remappedValue ) ) {

src/main/java/ru/feodorkek/dev/mcremapper/service/impl/RemappingServiceImpl.java

@@ -15,8 +15,8 @@ public class McRemapperUseCasesImpl implements McRemapperUseCases {
 
     @Override
     public RemapResponse maybeRemap( final RemapRequest request ) {
-        remappingService.setCurrentProvider( request.getMcRemapperProviderName() );
-        return new RemapResponse( remappingService.maybeRemap( request.getMappedSource() ) );
+        return new RemapResponse( remappingService.maybeRemap( request.getMcRemapperProviderName(),
+                                                               request.getMappedSource() ) );
     }
 
 }