Projects >> wro4j >>8bc4089208f19418ef5ac49a01947ed1a46b42c3

Chunk
Conflicting content
  private static final AtomicInteger threadFactoryNumber = new AtomicInteger(1);
  public static final InputStream EMPTY_STREAM = new ByteArrayInputStream("".getBytes());
<<<<<<< HEAD
  
  /**
   * @return {@link ThreadFactory} with daemon threads.
   */
  public static ThreadFactory createDaemonThreadFactory(final String name) {
    return new ThreadFactory() {
      private final String prefix = "wro4j-" + name + "-" + threadFactoryNumber.getAndIncrement() + "-thread-";
      private final AtomicInteger threadNumber = new AtomicInteger(1);
      
      public Thread newThread(final Runnable runnable) {
        final Thread thread = new Thread(runnable, prefix + threadNumber.getAndIncrement());
        thread.setDaemon(true);
        return thread;
      }
    };
  }
  
  /**
   * Transforms milliseconds into date format for response header of this form: Sat, 10 Apr 2010 17:31:31 GMT.
   * 
   * @param milliseconds
   *          to transform
   * @return string representation of the date.
   */
  public static String toDateAsString(final long milliseconds) {
    return DATE_FORMAT.format(milliseconds);
  }

  /**
   * Retrieve pathInfo from a given location.
   * 
   *          the String to check, may be null
   * @param request
   * @param location
   *          where to search contextPath.
   * @return pathInfo value.
   */
  public static String getPathInfoFromLocation(final HttpServletRequest request, final String location) {
    if (StringUtils.isEmpty(location)) {
      throw new IllegalArgumentException("Location cannot be empty string!");
    }
    final String contextPath = request.getContextPath();
    if (contextPath != null) {
      if (startsWithIgnoreCase(location, contextPath)) {
        return location.substring(contextPath.length());
      } else {
        return location;
      }
    }
    final String noSlash = location.substring(1);
    final int nextSlash = noSlash.indexOf('/');
    if (nextSlash == -1) {
      return "";
    }
    final String pathInfo = noSlash.substring(nextSlash);
    return pathInfo;
  }
  
  /**
   * 

* Case insensitive check if a String starts with a specified prefix. *

*

* nulls are handled without exceptions. Two null references are considered to be equal. The * comparison is case insensitive. *

* *
   * StringUtils.startsWithIgnoreCase(null, null)      = true
   * StringUtils.startsWithIgnoreCase(null, "abcdef")  = false
   * StringUtils.startsWithIgnoreCase("abc", null)     = false
   * StringUtils.startsWithIgnoreCase("abc", "abcdef") = true
   * StringUtils.startsWithIgnoreCase("abc", "ABCDEF") = true
   * 
* * @see java.lang.String#startsWith(String) * @param str * the String to check, may be null * @param prefix * the prefix to find, may be null * @return true if the String starts with the prefix, case insensitive, or both null */ public static boolean startsWithIgnoreCase(final String str, final String prefix) { return startsWith(str, prefix, true); } /** * Creates a folder like implementation for a class. Ex: com.mycompany.MyClass -> com/mycompany/ * * @param clazz * used as a base location for determining the package path. * @return a string representation of the path where the class resides. */ public static String toPackageAsFolder(final Class clazz) { Validate.notNull(clazz, "Class cannot be null!"); return clazz.getPackage().getName().replace('.', '/'); } /** *

* Check if a String starts with a specified prefix (optionally case insensitive). *

* * @see java.lang.String#startsWith(String) * @param str * the String to check, may be null * @param prefix * the prefix to find, may be null * @param ignoreCase * inidicates whether the compare should ignore case (case insensitive) or not. * @return true if the String starts with the prefix or both null */ private static boolean startsWith(final String str, final String prefix, final boolean ignoreCase) { if (str == null || prefix == null) { return (str == null && prefix == null); } if (prefix.length() > str.length()) { return false; } return str.regionMatches(ignoreCase, 0, prefix, 0, prefix.length()); } /** * Retrieve servletPath from a given location. * * @param location * where to search the servletPath. * @return ServletPath string value. */ public static String getServletPathFromLocation(final HttpServletRequest request, final String location) { return location.replace(getPathInfoFromLocation(request, location), ""); } /** * Analyze headers of the request and searches for mangled (by proxy) for "Accept-Encoding" header and its mangled * variations and gzip header value and its mangled variations. * * @return true if this request support gzip encoding. */ @SuppressWarnings("unchecked") public static boolean isGzipSupported(final HttpServletRequest request) { if (request != null) { final Enumeration headerNames = request.getHeaderNames(); if (headerNames != null) { while (headerNames.hasMoreElements()) { final String headerName = headerNames.nextElement(); final Matcher m = PATTERN_ACCEPT_ENCODING.matcher(headerName); if (m.find()) { final String headerValue = request.getHeader(headerName); final Matcher mValue = PATTERN_GZIP.matcher(headerValue); return mValue.find(); } } } } return false; } /** * Transforms a java multi-line string into javascript multi-line string. This technique was found at {@link http * ://stackoverflow.com/questions/805107/multiline-strings-in-javascript/} * * @param data * a string containing new lines. * @return a string which being evaluated on the client-side will be treated as a correct multi-line string. */ public static String toJSMultiLineString(final String data) { final String[] lines = data.split("\n"); final StringBuffer result = new StringBuffer("["); if (lines.length == 0) { result.append("\"\""); } for (int i = 0; i < lines.length; i++) { final String line = lines[i]; result.append("\""); result.append(line.replace("\\", "\\\\").replace("\"", "\\\"").replaceAll("\\r|\\n", "")); // this is used to force a single line to have at least one new line (otherwise cssLint fails). if (lines.length == 1) { result.append("\\n"); } result.append("\""); if (i < lines.length - 1) { result.append(","); } } result.append("].join(\"\\n\")"); return result.toString(); } /** * Utility used to verify that requestURI matches provided path */ public static boolean matchesUrl(final HttpServletRequest request, final String path) { final Pattern pattern = Pattern.compile(".*" + path + "[/]?", Pattern.CASE_INSENSITIVE); if (request.getRequestURI() != null) { final Matcher m = pattern.matcher(request.getRequestURI()); return m.matches(); } return false; } /** * A simple way to create a {@link WroModelFactory}. * * @param model * {@link WroModel} instance to be returned by the factory. */ public static WroModelFactory factoryFor(final WroModel model) { return new WroModelFactory() { public WroModel create() { return model; } public void destroy() { } }; } public static ObjectFactory simpleObjectFactory(final T object) { return new ObjectFactory() { public T create() { return object; } }; } /** * Wraps original exception into {@link WroRuntimeException} and throw it. * * @param e * the exception to wrap. * @deprecated use {@link WroRuntimeException#wrap(Exception)} */ @Deprecated public static void wrapWithWroRuntimeException(final Exception e) { LOG.error("Exception occured: " + e.getClass(), e.getCause()); if (e instanceof WroRuntimeException) { throw (WroRuntimeException) e; } throw new WroRuntimeException(e.getMessage(), e); } /** * Load the regular expression stored in in regexp.properties resource file. * * @param key * the key of the regexp to load. * @return regular expression value. */ public static String loadRegexpWithKey(final String key) { try { final InputStream stream = WroUtil.class.getResourceAsStream("regexp.properties"); final Properties props = new RegexpProperties().load(stream); return props.getProperty(key); ======= /** * @return {@link ThreadFactory} with daemon threads. */ public static ThreadFactory createDaemonThreadFactory(final String name) { return new ThreadFactory() { private final String prefix = "wro4j-" + name + "-" + threadFactoryNumber.getAndIncrement() + "-thread-"; private final AtomicInteger threadNumber = new AtomicInteger(1); public Thread newThread(final Runnable runnable) { final Thread thread = new Thread(runnable, prefix + threadNumber.getAndIncrement()); thread.setDaemon(true); return thread; } }; } /** * Transforms milliseconds into date format for response header of this form: Sat, 10 Apr 2010 17:31:31 GMT. * * @param milliseconds * to transform * @return string representation of the date. */ public static String toDateAsString(final long milliseconds) { return DATE_FORMAT.format(milliseconds); } /** * Retrieve pathInfo from a given location. * * @param request * @param location * where to search contextPath. * @return pathInfo value. */ public static String getPathInfoFromLocation(final HttpServletRequest request, final String location) { if (StringUtils.isEmpty(location)) { throw new IllegalArgumentException("Location cannot be empty string!"); } final String contextPath = request.getContextPath(); if (contextPath != null) { if (startsWithIgnoreCase(location, contextPath)) { return location.substring(contextPath.length()); } else { return location; } } final String noSlash = location.substring(1); final int nextSlash = noSlash.indexOf('/'); if (nextSlash == -1) { return ""; } final String pathInfo = noSlash.substring(nextSlash); return pathInfo; } /** *

* Case insensitive check if a String starts with a specified prefix. *

*

* nulls are handled without exceptions. Two null references are considered to be equal. The * comparison is case insensitive. *

* *
   * StringUtils.startsWithIgnoreCase(null, null)      = true
   * StringUtils.startsWithIgnoreCase(null, "abcdef")  = false
   * StringUtils.startsWithIgnoreCase("abc", null)     = false
   * StringUtils.startsWithIgnoreCase("abc", "abcdef") = true
   * StringUtils.startsWithIgnoreCase("abc", "ABCDEF") = true
   * 
* * @see java.lang.String#startsWith(String) * @param str * @param prefix * the prefix to find, may be null * @return true if the String starts with the prefix, case insensitive, or both null * @since 2.4 */ public static boolean startsWithIgnoreCase(final String str, final String prefix) { return startsWith(str, prefix, true); } /** * Creates a folder like implementation for a class. Ex: com.mycompany.MyClass -> com/mycompany/ * * @param clazz * used as a base location for determining the package path. * @return a string representation of the path where the class resides. */ public static String toPackageAsFolder(final Class clazz) { Validate.notNull(clazz, "Class cannot be null!"); return clazz.getPackage().getName().replace('.', '/'); } /** *

* Check if a String starts with a specified prefix (optionally case insensitive). *

* * @see java.lang.String#startsWith(String) * @param str * the String to check, may be null * @param prefix * the prefix to find, may be null * @param ignoreCase * inidicates whether the compare should ignore case (case insensitive) or not. * @return true if the String starts with the prefix or both null */ private static boolean startsWith(final String str, final String prefix, final boolean ignoreCase) { if (str == null || prefix == null) { return (str == null && prefix == null); } if (prefix.length() > str.length()) { return false; } return str.regionMatches(ignoreCase, 0, prefix, 0, prefix.length()); } /** } * Retrieve servletPath from a given location. * * @param location * where to search the servletPath. * @return ServletPath string value. */ public static String getServletPathFromLocation(final HttpServletRequest request, final String location) { return location.replace(getPathInfoFromLocation(request, location), ""); } /** * Analyze headers of the request and searches for mangled (by proxy) for "Accept-Encoding" header and its mangled * variations and gzip header value and its mangled variations. * * @return true if this request support gzip encoding. */ @SuppressWarnings("unchecked") public static boolean isGzipSupported(final HttpServletRequest request) { if (request != null) { final Enumeration headerNames = request.getHeaderNames(); if (headerNames != null) { while (headerNames.hasMoreElements()) { final String headerName = headerNames.nextElement(); final Matcher m = PATTERN_ACCEPT_ENCODING.matcher(headerName); if (m.find()) { final String headerValue = request.getHeader(headerName); final Matcher mValue = PATTERN_GZIP.matcher(headerValue); return mValue.find(); } } } } return false; } /** * Transforms a java multi-line string into javascript multi-line string. This technique was found at {@link http * ://stackoverflow.com/questions/805107/multiline-strings-in-javascript/} * * @param data * a string containing new lines. * @return a string which being evaluated on the client-side will be treated as a correct multi-line string. */ public static String toJSMultiLineString(final String data) { final StringBuffer result = new StringBuffer("["); if (data != null) { final String[] lines = data.split("\n"); if (lines.length == 0) { result.append("\"\""); } for (int i = 0; i < lines.length; i++) { } final String line = lines[i]; result.append("\""); result.append(line.replace("\\", "\\\\").replace("\"", "\\\"").replaceAll("\\r|\\n", "")); // this is used to force a single line to have at least one new line (otherwise cssLint fails). if (lines.length == 1) { result.append("\\n"); } result.append("\""); if (i < lines.length - 1) { result.append(","); } } } result.append("].join(\"\\n\")"); return result.toString(); } /** * Utility used to verify that requestURI matches provided path */ public static boolean matchesUrl(final HttpServletRequest request, final String path) { final Pattern pattern = Pattern.compile(".*" + path + "[/]?", Pattern.CASE_INSENSITIVE); if (request.getRequestURI() != null) { final Matcher m = pattern.matcher(request.getRequestURI()); return m.matches(); } return false; } /** * A factory method for creating a {@link ResourceProcessor} based on provided {@link ResourcePreProcessor}. * * @param preProcessor * {@link ResourcePreProcessor} to use as a {@link ResourceProcessor}. * @return instance of {@link ResourceProcessor}. */ public static ResourcePostProcessor newResourceProcessor(final Resource resource, final ResourcePreProcessor preProcessor) { return new ResourcePostProcessor() { public void process(final Reader reader, final Writer writer) throws IOException { preProcessor.process(resource, reader, writer); } }; /** * A simple way to create a {@link WroModelFactory}. * * @param model * {@link WroModel} instance to be returned by the factory. */ public static WroModelFactory factoryFor(final WroModel model) { return new WroModelFactory() { public WroModel create() { return model; } public void destroy() { } }; } public static ObjectFactory simpleObjectFactory(final T object) { return new ObjectFactory() { public T create() { return object; } }; } /** * Wraps original exception into {@link WroRuntimeException} and throw it. * * @param e * the exception to wrap. * @deprecated use {@link WroRuntimeException#wrap(Exception)} */ @Deprecated public static void wrapWithWroRuntimeException(final Exception e) { LOG.error("Exception occured: " + e.getClass(), e.getCause()); if (e instanceof WroRuntimeException) { throw (WroRuntimeException) e; } throw new WroRuntimeException(e.getMessage(), e); } /** * Load the regular expression stored in in regexp.properties resource file. * * @param key * the key of the regexp to load. * @return regular expression value. */ public static String loadRegexpWithKey(final String key) { try { final InputStream stream = WroUtil.class.getResourceAsStream("regexp.properties"); final Properties props = new RegexpProperties().load(stream); return props.getProperty(key); >>>>>>> c134b3267fe5cd8eaafa39ce9e492319bd6c174b } catch (final IOException e) { throw new WroRuntimeException("Could not load pattern with key: " + key + " from property file", e);
Solution content
  private static final AtomicInteger threadFactoryNumber = new AtomicInteger(1);
  public static final InputStream EMPTY_STREAM = new ByteArrayInputStream("".getBytes());
  
  /**
   * @return {@link ThreadFactory} with daemon threads.
   */
  public static ThreadFactory createDaemonThreadFactory(final String name) {
    return new ThreadFactory() {
      private final String prefix = "wro4j-" + name + "-" + threadFactoryNumber.getAndIncrement() + "-thread-";
      private final AtomicInteger threadNumber = new AtomicInteger(1);
      
      public Thread newThread(final Runnable runnable) {
        final Thread thread = new Thread(runnable, prefix + threadNumber.getAndIncrement());
        thread.setDaemon(true);
        return thread;
      }
    };
  }
  
  /**
   * Transforms milliseconds into date format for response header of this form: Sat, 10 Apr 2010 17:31:31 GMT.
   * 
   * @param milliseconds
   *          to transform
   * @return string representation of the date.
   */
  public static String toDateAsString(final long milliseconds) {
    return DATE_FORMAT.format(milliseconds);
  }

  /**
   * Retrieve pathInfo from a given location.
   * 
   * @param request
   * @param location
   *          where to search contextPath.
   * @return pathInfo value.
   */
  public static String getPathInfoFromLocation(final HttpServletRequest request, final String location) {
    if (StringUtils.isEmpty(location)) {
      throw new IllegalArgumentException("Location cannot be empty string!");
    }
    final String contextPath = request.getContextPath();
    if (contextPath != null) {
      if (startsWithIgnoreCase(location, contextPath)) {
        return location.substring(contextPath.length());
      } else {
        return location;
      }
    }
    final String noSlash = location.substring(1);
    final int nextSlash = noSlash.indexOf('/');
    if (nextSlash == -1) {
      return "";
    }
    final String pathInfo = noSlash.substring(nextSlash);
    return pathInfo;
  }
  
  /**
   * 

* Case insensitive check if a String starts with a specified prefix. *

*

* nulls are handled without exceptions. Two null references are considered to be equal. The * comparison is case insensitive. *

* *
   * StringUtils.startsWithIgnoreCase(null, null)      = true
   * StringUtils.startsWithIgnoreCase(null, "abcdef")  = false
   * StringUtils.startsWithIgnoreCase("abc", null)     = false
   * StringUtils.startsWithIgnoreCase("abc", "abcdef") = true
   * StringUtils.startsWithIgnoreCase("abc", "ABCDEF") = true
   * 
* * @see java.lang.String#startsWith(String) * @param str * the String to check, may be null * @param prefix * the prefix to find, may be null * @return true if the String starts with the prefix, case insensitive, or both null */ public static boolean startsWithIgnoreCase(final String str, final String prefix) { return startsWith(str, prefix, true); } /** * Creates a folder like implementation for a class. Ex: com.mycompany.MyClass -> com/mycompany/ * * @param clazz * used as a base location for determining the package path. * @return a string representation of the path where the class resides. */ public static String toPackageAsFolder(final Class clazz) { Validate.notNull(clazz, "Class cannot be null!"); return clazz.getPackage().getName().replace('.', '/'); } /** *

* Check if a String starts with a specified prefix (optionally case insensitive). *

* * @see java.lang.String#startsWith(String) * @param str * the String to check, may be null * @param prefix * the prefix to find, may be null * @param ignoreCase * inidicates whether the compare should ignore case (case insensitive) or not. * @return true if the String starts with the prefix or both null */ private static boolean startsWith(final String str, final String prefix, final boolean ignoreCase) { if (str == null || prefix == null) { return (str == null && prefix == null); } if (prefix.length() > str.length()) { return false; } return str.regionMatches(ignoreCase, 0, prefix, 0, prefix.length()); } /** * Retrieve servletPath from a given location. * * @param location * where to search the servletPath. * @return ServletPath string value. */ public static String getServletPathFromLocation(final HttpServletRequest request, final String location) { return location.replace(getPathInfoFromLocation(request, location), ""); } /** * Analyze headers of the request and searches for mangled (by proxy) for "Accept-Encoding" header and its mangled * variations and gzip header value and its mangled variations. * * @return true if this request support gzip encoding. */ @SuppressWarnings("unchecked") public static boolean isGzipSupported(final HttpServletRequest request) { if (request != null) { final Enumeration headerNames = request.getHeaderNames(); if (headerNames != null) { while (headerNames.hasMoreElements()) { final String headerName = headerNames.nextElement(); final Matcher m = PATTERN_ACCEPT_ENCODING.matcher(headerName); if (m.find()) { final String headerValue = request.getHeader(headerName); final Matcher mValue = PATTERN_GZIP.matcher(headerValue); return mValue.find(); } } } } return false; } /** * Transforms a java multi-line string into javascript multi-line string. This technique was found at {@link http * ://stackoverflow.com/questions/805107/multiline-strings-in-javascript/} * * @param data * a string containing new lines. * @return a string which being evaluated on the client-side will be treated as a correct multi-line string. */ public static String toJSMultiLineString(final String data) { final StringBuffer result = new StringBuffer("["); if (data != null) { final String[] lines = data.split("\n"); if (lines.length == 0) { result.append("\"\""); } for (int i = 0; i < lines.length; i++) { final String line = lines[i]; result.append("\""); result.append(line.replace("\\", "\\\\").replace("\"", "\\\"").replaceAll("\\r|\\n", "")); // this is used to force a single line to have at least one new line (otherwise cssLint fails). if (lines.length == 1) { result.append("\\n"); } result.append("\""); if (i < lines.length - 1) { result.append(","); } } } result.append("].join(\"\\n\")"); return result.toString(); } /** * Utility used to verify that requestURI matches provided path */ public static boolean matchesUrl(final HttpServletRequest request, final String path) { final Pattern pattern = Pattern.compile(".*" + path + "[/]?", Pattern.CASE_INSENSITIVE); if (request.getRequestURI() != null) { final Matcher m = pattern.matcher(request.getRequestURI()); return m.matches(); } return false; } /** * A simple way to create a {@link WroModelFactory}. * * @param model * {@link WroModel} instance to be returned by the factory. */ public static WroModelFactory factoryFor(final WroModel model) { return new WroModelFactory() { public WroModel create() { return model; } public void destroy() { } }; } public static ObjectFactory simpleObjectFactory(final T object) { return new ObjectFactory() { public T create() { return object; } }; } /** * Wraps original exception into {@link WroRuntimeException} and throw it. * * @param e * the exception to wrap. * @deprecated use {@link WroRuntimeException#wrap(Exception)} */ @Deprecated public static void wrapWithWroRuntimeException(final Exception e) { LOG.error("Exception occured: " + e.getClass(), e.getCause()); if (e instanceof WroRuntimeException) { throw (WroRuntimeException) e; } throw new WroRuntimeException(e.getMessage(), e); } /** * Load the regular expression stored in in regexp.properties resource file. * * @param key * the key of the regexp to load. * @return regular expression value. */ public static String loadRegexpWithKey(final String key) { try { final InputStream stream = WroUtil.class.getResourceAsStream("regexp.properties"); final Properties props = new RegexpProperties().load(stream); return props.getProperty(key); } catch (final IOException e) { throw new WroRuntimeException("Could not load pattern with key: " + key + " from property file", e); }
File
WroUtil.java
Developer's decision
Combination
Kind of conflict
Annotation
Comment
Method declaration
Method invocation
Method signature
Return statement
Try statement
Variable
Chunk
Conflicting content
import java.io.Reader;
import java.io.Writer;

<<<<<<< HEAD
=======
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import ro.isdc.wro.WroRuntimeException;
import ro.isdc.wro.extensions.processor.support.yui.YuiCssCompressor;
>>>>>>> c134b3267fe5cd8eaafa39ce9e492319bd6c174b
import ro.isdc.wro.model.group.processor.Minimize;
import ro.isdc.wro.model.resource.Resource;
import ro.isdc.wro.model.resource.ResourceType;
Solution content
import java.io.Reader;
import java.io.Writer;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import ro.isdc.wro.WroRuntimeException;
import ro.isdc.wro.extensions.processor.support.yui.YuiCssCompressor;
import ro.isdc.wro.model.group.processor.Minimize;
import ro.isdc.wro.model.resource.Resource;
import ro.isdc.wro.model.resource.ResourceType;
File
YUICssCompressorProcessor.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content
  /**
   * {@inheritDoc}
   */
<<<<<<< HEAD
=======
  @Override
  public void process(final Reader reader, final Writer writer)
    throws IOException {
    process(null, reader, writer);
  }

  /**
   * {@inheritDoc}
   */
  @Override
>>>>>>> c134b3267fe5cd8eaafa39ce9e492319bd6c174b
  public void process(final Resource resource, final Reader reader, final Writer writer)
    throws IOException {
    try {
Solution content
  /**
   * {@inheritDoc}
   */
  @Override
  public void process(final Resource resource, final Reader reader, final Writer writer)
    throws IOException {
    try {
File
YUICssCompressorProcessor.java
Developer's decision
Combination
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content
    try {
      final YuiCssCompressor compressor = new YuiCssCompressor(reader);
      compressor.compress(writer, linebreakpos);
<<<<<<< HEAD
=======
    } catch(final IOException e) {
      LOG.error("Exception occured while processing resource: " + resource + " using processor: " + ALIAS);
      onException(new WroRuntimeException("Exception during YuiCss processing of resource: " + resource, e));
>>>>>>> c134b3267fe5cd8eaafa39ce9e492319bd6c174b
    } finally {
      reader.close();
      writer.close();
Solution content
    try {
      final YuiCssCompressor compressor = new YuiCssCompressor(reader);
      compressor.compress(writer, linebreakpos);
    } catch(final IOException e) {
      LOG.error("Exception occured while processing resource: " + resource + " using processor: " + ALIAS);
      onException(new WroRuntimeException("Exception during YuiCss processing of resource: " + resource, e));
    } finally {
      reader.close();
      writer.close();
File
YUICssCompressorProcessor.java
Developer's decision
Version 2
Kind of conflict
Catch clause
Method invocation