テキスト比較

2 つのテキストファイルの違いを見つける

ライブエディター

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

Untitled diff

作成日 10 年前差分は期限切れになりません

5 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

145 行

9 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

149 行

package BotFarmServer;

import java.io.IOException;

import java.net.URL;

import java.util.HashMap;

import java.util.Map;

import java.util.Scanner;

import java.util.regex.Matcher;

import java.util.regex.Pattern;

/**

* Utility class for access to the Grand Exchange API.

public class GrandExchangeApi {

private static final String API_LOCATION = "http://services.runescape.com/m=itemdb_oldschool" +

"/api/catalogue/detail.json?item=%d";

private static final long TEN_MINUTES = 600000;

private final Map<Integer, GELookupResult> cache;

private long startTime;

/**

* Caching-enabled default constructor

public GrandExchangeApi() {

this(true);

}

/**

* Creates a new Grand Exchange API instance. Starts cache-refresh timer.

* @[member='param'] cache Whether to enable caching of results.

public GrandExchangeApi(boolean cache) {

startTime = System.currentTimeMillis();

this.cache = cache ? new HashMap<>() : null;

}

/**

* If caching is enabled, clears the cache so that new results are fetched on lookup.

public void flushCache() {

long currentTime = System.currentTimeMillis();

if(cache != null) {

cache.clear();

for (Map.Entry<int,GELookupResult>> entry : cache) {

if (currentTime - TEN_MINUTES) > entry.getValue().lastUpdatedAt) {

cache.remove(entry.getKey()); // item is old. it needs to be refreshed

}

/**

* Looks up an item using the Grand Exchange API. This method blocks while waiting for the API result.

* @[member='param'] itemId the id to look up.

* @return the result returned by the api. May be null if an error has occurred.

public GELookupResult lookup(int itemId) {

if((System.currentTimeMillis() - TEN_MINUTES) > startTime){ //Flush cache after 10 minutes. Auto-update prices.

flushCache();

startTime = System.currentTimeMillis();

}

if(cache != null && !cache.isEmpty()) {

GELookupResult result = cache.get(itemId);

if(result != null) {

return result;

}

String json;

try {

URL url = new URL(String.format(API_LOCATION, itemId));

Scanner scan = new Scanner(url.openStream()).useDelimiter("\\A");

json = scan.next();

scan.close();

} catch(IOException e) {

return null;

}

GELookupResult result = parse(itemId, json);

if(cache != null) {

cache.put(itemId, result);

}

return result;

}

/**

* Parses a GELookupResult from the JSON returned by the API.

* @[member='param'] itemId The item ID.

* @[member='param'] json The JSON returned by the RuneScape's API.

* @return The serialized result.

private static GELookupResult parse(int itemId, String json) {

Pattern pattern = Pattern.compile("\"(?<key>[^\"]+)\":\"(?<value>[^\"]+)\"");

Matcher m = pattern.matcher(json);

Map<String, String> results = new HashMap<>();

while(m.find()) {

results.put(m.group("key"), m.group("value"));

}

int price = 0;

Matcher priceMatcher = Pattern.compile("\"price\":(?<price>\\d+)").matcher(json);

if (priceMatcher.find()) {

price = Integer.parseInt(priceMatcher.group("price"));

}

return new GELookupResult(

results.get("icon"),

results.get("icon_large"),

results.get("type"),

results.get("typeIcon"),

results.get("name"),

results.get("description"),

Boolean.parseBoolean(results.get("members")),

itemId,

price

);

}

/**

* A class representing a result from an API lookup.

public static final class GELookupResult {

public final String smallIconUrl, largeIconUrl, type, typeIcon, name, itemDescription;

public final boolean isMembers;

public final int id, price;

public final long lastUpdatedAt;

private GELookupResult(String smallIconUrl,

String largeIconUrl,

String type,

String typeIcon,

String name,

String itemDescription,

boolean isMembers,

int id,

int price) {

this.smallIconUrl = smallIconUrl;

this.largeIconUrl = largeIconUrl;

this.type = type;

this.typeIcon = typeIcon;

this.name = name;

this.itemDescription = itemDescription;

this.isMembers = isMembers;

this.id = id;

this.price = price;

this.lastUpdatedAt = System.currentTimeMillis();

}

保存された差分

原文

ファイルを開く

package BotFarmServer;

import java.io.IOException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.Scanner;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
 * Utility class for access to the Grand Exchange API.
 */
public class GrandExchangeApi {
    private static final String API_LOCATION = "http://services.runescape.com/m=itemdb_oldschool" +
            "/api/catalogue/detail.json?item=%d";
    private static final long TEN_MINUTES = 600000;
    private final Map<Integer, GELookupResult> cache;
    private long startTime;

/**
     * Caching-enabled default constructor
     */
    public GrandExchangeApi() {
        this(true);
    }

/**
     * Creates a new Grand Exchange API instance. Starts cache-refresh timer.
     * @[member='param'] cache Whether to enable caching of results.
     */
    public GrandExchangeApi(boolean cache) {
        startTime = System.currentTimeMillis();
        this.cache = cache ? new HashMap<>() : null;
    }

/**
     * If caching is enabled, clears the cache so that new results are fetched on lookup.
     */
    public void flushCache() {
        if(cache != null) {
            cache.clear();
        }
    }

/**
     * Looks up an item using the Grand Exchange API. This method blocks while waiting for the API result.
     * @[member='param'] itemId the id to look up.
     * @return the result returned by the api. May be null if an error has occurred.
     */
    public GELookupResult lookup(int itemId) {
        if((System.currentTimeMillis() - TEN_MINUTES) > startTime){ //Flush cache after 10 minutes. Auto-update prices.
            flushCache();
            startTime = System.currentTimeMillis();
        }

if(cache != null && !cache.isEmpty()) {
            GELookupResult result = cache.get(itemId);
            if(result != null) {
                return result;
            }
        }

String json;
        try {
            URL url = new URL(String.format(API_LOCATION, itemId));
            Scanner scan = new Scanner(url.openStream()).useDelimiter("\\A");
            json = scan.next();
            scan.close();
        } catch(IOException e) {
            return null;
        }

GELookupResult result = parse(itemId, json);

if(cache != null) {
            cache.put(itemId, result);
        }

return result;
    }

/**
     * Parses a GELookupResult from the JSON returned by the API.
     * @[member='param'] itemId The item ID.
     * @[member='param'] json The JSON returned by the RuneScape's API.
     * @return The serialized result.
     */
    private static GELookupResult parse(int itemId, String json) {
        Pattern pattern = Pattern.compile("\"(?<key>[^\"]+)\":\"(?<value>[^\"]+)\"");
        Matcher m = pattern.matcher(json);
        Map<String, String> results = new HashMap<>();
        while(m.find()) {
            results.put(m.group("key"), m.group("value"));
        }

int price = 0;
        Matcher priceMatcher = Pattern.compile("\"price\":(?<price>\\d+)").matcher(json);
        if (priceMatcher.find()) {
            price = Integer.parseInt(priceMatcher.group("price"));
        }

return new GELookupResult(
                results.get("icon"),
                results.get("icon_large"),
                results.get("type"),
                results.get("typeIcon"),
                results.get("name"),
                results.get("description"),
                Boolean.parseBoolean(results.get("members")),
                itemId,
                price
        );
    }

/**
     * A class representing a result from an API lookup.
     */
    public static final class GELookupResult {
        public final String smallIconUrl, largeIconUrl, type, typeIcon, name, itemDescription;
        public final boolean isMembers;
        public final int id, price;

private GELookupResult(String smallIconUrl,
                               String largeIconUrl,
                               String type,
                               String typeIcon,
                               String name,
                               String itemDescription,
                               boolean isMembers,
                               int id,
                               int price) {

this.smallIconUrl = smallIconUrl;
            this.largeIconUrl = largeIconUrl;
            this.type = type;
            this.typeIcon = typeIcon;
            this.name = name;
            this.itemDescription = itemDescription;
            this.isMembers = isMembers;
            this.id = id;
            this.price = price;
        }
    }
}

変更されたテキスト

ファイルを開く

package BotFarmServer;

import java.io.IOException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.Scanner;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
     * Caching-enabled default constructor
     */
    public GrandExchangeApi() {
        this(true);
    }

/**
     * If caching is enabled, clears the cache so that new results are fetched on lookup.
     */
    public void flushCache() {
        long currentTime = System.currentTimeMillis();
        if(cache != null) {
            for (Map.Entry<int,GELookupResult>> entry : cache) {
                if (currentTime - TEN_MINUTES) > entry.getValue().lastUpdatedAt) {
                    cache.remove(entry.getKey()); // item is old. it needs to be refreshed
                }
            }
        }
    }

if(cache != null && !cache.isEmpty()) {
            GELookupResult result = cache.get(itemId);
            if(result != null) {
                return result;
            }
        }

GELookupResult result = parse(itemId, json);

if(cache != null) {
            cache.put(itemId, result);
        }

return result;
    }