aserg-ufmg / refdiff Goto Github PK

@@ -0,0 +1,24 @@
+public interface IWatermark {
+
+	/**
+	   * Convert this {@link Watermark} into a {@link JsonElement}.
+	   * @return a {@link JsonElement} representing this {@link Watermark}.
+	   */
+	JsonElement toJson();
+
+	/**
+	   * This method must return a value from [0, 100]. The value should correspond to a percent completion. Given two
+	   * {@link Watermark} values, where the lowWatermark is the starting point, and the highWatermark is the goal, what
+	   * is the percent completion of this {@link Watermark}.
+	   *
+	   * @param lowWatermark is the starting {@link Watermark} for the percent completion calculation. So if this.equals(lowWatermark) is true, this method should return 0.
+	   * @param highWatermark is the end value {@link Watermark} for the percent completion calculation. So if this.equals(highWatermark) is true, this method should return 100.
+	   * @return a value from [0, 100] representing the percentage completion of this {@link Watermark}.
+	   */
+	short calculatePercentCompletion(IWatermark lowWatermark, IWatermark highWatermark);
+
+}

@@ -30,22 +30,5 @@ import com.google.gson.JsonElement;
-public interface Watermark {
-
-  /**
-   * Convert this {@link Watermark} into a {@link JsonElement}.
-   * @return a {@link JsonElement} representing this {@link Watermark}.
-   */
-  public JsonElement toJson();
-
-  /**
-   * This method must return a value from [0, 100]. The value should correspond to a percent completion. Given two
-   * {@link Watermark} values, where the lowWatermark is the starting point, and the highWatermark is the goal, what
-   * is the percent completion of this {@link Watermark}.
-   *
-   * @param lowWatermark is the starting {@link Watermark} for the percent completion calculation. So if this.equals(lowWatermark) is true, this method should return 0.
-   * @param highWatermark is the end value {@link Watermark} for the percent completion calculation. So if this.equals(highWatermark) is true, this method should return 100.
-   * @return a value from [0, 100] representing the percentage completion of this {@link Watermark}.
-   */
-  public short calculatePercentCompletion(Watermark lowWatermark, Watermark highWatermark);
+public interface Watermark extends IWatermark {
 }

@@ -81,16 +79,5 @@ public abstract class AvroToJsonStringConverterBase<T> extends Converter<Schema,
     return this.schema.toString();
   }
 
-  @Override
-  public Iterable<T> convertRecord(String outputSchema, GenericRecord inputRecord, WorkUnitState workUnit)
-      throws DataConversionException {
-    try {
-      byte[] utf8Bytes = this.serializer.get().serialize(inputRecord);
-      return Collections.singleton(processUtf8Bytes(utf8Bytes));
-    } catch (IOException ioe) {
-      throw new DataConversionException(ioe);
-    }
-  }
-

@@ -24,4 +30,14 @@ public class AvroToJsonStringConverter extends AvroToJsonStringConverterBase<Str
   protected String processUtf8Bytes(byte[] utf8Bytes) {
     return new String(utf8Bytes, StandardCharsets.UTF_8);
   }
+
+@Override
+public Iterable<String> convertRecord(String outputSchema, GenericRecord inputRecord, WorkUnitState workUnit) throws DataConversionException {
+    try {
+      byte[] utf8Bytes = this.serializer.get().serialize(inputRecord);
+      return Collections.singleton(processUtf8Bytes(utf8Bytes));
+    } catch (IOException ioe) {
+      throw new DataConversionException(ioe);
+    }
+  }

@@ -38,4 +38,8 @@ public interface JmxOperationResponseMapper {
         */
        Object mapResponse(Object response);
 
+       default String getType(MBeanInfoFactory mBeanInfoFactory, Class<?> outputType) {
+               return mapResponseType(outputType).getName();
+       }
+
 }

@@ -69,7 +69,7 @@ class MBeanInfoFactory {
                String name = operation.getName();
                String description = operation.getDescription();
                MBeanParameterInfo[] signature = getSignature(operation.getParameters());
-               String type = getType(operation.getOutputType());
+               String type = responseMapper.getType(this, operation.getOutputType());
                int impact = getImpact(operation.getType());
                return new ModelMBeanOperationInfo(name, description, signature, type, impact);
        }
        
@@ -92,8 +92,4 @@ class MBeanInfoFactory {
                return MBeanOperationInfo.UNKNOWN;
        }
 
-       private String getType(Class<?> outputType) {
-               return this.responseMapper.mapResponseType(outputType).getName();
-       }
-
 }

@@ -2,6 +2,6 @@ package gr.uom.java.xmi;
 
 import gr.uom.java.xmi.decomposition.VariableDeclaration;
 
-public interface VariableDeclarationProvider {
+public interface VariableDeclarationProvider_RENAMED {

@@ -61,22 +60,7 @@ public abstract class ManagementWebServerFactoryCustomizer<T extends Configurabl
-       @Override
-       public final void customize(T factory) {
-               ManagementServerProperties managementServerProperties = BeanFactoryUtils
-                               .beanOfTypeIncludingAncestors(this.beanFactory, ManagementServerProperties.class);
-               // Customize as per the parent context first (so e.g. the access logs go to
-               // the same place)
-               customizeSameAsParentContext(factory);
-               // Then reset the error pages
-               factory.setErrorPages(Collections.emptySet());
-               // and add the management-specific bits
-               ServerProperties serverProperties = BeanFactoryUtils.beanOfTypeIncludingAncestors(this.beanFactory,
-                               ServerProperties.class);
-               customize(factory, managementServerProperties, serverProperties);
-       }

@@ -126,6 +128,21 @@ class ServletManagementChildContextConfiguration {
                static class ServletManagementWebServerFactoryCustomizer
			extends ManagementWebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
                [...] 
+               @Override
+               public final void customize(ConfigurableServletWebServerFactory factory) {
+                       ManagementServerProperties managementServerProperties = BeanFactoryUtils
+                                       .beanOfTypeIncludingAncestors(this.beanFactory, ManagementServerProperties.class);
+                       // Customize as per the parent context first (so e.g. the access logs go to
+                       // the same place)
+                       customizeSameAsParentContext(factory);
+                       // Then reset the error pages
+                       factory.setErrorPages(Collections.emptySet());
+                       // and add the management-specific bits
+                       ServerProperties serverProperties = BeanFactoryUtils.beanOfTypeIncludingAncestors(this.beanFactory,
+                                       ServerProperties.class);
+                       customize(factory, managementServerProperties, serverProperties);
+               }
+
        }

@@ -531,4 +531,8 @@ public class CompositeStatementObject extends AbstractStatement {
                }
                return null;
        }
+
+       public void setFinallyClause(TryStatementObject tryStatementObject) {
+               tryStatementObject.finallyClause = this;
+       }
 }

@@ -250,7 +250,7 @@ public class OperationBody {
                        Block finallyBlock = tryStatement.getFinally();
                        if(finallyBlock != null) {
                                CompositeStatementObject finallyClauseStatementObject = new CompositeStatementObject(cu, filePath, finallyBlock, parent.getDepth()+1, CodeElementType.FINALLY_BLOCK);
-                               child.setFinallyClause(finallyClauseStatementObject);
+                               finallyClauseStatementObject.setFinallyClause(child);

@@ -10,7 +10,7 @@ import gr.uom.java.xmi.LocationInfo.CodeElementType;
 
 public class TryStatementObject extends CompositeStatementObject {
        private List<CompositeStatementObject> catchClauses;
-       private CompositeStatementObject finallyClause;
+       CompositeStatementObject finallyClause;
 
        public TryStatementObject(CompilationUnit cu, String filePath, Statement statement, int depth) {
                super(cu, filePath, statement, depth, CodeElementType.TRY_STATEMENT);
@@ -25,10 +25,6 @@ public class TryStatementObject extends CompositeStatementObject {
                return catchClauses;
        }
 
-       public void setFinallyClause(CompositeStatementObject finallyClause) {
-               this.finallyClause = finallyClause;
-       }
-

@@ -89,19 +89,15 @@ abstract class DiscoveredOperationsFactory<O extends Operation> {
                DiscoveredOperationMethod operationMethod = new DiscoveredOperationMethod(method, operationType,
                                annotation.asAnnotationAttributes());
                OperationInvoker invoker = new ReflectiveOperationInvoker(target, operationMethod, this.parameterValueMapper);
-               invoker = applyAdvisors(endpointId, operationMethod, invoker);
-               return createOperation(endpointId, operationMethod, invoker);
-       }
-
-       private OperationInvoker applyAdvisors(EndpointId endpointId, OperationMethod operationMethod,
-                       OperationInvoker invoker) {
+               OperationInvoker invoker1 = invoker;
                if (this.invokerAdvisors != null) {
                        for (OperationInvokerAdvisor advisor : this.invokerAdvisors) {
-                               invoker = advisor.apply(endpointId, operationMethod.getOperationType(), operationMethod.getParameters(),
-                                               invoker);
+                               invoker1 = advisor.apply(endpointId, operationMethod.getOperationType(), operationMethod.getParameters(),
+                                               invoker1);
                        }
                }
-               return invoker;
+               invoker = invoker1;
+               return createOperation(endpointId, operationMethod, invoker);
        }

@@ -11,12 +11,12 @@ import org.refactoringminer.api.RefactoringType;
 
 import gr.uom.java.xmi.UMLAttribute;
 
-public class MoveAttributeRefactoring implements Refactoring {
+public class MoveAttributeRefactoring_RENAMED implements Refactoring {
        protected UMLAttribute originalAttribute;
        protected UMLAttribute movedAttribute;
        private volatile int hashCode = 0;
        
@@ -86,7 +86,7 @@ public class MoveOperationRefactoring implements Refactoring {
                return movedOperation.codeRange();
        }
 
-       public boolean compatibleWith(MoveAttributeRefactoring ref) {
+       public boolean compatibleWith(MoveAttributeRefactoring_RENAMED ref) {
                if(ref.getMovedAttribute().getClassName().equals(this.movedOperation.getClassName()) &&

@@ -735,7 +735,7 @@ public class UMLModelDiff {
           return false;
    }
 
-   private int computeCompatibility(MoveAttributeRefactoring candidate) {
+   private int computeCompatibility(MoveAttributeRefactoring_RENAMED candidate) {
           int count = 0;

@@ -327,12 +327,6 @@ public class OkHttpPendingResult<T, R extends ApiResponse<T>> implements PendingResult<T>, Callback {
     return this.await();
   }
 
-  private boolean shouldRetry(Response response) {
-    return RETRY_ERROR_CODES.contains(response.code())
-        && cumulativeSleepTime < errorTimeOut
-        && (maxRetries == null || retryCounter < maxRetries);
-  }

@@ -77,5 +81,11 @@ public interface PendingResult<T> {
     void onFailure(Throwable e);
+
+       public default boolean shouldRetry(OkHttpPendingResult okHttpPendingResult, Response response) {
+           return OkHttpPendingResult.RETRY_ERROR_CODES.contains(response.code())
+               && okHttpPendingResult.cumulativeSleepTime < okHttpPendingResult.errorTimeOut
+               && (okHttpPendingResult.maxRetries == null || okHttpPendingResult.retryCounter < okHttpPendingResult.maxRetries);
+         }

@@ -115,7 +115,7 @@ public class VariableDeclaration implements LocationInfoProvider, VariableDeclar
                return scope;
        }
 
-       public boolean isParameter() {
+       public boolean isParameter_RENAMED() {
                return isParameter;
        }

@@ -40,7 +40,7 @@ public class ChangeVariableTypeRefactoring implements Refactoring {
        }
 
        public RefactoringType getRefactoringType() {
-               if(originalVariable.isParameter() && changedTypeVariable.isParameter())
+               if(originalVariable.isParameter_RENAMED() && changedTypeVariable.isParameter_RENAMED())

@@ -51,11 +51,11 @@ public class MergeVariableRefactoring implements Refactoring {
 
        private boolean allVariablesAreParameters() {
                for(VariableDeclaration declaration : mergedVariables) {
-                       if(!declaration.isParameter()) {
+                       if(!declaration.isParameter_RENAMED()) {
                                return false;
                        }
                }
-               return newVariable.isParameter();
+               return newVariable.isParameter_RENAMED();

@@ -34,9 +34,9 @@ public class RenameVariableRefactoring implements Refactoring {
        }
 
        public RefactoringType getRefactoringType() {
-               if(originalVariable.isParameter() && renamedVariable.isParameter())
+               if(originalVariable.isParameter_RENAMED() && renamedVariable.isParameter_RENAMED())
                        return RefactoringType.RENAME_PARAMETER;
-               if(!originalVariable.isParameter() && renamedVariable.isParameter())
+               if(!originalVariable.isParameter_RENAMED() && renamedVariable.isParameter_RENAMED())

@@ -51,11 +51,11 @@ public class SplitVariableRefactoring implements Refactoring {
 
        private boolean allVariablesAreParameters() {
                for(VariableDeclaration declaration : splitVariables) {
-                       if(!declaration.isParameter()) {
+                       if(!declaration.isParameter_RENAMED()) {
                                return false;
                        }
                }
-               return oldVariable.isParameter();
+               return oldVariable.isParameter_RENAMED();
        }

@@ -60,29 +60,9 @@ public class GaeRequestHandler implements GeoApiContext.RequestHandler {
-    FetchOptions fetchOptions = FetchOptions.Builder.withDeadline(10);
-    HTTPRequest req;
-    try {
-      req = new HTTPRequest(new URL(hostName + url), HTTPMethod.POST, fetchOptions);
-      if (experienceIdHeaderValue != null) {
-        req.setHeader(
-            new HTTPHeader(HttpHeaders.X_GOOG_MAPS_EXPERIENCE_ID, experienceIdHeaderValue));
-      }
-    } catch (MalformedURLException e) {
-      LOG.error("Request: {}{}", hostName, url, e);
-      throw (new RuntimeException(e));
-    }
-
-    return new GaePendingResult<>(
-        req,
-        client,
-        clazz,
-        fieldNamingPolicy,
-        errorTimeout,
-        maxRetries,
-        exceptionsAllowedToRetry,
-        metrics);
-  }
+               return exceptionsAllowedToRetry.handle(hostName, url, userAgent, experienceIdHeaderValue, clazz,
+                               fieldNamingPolicy, errorTimeout, maxRetries, this, metrics);
+       }

@@ -15,7 +15,19 @@
 [...] 
 public final class ExceptionsAllowedToRetry extends HashSet<Class<? extends ApiException>> {
@@ -37,4 +49,30 @@ public final class ExceptionsAllowedToRetry extends HashSet<Class<? extends ApiE
     sb.append(']');
     return sb.toString();
   }
+
+public <T, R extends ApiResponse<T>> PendingResult<T> handle(
+      String hostName, String url, String userAgent, String experienceIdHeaderValue, Class<R> clazz, FieldNamingPolicy fieldNamingPolicy, long errorTimeout, Integer maxRetries, GaeRequestHandler gaeRequestHandler, RequestMetrics metrics) {
+    FetchOptions fetchOptions = Builder.withDeadline(10);
+    HTTPRequest req;
+    try {
+      req = new HTTPRequest(new URL(hostName + url), HTTPMethod.POST, fetchOptions);
+      if (experienceIdHeaderValue != null) {
+        req.setHeader(
+            new HTTPHeader(HttpHeaders.X_GOOG_MAPS_EXPERIENCE_ID, experienceIdHeaderValue));
+      }
+    } catch (MalformedURLException e) {
+      GaeRequestHandler.LOG.error("Request: {}{}", hostName, url, e);
+      throw (new RuntimeException(e));
+    }
+
+    return new GaePendingResult<>(
+        req,
+        gaeRequestHandler.client,
+        clazz,
+        fieldNamingPolicy,
+        errorTimeout,
+        maxRetries,
+        this,
+        metrics);
+  }
 }

@@ -72,11 +72,7 @@ abstract class PendingResultBase<T, A extends PendingResultBase<T, A, R>, R exte
   }
 
   private PendingResult<T> makeRequest() {
-    if (delegate != null) {
-      throw new IllegalStateException(
-          "'await', 'awaitIgnoreError' or 'setCallback' was already called.");
-    }
-    validateRequest();
+    extracted();
     switch (config.requestVerb) {
       case "GET":
         return delegate = context.get(config, responseClass, params);
@@ -88,6 +84,14 @@ abstract class PendingResultBase<T, A extends PendingResultBase<T, A, R>, R exte
     }
   }
 
+private void extracted() {
+       if (delegate != null) {
+      throw new IllegalStateException(
+          "'await', 'awaitIgnoreError' or 'setCallback' was already called.");
+    }
+    validateRequest();
+}
+

@@ -121,7 +121,7 @@ public enum RefactoringType {
                this.aggregateGroups = aggregateGroups;
        }
 
-       public Pattern getRegex() {
+       public Pattern getRegex_RENAMED() {
         return regex;
     }

@@ -45,7 +45,7 @@ public class UMLAttribute implements Comparable<UMLAttribute>, Serializable, Loc
                this.visibility = visibility;
        }
 
-       public boolean isFinal() {
+       public boolean isFinal_RENAMED() {
                return isFinal;
        }

@@ -42,7 +42,7 @@ public class UMLAttributeDiff {
                        qualifiedTypeChanged = true;
                if(removedAttribute.isStatic() != addedAttribute.isStatic())
                        staticChanged = true;
-               if(removedAttribute.isFinal() != addedAttribute.isFinal())
+               if(removedAttribute.isFinal_RENAMED() != addedAttribute.isFinal_RENAMED())

@@ -89,8 +89,8 @@ public class UMLAttributeDiff {
                        sb.append("\t").append("modifier changed from " + (removedAttribute.isStatic() ? "static" : "non-static") + " to " +
                                        (addedAttribute.isStatic() ? "static" : "non-static")).append("\n");
                if(finalChanged)
-                       sb.append("\t").append("modifier changed from " + (removedAttribute.isFinal() ? "final" : "non-final") + " to " +
-                                       (addedAttribute.isFinal() ? "final" : "non-final")).append("\n");
+                       sb.append("\t").append("modifier changed from " + (removedAttribute.isFinal_RENAMED() ? "final" : "non-final") + " to " +
+                                       (addedAttribute.isFinal_RENAMED() ? "final" : "non-final")).append("\n");